Author: eelco
Date: Mon Dec 12 18:51:11 2011
New Revision: 30857
URL: https://nixos.org/websvn/nix/?rev=30857&sc=1
Log:
* ‘linuxHeaders’ shouldn't use the kernel sources from
‘linuxPackages.kernel’, because then every minor kernel upgrade will
cause a rebuild of everything. So fix it at 2.6.35.
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/builder.sh
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
Mon Dec 12 17:25:51 2011 (r30856)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
Mon Dec 12 18:51:11 2011 (r30857)
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, perl, cross ? null, kernel}:
+{ stdenv, fetchurl, perl, cross ? null }:
assert cross == null -> stdenv.isLinux;
let
- version = kernel.version;
+ version = "2.6.35.14";
kernelHeadersBaseConfig = if (cross == null) then
stdenv.platform.kernelHeadersBaseConfig
else
@@ -13,7 +13,10 @@
stdenv.mkDerivation {
name = "linux-headers-${version}";
- src = kernel.src;
+ src = fetchurl {
+ url =
"mirror://kernel/linux/kernel/v2.6/longterm/v2.6.35/linux-${version}.tar.bz2";
+ sha256 = "1wzml7s9karfbk2yi36g1r8fyaq4d4f16yizc68zgchv0xzj39zl";
+ };
targetConfig = if (cross != null) then cross.config else null;
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Dec
12 17:25:51 2011 (r30856)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Dec
12 18:51:11 2011 (r30857)
@@ -5330,16 +5330,7 @@
libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { };
- linuxHeaders =
- let
-
- kernel = {
- src = linuxPackages.kernel.src;
- version = linuxPackages.kernel.version;
- };
-
- in
- callPackage ../os-specific/linux/kernel-headers { inherit kernel; };
+ linuxHeaders = callPackage ../os-specific/linux/kernel-headers { };
linuxHeaders26Cross = forceBuildDrv (import
../os-specific/linux/kernel-headers/2.6.32.nix {
inherit stdenv fetchurl perl;
@@ -5359,12 +5350,8 @@
linuxHeadersCross = assert crossSystem != null;
linuxHeadersCrossChooser crossSystem.platform.kernelMajor;
- linuxHeaders_2_6_18 = callPackage
../os-specific/linux/kernel-headers/2.6.18.5.nix { };
-
linuxHeaders_2_6_28 = callPackage
../os-specific/linux/kernel-headers/2.6.28.nix { };
- linuxHeaders_2_6_32 = callPackage
../os-specific/linux/kernel-headers/2.6.32.nix { };
-
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
linux_2_6_15 = makeOverridable (import
../os-specific/linux/kernel/linux-2.6.15.nix) {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
