JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,660 Commits 2 Branches 0 Tags 13 GiB
42da927f6a
Commit Graph

6864 Commits

Author SHA1 Message Date
Sven Keidel
1a484c8ba2 moved wrapper declaration to preFixup 2014-07-21 17:58:27 +02:00
_1126
70c46319d8 Merge remote-tracking branch 'upstream/master' 2014-07-21 16:01:40 +02:00
Vladimír Čunát
9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Vladimír Čunát
923bf0a3ff mpv: major update, incl. build fix with new ffmpeg 
CC @AndersonTorres. The real build fix is in previous minor updates,
but I see no reason not to have the major updates as well.
 2014-07-21 10:05:50 +02:00
Vladimír Čunát
f63fb3fda0 blender: fix parallel builds 2014-07-21 09:57:16 +02:00
Cillian de Róiste
bc8fe732d0 Add gimpPlugins.focusblur 2014-07-20 21:28:50 +02:00
Sven Keidel
eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Linquize
4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
Cillian de Róiste
2405a94701 KDE Connect 0.7 -> 0.7.2 2014-07-19 18:02:17 +02:00
John Wiegley
73e0c50b30 haskell-git-annex: fix for darwin 
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
 2014-07-18 18:37:54 -05:00
Andrew Morsillo
7f96fff12b Add SpiderOak secure backup service. 2014-07-18 16:21:48 -04:00
Peter Simons
92faa6a009 haskell-git-annex: update to version 5.20140717 2014-07-18 17:30:47 +02:00
Pascal Wittmann
a49e2f866d calibre: update from 1.44.0 to 1.45.0 2014-07-18 16:20:00 +02:00
Vladimír Čunát
df99ec18dc inkscape: enableParallelBuilding, doCheck, add meta 2014-07-18 11:56:47 +02:00
Vladimír Čunát
7e9a0b8ec2 inkscape: maintenance update 
Needed to fix build with poppler-0.26.
 2014-07-18 11:56:44 +02:00
Vladimír Čunát
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
_1126
33e9f3192d Merge remote-tracking branch 'upstream/master' 2014-07-17 13:47:37 +02:00
Eugene Akentyev
08ca4e2d59 Add Light Table editor. 2014-07-17 12:25:22 +02:00
Pascal Wittmann
70caf388eb org: update from 8.2.7 to 8.2.7b 2014-07-17 12:20:22 +02:00
Peter Simons
f0de2bd4a1 Re-generate Haskell expressions with cabal2nix. 2014-07-16 12:10:10 +02:00
Ian-Woo Kim
02d6445409 update hoodle-types 0.2.2 -> 0.3, hoodle-builder 0.2.2.0 -> 0.3, hoodle-parser 0.2.2 -> 0.3, hoodle-render 0.3.2 -> 0.4, hoodle-core 0.13.0.0 -> 0.14, and hoodle 0.2.2.1 -> 0.3 2014-07-16 12:10:10 +02:00
John Wiegley
d24df6e334 haskell-git-annex: corrections for darwin 2014-07-16 01:27:29 -05:00
Eelco Dolstra
327c2061d1 blender: Don't use system openjpeg 
It was ignored anyway (instead using the internal openjpeg copy).
 2014-07-15 23:34:34 +02:00
Eelco Dolstra
12fb52b08a blender: Enable ocean modifier 2014-07-15 23:34:24 +02:00
Eelco Dolstra
457e539048 blender: Fix jackaudio dependency 2014-07-15 23:33:09 +02:00
Eelco Dolstra
2d8e880c82 blender: Update to 2.71 2014-07-15 23:31:55 +02:00
Paul Colomiets
ab2c7cfff7 vim: Add syntax on and set nocompatible by default 
Its what everybody wants in 2014. They are enabled by default both in
ubuntu and archlinux.
 2014-07-15 14:59:16 +02:00
Paul Colomiets
e376e9731d vim: Update vim to 7.4.335 2014-07-15 14:59:16 +02:00
Paul Colomiets
5e99b0553c vim: Implement sourcing /etc/vimrc and /etc/vim/vimrc 2014-07-15 14:59:16 +02:00
Paul Colomiets
abf19df497 Remove wrapVim 
I don't see a reason for having wrapVim function and vimWrapper and
vimHugeXWrapper packages. If you need a system vimrc, whats wrong with
``environment.etc."vimrc".text`` ?

