Merge pull request #44533 from Chiiruno/dev/bcachefs

linux_testing_bcachefs: 4.15.2018.04.14 -> 4.15.2018.08.03

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 {}))

pkgs/tools/filesystems/bcachefs-tools/Makefile.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index af7a206..553ac70 100644
---- a/Makefile
-+++ b/Makefile
-@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr)
- 	INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools
- else
- 	ROOT_SBINDIR=$(PREFIX)/sbin
--	INITRAMFS_DIR=/etc/initramfs-tools
-+	INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools
- endif
- 
- .PHONY: all

pkgs/tools/filesystems/bcachefs-tools/default.nix

@@ -1,27 +1,30 @@
-{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
-, keyutils, liburcu, zlib, libaio, zstd }:
+{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
+, liburcu, zlib, libaio, zstd, lz4 }:
 
 stdenv.mkDerivation rec {
-  name = "bcachefs-tools-unstable-2018-04-10";
+  name = "bcachefs-tools-unstable-2018-07-21";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "c598d91dcb0c7e95abdacb2711898ae14ab52ca1";
-    sha256 = "1mglw6p1145nryn8babkg2hj778kqa0vrzjbdp9kxjlyb3fksmff";
+    rev = "cecf7e05e151499a3e96dc05f97f37c14162e94b";
+    sha256 = "18vmyrjwza1iv0apkykbqsnnic5lrqlwfsrj85pgrpwzii36i8i0";
   };
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ];
-  patches = [ ./Makefile.patch ];
-
+  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ];
   installFlags = [ "PREFIX=$(out)" ];
+  
+  preInstall = ''
+    sed -i \
+      "s,INITRAMFS_DIR=/etc/initramfs-tools,INITRAMFS_DIR=$out/etc/initramfs-tools,g" Makefile
+  '';
 
   meta = with stdenv.lib; {
     description = "Tool for managing bcachefs filesystems";
     homepage = https://bcachefs.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ davidak chiiruno];
+    maintainers = with maintainers; [ davidak chiiruno ];
     platforms = platforms.linux;
   };
 }