summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shlevy@xps13.shealevy.com>2018-11-06 09:42:45 -0500
committerShea Levy <shlevy@xps13.shealevy.com>2018-11-06 09:42:45 -0500
commit329bf4c3e1f3c8020ab9e31ba652f6b13e713630 (patch)
treebaaaea228788f2357836edff380cae3f8cd17d87
parent1aed180d73ab97cd40db94ba40a69907ab3153a2 (diff)
downloadnixlib-329bf4c3e1f3c8020ab9e31ba652f6b13e713630.tar
nixlib-329bf4c3e1f3c8020ab9e31ba652f6b13e713630.tar.gz
nixlib-329bf4c3e1f3c8020ab9e31ba652f6b13e713630.tar.bz2
nixlib-329bf4c3e1f3c8020ab9e31ba652f6b13e713630.tar.lz
nixlib-329bf4c3e1f3c8020ab9e31ba652f6b13e713630.tar.xz
nixlib-329bf4c3e1f3c8020ab9e31ba652f6b13e713630.tar.zst
nixlib-329bf4c3e1f3c8020ab9e31ba652f6b13e713630.zip
linux-riscv: Remove.
risc-v changes are now upstream.

See #49490
-rw-r--r--pkgs/os-specific/linux/kernel/linux-riscv.nix18
-rw-r--r--pkgs/top-level/all-packages.nix7
2 files changed, 0 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix
deleted file mode 100644
index dbc69144c4da..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-riscv.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
-
-buildLinux (args // rec {
-  version = "4.16-rc6";
-  modDirVersion = "4.16.0-rc6";
-  extraMeta.branch = "4.16";
-
-  src = fetchFromGitHub {
-    owner = "shlevy";
-    repo ="riscv-linux";
-    rev = "a54f259c2adce68e3bd7600be8989bf1ddf9ea3a";
-    sha256 = "140w6mj4hm1vf4zsmcr2w5cghcaalbvw5d4m9z57dmq1z5plsl4q";
-  };
-
-  # Should the testing kernels ever be built on Hydra?
-  extraMeta.hydraPlatforms = [];
-
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8aa4618fad2..7f29df2948e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14329,13 +14329,6 @@ with pkgs;
       ];
   };
 
-  linux_riscv = callPackage ../os-specific/linux/kernel/linux-riscv.nix {
-    kernelPatches = [
-      kernelPatches.bridge_stp_helper
-      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