nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Packages changes, needed after recent kernel expression restructurisation

Browse Source 
svn path=/nixpkgs/trunk/; revision=11883
This commit is contained in:
Michael Raskin 2008-05-22 19:29:23 +00:00
parent 5f4c7bcf53
commit e0caa641c0
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/kernel/linux.nix
View File

@ -29,6 +29,8 @@
, # A list of additional statements to be appended to the , # A list of additional statements to be appended to the
# configuration file. # configuration file.
extraConfig ? [] extraConfig ? []
, features ? []
}: }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@ -42,6 +44,12 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}"; name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
builder = ./builder-custom.sh; builder = ./builder-custom.sh;
passthru = {
inherit version;
# 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;
};
inherit src; inherit src;
preConfigure = preConfigure; preConfigure = preConfigure;

23
pkgs/top-level/all-packages.nix
View File

@ -3999,14 +3999,6 @@ let pkgs = rec {
alsaUtils = alsa.alsaUtils; alsaUtils = alsa.alsaUtils;
atherosFun = lib.sumArgs (selectVersion ../os-specific/linux/atheros "0.9.4") {
inherit fetchurl stdenv builderDefs;
};
atherosFunCurrent = kernel: atherosFun {
inherit kernel;
} null;
blcrFun = builderDefsPackage (selectVersion ../os-specific/linux/blcr "0.6.5"){ blcrFun = builderDefsPackage (selectVersion ../os-specific/linux/blcr "0.6.5"){
inherit perl; inherit perl;
}; };
@ -4411,6 +4403,10 @@ let pkgs = rec {
inherit fetchurl stdenv kernel; inherit fetchurl stdenv kernel;
}; };
atheros = composedArgsAndFun (selectVersion ../os-specific/linux/atheros "0.9.4") {
inherit fetchurl stdenv builderDefs kernel;
} null;
nvidiaDrivers = import ../os-specific/linux/nvidia { nvidiaDrivers = import ../os-specific/linux/nvidia {
inherit stdenv fetchurl kernel xlibs gtkLibs; inherit stdenv fetchurl kernel xlibs gtkLibs;
}; };
@ -4419,6 +4415,10 @@ let pkgs = rec {
inherit fetchurl stdenv kernel ncurses fxload; inherit fetchurl stdenv kernel ncurses fxload;
}; };
kqemu = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") {
inherit kernel;
} null;
# Actually, klibc builds fine with the static kernelHeaders, but # Actually, klibc builds fine with the static kernelHeaders, but
# splashutils expects a klibc with patched headers... # splashutils expects a klibc with patched headers...
klibc = import ../os-specific/linux/klibc { klibc = import ../os-specific/linux/klibc {
@ -4474,13 +4474,6 @@ let pkgs = rec {
inherit fetchurl stdenv perl mktemp module_init_tools lib; inherit fetchurl stdenv perl mktemp module_init_tools lib;
}; };
kqemuFun = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") {
inherit builderDefs;
};
# No finished expression is provided - pick your own kernel
kqemuFunCurrent = kernel: kqemuFun {inherit kernel;};
libselinux = import ../os-specific/linux/libselinux { libselinux = import ../os-specific/linux/libselinux {
inherit fetchurl stdenv libsepol; inherit fetchurl stdenv libsepol;
}; };