Also strictly speaking ``vimHugeXWrapper`` didn't wrap, X-version
properly. I.e. running ``gvim`` have console vim version.
 2014-07-15 14:59:16 +02:00
Paul Colomiets
496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Vladimír Čunát
0ef81572d8 Merge pull request #3263 from cstrahan/finalterm 
finalterm: New package
 2014-07-15 14:50:25 +02:00
Peter Simons
5bfb58a8a2 Re-generate Haskell packages with cabal2nix. 2014-07-14 17:33:52 +02:00
Peter Simons
56c569a9cd haskell-github-backup: update to version 1.20140707 2014-07-14 17:33:51 +02:00
Peter Simons
af88d71b55 haskell-git-annex: update to version 5.20140709 2014-07-14 17:33:50 +02:00
Ricardo M. Correia
dd41c19ab1 flashplayer: Update from 11.2.202.378 -> 11.2.202.394 2014-07-14 14:36:35 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
_1126
3fee3c05b1 ncmpc: updated to version 0.23. 2014-07-14 10:05:41 +02:00
Charles Strahan
cd8063c4b2 finalterm: Add package 2014-07-13 19:36:43 -04:00
aszlig
4086f7c978
twister: Add new package, version 0.9.22. 
This includes another source-only derivation for the web interface (and
patches the path into the twister binary), so there shouldn't be a need
to move it into ~/.twister/html separately.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-07-13 23:56:11 +02:00
Luca Bruno
6fb00303fb gitolite: fix aborted build due to non-deterministic fetchgit 2014-07-13 12:39:23 +02:00
Rickard Nilsson
89a0bf43d1 mopidy: Update from 0.15.0 to 0.18.3 
Also add the mopidy-spotify extension.
 2014-07-12 09:34:52 +02:00
Pascal Wittmann
e8ef98cea2 calibre: update from 1.35.0 to 1.44.0 2014-07-11 22:57:59 +02:00
Peter Simons
61b60fb1ad cdrtools: mark as broken 
https://github.com/NixOS/nixos/issues/231
 2014-07-10 13:11:32 +02:00
lethalman
1e806db8db Merge pull request #3174 from pSub/dconf-issue 
Fixed settings issue.
 2014-07-10 11:17:10 +02:00
John Wiegley
a25c35b89b git-annex: Allow building on darwin again 2014-07-09 17:52:18 -05:00
Lluís Batlle i Rossell
8aca2c5fa0 Adding retroshare 0.6 (unstable) 2014-07-09 22:24:28 +02:00
Vladimír Čunát
5979d428b4 Merge recent master into x-updates 
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
 2014-07-09 22:13:29 +02:00
Vladimír Čunát
4b263946dd qt3, graphicsmagick137, fox, neverball: fix build 
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
 2014-07-09 21:52:04 +02:00
Peter Simons
ac44601157 idea: minor cosmetic chance to fix syntax highlighting in Emacs 2014-07-09 16:10:50 +02:00
Peter Simons
d4fa3e2e54 Rename 'idea_community_1313' attribute to 'idea_community', i.e. drop the 
version number so that it's possible to refer to some "default version of the
package" without knowing what version number that actually is.

The same applies to idea_ultimate_1313.
 2014-07-09 16:10:50 +02:00
Austin Seipp
c734ec6952 Merge pull request #3201 from cstrahan/update-macvim 
Update `macvim` package to v7.4.355
 2014-07-08 11:47:09 -05:00
Peter Simons
f7f1e3f842 haskell-git-annex: update to version 5.20140707 2014-07-08 15:58:22 +02:00
Pascal Wittmann
a1b27f9806 Merge pull request #3131 from bennofs/dwb-wrapper 
add dwb-wrapper for plugin support
 2014-07-08 14:19:47 +02:00
