Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
all-packages.nix	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
guile-2-test.nix
haskell-defaults.nix	ghc: add version 7.6.3 (and a corresponding package set)	2013-04-21 20:10:27 +02:00
haskell-packages.nix	haskell-cgi: downgrade to version 3001.1.7.5 in GHC 7.6.x	2013-05-03 11:38:57 +02:00
make-tarball.nix	Add an "unstable" aggregate to replace the "unstable" view	2013-03-26 11:59:00 +01:00
mingw.nix
node-packages.nix	nodePackages.underscore: Update	2013-05-06 12:56:15 -04:00
perl-packages.nix	Merge pull request #499 from bjornfor/perl-modules	2013-05-03 00:43:16 -07:00
platforms.nix	fuloong linux: add CGROUPS and disable FTRACE	2013-03-30 23:38:39 +01:00
python-packages.nix	Merge pull request #509 from coroa/elpy-pkg	2013-05-07 16:45:29 -07:00
release-cross.nix	release-lib.nix: Make the set of supported platforms an argument	2013-03-26 13:12:25 +01:00
release-haskell.nix	release-haskell.nix: fsnotify won't build with ghc 6.x	2013-04-24 13:21:06 +02:00
release-lib.nix	release-lib.nix: Make the set of supported platforms an argument	2013-03-26 13:12:25 +01:00
release-python.nix	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
release-small.nix	Merge branch 'master' into x-updates	2013-04-11 23:31:33 +02:00
release.nix	openssh: Update to 6.2p1	2013-04-12 15:27:13 +02:00