diff options
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 51 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 28 |
2 files changed, 13 insertions, 66 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ca061322c9d..9fb597be72c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -36,23 +36,23 @@ let }; }; - makeAufs3StandalonePatch = {version, rev, sha256}: + makeAufs3StandalonePatch = {version, rev, sha256}: - stdenv.mkDerivation { - name = "aufs3-standalone-${version}.patch"; + stdenv.mkDerivation { + name = "aufs3-standalone-${version}.patch"; - src = fetchgit { - url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git; - inherit sha256 rev; - }; + src = fetchgit { + url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git; + inherit sha256 rev; + }; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "unpackPhase" "installPhase" ]; - #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4 - installPhase = '' - cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out - ''; - }; + # Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4 + installPhase = '' + cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out + ''; + }; in @@ -397,31 +397,6 @@ rec { patch = ./guruplug-mach-type.patch; }; - tuxonice_2_6_34 = makeTuxonicePatch { - version = "3.2-rc2"; - kernelVersion = "2.6.34"; - sha256 = "0bagqinmky1kmvg3vw8cdysqklxrsfjm7gqrpxviq9jq8vyycviz"; - }; - - tuxonice_2_6_35 = makeTuxonicePatch { - version = "3.2-rc2"; - kernelVersion = "2.6.35"; - sha256 = "00jbrqq6p1lyvli835wczc0vqsn0z73jpb2aak3ak0vgnvsxw37q"; - }; - - tuxonice_2_6_36 = makeTuxonicePatch { - version = "3.2-rc2"; - kernelVersion = "2.6.36"; - sha256 = "1vcw3gpjdghnkli46j37pc6rp8mqk8dh688jv8rppzsry0ll7b7k"; - }; - - tuxonice_2_6_37 = makeTuxonicePatch { - version = "3.2-rc2"; - kernelVersion = "2.6.37"; - url = "http://tuxonice.net/files/current-tuxonice-for-2.6.37.patch_0.bz2"; - sha256 = "0acllabvbm9pmjnh0zx9mgnp47xbrl9ih6i037c85h0ymnjsxdhk"; - }; - glibc_getline = { # Patch to work around conflicting types for the `getline' function diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 464d87efc04..1df28d6f432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5478,12 +5478,6 @@ let ]; }; - linux_2_6_34_tuxonice = linux_2_6_34.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_2_6_34 - ]; - }); - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5495,12 +5489,6 @@ let kernelPatches.sheevaplug_modules_2_6_35; }; - linux_2_6_35_tuxonice = linux_2_6_35.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_2_6_35 - ]; - }); - linux_nanonote_jz_2_6_34 = makeOverridable (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix) { inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser; @@ -5551,12 +5539,6 @@ let ]; }; - linux_2_6_36_tuxonice = linux_2_6_36.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_2_6_36 - ]; - }); - linux_2_6_37 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.37.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5568,12 +5550,6 @@ let ]; }; - linux_2_6_37_tuxonice = linux_2_6_37.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_2_6_37 - ]; - }); - linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5813,13 +5789,9 @@ let recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen); linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33); linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34); - linuxPackages_2_6_34_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_34_tuxonice pkgs.linuxPackages_2_6_34_tuxonice); linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); - linuxPackages_2_6_35_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_35_tuxonice pkgs.linuxPackages_2_6_35_tuxonice); linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36); - linuxPackages_2_6_36_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_36_tuxonice pkgs.linuxPackages_2_6_36_tuxonice); linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37); - linuxPackages_2_6_37_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_37_tuxonice pkgs.linuxPackages_2_6_37_tuxonice); linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38); linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38); linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39); |