Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix		2013-06-13 17:12:43 +04:00
..
all-packages.nix	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
guile-2-test.nix
haskell-defaults.nix	haskell-bmp: update to version 1.2.5.1	2013-06-05 12:17:35 +02:00
haskell-packages.nix	haskell-haddock: add version 2.13.2.1	2013-06-13 10:43:35 +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-generated.nix	nijs: bump to 0.0.8	2013-06-11 15:09:10 +02:00
node-packages.json	add nodePackages.jshint	2013-05-30 16:01:18 +02:00
node-packages.nix	Make nodePackages individually overridable	2013-05-31 13:27:55 -04:00
perl-packages.nix	perlPackages.TestMagpie: new expression	2013-06-10 23:06:08 +01:00
platforms.nix	fuloong linux: add CGROUPS and disable FTRACE	2013-03-30 23:38:39 +01:00
python-packages.nix	pyGtkGlade: fix eval	2013-06-13 13:12:39 +02:00
release-cross.nix	rpi: more packages to cross-compile	2013-05-26 12:54:26 +02:00
release-haskell.nix	release-haskell.nix: make sure idris compiles	2013-06-05 12:17:35 +02:00
release-lib.nix	mercurial: Update to 2.6.1	2013-05-15 13:15:53 +02:00
release-python.nix	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
release-small.nix	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
release.nix	release.nix: remove emacs-ecb from nixos-tarball	2013-06-11 11:05:42 +02:00