Moritz Maxeiner
682aadfc91 eclipse: add Eclipse Standard 4.4 Luna 2014-07-08 00:34:56 +02:00
_1126
daa7f344ae ncmpc: update to version 0.22 2014-07-07 23:51:14 +02:00
Benno Fünfstück
52c8df4ad3 dwb: add wrapper and use GTK2 for plugin support 2014-07-07 21:00:53 +02:00
Oliver Charles
847a9a5c30 Merge pull request #3206 from bosu/mp3splt 
Add mp3splt: utility to split mp3 files
 2014-07-07 19:58:00 +01:00
Boris Sukholitko
70ad9ad8f9 Add mp3splt 2014-07-07 21:38:14 +03:00
Charles Strahan
03391f9894 Update macvim package to v7.4.355 
MacVim's maintenance has stagnated, so this moves `macvim` to a new maintainer.
Additionally, the `-headerpad_max_install_names` linker flag is passed to
prevent problems when setting the rpaths.
 2014-07-07 00:16:55 -04:00
Luca Bruno
873832ab6d telepathy-gabble: build on hydra 2014-07-06 11:50:30 +02:00
John Wiegley
67e4df75dd Revert "mutt: update to 1.5.23" 
This reverts commit 6a7d60c01a.
 2014-07-04 15:48:14 -05:00
Michael Raskin
01d9778625 Update boinc 2014-07-04 22:18:49 +04:00
Pascal Wittmann
a628da8b64 Update dwb to latest revision 2014-07-04 15:20:08 +02:00
Peter Simons
0d414a9399 haskell-sloane: update to version 1.8.2 2014-07-04 11:45:43 +02:00
Peter Simons
99c6b978a7 haskell-arbtt: update to version 0.8.1 2014-07-04 11:45:43 +02:00
Pascal Wittmann
6d13d1e521 Fixed settings issue. 
The following warning was shown when I clicked on links:
'GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.'
 2014-07-03 23:19:15 +02:00
Peter Simons
20a931aa8b xmobar: set the proper home page url 2014-07-03 16:52:23 +02:00
Ricardo M. Correia
3614b34c6a transmission: Update from 2.83 -> 2.84 2014-07-03 11:39:11 +02:00
Vladimír Čunát
aceb30cd93 Merge master into x-updates 
Adds the mass-rebuilding python update.
 2014-07-02 22:54:41 +02:00
Austin Seipp
f36252b7cd Merge pull request #3155 from doublec/inferno 
Add inferno, a distributed cross-platform hosted OS
 2014-07-02 13:48:15 -05:00
Austin Seipp
14aca4feff Merge pull request #3164 from 1126/master 
mutt: update to 1.5.23
 2014-07-02 13:45:57 -05:00
Austin Seipp
f318c99f21 Merge pull request #3160 from cstrahan/vcprompt 
vcprompt: new package
 2014-07-02 13:45:27 -05:00
_1126
61c200391a mutt: added mailpath.patch. 2014-07-02 17:14:20 +02:00
_1126
6a7d60c01a mutt: update to 1.5.23 
This commit rewrites the expression somewhat:

- it tries to simplify the expression.
- it changes from fetchurl to fetchhg.
- a patch to configure.ac is added in order to enable configuring the
  source on NixOS.
 2014-07-02 17:08:45 +02:00
cillianderoiste
00cb266c4f Merge pull request #3163 from pSub/writegood-mode 
Update writegood-mode from 1.3 to 2.0
 2014-07-02 14:15:10 +02:00
Pascal Wittmann
da8b931738 Update writegood-mode from 1.3 to 2.0 2014-07-02 13:03:01 +02:00
Charles Strahan
6c15656a06 vcprompt: new package 
This adds the vcprompt utility, a little C program that prints a short string
with barebones information about the current working directory for various
version control systems.
 2014-07-02 02:43:47 -04:00
Chris Double
91ac34b648 Add inferno, a distributed cross-platform hosted OS 2014-07-02 14:00:49 +12:00
_1126
5cc1245a11 xmobar: Updated to 0.21 2014-07-02 01:30:49 +02:00
Michael Raskin
ce623950ad Update bip 2014-07-01 12:08:07 +04:00
Michael Raskin
0733404aca Update baresip 2014-07-01 11:54:09 +04:00
Oliver Charles
e11813c8fe Merge pull request #3142 from pSub/dwb-dconf-issue 
Fixed dwb startup issue
 2014-07-01 08:43:50 +01:00
