summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-03-24 01:17:36 -0400
committerShea Levy <shea@shealevy.com>2018-03-24 01:17:36 -0400
commit34087d0dec1d9d4bda83af10d165fbbd30d177f7 (patch)
treeec7db505c92e6ab96c4fc53e4ac33c4f66a83391
parentbee172501de3b4496ff81cc1621d307f167e9382 (diff)
downloadnixpkgs-34087d0dec1d9d4bda83af10d165fbbd30d177f7.tar
nixpkgs-34087d0dec1d9d4bda83af10d165fbbd30d177f7.tar.gz
nixpkgs-34087d0dec1d9d4bda83af10d165fbbd30d177f7.tar.bz2
nixpkgs-34087d0dec1d9d4bda83af10d165fbbd30d177f7.tar.lz
nixpkgs-34087d0dec1d9d4bda83af10d165fbbd30d177f7.tar.xz
nixpkgs-34087d0dec1d9d4bda83af10d165fbbd30d177f7.tar.zst
nixpkgs-34087d0dec1d9d4bda83af10d165fbbd30d177f7.zip
linux_riscv: 4.16-rc2 -> 4.16-rc6.
Also moves most of our patches upstream.
-rw-r--r--pkgs/os-specific/linux/kernel/linux-riscv.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix
index 45795e24c54..60370311865 100644
--- a/pkgs/os-specific/linux/kernel/linux-riscv.nix
+++ b/pkgs/os-specific/linux/kernel/linux-riscv.nix
@@ -1,15 +1,15 @@
 { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.16-rc2";
-  modDirVersion = "4.16.0-rc2";
+  version = "4.16-rc6";
+  modDirVersion = "4.16.0-rc6";
   extraMeta.branch = "4.16";
 
   src = fetchFromGitHub {
     owner = "shlevy";
     repo ="riscv-linux";
-    rev = "f0c42cff9292c0a8e6ca702a54aafa04b35758a6";
-    sha256 = "050mdciyz1595z81zsss0v9vqsaysppyzqaqpfs5figackifv3iv";
+    rev = "a54f259c2adce68e3bd7600be8989bf1ddf9ea3a";
+    sha256 = "140w6mj4hm1vf4zsmcr2w5cghcaalbvw5d4m9z57dmq1z5plsl4q";
   };
 
   # Should the testing kernels ever be built on Hydra?