diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 8c2942bfdfc..adb89db34dd 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ fetchurl }: +{ stdenv, fetchurl }: let @@ -235,4 +235,20 @@ in patch = ./guruplug-mach-type.patch; }; + tuxonice_2_6_35 = + { name = "tuxonice-2.6.35"; + patch = stdenv.mkDerivation { + name = "tuxonice-3.2-rc2-for-2.6.35.patch"; + src = fetchurl { + url = http://tuxonice.net/files/tuxonice-3.2-rc2-for-2.6.35.patch.bz2; + sha256 = "00jbrqq6p1lyvli835wczc0vqsn0z73jpb2aak3ak0vgnvsxw37q"; + }; + phases = [ "installPhase" ]; + installPhase = '' + source $stdenv/setup + bunzip2 -c $src > $out + ''; + }; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de53df95315..a90f33e2c20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4973,6 +4973,12 @@ 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; @@ -5148,6 +5154,7 @@ let 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_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); linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36); linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37); linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);