Oliver Charles
37e8ebc456 Merge pull request #3144 from wmertens/source-missing-fixes 
Source missing fixes
 2014-07-01 08:43:27 +01:00
Mihaly Barasz
c3c41f4ba0 nc-indicators 0.1 -> 0.2 2014-06-30 16:16:38 +02:00
Wout Mertens
ea4207f7a3 makeself: bump to 2.2.0 2014-06-30 16:10:04 +02:00
Michael Raskin
7caec74142 Merge pull request #3118 from NixOS/libreoffice-update-4.2.5 
Libreoffice update 4.2.5
 2014-06-30 17:39:12 +04:00
Pascal Wittmann
eb851b6a19 Fixed dwb startup issue 2014-06-30 14:36:51 +02:00
Michael Raskin
3a197214f9 Merge pull request #3068 from taku0/firefox-bin-30.0 
add firefox-bin: the binary package for Firefox web browser
 2014-06-30 10:31:43 +04:00
John Wiegley
79aaef4846 Merge pull request #3038 from bennofs/fetch-rev-attr 
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
 2014-06-28 17:04:04 -07:00
Michael Raskin
a72bb396a2 Do not create unneeded local-scope packages; disable a failing test 
The test in question tries to fit a table into one page; I cannot find
what dependency update is needed to fix it and there are a few
depedendencies better updated on x-updates.
 2014-06-28 23:33:42 +04:00
Cillian de Róiste
009196d02c KDE Connect 0.5.2 -> 0.7 2014-06-28 21:11:10 +02:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
John Wiegley
bf610b79ff structured-haskell-mode: 1.0.2 > 1.0.3 2014-06-28 09:23:22 -07:00
Rok Garbas
71812277d3 git-remote-add: new package added 2014-06-28 14:15:31 +01:00
John Wiegley
34de04149e twelf: Fix the source URL 2014-06-27 10:46:24 -07:00
Michael Raskin
7788afd571 Libreoffice update: not succesful yet 2014-06-27 16:37:34 +04:00
Luca Bruno
f5eb0f2883 Merge pull request #3052 with some additional changes 2014-06-27 11:38:00 +02:00
Jos van den Oever
6c20d83263 transcode: new package 
Suite of command line utilities for transcoding video and audio codecs,
and for converting beween different container formats.

http://www.transcoding.org/
 2014-06-27 11:34:29 +02:00
John Wiegley
ad96cc8bf9 twelf: new expression; prover for PL theory and logic 2014-06-26 15:54:45 -07:00
Vladimír Čunát
dfd80a1b7e Merge recent master into x-updates 
Hydra eval: 1131611
 2014-06-26 22:05:15 +02:00
Vladimír Čunát
4e39e578f2 lmms: fix build with freetype-2.5 2014-06-26 21:56:47 +02:00
Shea Levy
731288059c Merge branch 'skype43' of git://github.com/nslqqq/nixpkgs 
skype: 4.2.0.13 -> 4.3.0.37
 2014-06-26 12:02:23 -04:00
