git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140811 from robintown/bcachefs-tools

bcachefs-tools: 2021-07-08 -> 2021-10-01

commit8d4b70dfec8661e8d304e7ea5dd0e3e220016dc6 authordavidak <davidak@users.noreply.github.com> dateThu 7 Oct 2021, 01:52 (5 years ago) parent3f5379da961352
2 files changed+6−4
compare with master
unifiedsplit
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+1 pkgs/tools/filesystems/bcachefs-tools/default.nix+5−4
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+1
@@ -1,6 +1,7 @@
11{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
22
33buildLinux (args // {
4+ # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
45 version = "5.13.0-2021.10.01";
56 modDirVersion = "5.13.0";
67
pkgs/tools/filesystems/bcachefs-tools/default.nix+5−4
@@ -22,20 +22,21 @@
2222
2323stdenv.mkDerivation {
2424 pname = "bcachefs-tools";
25− version = "unstable-2021-07-08";
25+ version = "unstable-2021-10-01";
2626
2727 src = fetchFromGitHub {
2828 owner = "koverstreet";
2929 repo = "bcachefs-tools";
30− rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e";
31− sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw";
30+ rev = "37850436dd7dfbe67738749c4d4a2506ffff1ec3";
31+ sha256 = "040vgxrimahmfs9rhlggfwg0bzl7h9j2ksx3563rh63asjwlhnhi";
3232 };
3333
3434 postPatch = ''
3535 substituteInPlace Makefile \
3636 --replace "pytest-3" "pytest --verbose" \
3737 --replace "INITRAMFS_DIR=/etc/initramfs-tools" \
38− "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
38+ "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" \
39+ --replace "doc/macro2rst.py" "python3 doc/macro2rst.py"
3940 '';
4041
4142 nativeBuildInputs = [ pkg-config docutils ];