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

Updating from trunk, to get the main evaluation fix about libcCross.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=20512
This commit is contained in:
Lluís Batlle i Rossell 2010-03-09 18:17:30 +00:00
parent 6f9a783232
commit 9665611c9e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/util-linux-ng/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses ? null, ... }: { stdenv, fetchurl, ncurses ? null, ... }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "util-linux-ng-2.16.2"; name = "util-linux-ng-2.17.1";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux-ng/v2.16/${name}.tar.bz2"; url = "mirror://kernel/linux/utils/util-linux-ng/v2.17/${name}.tar.bz2";
sha256 = "1sx3z64z8z95v93k0c9lczcp04zw4nm3d2rkhczkyxcpdfcgbhxi"; sha256 = "140k32jqg9192vskdb3p98q99qgr14029h975nw21p426zm1kh79";
}; };
configureFlags = '' configureFlags = ''

2
pkgs/top-level/all-packages.nix
View File

@ -3747,7 +3747,7 @@ let
else if (name == "uclibc") then uclibcCross else if (name == "uclibc") then uclibcCross
else throw "Unknown libc"; else throw "Unknown libc";
libcCross = libcCrossChooser crossSystem.libc; libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
eglibc = import ../development/libraries/eglibc { eglibc = import ../development/libraries/eglibc {
inherit fetchsvn stdenv; inherit fetchsvn stdenv;