Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging ... Conflicts: pkgs/development/interpreters/ruby/ruby-19.nix pkgs/development/libraries/libc++/default.nix pkgs/development/libraries/libc++abi/default.nix pkgs/tools/text/sgml/opensp/default.nix		2014-09-23 11:27:53 +02:00
..
all-packages.nix	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
guile-2-test.nix
haskell-defaults.nix	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
haskell-packages.nix	haskell-here: revert "new expression"	2014-09-18 21:16:44 +02:00
make-tarball.nix
node-packages-generated.nix	Merge recent master into staging	2014-09-13 21:48:29 +02:00
node-packages.json	Merge recent master into staging	2014-09-13 21:48:29 +02:00
node-packages.nix
perl-packages.nix	Merge recent master into staging	2014-09-13 21:48:29 +02:00
php-packages.nix	Add zendopcache php package	2014-08-27 03:21:03 -04:00
platforms.nix
python-packages-generated.nix	python-packages-generated.nix: fix lxml-2.3.6 by hardcoding the fix	2014-09-17 21:37:37 +02:00
python-packages.json	python-packages-generated.nix: fix lxml-2.3.6 by hardcoding the fix	2014-09-17 21:37:37 +02:00
python-packages.nix	Merge pull request #4146 from DamienCassou/screenkey	2014-09-18 17:51:12 +02:00
release-cross.nix
release-lib.nix	release: do not process broken packages, we induce they don't have platforms at all	2014-09-03 13:02:45 +02:00
release-python.nix
release-small.nix
release.nix	Merge recent master into staging	2014-09-13 21:48:29 +02:00