nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-31 09:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Remove broken tux-on-ice kernels.

Browse Source 
svn path=/nixpkgs/trunk/; revision=30619
This commit is contained in:
Eelco Dolstra 2011-11-29 14:49:32 +00:00
parent 25f6c6ca6e
commit 752203c3ca
2 changed files with 14 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,24 +36,24 @@ let
}; };
}; };
makeAufs3StandalonePatch = {version, rev, sha256}: makeAufs3StandalonePatch = {version, rev, sha256}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "aufs3-standalone-${version}.patch"; name = "aufs3-standalone-${version}.patch";
src = fetchgit { src = fetchgit {
url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git; url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git;
inherit sha256 rev; inherit sha256 rev;
};
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
'';
}; };
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
'';
};
in in
rec { rec {
@ -397,31 +397,6 @@ rec {
patch = ./guruplug-mach-type.patch; 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 = glibc_getline =
{ {
# Patch to work around conflicting types for the `getline' function # Patch to work around conflicting types for the `getline' function

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

@ -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) { linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches = kernelPatches =
@ -5495,12 +5489,6 @@ let
kernelPatches.sheevaplug_modules_2_6_35; 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 linux_nanonote_jz_2_6_34 = makeOverridable
(import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix) { (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix) {
inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser; 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) { linux_2_6_37 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.37.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches = 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) { linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches = kernelPatches =
@ -5813,13 +5789,9 @@ let
recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen); 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_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 = 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 = 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 = 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 = 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 = 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_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); linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39);