diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-03-09 18:17:30 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-03-09 18:17:30 +0000 |
| commit | 9665611c9ef7caa8119451c4b4fb5a0c211593c1 (patch) | |
| tree | 10d3444f02fd9114d47063c3bc9696aab8a2b5eb | |
| parent | 6f9a7832326b7a695ecadcd66b3b8c7acb8dd632 (diff) | |
| download | nixpkgs-9665611c9ef7caa8119451c4b4fb5a0c211593c1.tar nixpkgs-9665611c9ef7caa8119451c4b4fb5a0c211593c1.tar.gz nixpkgs-9665611c9ef7caa8119451c4b4fb5a0c211593c1.tar.bz2 nixpkgs-9665611c9ef7caa8119451c4b4fb5a0c211593c1.tar.lz nixpkgs-9665611c9ef7caa8119451c4b4fb5a0c211593c1.tar.xz nixpkgs-9665611c9ef7caa8119451c4b4fb5a0c211593c1.tar.zst nixpkgs-9665611c9ef7caa8119451c4b4fb5a0c211593c1.zip | |
Updating from trunk, to get the main evaluation fix about libcCross.
svn path=/nixpkgs/branches/stdenv-updates/; revision=20512
| -rw-r--r-- | pkgs/os-specific/linux/util-linux-ng/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index 3ab1c580837..166c9358759 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses ? null, ... }: stdenv.mkDerivation rec { - name = "util-linux-ng-2.16.2"; + name = "util-linux-ng-2.17.1"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux-ng/v2.16/${name}.tar.bz2"; - sha256 = "1sx3z64z8z95v93k0c9lczcp04zw4nm3d2rkhczkyxcpdfcgbhxi"; + url = "mirror://kernel/linux/utils/util-linux-ng/v2.17/${name}.tar.bz2"; + sha256 = "140k32jqg9192vskdb3p98q99qgr14029h975nw21p426zm1kh79"; }; configureFlags = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 153ca8b1bd9..128958e0fa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3747,7 +3747,7 @@ let else if (name == "uclibc") then uclibcCross else throw "Unknown libc"; - libcCross = libcCrossChooser crossSystem.libc; + libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; eglibc = import ../development/libraries/eglibc { inherit fetchsvn stdenv; |