Permalink
Browse files

Merge branch 'merge-kernel-builds' into upstream-master

This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac20352), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
  • Loading branch information...
2 parents 010e63c + ac20352 commit 139f8949e6a5898aa8f245b49c18a6c523dce24e @shlevy shlevy committed Jan 5, 2014
Showing with 541 additions and 1,257 deletions.
  1. +0 −7 nixos/modules/services/x11/xserver.nix
  2. +4 −4 pkgs/applications/virtualization/virtualbox/default.nix
  3. +4 −4 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
  4. +2 −2 pkgs/development/tools/profiling/systemtap/default.nix
  5. +5 −5 pkgs/os-specific/linux/acpi-call/default.nix
  6. +0 −28 pkgs/os-specific/linux/atheros/0.9.4.nix
  7. +6 −5 pkgs/os-specific/linux/ati-drivers/default.nix
  8. +0 −41 pkgs/os-specific/linux/aufs-util/2.nix
  9. +0 −40 pkgs/os-specific/linux/aufs-util/3.nix
  10. +0 −43 pkgs/os-specific/linux/aufs/2.nix
  11. +0 −44 pkgs/os-specific/linux/aufs/3.nix
  12. +5 −5 pkgs/os-specific/linux/batman-adv/default.nix
  13. +6 −6 pkgs/os-specific/linux/bbswitch/default.nix
  14. +6 −6 pkgs/os-specific/linux/blcr/default.nix
  15. +0 −49 pkgs/os-specific/linux/broadcom-sta-v6/default.nix
  16. +0 −13 pkgs/os-specific/linux/broadcom-sta-v6/license.patch
  17. +27 −28 pkgs/os-specific/linux/broadcom-sta/default.nix
  18. +5 −4 pkgs/os-specific/linux/broadcom-sta/license.patch
  19. +0 −11 pkgs/os-specific/linux/broadcom-sta/linux-2.6.39.patch
  20. +0 −13 pkgs/os-specific/linux/broadcom-sta/linux-3.2.patch
  21. +0 −12 pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch
  22. 0 pkgs/os-specific/linux/{broadcom-sta-v6 → broadcom-sta}/linux-recent.patch
  23. +0 −16 pkgs/os-specific/linux/broadcom-sta/makefile.patch
  24. +4 −4 pkgs/os-specific/linux/cryptodev/default.nix
  25. +6 −8 pkgs/os-specific/linux/e1000e/default.nix
  26. +0 −56 pkgs/os-specific/linux/exmap/default.nix
  27. +5 −5 pkgs/os-specific/linux/frandom/default.nix
  28. +0 −27 pkgs/os-specific/linux/iscsitarget/default.nix
  29. +0 −40 pkgs/os-specific/linux/iwlwifi/default.nix
  30. +25 −0 pkgs/os-specific/linux/kernel-headers/default.nix
  31. +0 −149 pkgs/os-specific/linux/kernel/builder.sh
  32. +4 −1 pkgs/os-specific/linux/kernel/generate-config.pl
  33. +76 −92 pkgs/os-specific/linux/kernel/generic.nix
  34. +189 −133 pkgs/os-specific/linux/kernel/manual-config.nix
  35. +0 −46 pkgs/os-specific/linux/kernel/patches.nix
  36. +4 −3 pkgs/os-specific/linux/kernel/perf.nix
  37. +26 −52 pkgs/os-specific/linux/klibc/default.nix
  38. +11 −0 pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
  39. +3 −3 pkgs/os-specific/linux/lttng-modules/default.nix
  40. +9 −9 pkgs/os-specific/linux/ndiswrapper/default.nix
  41. +12 −0 pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
  42. +0 −66 pkgs/os-specific/linux/ndiswrapper/prefix.patch
  43. +5 −5 pkgs/os-specific/linux/netatop/default.nix
  44. +3 −4 pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh
  45. +3 −4 pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
  46. +3 −4 pkgs/os-specific/linux/nvidia-x11/builder.sh
  47. +3 −3 pkgs/os-specific/linux/nvidia-x11/default.nix
  48. +6 −6 pkgs/os-specific/linux/nvidia-x11/legacy173.nix
  49. +3 −3 pkgs/os-specific/linux/nvidia-x11/legacy304.nix
  50. +0 −44 pkgs/os-specific/linux/nvidia-x11/legacy96.nix
  51. +8 −6 pkgs/os-specific/linux/open-iscsi/default.nix
  52. +6 −4 pkgs/os-specific/linux/psmouse-alps/default.nix
  53. +5 −5 pkgs/os-specific/linux/spl/default.nix
  54. +5 −7 pkgs/os-specific/linux/tp_smapi/default.nix
  55. +3 −4 pkgs/os-specific/linux/v86d/default.nix
  56. +4 −13 pkgs/os-specific/linux/wis-go7007/default.nix
  57. +5 −5 pkgs/os-specific/linux/zfs/default.nix
  58. +3 −3 pkgs/servers/openafs-client/default.nix
  59. +21 −49 pkgs/top-level/all-packages.nix
  60. +10 −5 pkgs/top-level/platforms.nix
  61. +1 −1 pkgs/top-level/release-cross.nix
  62. +0 −2 pkgs/top-level/release-python.nix
