ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1268 from cillianderoiste/tuxonice

Browse Source 
TuxOnIce: Add a 3.10 linux kernel with the TuxOnIce hibernation patch
This commit is contained in:
cillianderoiste 2013-11-23 08:33:36 -08:00
commit d0ce0f836f
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/hibernate/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, gawk }: { stdenv, fetchurl, gawk }:
let version = "1.98.1"; let version = "2.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hibernate-${version}"; name = "hibernate-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.tuxonice.net/downloads/all/hibernate-script-${version}.tar.gz"; url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz";
sha256 = "1xpc2i16jczc3nhvxlkn6fb044srqrh528gnp92cwy4hxf2nzi1z"; sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh";
}; };
patches = [ ./install.patch ./gen-manpages.patch ./hibernate.patch ]; patches = [ ./install.patch ./gen-manpages.patch ./hibernate.patch ];

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -3,7 +3,7 @@
let let
makeTuxonicePatch = { version, kernelVersion, sha256, makeTuxonicePatch = { version, kernelVersion, sha256,
url ? "http://tuxonice.net/files/tuxonice-${version}-for-${kernelVersion}.patch.bz2" }: url ? "http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-${kernelVersion}-${version}.patch.bz2" }:
{ name = "tuxonice-${kernelVersion}"; { name = "tuxonice-${kernelVersion}";
patch = stdenv.mkDerivation { patch = stdenv.mkDerivation {
name = "tuxonice-${version}-for-${kernelVersion}.patch"; name = "tuxonice-${version}-for-${kernelVersion}.patch";
@ -117,6 +117,13 @@ rec {
patch = ./mips-ext3-n32.patch; patch = ./mips-ext3-n32.patch;
}; };
tuxonice_3_10 = makeTuxonicePatch {
version = "2013-11-07";
kernelVersion = "3.10.18";
sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j";
};
grsecurity_2_9_1_3_2_52 = grsecurity_2_9_1_3_2_52 =
{ name = "grsecurity-2.9.1-3.2.52"; { name = "grsecurity-2.9.1-3.2.52";
patch = fetchurl { patch = fetchurl {

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

@ -6730,6 +6730,15 @@ let
]; ];
}; };
linux_3_10_tuxonice = linux_3_10.override (attrs: {
kernelPatches = attrs.kernelPatches ++ [
kernelPatches.tuxonice_3_10
];
extraConfig = ''
TOI_CORE y
'';
});
linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) { linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) {
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches = kernelPatches =
@ -6872,6 +6881,7 @@ let
linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor;
linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi;
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
# Update this when adding a new version! # Update this when adding a new version!