Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates ... Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix		2013-03-17 11:28:28 +01:00
..
all-packages.nix	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
guile-2-test.nix
haskell-defaults.nix	jailbreak-cabal: build jailbreak-cabal with a version of Cabal that has its unit tests disabled	2013-03-09 13:04:19 +01:00
haskell-packages.nix	haskell-constraints: add package	2013-03-11 12:47:01 +01:00
make-tarball.nix
mingw.nix
node-packages.nix	nijs: Bump to 0.0.4	2013-03-11 17:43:59 +01:00
perl-packages.nix	Module::Find: Update to 0.11	2013-03-14 16:37:18 +01:00
platforms.nix
python-packages.nix	upgrade deluge to 1.3.6	2013-03-12 01:13:52 +01:00
release-cross.nix
release-lib.nix
release-python.nix	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
release-small.nix	Remove some references to non-existent packages	2013-03-08 16:36:59 -05:00
release.nix	pkgs/top-level/release.nix: enable Hydra builds of GHC versions 6.10.4, 6.12.3, 7.0.4, 7.4.2, and 7.6.2	2013-03-14 19:25:27 +01:00