public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
This commit is contained in:
Vladimír Čunát
2014-01-12 12:29:24 +01:00
parent 51713fbbfc a0070a9157
commit a2c316288c
281 changed files with 3039 additions and 2058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
+1 -1
View File
@@ -83,7 +83,7 @@ let
isl = pkgs.isl.crossDrv;
mpc = pkgs.mpc.crossDrv;
binutils = pkgs.binutils.crossDrv;
klibc = pkgs.klibc.crossDrv;
klibc = pkgs.linuxPackages.klibc.crossDrv;
in