Nikita Mikhailov
e2ff019965 skype: 4.2.0.13 -> 4.3.0.37 2014-06-26 22:42:21 +07:00
Georges Dubus
bf1f2c6b1f git: Updated to 2.0.1 (close #3096) 2014-06-26 16:54:48 +02:00
Austin Seipp
2711f5772c gitolite: fix default update hooks 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-26 00:24:05 -05:00
Austin Seipp
13162e8cdb Fix gitolite docs 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-25 22:55:43 -05:00
Austin Seipp
ec4cd43ca8 gitolite: 3.6.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-25 22:54:18 -05:00
John Wiegley
d3790c569f Merge pull request #3067 from cstrahan/camlistore 
add camlistore package
 2014-06-24 15:21:12 -07:00
Ricardo M. Correia
11d6964c74 flashplayer: Update from 11.2.202.359 -> 11.2.202.378 2014-06-23 15:50:24 +02:00
taku0
64016c57e7 add firefox-bin: the binary package for Firefox web browser 2014-06-23 22:03:11 +09:00
Lluís Batlle i Rossell
6edfe3e470 Making retroshare bootstrap the DHT fine. 2014-06-23 15:02:22 +02:00
Bjørn Forsman
e395f91607 zile: fix description (don't repeat package name) 2014-06-23 13:36:21 +02:00
Bjørn Forsman
654f9e38e6 zynaddsubfx: fix description (capitalize first word) 2014-06-23 13:04:57 +02:00
Bjørn Forsman
ba9254fcf3 abiword: add to channel 2014-06-23 12:54:46 +02:00
Bjørn Forsman
5dea7f0ed5 abiword: fix typo in description (Microsof -> Microsoft) 2014-06-23 12:45:13 +02:00
Charles Strahan
79e805e281 add camlistore package 2014-06-23 06:26:56 -04:00
Austin Seipp
f8d9d0e5bf Merge pull request #3045 from nslqqq/master 
st: 0.4.1 -> 0.5
 2014-06-22 19:09:31 -05:00
Austin Seipp
c2d33f05d0 Merge pull request #3046 from nslqqq/i3update 
i3: 4.7.2 -> 4.8
 2014-06-22 19:08:57 -05:00
Bjørn Forsman
4a5cf73caa cinelerra: don't repeat package name in meta.description 2014-06-22 22:49:32 +02:00
Bjørn Forsman
a14365b568 alchemy: add meta.longDescription 2014-06-22 21:46:34 +02:00
Vladimír Čunát
6ca980f0b4 llpp: fix freetype include path 
Fixes build, probably after freetype-2.5 update.
 2014-06-22 14:11:46 +02:00
Nikita Mikhailov
724fbd81ff i3: 4.7.2 -> 4.8 2014-06-22 18:17:09 +07:00
Nikita Mikhailov
d851ce331d st: 0.4.1 -> 0.5 2014-06-22 17:25:49 +07:00
Cillian de Róiste
15166ca5c2 Add KDE Connect: A tool to connect and sync your devices with KDE 2014-06-22 10:56:43 +02:00
Charles Strahan
ffc485547f enable bazaar on darwin 2014-06-22 02:57:05 -04:00
Bjørn Forsman
ba048baaff tig: enable command line history/completion support 
Since version 2.0, tig can use readline for history/completion support,
so add readline as a build input.

Increases closure size from 53 MiB to 54 MiB.
 2014-06-21 19:57:36 +02:00
John Wiegley
3b267d77a8 Merge pull request #3031 from jwiegley/proofgeneral 
proofgeneral_4_3_pre: Add expression needed for current prooftree
 2014-06-21 09:22:29 -07:00
John Wiegley
476700d56f git-annex: Build on Darwin, let Cabal determine proper flags 2014-06-21 09:20:46 -07:00
Lluís Batlle i Rossell
116807aa55 retroshare: place plugins at proper place 
Now they can be used.
 2014-06-21 15:53:57 +02:00
Peter Simons
92082524a9 Revert "add OPENSSL_X509_CERT_FILE to the git command environment" 
This reverts commit 88b5578a57 because of the
following issues:

 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then
    its value will overwrite any settings the user may have configured in
    http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then
    this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not
    supposed to have an effect on Git.

 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO
    environment variable as documented in git-config(1), because anything set
    there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which
    might be empty).

 3) The patch breaks other builds of packages that depend on Git, i.e.
    <http://hydra.nixos.org/build/11995872/nixlog/1/raw>.
 2014-06-21 13:15:50 +02:00
John Wiegley
bfe77718d4 emacs-modes-emms, emacs-modes-org: Relax platform qualifier 2014-06-20 22:37:09 -07:00
John Wiegley
073933101e proofgeneral: Delete default.nix for proofgeneral 2014-06-20 22:36:06 -07:00
John Wiegley
0cf6e55a70 proofgeneral_4_3_pre: Add expression needed for current prooftree 2014-06-20 22:31:55 -07:00
Austin Seipp
4d0d891644 Merge pull request #3019 from matejc/syncthing0815 
syncthing: update from 0.8.11 to 0.8.15
 2014-06-20 16:41:09 -05:00
