public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially revert my recent kernelPackages changes

Browse Source 
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy
2013-03-24 07:45:00 -04:00
parent f8fb55b4cc
commit 4fa4ab3a6e
34 changed files with 228 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/nvidia-x11/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
{ stdenv, fetchurl, kernelDev ? null, xlibs, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
@@ -11,7 +11,7 @@ with stdenv.lib;
let versionNumber = "310.32"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
builder = ./builder.sh;
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
inherit versionNumber libsOnly;
kernel = if libsOnly then null else kernel;
kernel = if libsOnly then null else kernelDev;
dontStrip = true;
pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+5 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}:
{stdenv, fetchurl, kernelDev, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}:
let
@@ -7,7 +7,7 @@ let
in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}-${kernel.version}";
name = "nvidia-x11-${versionNumber}-${kernelDev.version}";
builder = ./builder-legacy.sh;
@@ -24,7 +24,9 @@ stdenv.mkDerivation {
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
inherit versionNumber kernel;
kernel = kernelDev;
inherit versionNumber;
dontStrip = true;
pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
{ stdenv, fetchurl, kernelDev ? null, xlibs, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
@@ -11,7 +11,7 @@ with stdenv.lib;
let versionNumber = "304.84"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
builder = ./builder-legacy304.sh;
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
inherit versionNumber libsOnly;
kernel = if libsOnly then null else kernel;
kernel = if libsOnly then null else kernelDev;
dontStrip = true;
pkgs/os-specific/linux/nvidia-x11/legacy96.nix
+5 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}:
{stdenv, fetchurl, kernelDev, xlibs, zlib, gtk, atk, pango, glib}:
let
@@ -7,7 +7,7 @@ let
in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}-${kernel.version}";
name = "nvidia-x11-${versionNumber}-${kernelDev.version}";
builder = ./builder-legacy.sh;
@@ -24,7 +24,9 @@ stdenv.mkDerivation {
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
inherit versionNumber kernel;
kernel = kernelDev;
inherit versionNumber;
dontStrip = true;