Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates ... Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix		2013-04-04 21:43:40 +02:00
..
all-packages.nix	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: remove useless for cabal2nix on GHC 6.10.4	2013-03-30 00:12:36 +01:00
haskell-packages.nix	Merge pull request #442 from pSub/keter	2013-04-04 06:44:59 -07: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	Allow overriding perlPackages	2013-03-29 12:41:38 -04:00
platforms.nix	fuloong linux: add CGROUPS and disable FTRACE	2013-03-30 23:38:39 +01:00
python-packages.nix	flexget: run time dependency on deluge (plugin)	2013-04-01 22:55:33 +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: sort attributes alphabetically	2013-04-04 16:18:09 +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-03-09 17:55:37 +01:00
release-small.nix	tinycc: updating it to 0.9.26	2013-04-01 12:50:45 +02:00
release.nix	tinycc: updating it to 0.9.26	2013-04-01 12:50:45 +02:00