3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/development
Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
2013-08-21 17:05:30 +02:00
..
arduino ino: fix hash 2013-08-16 22:26:34 +03:00
compilers Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-08-21 17:05:30 +02:00
eclipse unmaintain several packages 2013-08-16 23:45:01 +02:00
guile-modules
interpreters Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-08-21 17:05:30 +02:00
libraries Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-08-21 17:05:30 +02:00
misc amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully 2013-06-20 02:22:18 +00:00
mobile Moved reference to iPhone SDKs to the wrapper that proxies to Xcode 2013-08-16 13:20:59 +02:00
ocaml-modules extlib: fix version to match tarball 2013-07-14 02:08:51 +03:00
perl-modules
python-modules pythonPackages.googlecl: add expression 2013-08-06 09:43:57 +10:00
qtcreator qtcreator: Update to version 2.8.0 2013-07-15 11:15:34 +02:00
ruby-modules
tools Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-08-21 17:05:30 +02:00
web Add karma nodePackage 2013-08-20 18:56:20 -04:00