Thomas Tuegel
e07fde4017 Update zotero 4.0.20 -> 4.0.21.1 2014-06-20 08:00:06 -05:00
Vladimír Čunát
3ec2cea214 Merge master into x-updates 
Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-06-20 00:24:38 +02:00
Vladimír Čunát
a00c345343 telepathy_mission_control: minor update, doCheck 
Also add meta, and support upower.
 2014-06-19 23:44:50 +02:00
Vladimír Čunát
87ef13ee80 telepathy-gabble: major update 0.17.2 -> 0.18.2 
Also doCheck, enableParallelBuilding, and add meta attributes.
 2014-06-19 23:44:50 +02:00
aszlig
ca545ac8ec
chromium: Update beta channel to v36.0.1985.84. 
Tested and successfully built on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-19 19:54:34 +02:00
Matej Cotman
25785270b7 syncthing: update from 0.8.11 to 0.8.15 2014-06-19 18:04:18 +02:00
aszlig
3ae3f3272f
chromium: Don't add sources as runtime dependency. 
This is because of a single file that symlinks to the source output
path:

libexec/chromium/resources/extension/demo/library.js

Target within source output path:

chrome/browser/resources/extension_resource/demo/library.js

So we just need to ensure that the cp command follows symlinks during
installPhase and we should no longer have this unnecessary dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-19 01:51:36 +02:00
aszlig
0c50978cb8
chromium: Hardcode dlopen() path for libexif. 
This is needed for Chromium version 36 and higher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-19 01:51:35 +02:00
aszlig
47214207b9
chromium/update: Fix fetching previous version. 
After refactoring the updater we no longer did properly propagate the
exit code from the nix-prefetch-url call to the main script. So if the
newest version could not be fetched it didn't even bother to try the
previous release and we would end up with an empty hash.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-19 01:51:35 +02:00
aszlig
4cbedd7322
chromium: Update all channels to latest versions. 
With this commit, the following new upstream versions are introduced:

stable: 35.0.1916.114 -> 35.0.1916.153
beta:   35.0.1916.86  -> 36.0.1985.67
dev:    36.0.1964.2   -> 37.0.2054.3

All builds successfully tested on my machine, however in order to update
the beta and dev channels, a few additional modifications were
necessary:

 * Update/rebase USER_NS sandbox patch for version 36 and higher.
 * Create address_input_strings.grdp before running gyp in version 37.
 * Remove an empty string leftover from 0517041.
 * Add patch for building bundled Angle for version 37.

The patch for Angle is to remove reliance on git being present during
build and is from https://chromium-review.googlesource.com/202048 but
with own modifications to remove/fix Windows-specific parts within the
patch file.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-19 01:51:34 +02:00
aszlig
3d665679c1
chromium: Properly implement mksnapshot target. 
Let's ensure we do all architecture-dependant stuff inside
mkChromiumDerivation and not pass archInfo around, so we can properly
decouple it from the main function.

This partially reverts 8d54dc6d13.

The main reason for doing this is because the architecture information
is no longer required in Chromium 37, so let's uglify and XXX it in
common.nix and remove it once version 37 hits the stable channel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-19 01:51:34 +02:00
Austin Seipp
85c70f642f Merge pull request #2977 from bluescreen303/emacs-org2blog 
Emacs org2blog - bring up to date - now works with org-8.* again
 2014-06-18 16:21:02 -05:00
Austin Seipp
d349481e8b Merge pull request #2960 from third3ye/patch-2 
Application.ini does not refer correctly
 2014-06-18 16:18:54 -05:00
Austin Seipp
f72e9c1090 Merge pull request #2975 from bluescreen303/conkeror 
conkeror: upgrade to latest snapshot
 2014-06-18 16:09:52 -05:00
Austin Seipp
ae8e54c64b Merge pull request #2989 from pwoolcoc/git-cacert-path 
add OPENSSL_X509_CERT_FILE to the `git` command environment
 2014-06-18 16:09:22 -05:00