summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-06-01 13:56:42 -0500
committerGitHub <noreply@github.com>2019-06-01 13:56:42 -0500
commit3185e5374d923f92bbcfcf571cb39158abc0502e (patch)
tree7ac189abf9f7ceed0c7cdd893d3d05d8556520d7 /pkgs
parentdf51e9b88fe78b46fb5e0fc67c949c0c8ef1597d (diff)
parent4ecd28c4c75472452e47a096631013740bf94793 (diff)
downloadnixpkgs-3185e5374d923f92bbcfcf571cb39158abc0502e.tar
nixpkgs-3185e5374d923f92bbcfcf571cb39158abc0502e.tar.gz
nixpkgs-3185e5374d923f92bbcfcf571cb39158abc0502e.tar.bz2
nixpkgs-3185e5374d923f92bbcfcf571cb39158abc0502e.tar.lz
nixpkgs-3185e5374d923f92bbcfcf571cb39158abc0502e.tar.xz
nixpkgs-3185e5374d923f92bbcfcf571cb39158abc0502e.tar.zst
nixpkgs-3185e5374d923f92bbcfcf571cb39158abc0502e.zip
Merge pull request #62053 from eadwu/bcachefs/update-3
bcachefs: 2019-05-29
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix6
-rw-r--r--pkgs/tools/filesystems/bcachefs-tools/default.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 3718a8f636a..d8b9fc2a61e 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "5.0.2019.05.08";
+  version = "5.0.2019.05.29";
   modDirVersion = "5.0.0";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "454bd4f82d85bb42a86b8eb0172b13e86e5788a7";
-    sha256 = "1k11yz464lr02yncy231p06ja7w72w9l1nr7cihyiyj1ynzwpdls";
+    rev = "7e42539c80470cb655bbc46cd0f144de6c644523";
+    sha256 = "0f7z3awfzdg56rby6z8dh9v9bzyyfn53zgwxmk367mfi0wqk49d2";
   };
 
   extraConfig = "BCACHEFS_FS m";
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 72e514fff6b..48926a3aade 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bcachefs-tools";
-  version = "2019-05-08";
+  version = "2019-05-29";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "93bdfcb2105afe7a45d512984b855ce97937cfc1";
-    sha256 = "125kjf66h9m31xvsanail1i10h4xld4fpv9gs9liqq91hdh0myyj";
+    rev = "34b93747051055c1076add36f4730c7715e27f07";
+    sha256 = "1z6ih0mssa9y9yr3v0dzrflliqz8qfdkjb29p9nqbpg8iqi45fa8";
   };
 
   enableParallelBuilding = true;