summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-02-10 08:20:35 +0000
committerGitHub <noreply@github.com>2018-02-10 08:20:35 +0000
commit3b8bb02f68c3b1661fa4609a4b98a950e37bc79d (patch)
treed4ea095fe9ed6c8b3d15d0db503e9b5cc4c9d51a /pkgs/tools
parent79315b632efb9131f6b37ebe634e38217c9e4fdc (diff)
parentbad837fd3bfbdc7cc70b9cba2185e7ebe8361cb0 (diff)
downloadnixlib-3b8bb02f68c3b1661fa4609a4b98a950e37bc79d.tar
nixlib-3b8bb02f68c3b1661fa4609a4b98a950e37bc79d.tar.gz
nixlib-3b8bb02f68c3b1661fa4609a4b98a950e37bc79d.tar.bz2
nixlib-3b8bb02f68c3b1661fa4609a4b98a950e37bc79d.tar.lz
nixlib-3b8bb02f68c3b1661fa4609a4b98a950e37bc79d.tar.xz
nixlib-3b8bb02f68c3b1661fa4609a4b98a950e37bc79d.tar.zst
nixlib-3b8bb02f68c3b1661fa4609a4b98a950e37bc79d.zip
Merge pull request #34792 from dywedir/bcachefs
linux_testing_bcachefs: 4.11.2017.08.23 -> 4.15.2018.02.09
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/filesystems/bcachefs-tools/default.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index fc4d3f505cdc..0a5017de53c4 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,29 +1,25 @@
-{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }:
+{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
+, keyutils, liburcu, zlib, libaio }:
 
 stdenv.mkDerivation rec {
-  name = "bcachefs-tools-unstable-2017-08-28";
+  name = "bcachefs-tools-unstable-2018-02-08";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "b1814f2dd0c6b61a12a2ebb67a13d406d126b227";
-    sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350";
+    rev = "fc96071b58c28ea492103e7649c0efd5bab50ead";
+    sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ];
 
-  preConfigure = ''
-    substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h
-  '';
-
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "Tool for managing bcachefs filesystems";
-    homepage = http://bcachefs.org/;
+    homepage = https://bcachefs.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ davidak ];
     platforms = platforms.linux;
   };
 }
-