@@ -16,7 +16,6 @@ let
ati_unfree = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
nouveau = { modules = [ pkgs.xf86_video_nouveau ]; };
nvidia = { modules = [ kernelPackages.nvidia_x11 ]; };
- nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ]; driverName = "nvidia"; };
nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ]; driverName = "nvidia"; };
nvidiaLegacy304 = { modules = [ kernelPackages.nvidia_x11_legacy304 ]; driverName = "nvidia"; };
unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; };
@@ -443,7 +442,6 @@ in
boot.extraModulePackages =
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
- optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++
optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++
optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304 ++
optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
@@ -497,7 +495,6 @@ in
pkgs.xdg_utils
]
++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
- ++ optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96
++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173
++ optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304
++ optional (elem "virtualbox" driverNames) xorg.xrefresh
@@ -521,8 +518,6 @@ in
XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
} // optionalAttrs (elem "nvidia" driverNames) {
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
- } // optionalAttrs (elem "nvidiaLegacy96" driverNames) {
- LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy96}/lib";
} // optionalAttrs (elem "nvidiaLegacy173" driverNames) {
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy173}/lib";
} // optionalAttrs (elem "nvidiaLegacy304" driverNames) {
@@ -544,8 +539,6 @@ in
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernelDev = null; } } /run/opengl-driver-32"}
''
- else if elem "nvidiaLegacy96" driverNames then
- "ln -sf ${kernelPackages.nvidia_x11_legacy96} /run/opengl-driver"
else if elem "nvidiaLegacy173" driverNames then
"ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
else if elem "nvidiaLegacy304" driverNames then
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernelDev, lvm2
+, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
, which, alsaLib, curl, gawk
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
@@ -52,7 +52,7 @@ let
};
in stdenv.mkDerivation {
- name = "virtualbox-${version}-${kernelDev.version}";
+ name = "virtualbox-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
@@ -61,14 +61,14 @@ in stdenv.mkDerivation {
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
- libcap glib kernelDev lvm2 python alsaLib curl pam xorriso makeself perl
+ libcap glib lvm2 python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ]
++ optional javaBindings jdk
++ optional pythonBindings python;
prePatch = ''
set -x
- MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build`
+ MODULES_BUILD_DIR=`echo ${kernel.dev}/lib/modules/*/build`
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
-e 's@MKISOFS --version@MKISOFS -version@' \
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
+{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
, xorg, dbus, virtualbox }:
let
@@ -8,14 +8,14 @@ let
in
stdenv.mkDerivation {
- name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
+ name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767";
};
- KERN_DIR = "${kernelDev}/lib/modules/*/build";
+ KERN_DIR = "${kernel.dev}/lib/modules/*/build";
buildInputs = [ patchelf cdrkit makeWrapper dbus ];
@@ -115,7 +115,7 @@ stdenv.mkDerivation {
for i in *
do
cd $i
- kernelVersion=$(cd ${kernelDev}/lib/modules; ls)
+ kernelVersion=$(cd ${kernel.dev}/lib/modules; ls)
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
find . -type f | xargs sed -i -e "s|-o root||g" \
-e "s|-g root||g"
@@ -1,9 +1,9 @@
-{ fetchurl, stdenv, linux, elfutils, latex2html, xmlto, docbook_xml_dtd_412
+{ fetchurl, stdenv, elfutils, latex2html, xmlto, docbook_xml_dtd_412
, libxml2, docbook_xsl, libxslt, texLive, texLiveExtra, ghostscript, pkgconfig
, gtkmm, libglademm, boost, perl, sqlite }:
stdenv.mkDerivation rec {
- name = "systemtap-1.2-${linux.version}";
+ name = "systemtap-1.2";
src = fetchurl {
url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz";
@@ -1,7 +1,7 @@
-{ stdenv, fetchgit, kernelDev }:
+{ stdenv, fetchgit, kernel }:
stdenv.mkDerivation {
- name = "acpi-call-${kernelDev.version}";
+ name = "acpi-call-${kernel.version}";
src = fetchgit {
url = "git://github.com/mkottman/acpi_call.git";
@@ -12,12 +12,12 @@ stdenv.mkDerivation {
preBuild = ''
sed -e 's/break/true/' -i examples/turn_off_gpu.sh
sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh
- sed -e "s@/lib/modules/\$(.*)@${kernelDev}/lib/modules/${kernelDev.modDirVersion}@" -i Makefile
+ sed -e "s@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@" -i Makefile
'';
installPhase = ''
- mkdir -p $out/lib/modules/${kernelDev.modDirVersion}/misc
- cp acpi_call.ko $out/lib/modules/${kernelDev.modDirVersion}/misc
+ mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
+ cp acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc
mkdir -p $out/bin
cp examples/turn_off_gpu.sh $out/bin/test_discrete_video_off.sh
chmod a+x $out/bin/test_discrete_video_off.sh
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, builderDefs, kernelDev }:
- let localDefs = builderDefs.passthru.function {
- src = /* put a fetchurl here */
- fetchurl {
- url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz;
- sha256 = "06jd5b8rfw7rmiva6jgmrb7n26g5plcg9marbnnmg68gbcqbr3xh";
- };
-
- buildInputs = [];
- configureFlags = [];
- makeFlags = [''KERNELPATH=${kernelDev}/lib/modules/*/build'' ''DESTDIR=$out''];
- };
- in with localDefs;
-let
-postInstall = fullDepEntry (''
- ln -s $out/usr/local/bin $out/bin
-'') [minInit doMakeInstall];
-in
-stdenv.mkDerivation rec {
- name = "atheros-0.9.4-${kernelDev.version}";
- builder = writeScript (name + "-builder")
- (textClosure localDefs [doMakeInstall
- postInstall doForceShare doPropagate]);
- meta = {
- description = "Atheros WiFi driver";
- inherit src;
- };
-}
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernelDev, xlibs, which, imake
+{ stdenv, fetchurl, kernel, xlibs, which, imake
, mesa # for fgl_glxgears
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
, xorg, makeWrapper, glibc, patchelf
@@ -22,9 +22,9 @@
assert stdenv.system == "x86_64-linux";
-stdenv.mkDerivation rec {
- name = "ati-drivers-${version}-${kernel.version}";
- version = "13.4";
+
+stdenv.mkDerivation {
+ name = "ati-drivers-13.4-${kernel.version}";
builder = ./builder.sh;
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
mesa
];
- kernel = kernelDev;
+ kernel = kernel.dev;
inherit glibc /* glibc only used for setting interpreter */;
@@ -72,6 +72,7 @@ stdenv.mkDerivation rec {
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = [ "x86_64-linux" ];
hydraPlatforms = [];
+ broken = true;
};
# moved assertions here because the name is evaluated when the NixOS manual is generated
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, kernelDev, aufs }:
-
-assert aufs != null;
-
-let version = "20100506"; in
-
-stdenv.mkDerivation {
- name = "aufs2-util-${version}-${kernelDev.version}";
-
- src = fetchurl {
- url = "http://tarballs.nixos.org/aufs2-util-git-${version}.tar.bz2";
- sha256 = "0ly0c3p8fjxqbk8k5rmm1a91wg8wcrvhi1lv4aawalkkk8rqbnwk";
- };
-
- buildInputs = [ aufs ];
-
- makeFlags =
- [ "KDIR=${kernelDev}/lib/modules/${kernelDev.version}/build"
- "Install=install"
- "DESTDIR=$(out)"
- ];
-
- postInstall =
- ''
- mv $out/usr/* $out
- rmdir $out/usr
-
- cp aufs.shlib $out/lib/
-
- substituteInPlace $out/bin/aubrsync \
- --replace /sbin/mount $out/sbin/mount \
- --replace /usr/lib/aufs.shlib $out/lib/aufs.shlib
- '';
-
- meta = {
- description = "Utilities for AUFS2";
- homepage = http://aufs.sourceforge.net/;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
@@ -1,40 +0,0 @@
-{ stdenv, fetchgit, kernelDev, aufs }:
-
-assert aufs != null;
-
-stdenv.mkDerivation {
- name = "aufs3-util-${aufs.patch.version}-${kernelDev.version}";
-
- src = fetchgit {
- url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git;
- rev = aufs.patch.utilRev;
- sha256 = aufs.patch.utilHash;
- };
-
- buildInputs = [ aufs ];
-
- makeFlags =
- [ "KDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build"
- "Install=install"
- "DESTDIR=$(out)"
- ];
-
- postInstall =
- ''
- mv $out/usr/* $out
- rmdir $out/usr
-
- cp aufs.shlib $out/lib/
-
- substituteInPlace $out/bin/aubrsync \
- --replace /sbin/mount $out/sbin/mount \
- --replace /usr/lib/aufs.shlib $out/lib/aufs.shlib
- '';
-
- meta = {
- description = "Utilities for AUFS3";
- homepage = http://aufs.sourceforge.net/;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, kernelDev, perl, fetchgit }:
-
-assert kernelDev.features ? aufsBase;
-
-let version = "20100522"; in
-
-stdenv.mkDerivation {
- name = "aufs2-${version}-${kernelDev.version}";
-
- src =
- if (builtins.lessThan (builtins.compareVersions kernelDev.version "2.6.35") 0) then
- fetchurl {
- url = "http://tarballs.nixos.org/aufs2-standalone-git-${version}.tar.bz2";
- sha256 = "1g4mw4qx2xzpygdwjiw36bkhfz1hi7wxx7w79n2h0lr5grzzdnd6";
- }
- else
- fetchgit {
- url = "http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git";
- rev = "d950eef373ff1e0448ad3945b734da6ab050571d";
- sha256 = "816145b0341bd7862df50c058144cf6ebc25c05d2976f781ff0fe10d4559b853";
- };
-
- buildInputs = [ perl ];
-
- makeFlags = "KDIR=${kernelDev}/lib/modules/${kernelDev.version}/build";
-
- installPhase =
- ''
- mkdir -p $out/lib/modules/${kernelDev.version}/misc
- cp aufs.ko $out/lib/modules/${kernelDev.version}/misc
-
- # Install the headers because aufs2-util requires them.
- cp -prvd include $out/
- '';
-
- meta = {
- description = "Another Unionfs implementation for Linux (second generation)";
- homepage = http://aufs.sourceforge.net/;
- maintainers = [ stdenv.lib.maintainers.eelco
- stdenv.lib.maintainers.raskin ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
@@ -1,44 +0,0 @@
-{ stdenv, kernelDev, perl }:
-
-let
-
- aufsPredicate = x:
- if x ? features then
- (if x.features ? aufs3 then x.features.aufs3 else false)
- else false;
- featureAbort = abort "This kernel does not have aufs 3 support";
- patch = stdenv.lib.findFirst aufsPredicate featureAbort kernelDev.kernelPatches;
-
-in
-
-stdenv.mkDerivation {
- name = "aufs3-${patch.version}-${kernelDev.version}";
-
- src = patch.patch.src;
-
- buildInputs = [ perl ];
-
- makeFlags = "KDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build";
-
- NIX_CFLAGS_COMPILE="-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated";
-
- installPhase =
- ''
- mkdir -p $out/lib/modules/${kernelDev.modDirVersion}/misc
- cp -v aufs.ko $out/lib/modules/${kernelDev.modDirVersion}/misc
-
- # Install the headers because aufs3-util requires them.
- mkdir -p $out/include/linux
- cp -v usr/include/linux/aufs_type.h $out/include/linux
- '';
-
- passthru = { inherit patch; };
-
- meta = {
- description = "Another Unionfs implementation for Linux (third generation)";
- homepage = http://aufs.sourceforge.net/;
- maintainers = [ stdenv.lib.maintainers.eelco
- stdenv.lib.maintainers.raskin ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
Oops, something went wrong.

0 comments on commit 139f894

Please sign in to comment.