Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix		2013-04-24 06:29:09 +00:00
..
all-packages.nix	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00: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-hashable: update to version 1.2.x	2013-04-22 14:14:39 +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.patchLatest: Handle tarballs whose root directories are already named 'package'	2013-04-03 07:41:02 -04:00
perl-packages.nix	Update ack to 2.02 (and File-Next to 1.12, only used by ack)	2013-04-21 13:10:44 +02:00
platforms.nix	fuloong linux: add CGROUPS and disable FTRACE	2013-03-30 23:38:39 +01:00
python-packages.nix	Add limnoria, a well maintained fork of Supybot, an IRC bot	2013-04-24 01:41:31 +02: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	pkgs/top-level/release-haskell.nix: cosmetic	2013-04-22 14:14:39 +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-04-24 06:29:09 +00: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