b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #140811 from robintown/bcachefs-tools

Browse source 
bcachefs-tools: 2021-07-08 -> 2021-10-01
This commit is contained in:
davidak 2021-10-07 01:52:14 +02:00 committed by GitHub
parent 3f5379dde3 a961352f5e
commit 8d4b70dfec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file

@ -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";

9
pkgs/tools/filesystems/bcachefs-tools/default.nix
View file

@ -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 ];