MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updating glibc to 2.12.2 (considering the ports for 2.12.1 would work equally).

Browse source 
I also update the url for the ports to take the upstream tarball instead of a
copy I had in vicerveza.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25108
This commit is contained in:
Lluís Batlle i Rossell 2010-12-13 23:08:10 +00:00
parent 195a90d7ce
commit 3c78b20229
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/glibc-2.12/common.nix
View file

@ -11,7 +11,7 @@ cross :
let let
# For GNU/Hurd, see below. # For GNU/Hurd, see below.
version = if hurdHeaders != null then "20100512" else "2.12.1"; version = if hurdHeaders != null then "20100512" else "2.12.2";
needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsNative = stdenv.isMips || stdenv.isArm;
needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@ -20,9 +20,9 @@ let
else needsPortsCross; else needsPortsCross;
srcPorts = fetchurl { srcPorts = fetchurl {
# A tarball I manually made from a git clone, for the tag "glibc-2.12.1". # These should work equally well for 2.12.2
url = http://vicerveza.homeunix.net/~viric/tmp/nix/glibc-ports-2.12.1.tar.gz; url = "mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2";
sha256 = "160dr4v9210r6d7xp0af5kx1pljcjaa2x4ya88psjiphcr6bsy37"; sha256 = "041ix0nq7nc5r7jf80jsdlw4idah2mjp5nf7khybhc4cs1kc31ir";
}; };
in in
@ -159,7 +159,7 @@ stdenv.mkDerivation ({
} }
else fetchurl { else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
sha256 = "01vlr473skl08xpcjz0b4lw23lsnskf5kx9s8nxwa4mwa9f137vm"; sha256 = "05hjz816a2hmzc44gxxi9vrdx6l9f23az794zj45xsxr94yfpy12";
}; };
# `fetchurl' is a function and thus should not be passed to the # `fetchurl' is a function and thus should not be passed to the