philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv 
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
..
applications Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00
build-support Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00
data Merge pull request #3211 from ttuegel/adobe-fonts 2014-08-08 21:52:59 +02:00
desktops Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00
development Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00
games haskell-Allure: add version 0.4.99.0 2014-08-12 12:37:44 +02:00
misc Mednafen: update to 0.9.36.3 2014-08-14 11:20:25 -03:00
os-specific Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00
servers Add taskserver package (close #3269) 2014-08-15 00:28:41 +02:00
shells Merge 'staging' into master 2014-08-08 20:13:23 +02:00
stdenv Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00
test
tools Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00
top-level Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00