On 10/01/2011 06:25 PM, Shea Levy wrote: > Author: shlevy > Date: Sat Oct 1 22:25:28 2011 > New Revision: 29554 > URL: https://ssl.nixos.org/websvn/nix/?rev=29554&sc=1 > > Log: > Cleaner decoupling of glibc and linuxPackages while keeping kernelHeaders a > linuxPackage and having a single default.nix for kernelHeaders > > Modified: > > nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix > nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.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 > Sat Oct 1 18:12:00 2011 (r29553) > +++ > nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix > Sat Oct 1 22:25:28 2011 (r29554) > @@ -3,7 +3,7 @@ > assert cross == null -> stdenv.isLinux; > > let > - version = kernel.headersVersion; > + version = kernel.version; > kernelHeadersBaseConfig = if (cross == null) then > stdenv.platform.kernelHeadersBaseConfig > else > @@ -13,7 +13,7 @@ > stdenv.mkDerivation { > name = "linux-headers-${version}"; > > - src = kernel.headersSrc; > + src = kernel.src; > > targetConfig = if (cross != null) then cross.config else null; > > > Modified: > nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix > ============================================================================== > --- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix > Sat Oct 1 18:12:00 2011 (r29553) > +++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix > Sat Oct 1 22:25:28 2011 (r29554) > @@ -3,15 +3,9 @@ > , # The kernel source tarball. > src > > -, # The kernel headers source tarball. > - headersSrc ? src > - > , # The kernel version. > version > > -, # The kernel headers version. > - headersVersion ? version > - > , # The version number used for the module directory > modDirVersion ? version > > @@ -75,7 +69,7 @@ > enableParallelBuilding = true; > > passthru = { > - inherit version modDirVersion kernelPatches headersSrc headersVersion; > + inherit version modDirVersion kernelPatches; > # Combine the `features' attribute sets of all the kernel patches. > features = lib.fold (x: y: (if x ? features then x.features else {}) // > y) features kernelPatches; > }; > > Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix > ============================================================================== > --- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sat Oct > 1 18:12:00 2011 (r29553) > +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sat Oct > 1 22:25:28 2011 (r29554) > @@ -5242,7 +5242,16 @@ > > libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { }; > > - linuxHeaders = linuxPackages.kernelHeaders; > + linuxHeaders = > + let > + > + kernel = { > + src = linuxPackages.kernel.src; > + version = linuxPackages.kernel.version; > + }; > + > + in > + callPackage ../os-specific/linux/kernel-headers { inherit kernel; }; > > linuxHeaders26Cross = forceBuildDrv (import > ../os-specific/linux/kernel-headers/2.6.32.nix { > inherit stdenv fetchurl perl; > _______________________________________________ > nix-commits mailing list > [email protected] > http://lists.science.uu.nl/mailman/listinfo/nix-commits
Hi Ludo’, Does this look better? ~Shea _______________________________________________ nix-dev mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-dev
