philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Vladimír Čunát ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
..
applications Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
build-support Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
data
desktops Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
development Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
games Merge master into stdenv-updates 2014-01-18 14:46:20 +01:00
misc Merge master into stdenv-updates 2014-01-18 14:46:20 +01:00
os-specific Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
servers Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
shells
stdenv fixupPhase: Handle the case where $prefix doesn't exist 2014-01-17 12:41:08 +01:00
test
tools Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
top-level Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00