JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,030 Commits 2 Branches 0 Tags 13 GiB
e3b0d09591
Commit Graph

821 Commits

Author SHA1 Message Date
armijnhemel
fed7d4a6e9 RPM: 4.13.0-rc1 -> 4.13.0.1 (#24910) 2017-04-15 10:18:04 +02:00
Eelco Dolstra
29b415dcdb
Add nixUnstable.perl-bindings 2017-04-11 15:36:51 +02:00
Eelco Dolstra
3dd66ec6e9
nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa 2017-04-11 15:02:45 +02:00
Dan Peebles
ec674a6372 nix: fix evaluation 
Sorry!
 2017-04-08 21:15:21 -04:00
Dan Peebles
fbdc4616ab nix: fix on LLVM 4.0 2017-04-08 16:54:16 -04:00
Tim Cuthbertson
892fd83ec8 nix-update-source: init at 0.4.0 2017-04-07 22:11:34 +10:00
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