Carles Pagès 6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland ... Conflicts: pkgs/development/libraries/mesa/default.nix pkgs/top-level/all-packages.nix		2013-03-10 18:19:49 +01:00
..
all-packages.nix	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-03-10 18:19:49 +01:00
guile-2-test.nix	guile-2-test: Update to 2.0.	2011-02-22 13:39:56 +00:00
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-shake: add version 0.9.1	2013-03-09 13:11:48 +01:00
make-tarball.nix	Nixpkgs channel: Use XZ compression for nixexprs.tar	2013-01-30 12:52:07 +01:00
mingw.nix	* Remove execute permission.	2006-09-11 13:37:46 +00:00
node-packages.nix	upgrading uglify to 2.2.5, optimist to 0.3.5, upgrading source-map to 0.1.7, and adding amdefine	2013-02-26 09:45:43 -05:00
perl-packages.nix	XML-LibXML-2.0014, as XML-LibXML-2.0001 doesn't exist upstream anymore	2013-03-08 07:44:30 -08:00
platforms.nix	Raspberrypi platform: make ext4 in kernel	2013-01-29 20:17:36 +01:00
python-packages.nix	add older buildout152	2013-03-09 10:41:27 +01:00
release-cross.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
release-lib.nix	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-01-20 16:53:21 +01:00
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	Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs	2013-03-08 17:03:22 -05:00