Vladimír Čunát 694fa543af Merge 'staging' ... Conflicts: pkgs/servers/x11/xorg/default.nix		2014-08-24 10:50:22 +02:00
..
all-packages.nix	Merge 'staging'	2014-08-24 10:50:22 +02:00
guile-2-test.nix
haskell-defaults.nix	Revert "Many minor fixes to get things building after recent compiler changes".	2014-08-11 14:48:35 +02:00
haskell-packages.nix	haskell-timeparsers: build this package with a recent version of 'convertible'	2014-08-20 20:26:57 +02:00
make-tarball.nix
node-packages-generated.nix	Revert "titanium: Bump to 3.3.0"	2014-07-18 23:49:33 +02:00
node-packages.json	Revert "titanium: Bump to 3.3.0"	2014-07-18 23:49:33 +02:00
node-packages.nix
perl-packages.nix	Slic3r: Bump to 1.1.7.	2014-08-20 16:27:47 +02:00
php-packages.nix
platforms.nix
python-packages-generated.nix	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
python-packages.json
python-packages.nix	Merge pull request #3612 from nathanielbaxter/dev/flexget_update	2014-08-16 15:05:23 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix	Make platforms.allBut accept a list rather than a single platform	2014-08-09 12:31:33 +02:00
release.nix	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00