summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-08-07 00:37:07 +0200
committerGitHub <noreply@github.com>2018-08-07 00:37:07 +0200
commitbd758ed746558e816f3f5f0a057ab06e94bec581 (patch)
tree22338d95377554c73a02ca7a5b8fee3bb34f18be /pkgs/os-specific/linux/kernel
parent8397411b4011cc5cd78f629e91b7635898e466d5 (diff)
parent2d82b2625f56f7794c3aff53f774bcbe9354b7a9 (diff)
downloadnixlib-bd758ed746558e816f3f5f0a057ab06e94bec581.tar
nixlib-bd758ed746558e816f3f5f0a057ab06e94bec581.tar.gz
nixlib-bd758ed746558e816f3f5f0a057ab06e94bec581.tar.bz2
nixlib-bd758ed746558e816f3f5f0a057ab06e94bec581.tar.lz
nixlib-bd758ed746558e816f3f5f0a057ab06e94bec581.tar.xz
nixlib-bd758ed746558e816f3f5f0a057ab06e94bec581.tar.zst
nixlib-bd758ed746558e816f3f5f0a057ab06e94bec581.zip
Merge pull request #44533 from Chiiruno/dev/bcachefs
 linux_testing_bcachefs: 4.15.2018.04.14 -> 4.15.2018.08.03
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix21
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 1366a11b573c..1fb9866f4e95 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,22 +1,21 @@
 { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.15.2018.04.14";
-  modDirVersion = "4.15.0";
-  extraMeta.branch = "master";
-  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak stdenv.lib.maintainers.chiiruno ];
+  version = "4.16.2018.08.03";
+  modDirVersion = "4.16.0";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "3b7c824e9330a640312fce1b04537c684c1d602c";
-    sha256 = "1l5ib28qkhrxggn6zj9b2839543anbxk2ip75yizgzlv9vr5m4pk";
+    rev = "e7a00a52b57336c04d1043c6fa0a67a7c8301cfb";
+    sha256 = "1a0kvpazvvh0rfb9hkyr4zw55ndh060j95fvhf2aaaj9qyc7p7wp";
   };
 
-  extraConfig = ''
-    BCACHEFS_FS m
-  '';
+  extraConfig = "BCACHEFS_FS m";
 
-  # Should the testing kernels ever be built on Hydra?
-  extraMeta.hydraPlatforms = [];
+  extraMeta = {
+    branch = "master";
+    hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?
+    maintainers = with stdenv.lib.maintainers; [ davidak chiiruno ];
+  };
 
 } // (args.argsOverride or {}))