diff options
| author | davidak <davidak@users.noreply.github.com> | 2021-10-07 01:52:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 01:52:14 +0200 |
| commit | 8d4b70dfec8661e8d304e7ea5dd0e3e220016dc6 (patch) | |
| tree | 4558fffd6da5eefefced5d697ee7872cc3ec448e | |
| parent | Merge pull request #140274 from fabaff/pyefergy (diff) | |
| parent | linux-testing-bcachefs: Add note about keeping bcachefs-tools up to date (diff) | |
| download | nixpkgs-8d4b70dfec8661e8d304e7ea5dd0e3e220016dc6.tar.gz | |
Merge pull request #140811 from robintown/bcachefs-tools
bcachefs-tools: 2021-07-08 -> 2021-10-01
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 378461f217e8..fa5729baf73a 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,6 +1,7 @@ { lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { + # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility version = "5.13.0-2021.10.01"; modDirVersion = "5.13.0"; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index be7a42e19e9d..bdb7e55b5cf5 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,20 +22,21 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2021-07-08"; + version = "unstable-2021-10-01"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e"; - sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw"; + rev = "37850436dd7dfbe67738749c4d4a2506ffff1ec3"; + sha256 = "040vgxrimahmfs9rhlggfwg0bzl7h9j2ksx3563rh63asjwlhnhi"; }; postPatch = '' substituteInPlace Makefile \ --replace "pytest-3" "pytest --verbose" \ --replace "INITRAMFS_DIR=/etc/initramfs-tools" \ - "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" + "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" \ + --replace "doc/macro2rst.py" "python3 doc/macro2rst.py" ''; nativeBuildInputs = [ pkg-config docutils ]; |