Commit Graph

965 Commits

Author SHA1 Message Date
Sander van der Burg
7408aca528 Regenerate NPM expressions with node2nix 1.2.0 2017-03-31 20:51:14 +02:00
Rob Vermaas
3139993740
nixUnstable: update to 1.12pre5122_c60715e
(cherry picked from commit 4da11d7c9b7ed59b5acb19dd6ba335aef113db94)
2017-03-28 11:32:17 +00:00
Domen Kožar
5912496490 Merge pull request #24277 from NixOS/hydra-bump
Nix, Hydra: bump to 2017-03-21
2017-03-26 18:33:59 +02:00
Domen Kožar
99632d5466
Nix, Hydra: bump to 2017-03-21 2017-03-25 13:00:49 +01:00
ndowens
16d2799af2 Changed fetchgit to fetchFromGitHub 2017-03-23 18:04:36 -05:00
Richard Lupton
d09ed00e2d
cde: init at 0.1 2017-03-22 22:45:42 +00:00
Eelco Dolstra
2cb25f8b59
nix: 1.11.7 -> 1.11.8 2017-03-21 14:49:23 +01:00
Pascal Wittmann
e8a395079a
opkg: 0.3.3 -> 0.3.4 2017-03-19 18:42:43 +01:00
Jörg Thalheim
a4c5fc068a
createrepo_c: add missing patches 2017-03-19 16:10:11 +01:00
Jörg Thalheim
d21c647ddb
createrepo_c: fix build
(cc: @copumpkin)
2017-03-19 11:11:43 +01:00
Sander van der Burg
a26c51116d disnix: 0.6 -> 0.7 2017-03-14 23:18:23 +01:00
Rob Vermaas
8784b0582e
Update nixUnstable
(cherry picked from commit fce036d16443b8b9f5f02a9d2bcadc5976044dbc)
2017-03-06 13:32:56 +00:00
Shea Levy
4da420709d nixUnstable: Add s3 support on darwin 2017-03-05 07:39:23 -05:00
Eelco Dolstra
f5e53aea5d
nixUnstable: 1.12pre4997_1351b0d -> 1.12pre5060_fa125b9 2017-03-01 18:04:18 +01:00
Eelco Dolstra
8e1fa01f3a
nix: 1.11.6 -> 1.11.7 2017-02-24 12:53:53 +01:00
Rob Vermaas
1c366b4e06
nixops: update to 1.5
(cherry picked from commit 780a38c611162c34229c9d06b09dd4ec2f8466f4)
2017-02-16 17:03:12 +00:00
Eelco Dolstra
97fc806a7b
nix-prefetch-zip: Remove
This script is not needed anymore since "nix-prefetch-url --unpack
<url>" and "nix-prefetch-url -A foo.src" (where "foo.src" is a
fetchzip / fetchFromGitHub call) work fine.
2017-02-16 11:28:23 +01:00
Vladimír Čunát
6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Frederik Rietdijk
bce69c9cec librepo: use python2
python3 support is experimental. Let's wait with changing.
2017-02-08 19:48:21 +01:00
Joachim F
664360229e Merge pull request #22374 from peterhoeg/f/ruby-tar
fpm: fix vulnerable dependency
2017-02-04 15:27:32 +01:00
Eelco Dolstra
dea81956fc nixUnstable: 1.12pre4911_b30d1e7 -> 1.12pre4997_1351b0d 2017-02-03 14:47:05 +01:00
Peter Hoeg
4494720241 fpm: fix vulnerable dependency 2017-02-02 22:58:43 +08:00
Eelco Dolstra
5fdc6db957
Revert "add nix-prefetch-source (#21734)"
This reverts commit ca38ef79e9 due its
use of importJSON and external source info files, which is
non-idiomatic.
2017-01-30 11:44:15 +01:00
Eelco Dolstra
e7ec067b6b
Revert "nix-update-source: 0.2.1 -> 0.2.2"
This reverts commit b984d5d25f.
2017-01-30 11:44:15 +01:00
Michael Raskin
1d44213c7e Merge pull request #21516 from timbertson/gup
gup: 0.5.5 -> 0.6.0 and extract src into JSON
2017-01-26 07:46:16 +00:00
Franz Pletz
2a7707cf5c
dpkg: 1.18.15 -> 1.18.18 2017-01-26 03:52:48 +01:00
Tim Cuthbertson
b984d5d25f nix-update-source: 0.2.1 -> 0.2.2 2017-01-25 22:23:52 +11:00
Tim Cuthbertson
ca38ef79e9 add nix-prefetch-source (#21734) 2017-01-23 17:44:43 +00:00
Sander van der Burg
5cf1a4d36a nodePackages: upgrade node2nix to version 1.1.1 and regenerate the package set 2017-01-20 22:05:44 +01:00
Eelco Dolstra
96b6968950
nix: 1.11.5 -> 1.11.6 2017-01-13 11:38:09 +01:00
Georges Dubus
08fd548dfd nox: 0.0.4 -> 0.0.5 2017-01-04 15:31:41 +01:00
Eelco Dolstra
0108c31e22
nix: 1.11.4 -> 1.11.5 2017-01-03 11:25:38 +01:00
ikervagyok
fa80bf7b0d packagekit: add 'enableNixBackend' as an option (#21157)
* packagekit: disable nix-backend

Packagekit fails to build on my machines, as long as it's nix-backend is enabled

* packagekit: add 'enableNixBackend' as an option
2016-12-17 16:53:27 +01:00
Eelco Dolstra
c94454a45a nixUnstable: 1.12pre4523_3b81b26 -> 1.12pre4911_b30d1e7 2016-12-09 11:21:06 +01:00
Frederik Rietdijk
74276caf19 koji -> pythonPackages.koji
koji is both a library and an application. It is used in Nixpkgs
primarily as a library and therefore I move it.
2016-12-01 21:07:33 +01:00
Tuomas Tynkkynen
8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Pascal Wittmann
e8f7c31dfb
opkg: 0.3.1 -> 0.3.3 2016-11-27 15:58:29 +01:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk
2de9321880 nodejs: add python to passthru
so nodeEnv uses the exact same version.

See also https://github.com/svanderburg/node2nix/issues/25
2016-11-24 22:28:04 +01:00
Frederik Rietdijk
1e52bed8a3 createrepo_c: use python2 2016-11-24 22:28:02 +01:00
Domen Kožar
ce6abb9495 nixopsUnstable: init at 2016-11-23 2016-11-23 17:35:36 +01:00
Tobias Geerinckx-Rice
2034ffdc07
dpkg: 1.18.14 -> 1.18.15 2016-11-16 13:20:32 +01:00
Tobias Geerinckx-Rice
8ef3eaeb4e
dpkg: remove commented old postPatch
This was supposed to be removed in 7f71b89454
since it doesn't appear to be needed any longer.
2016-11-14 05:32:22 +01:00
Tobias Geerinckx-Rice
7f71b89454
dpkg: 1.18.10 -> 1.18.14 2016-11-14 01:45:49 +01:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Kirill Boltaev
0c34b202e3 nixops: explicitly specify python2 2016-10-19 18:51:44 +03:00
Frederik Rietdijk
582ab2cf4e koji: use python2 2016-10-18 23:16:07 +02:00
Vladimír Čunát
061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
zimbatm
6351c4d24b Merge pull request #19180 from zimbatm/bundler-env-bins
Bundler env bins
2016-10-14 11:51:23 +01:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Dan Peebles
f35ab9c2f8 rpm-ostree: 2016.1 -> 2016.10
This also updates a bunch of its dependencies to enable the update,
and gets rid of libhif because upstream stopped maintaining it as
such, instead using it internally in other projects until they can
agree on an interface for it. Nothing seemed to be using libhif so
I'm not too concerned about removing it.
2016-10-12 20:31:02 +00:00
zimbatm
16cf3cf687 fpm: simplify 2016-10-08 22:38:57 +01:00
Robert Helgesson
e8817a2d20
bash-completion: change attribute name
This changes the attribute name of bash-completion from `bashCompletion`
to `bash-completion`. Keeps `bashCompletion` as an alias for the new
name.
2016-09-28 17:46:29 +02:00
Graham Christensen
dad5651bd4
rpm: 4.12.0 -> 4.13.0-rc1 for CVEs
Null pointer deref & out of bound reads. See: https://lwn.net/Vulnerabilities/685287/

Fedora is shipping the rc1 as well.

re: https://github.com/NixOS/nixpkgs/pull/18975
2016-09-27 21:07:35 -04:00
Tuomas Tynkkynen
bb19e17d14 rpm: Split into multiple outputs
Patch away two things:

- %_includedir, %_oldincludedir, %_mandir, %_infodir macros from
  lib/rpm/platform/*/macros to avoid cycles between outputs. Hopefully
  anything doesn't really need those.
- Change %__ld, %__nm, %__objcopy, %__objdump in lib/rpm/macros to
  refer to the commands in PATH. Should be safe as %__cc for instance is
  already like that.
2016-09-19 16:09:34 +03:00
Tuomas Tynkkynen
48d7948808 rpm: Use list for configureFlags 2016-09-19 16:09:34 +03:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Sander van der Burg
77b9abf78c disnix: 0.6 -> 0.6.1 2016-09-13 19:47:19 +00:00
Sander van der Burg
2edb28ffc5 dysnomia: bump to version 0.6.1 2016-09-13 19:41:54 +00:00
Eelco Dolstra
6a9fb8b9e0 nix: Enable install check
Looks like this got disabled accidentally in
ec5b66eb4a.
2016-09-12 23:34:08 +02:00
Eelco Dolstra
f2ddf2a9be nix: 1.11.3 -> 1.11.4 2016-09-06 16:15:22 +02:00
Benjamin Staffin
2e88851c61 dpkg: Fix the build on Darwin
There are still some bugs and quirks, but this gets dpkg building at
least, and some parts of it are useful.
2016-09-05 01:14:36 -04:00
Sander van der Burg
792f50fe7c nixui: migrate to node2nix 2016-09-01 12:14:20 +00:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Vladimír Čunát
3996aa8953 nix: maintenance 1.11.2 -> 1.11.3
Fixes #17804.
2016-08-29 22:44:01 +02:00
Tuomas Tynkkynen
b2e701cb1d nix-repl: Use 'dev' output of nix 2016-08-29 21:30:52 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Jaka Hudoklin
869cfddcfc Merge pull request #17888 from peterhoeg/fpm_162
fpm: 1.4.0 -> 1.6.2
2016-08-24 23:39:51 +02:00
Robin Gloster
8cd050f6ba rpm: remove hack
elfutils now adds a eu- prefix to avoid collisions
2016-08-24 19:23:42 +00:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Ram Kromberg
1730151d97 packagekit: vala -> vala_0_23 2016-08-21 20:18:21 +03:00
Peter Hoeg
9aa2515d14 fpm: 1.4.0 -> 1.6.2 2016-08-21 20:28:39 +08:00
Aneesh Agrawal
e2ddcc938f nix: remove unused unstable.nix file 2016-08-18 23:14:07 -04:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Domen Kožar
49222660fc Merge pull request #17256 from matthewbauer/patch-4
Travis fixes
2016-08-13 14:17:59 +02:00
Luca Bruno
a10886dfdc Merge pull request #17514 from matthewbauer/packagekit-1.1.3
packagekit: git -> 1.1.3
2016-08-12 22:03:55 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Matthew
1c870804d1 opkg: add libxml2 as input
This caused the failures seen here:

http://hydra.nixos.org/build/38313838/nixlog/1
2016-08-09 21:24:59 +00:00
Matthew Bauer
bc49483bab packagekit: git -> 1.1.3
Update packagekit to a real release instead of just a random commit.
2016-08-04 18:05:31 +00:00
Tobias Geerinckx-Rice
80cae1f055
dpkg: 1.18.9 -> 1.18.10 2016-08-04 00:25:20 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
db35d7b8ab koji, opensp: Some meta fixes 2016-08-02 21:17:44 +03:00
Matthew Justin Bauer
a30a34b6f3 nox: add git as build input
also: add nox as separate target to make build log more quiet
2016-07-29 20:54:02 -05:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Rob Vermaas
48c32dc0b7 nixops: update to 1.4
(cherry picked from commit 9909d31602f6242259bcf7d31e88107fa5f1fb5f)
2016-07-19 14:33:52 +00:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Joachim F
ed50ef318b Merge pull request #15848 from matthewbauer/packagekit
Add in PackageKit
2016-07-16 13:29:08 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Domen Kožar
5789f5875f nix-repl: 2015-09-07 -> 2016-02-28 2016-07-11 14:00:28 +02:00
Tobias Geerinckx-Rice
ce5c51b406
dpkg: 1.18.8 -> 1.18.9 2016-07-06 19:42:45 +02:00
Tobias Geerinckx-Rice
12c055240d
dpkg: 1.18.7 -> 1.18.8 2016-07-06 15:56:33 +02:00
Matthew Bauer
10fb846989 packagekit: add myself as maintainer 2016-07-05 20:27:28 +00:00
Matthew Bauer
4e50880c82 packagekit: add latest from hughsie's github repo
- currently pulled in from Git until the next release of PackageKit
  has Nix support
- also: add in a service module to start packagekit properly
- nixos service can be enabled via services.packagekit.enable
- packagekit requires nixunstable to build properly
2016-07-05 20:26:59 +00:00
Georges Dubus
a865e34f51 nox: update to 0.0.4 2016-07-04 13:40:40 +02:00
William Casarin
c81b4cde58 clib: 1.4.2 -> 1.7.0 (#16656) 2016-07-02 12:46:57 +02:00
zimbatm
da253439ed gx: add missing meta 2016-06-19 13:45:16 +01:00
Aristid Breitkreuz
6163428316 Merge pull request #16271 from zimbatm/gx
Gx
2016-06-18 20:30:03 +02:00
Sander van der Burg
fcf72b82ae DisnixWebService: 0.5 -> 0.6 2016-06-17 08:15:32 +00:00
Sander van der Burg
16bbfe893b disnixos: 0.4.1 -> 0.5 2016-06-16 22:16:55 +00:00
Sander van der Burg
b4315e523f disnix: 0.5 -> 0.6 2016-06-16 21:01:45 +00:00
Sander van der Burg
c5faa7c83d dysnomia: 0.5.1 -> 0.6 2016-06-16 15:45:50 +00:00
Joachim Fasting
c05271adf9
nix-serve: fix meta eval
Introduced in d20a8ddea8
2016-06-16 15:54:29 +02:00
Allen Nelson
d20a8ddea8
nix-serve: set PATH
joachifm: also set `dontBuild = true`; `false` doesn't make any sense if
the intent is to skip the build phase.

Closes #16221
2016-06-16 15:00:04 +02:00
zimbatm
996a2b54c4 gx-go: init at 20160611 2016-06-15 22:41:29 +01:00
zimbatm
e1a487fa8f gx: init at 20160601 2016-06-12 23:14:42 +01:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Frederik Rietdijk
47d220818c Merge pull request #15503 from madjar/master
nox: update to 0.0.3
2016-05-16 21:34:14 +02:00
Tobias Geerinckx-Rice
a4e9662297
packagekit: 1.1.0 -> 1.1.1 2016-05-16 20:27:31 +02:00
Georges Dubus
7747d535b1 nox: update to 0.0.3 2016-05-16 19:45:51 +02:00
Tuomas Tynkkynen
d359ce90e8 nix-prefetch-scripts: Use correct output of 'nix' 2016-05-14 21:10:23 +03:00
Tobias Geerinckx-Rice
2cf6c67d15
dpkg: 1.18.6 -> 1.18.7 2016-05-14 16:01:33 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Tuomas Tynkkynen
24b046ce05 rpm: Fix python3 detection hack
Commit 5dff3c4b68 made rpm use autoreconfHook, so the patch that we
are making to `configure` gets lost when the file is regenerated.
To fix this, just patch the equivalent string in the `configure.ac` file
instead.

Fixes #15287
2016-05-07 17:55:32 +03:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Tobias Geerinckx-Rice
e58cd82e87
dpkg: 1.18.5 -> 1.18.6 2016-05-05 02:16:56 +02:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tobias Geerinckx-Rice
6b6463dbd2
dpkg: 1.18.4 -> 1.18.5 2016-05-03 02:01:12 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Dan Peebles
5dff3c4b68 rpm: stop build from trying to create /var/tmp, which breaks in sandboxed builds 2016-05-01 18:09:30 +00:00
Dan Peebles
6af34124a4 libhif, rpm-ostree: fix broken meta
Forgot to add stdenv.lib to scope!
2016-04-30 16:23:53 +00:00
Dan Peebles
c9be29c5fb libhif: add meta and add myself as a maintainer 2016-04-30 16:03:47 +00:00
Dan Peebles
df8971ba40 librepo: add meta and add myself as a maintainer 2016-04-30 16:01:26 +00:00
Dan Peebles
48fb16ffbf createrepo_c: add meta and myself as a maintainer 2016-04-30 02:15:04 +00:00
Dan Peebles
c048f7db7b rpm: fix state directory in build
Prior to this change, it was was defaulting to storing its state in
its store path, which didn't make any sense.

Also added myself as a maintainer
2016-04-30 02:07:50 +00:00
Tobias Geerinckx-Rice
88f9f8b9ce
packagekit: 1.0.8 -> 1.1.0 2016-04-29 21:42:35 +02:00
Dan Peebles
d70752cce9 libhif: init at 87e4cb24
The latest released version is too old for my needs, so I'm picking
a git commit that works. I'll update it when they release a new one.
2016-04-29 03:06:02 +00:00
Dan Peebles
fcf37351bd librepo: init at 1.7.18 2016-04-29 02:46:16 +00:00
Dan Peebles
bd8a1258bf createrepo_c: init at 0.10.0 2016-04-29 02:40:51 +00:00
Dan Peebles
fbbf910e23 rpm: add lua support and a few propagatedBuildInputs
It turns out that a surprising number of common packages use lua
scripts in RPM files, and not having lua can lead to obscure failures.

The propagatedBuildInputs stuff makes the librpm stuff more useful,
since some of its headers didn't work without extra buildInputs before.
2016-04-29 02:29:02 +00:00
Frederik Rietdijk
d5e6a4494a Python: use PyPI mirror (#15001)
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Eelco Dolstra
21a2f2ba3b nix: Add a "dev" output
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
2016-04-18 21:13:18 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Domen Kožar
d7034e6d5f nixUnstable: bump
(cherry picked from commit bb6d3c16d3a851c646c0d1fc6976b546c766a227)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-27 20:24:43 +01:00
Tobias Geerinckx-Rice
99c4f143d9 debian-devscripts: rename from deprecated debian_devscripts 2016-03-24 20:24:00 +01:00
Ludovic Courtès
5dab370d77 Remove Guix. 2016-03-23 13:33:29 +01:00
Sander van der Burg
7ed3dc6cfc dysnomia: bump to version 0.5.1 2016-03-20 15:21:42 +00:00
Vladimír Čunát
f9cae4f6dc fpm: init at 1.4.0
/cc #14061.
2016-03-20 11:56:07 +01:00
Domen Kožar
8e398a88a1 nixUnstable: point to latest 1.12pre 2016-03-17 13:03:36 +00:00
Sander van der Burg
0f46200f26 disnixos: bump to version 0.4.1 2016-03-16 13:27:54 +00:00
Vladimír Čunát
2cbe6bb3f0 nix: split man output from doc 2016-03-08 09:59:31 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Valérian Galliat
269d0864b5 nix-prefetch-scripts: explicitly depend on Nix
Otherwise, a call to, for example, nix-prefetch-git, in a nix-shell --pure or
nix-build phase would result in an error such as:

    Switched to a new branch 'fetchgit'
    removing `.git'...
    /nix/store/7qvjji7kbd033nsyxlpiiiam61a44yz9-nix-prefetch-git/bin/.nix-prefetch-git-wrapped: line 374: nix-hash: command not found
2016-02-29 18:38:59 -05:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Robin Gloster
ea84b3a915 clib: turn off fortify hardening 2016-02-19 21:15:59 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Eelco Dolstra
e674356c46 nix: Fix indentation 2016-02-12 16:10:59 +01:00
Eelco Dolstra
aa31d99d29 nix: 1.11.1 -> 1.11.2 2016-02-12 15:20:27 +01:00
Robin Gloster
6be9164b97 checkinstall: turn off fortify 2016-02-09 01:03:24 +00:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Sander van der Burg
a6bda1a62a disnix: bump to version 0.5 2016-01-27 22:32:34 +00:00
Eelco Dolstra
42e53ba62c nix: 1.10 -> 1.11.1 2016-01-26 17:00:15 +01:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Rob Vermaas
ce2756f701 Fix nixops URL 2016-01-19 10:00:32 +00:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice
33e2c9c29a dpkg: 1.18.2 -> 1.18.4 2016-01-19 02:04:18 +01:00
Eelco Dolstra
320f1b4e3c nix: 1.11pre4345_b8258a4 -> 1.11pre4379_786046c 2016-01-14 13:20:49 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Eelco Dolstra
63bf2a551e nixUnstable: 1.11pre4334_7431932 -> 1.11pre4345_b8258a4 2015-12-29 17:54:58 +01:00
Domen Kožar
688ff0c0dc Merge pull request #11992 from dezgeg/pr-update-diffoscope
diffoscope: 29 -> 44
2015-12-28 07:46:12 +01:00
Tuomas Tynkkynen
c0aada1e1f rpm: Hack fix finding libpython when compiling for Python 3
Currently, building RPM with `python = python3` causes this:

checking for a Python interpreter with version >= 2.6... python3
checking for python3... /nix/store/dykqxnrwiz9drlcv2wy8lpvl3xvklx0g-python3-3.4.3/bin/python3
checking for python3 version... 3.4
checking for Python.h... yes
checking for library containing Py_Main... no
configure: error: missing python library

That comes from this snippet in configure.ac:
    AC_SEARCH_LIBS([Py_Main],[python${PYTHON_VERSION} python],[
      WITH_PYTHON_LIB="$ac_res"
    ],[AC_MSG_ERROR([missing python library])
    ])

So it's looking for (e.g) `libpython3.4.so` wheras we have `libpython3.4m.so`.
Patching the configure script to match seems to make that work (although
I don't really understand what the heck is this 'm' business about).
2015-12-28 02:16:23 +02:00
Domen Kožar
0e4e01c7a6 add back nixopsUnstable 2015-12-18 18:51:12 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Eelco Dolstra
2de76b2753 nixUnstable: 1.11pre4273_71039be -> 1.11pre4334_7431932 2015-12-10 15:25:48 +01:00
Pascal Wittmann
fbcf7fcd33 opkg: 0.3.0 -> 0.3.1 2015-12-08 22:54:03 +01:00
Tuomas Tynkkynen
c47910ae4e nix-prefetch-scripts: Split into multiple derivations
This makes it possible to e.g. only install nix-prefetch-git and not the
others.

Closes #7399.
2015-12-04 14:38:41 +02:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Tobias Geerinckx-Rice
5e63a0b51a packagekit: fix typo urmpi -> urpmi 2015-11-24 01:40:41 +01:00
Tobias Geerinckx-Rice
8a222f6844 packagekit: convert configureFlags string -> list 2015-11-24 01:40:41 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Matej Cotman
5f5fd03a71 nixui: upgrade to 0.2.1 2015-11-17 12:28:22 +01:00
zimbatm
76bf9c54ea nix-prefetch-git: add missing coreutils dependency
At runtime, `readlink` is a dependency
2015-11-16 11:54:43 +01:00
Eelco Dolstra
58f9896a43 nixUnstable: Update to 1.11pre4273_71039be 2015-10-31 00:22:32 +01:00
Eelco Dolstra
d9d5c98c56 Add option environment.enableDebugInfo
This makes the debug outputs of packages that have them available to
programs like gdb.
2015-10-30 15:21:16 +01:00
Tuomas Tynkkynen
c471cb866f subversion: Split into multiple outputs 2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
bff9b546e4 nix-prefetch-scripts: Reference correct output of curl 2015-10-28 10:17:12 +01:00
Sander van der Burg
644dd145c9 dysnomia: bump to version 0.4.1 2015-10-24 18:23:47 +00:00
Vladimír Čunát
ba9b80c7e0 nspr,nss: split into multiple outputs
Hopefully most references are OK.
2015-10-13 20:18:44 +02:00
Eelco Dolstra
1286435499 nixUnstable: Update to 1.11pre4244_133a421 2015-10-09 14:44:27 +02:00
Eelco Dolstra
24483ebe47 nixUnstable: Update to 1.11pre4243_2075ec8 2015-10-08 15:57:29 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Arseniy Seroka
f34aedfbd7 Merge pull request #10161 from dezgeg/pr-update-rpm
rpm: 4.11.2 -> 4.12.0
2015-10-01 14:20:43 +03:00
Tuomas Tynkkynen
aa6076f9f5 rpm: 4.11.2 -> 4.12.0 2015-10-01 00:42:36 +03:00
Rob Vermaas
df9fc0f8e0 Remove nixops unstable expression, until we reintroduce it again. Currently it is not referenced, as nixopsUnstable = nixops. 2015-09-30 12:49:11 +00:00
Rob Vermaas
92e98c2b03 nixops: 1.2 -> 1.3
(cherry picked from commit a91d4f8a243933181c119ceff434e59eae09be10)
2015-09-29 19:53:47 +00:00
Rob Vermaas
ad4f110b73 Revert "nixops: 1.2 -> 1.3."
This reverts commit 43dee76b4b.
2015-09-28 11:41:10 +00:00
Rob Vermaas
43dee76b4b nixops: 1.2 -> 1.3.
(cherry picked from commit fcaf96b8d40e0c9559523674da03ab47edcfc8fb)
2015-09-28 11:33:58 +00:00
Eelco Dolstra
2a28bc6691 separateDebugInfo: Assert Linux
Also remove some unintended setting of separateDebugInfo.
2015-09-22 20:21:10 +02:00
Domen Kožar
6b7c2a47c2 nixopsUnstable: bump
(cherry picked from commit 9a401ca40430028310b4bcfa18f5c5b268b54014)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-19 16:37:33 +02:00
Eelco Dolstra
ec5b66eb4a Enable separate debug info
You can now pass

  separateDebugInfo = true;

to mkDerivation. This causes debug info to be separated from ELF
binaries and stored in the "debug" output. The advantage is that it
enables installing lean binaries, while still having the ability to
make sense of core dumps, etc.
2015-09-17 15:56:33 +02:00
Eric Seidel
1d5a96c3c6 Merge pull request #9309 from acowley/nix-darwin
nix: use libsodium on darwin
2015-09-14 15:12:33 -07:00
Eelco Dolstra
a5ea7ddb08 nix-repl: Update
Fixes #9710.
2015-09-08 10:41:13 +02:00
Eelco Dolstra
86eaeb4c0a Nix: Update to 1.10 2015-09-04 10:40:08 +02:00
Frederik Rietdijk
3e0fab3864 nox: use propagatedBuildInputs instead of pythonPath, fixes #9633
This way, when accessing Nox via Python, the dependencies will be
available.
2015-09-03 12:51:47 +02:00
Tobias Geerinckx-Rice
6a02e7201c packagekit: 1.0.7 -> 1.0.8 2015-08-31 17:17:33 +02:00
Tobias Geerinckx-Rice
80a882e6cc dpkg: 1.18.1 -> 1.18.2 2015-08-31 17:17:33 +02:00
Eelco Dolstra
fa67a2d301 nixUnstable: Update 2015-08-24 18:58:45 +02:00
Tobias Geerinckx-Rice
69114f74aa packagekit: use http:// instead of https://
Proxy weirdness?
2015-08-23 00:02:29 +02:00
Tobias Geerinckx-Rice
4ec87513b6 packagekit: python3 attr. -> unversioned python 2015-08-20 18:26:15 +02:00
Tobias Geerinckx-Rice
46df28d371 packagekit: init at 1.0.7
Don't worry, this does absolutely nothing on Nix and only serves to
satisfy simple-scan's zany new dep.
2015-08-20 04:41:11 +02:00
Anthony Cowley
7dbea7aa78 Nix darwin use libsodium 2015-08-17 18:09:19 -04:00
Peter Simons
7053602206 nixops: update unstable version to latest git HEAD 2015-08-05 14:37:46 +02:00
Eelco Dolstra
b3d8d750de Remove /etc/nixos/nixpkgs from $NIX_PATH
NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
2015-08-05 14:34:33 +02:00
Sander van der Burg
0310b48494 Add mongodb-tools package as dependency to make snapshots and restores work 2015-07-31 16:19:56 +00:00
Eelco Dolstra
61a858783c nix-repl: Bump 2015-07-30 12:08:20 +02:00
Eelco Dolstra
8a5000cc78 nixUnstable: Update to 1.10pre4200_76cc8e9
Also unify the nixStable and nixUnstable expressions.
2015-07-30 12:08:20 +02:00
Eelco Dolstra
f98c7f2976 More docs in separate outputs 2015-07-26 22:46:45 +02:00
Peter Simons
dc5084b4d1 nixops: fix Emacs syntax highlighting 2015-07-23 19:47:43 +02:00
Peter Simons
5fcdd7c0dc nixopsUnstable: disable broken documentation build 2015-07-23 19:47:16 +02:00
Georges Dubus
eb9475d110 nox: updated to 0.0.2 2015-07-20 17:09:33 +02:00
Sander van der Burg
e54d0371b9 disnix: bump to version 0.4 2015-07-08 12:03:56 +00:00
Tobias Geerinckx-Rice
8e16c57424 nox: show trace for evaluation errors
Backports upstream commit 8900531.
2015-07-03 04:52:06 +02:00
William Casarin
634d9eb4c1 clib: a micro-package manager for C 2015-06-23 00:35:03 -07:00
William A. Kennington III
3a60e40d9b nix-serve: Update 2015-06-18 19:29:39 -07:00
Tobias Geerinckx-Rice
4e5e44140b dpkg, x2goclient: fix evaluation
Bed time.
2015-06-17 23:25:09 +02:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Peter Simons
fcd7b6829b nix-repl: bump version to add support for current versions of Nix 2015-06-17 11:11:25 +02:00
Sander van der Burg
093b2de396 dysnomia: fix compatibility with mariadb derivation 2015-06-12 16:19:26 +00:00
Eelco Dolstra
192d20e820 nix: Update to 1.9 2015-06-12 13:19:48 +02:00
Pascal Wittmann
794feb7879 opkg: update from 0.2.4 to 3.0.0 2015-06-08 16:19:42 +02:00
Eelco Dolstra
a70d0275e2 nixUnstable: Bump
This should fix the NixOS installer tests.
2015-06-05 13:53:49 +02:00
Shea Levy
33a1b14b06 nixopsUnstable: Bring in quick fix 2015-06-02 16:23:46 -04:00
Shea Levy
99bf7f5698 nixopsUnstable: Bump 2015-06-02 15:50:44 -04:00
Tobias Geerinckx-Rice
cf8ea81fe4 dpkg 1.18.0 -> 1.18.1 2015-06-01 04:04:33 +02:00
Tobias Geerinckx-Rice
3c6d34a5d9 dpkg 1.17.25 -> 1.18.0 2015-05-30 21:09:25 +02:00
William A. Kennington III
f51d38214d nixUnstable: Bump 2015-05-29 11:48:58 -07:00
Shea Levy
0ad7204c3d nixopsUnstable: bump 2015-05-29 13:05:48 -04:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Edward Tjörnhammar
87b0558101 nixUnstable: Update to 1.9pre4100_4bbcfaf 2015-04-23 13:52:44 +02:00
Tobias Geerinckx-Rice
55edae18f0 dpkg 1.16.9 -> 1.17.25 2015-04-20 04:09:50 +02:00
Vladimír Čunát
e36dd5acf8 nix: fix paths to bzip outputs 2015-04-18 21:37:00 +02:00
William A. Kennington III
493f526eef nixUnstable: Bump 2015-04-07 14:00:26 -07:00
Eelco Dolstra
f713e7033e nixUnstable: Update to 1.9pre4087 2015-04-03 11:40:12 +02:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Eelco Dolstra
5cc05f6cf2 nixUnstable: Update to 1.9pre4083_5114a07 2015-03-24 14:42:37 +01:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Sander van der Burg
9be119bb0e disnix: bump to version 0.3 2015-03-13 21:07:46 +00:00
Sander van der Burg
0bc51eacd9 dysnomia: bump development version 2015-03-12 16:40:34 +00:00
Sander van der Burg
e61c7ad901 Bump development versions of Disnix 2015-03-09 23:29:40 +01:00
Eelco Dolstra
e02d926ca9 nixUnstable: Update to 1.9pre4074_e659978 2015-03-09 11:27:22 +01:00
Sander van der Burg
de8e1bcb03 DisnixWebService: bump to latest development version 2015-03-06 09:41:31 +00:00
Eric Seidel
b6a3fd396e dysnomia: fix syntax error 2015-03-05 13:00:50 -08:00
Sander van der Burg
bb3cf3b461 Bump development versions of disnix packages 2015-03-05 20:22:42 +00:00
Sander van der Burg
b0dc17a5ed Bump development versions of Disnix 2015-03-02 09:37:10 +00:00
Sander van der Burg
8b1110f89a Bump development versions of several Disnix tools 2015-02-20 20:20:43 +00:00
Eelco Dolstra
d6c88eaeb8 Apply upstream fix for Nix on XFS
Fixes #6424.
2015-02-18 10:41:39 +01:00
Eelco Dolstra
cbab474cea nixUnstable: Update 2015-02-18 10:39:47 +01:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Eelco Dolstra
038a837f02 nixUnstable: Update to 1.9pre4028_0d1dafa 2015-02-04 14:22:34 +01:00
Matej Cotman
7e1e553cb8 nixui: update to 0.1.2 (close #6005) 2015-01-27 18:19:39 +01:00
Matej Cotman
f550c76d0e nixui: update to 0.1.1 2015-01-26 10:21:24 +01:00
Matej Cotman
4212dcabd9 nixui: do not use pkgs.path 2015-01-23 17:28:04 +01:00
Wout Mertens
70ac34b8c0 nixui: include build files 2015-01-23 15:59:10 +01:00
Wout Mertens
4c2554ebf4 Remove nixui to fix travis failures 2015-01-23 15:49:57 +01:00
Wout Mertens
71e107acac Set nixui to broken
See 264ed82eda (commitcomment-9416066)
2015-01-23 15:37:54 +01:00
wmertens
c5692758b5 Merge pull request #5896 from matejc/nixui
Add NixUI package
2015-01-22 13:23:36 +01:00
Charles Strahan
8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby
Pleasant ruby
2015-01-21 23:27:38 -05:00
Matej Cotman
264ed82eda nixui: add new package 2015-01-22 05:27:31 +01:00
Daniel Peebles
ea5594679c Bump nixUnstable build 2015-01-21 22:13:51 -05:00
Charles Strahan
dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Domen Kožar
afe7612e89 Merge pull request #5779 from cstrahan/prefetch-scripts-home
prefetch-scripts: improve purity
2015-01-17 15:18:52 +01:00
Daniel Peebles
65522d05d4 Turn nixUnstable back on 2015-01-15 22:47:47 -05:00
Charles Strahan
54f3b50131 prefetch-scripts: improve purity
Set HOME to /homeless-shelter to prevent things like git hooks from
running

Closes #5777
2015-01-14 21:28:14 -05:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Kirill Elagin
67d0e60f6c nox: Do not wrap
Fixes madjar/nox#17.
2015-01-09 21:34:48 +03:00
Peter Simons
dc70244447 Update HEAD versions of Cabal and cabal-install version to 1.22.0.0. 2015-01-05 18:39:19 +01:00
Peter Simons
9b8ff2f5f2 Update Cabal to version 1.20.0.3 and cabal-install to version 1.20.0.6. 2015-01-01 23:07:41 +01:00
Charles Strahan
df55381b65 ghcjs: restructure 2014-12-31 00:03:43 -05:00
Charles Strahan
94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -05:00
Charles Strahan
145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Charles Strahan
347a9674c1 ghcjs: cleanup 2014-12-27 18:48:12 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Peter Simons
c9a2bbdf65 cabal-install-1.20.0.4: patch the build manually instead of relying on jailbreak
jailbreak-cabal has trouble with that cabal file when built with older versions
of the Cabal library.
2014-12-19 07:45:11 +01:00
Peter Simons
fa165e137d cabal-install: update to version 1.20.0.4
The test suite had to be disabled because of https://github.com/haskell/cabal/issues/2285.
2014-12-18 18:36:49 +01:00
Eelco Dolstra
bd0d1e836c nix-repl: Update 2014-12-14 05:29:32 +01:00
Eelco Dolstra
e115bdecd8 nix: Update to 1.8 2014-12-14 05:29:24 +01:00
Eelco Dolstra
188c038897 Add nix-serve 2014-12-14 02:19:54 +01:00
tv
86055e2f00 nixopsUnstable: Initial version 1.3pre1362_2a616f8 2014-12-12 16:30:54 +01:00
Shea Levy
fcaf268d54 nixUnstable: bump 2014-12-03 22:22:18 -05:00
Shea Levy
97f35cf29a nixUnstable: bump
Bug fixed in b0c5c2a was giving me segfaults...
2014-11-21 08:36:02 -05:00
Eelco Dolstra
8be7b23cb3 nixUnstable: Update to 1.8pre3899_8299aaf 2014-11-19 18:26:07 +01:00
Shea Levy
8b9b0d95a0 nixUnstable: bump 2014-11-17 00:59:31 -05:00
Pascal Wittmann
2c19d082fb opkg: update from 0.2.3 to 0.2.4 2014-11-15 12:19:54 +01:00
Eelco Dolstra
ca441636f1 Merge branch 'staging' 2014-11-14 16:00:23 +01:00
Eelco Dolstra
03d828a976 nixUnstable: Update to 1.8pre3890_8cfe939 2014-11-14 16:00:00 +01:00