diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-15 21:47:05 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-15 21:49:57 +0100 |
commit | cef0bcefc6544513fec9dec49686932ef15f1734 (patch) | |
tree | e3b0b5de8df6606a275786825a452b670373cf2c | |
parent | 975a822778896c086438e22532fe58652c019499 (diff) | |
download | nixlib-cef0bcefc6544513fec9dec49686932ef15f1734.tar nixlib-cef0bcefc6544513fec9dec49686932ef15f1734.tar.gz nixlib-cef0bcefc6544513fec9dec49686932ef15f1734.tar.bz2 nixlib-cef0bcefc6544513fec9dec49686932ef15f1734.tar.lz nixlib-cef0bcefc6544513fec9dec49686932ef15f1734.tar.xz nixlib-cef0bcefc6544513fec9dec49686932ef15f1734.tar.zst nixlib-cef0bcefc6544513fec9dec49686932ef15f1734.zip |
linux-headers: Update to 3.12.32
We can do this because bootstrap-tools contains an unxz program now (via busybox).
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/3.12.nix | 6 | ||||
-rw-r--r-- | pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/3.12.nix b/pkgs/os-specific/linux/kernel-headers/3.12.nix index 9bf189c40eda..2fd34c68edc6 100644 --- a/pkgs/os-specific/linux/kernel-headers/3.12.nix +++ b/pkgs/os-specific/linux/kernel-headers/3.12.nix @@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux; let - version = "3.12.6"; + version = "3.12.32"; kernelHeadersBaseConfig = if cross == null @@ -17,8 +17,8 @@ stdenv.mkDerivation { name = "linux-headers-${version}"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1qh6f1az0flfrbkdjx1i9r7yf31ad0gxigax91nd33z2jmd6h4df"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1hzws2bf267hfk81ywqcxspkyi1lg56x63izdc0pv1338xcfas53"; }; targetConfig = if cross != null then cross.config else null; diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh index 9db5d2c88e5d..52953c9b88da 100644 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh @@ -55,4 +55,9 @@ echo "#! $out/bin/sh" > $out/bin/egrep echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep echo "#! $out/bin/sh" > $out/bin/fgrep echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep -chmod +x $out/bin/egrep $out/bin/fgrep + +# Provide xz (actually only xz -d will work). +echo "#! $out/bin/sh" > $out/bin/xz +echo "exec $builder unxz \"\$@\"" >> $out/bin/xz + +chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/xz |