diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-11-04 11:39:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-04 11:39:09 +0000 |
| commit | e9f2267f8f598578b2a9a08a730f099cf3c26c7f (patch) | |
| tree | 5e986907b81bf4845fa01d220cfbe696abb4bf43 | |
| parent | f319c7fc89c6e9605cf1b8fec7a6d45105d46c2e (diff) | |
| parent | e84291bd23dc2d9936ad9199a9e744e1b25be601 (diff) | |
| download | nixlib-e9f2267f8f598578b2a9a08a730f099cf3c26c7f.tar nixlib-e9f2267f8f598578b2a9a08a730f099cf3c26c7f.tar.gz nixlib-e9f2267f8f598578b2a9a08a730f099cf3c26c7f.tar.bz2 nixlib-e9f2267f8f598578b2a9a08a730f099cf3c26c7f.tar.lz nixlib-e9f2267f8f598578b2a9a08a730f099cf3c26c7f.tar.xz nixlib-e9f2267f8f598578b2a9a08a730f099cf3c26c7f.tar.zst nixlib-e9f2267f8f598578b2a9a08a730f099cf3c26c7f.zip | |
Merge pull request #49710 from Mic92/linux-samus
linux-samus: remove
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-samus-4.12.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
2 files changed, 0 insertions, 32 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix deleted file mode 100644 index 0a936c6c053b..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args: - -buildLinux (args // rec { - version = "4.12.2"; - extraMeta.branch = "4.12-2"; - - src = - let upstream = fetchFromGitHub { - owner = "raphael"; - repo = "linux-samus"; - rev = "v${extraMeta.branch}"; - sha256 = "1dr74i79p8r13522w2ppi8gnjd9bhngc9d2hsn91ji6f5a8fbxx9"; - }; in "${upstream}/build/linux"; - - extraMeta.platforms = [ "x86_64-linux" ]; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 172f9754bc99..3fb3351f981a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14323,17 +14323,6 @@ with pkgs; ]; }; - linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14561,11 +14550,6 @@ with pkgs; linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - # Samus kernels - linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); - linuxPackages_samus_latest = linuxPackages_samus_4_12; - linux_samus_latest = linuxPackages_samus_latest.kernel; - # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; |