git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #97599: bcachefs*: update
commit638c8cb2d56be72e8842a8a4262af7b559cb7111 authorVladimír Čunát <v@cunat.cz> dateThu 17 Sep 2020, 23:19 (6 years ago) parent6bc58263cc3e86
2 files changed+18−16
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+8−7 pkgs/tools/filesystems/bcachefs-tools/default.nix+10−9
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+8−7
@@ -1,13 +1,14 @@
1−{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
1+{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
22
33buildLinux (args // {
4− version = "5.3.2020.04.04";
5− modDirVersion = "5.3.0";
4+ version = "5.8.0-2020.09.07";
5+ modDirVersion = "5.8.0";
66
7− src = fetchgit {
8− url = "https://evilpiepirate.org/git/bcachefs.git";
9− rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230";
10− sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x";
7+ src = fetchFromGitHub {
8+ owner = "koverstreet";
9+ repo = "bcachefs";
10+ rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf";
11+ sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy";
1112 };
1213
1314 extraConfig = "BCACHEFS_FS m";
pkgs/tools/filesystems/bcachefs-tools/default.nix+10−9
@@ -1,17 +1,18 @@
1−{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
2−, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages
1+{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
2+, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages
33, fuseSupport ? false, fuse3 ? null }:
44
55assert fuseSupport -> fuse3 != null;
66
77stdenv.mkDerivation {
88 pname = "bcachefs-tools";
9− version = "2020-04-04";
9+ version = "2020-08-25";
1010
11− src = fetchgit {
12− url = "https://evilpiepirate.org/git/bcachefs-tools.git";
13− rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d";
14− sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g";
11+ src = fetchFromGitHub {
12+ owner = "koverstreet";
13+ repo = "bcachefs-tools";
14+ rev = "487ddeb03c574e902c5b749b4307e87e2150976a";
15+ sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid";
1516 };
1617
1718 postPatch = ''
@@ -29,10 +30,10 @@ stdenv.mkDerivation {
2930
3031 buildInputs = [
3132 libuuid libscrypt libsodium keyutils liburcu zlib libaio
32− zstd lz4 python3Packages.pytest
33+ zstd lz4 python3Packages.pytest udev valgrind
3334 ] ++ stdenv.lib.optional fuseSupport fuse3;
3435
35− doCheck = true;
36+ doCheck = false; # needs bcachefs module loaded on builder
3637
3738 checkFlags = [
3839 "BCACHEFS_TEST_USE_VALGRIND=no"