linux_testing_bcachefs, bcachefs-tools: unstable-2021-07-08 → unstable-2021-11-06
bcachefs now supports snapshots so we need the latest version to use them. Additionally, it appears to build on AArch64 so I've removed the x86 requirement.
This commit is contained in:
parent
ea8596e4de
commit
8f4289267c
|
@ -33,7 +33,7 @@ in
|
|||
avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
|
||||
babeld = handleTest ./babeld.nix {};
|
||||
bazarr = handleTest ./bazarr.nix {};
|
||||
bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
|
||||
bcachefs = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bcachefs.nix {};
|
||||
beanstalkd = handleTest ./beanstalkd.nix {};
|
||||
bees = handleTest ./bees.nix {};
|
||||
bind = handleTest ./bind.nix {};
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{ lib
|
||||
, fetchpatch
|
||||
, kernel
|
||||
, date ? "2021-07-08"
|
||||
, commit ? "3693b2ca83ff9eda49660b31299d2bebe3a1075f"
|
||||
, diffHash ? "1sfq3vwc2kxa761s292f2cqrm0vvqvkdx6drpyn5yaxwnapwidcw"
|
||||
, date ? "2021-11-06"
|
||||
, commit ? "10669a2c540de3276c8d2fc0e43be62f2886f377"
|
||||
, diffHash ? "1rn72wd8jg919j74x8banl70b2bdd6r9fgvnw693j20dq96j5cnw"
|
||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
||||
, argsOverride ? {}
|
||||
, ...
|
||||
|
@ -16,7 +16,6 @@
|
|||
extraMeta = {
|
||||
branch = "master";
|
||||
maintainers = with lib.maintainers; [ davidak chiiruno ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
} // argsOverride;
|
||||
|
||||
|
@ -30,4 +29,4 @@
|
|||
extraConfig = "BCACHEFS_FS m";
|
||||
} ] ++ kernelPatches;
|
||||
|
||||
})).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; })
|
||||
}))
|
||||
|
|
|
@ -22,23 +22,24 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bcachefs-tools";
|
||||
version = "unstable-2021-07-08";
|
||||
version = "unstable-2021-11-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e";
|
||||
sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw";
|
||||
rev = "5b84952401146fec9a181a40877352f7faf9ee7b";
|
||||
sha256 = "09zs2h3vzqn163v4i9lrvgy9gcjlw24lld7715j3kyyxnc5vav32";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace Makefile \
|
||||
--replace "pytest-3" "pytest --verbose" \
|
||||
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \
|
||||
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config docutils ];
|
||||
nativeBuildInputs = [ pkg-config docutils python3Packages.python ];
|
||||
|
||||
buildInputs = [
|
||||
libuuid libscrypt libsodium keyutils liburcu zlib libaio
|
||||
|
@ -64,6 +65,6 @@ stdenv.mkDerivation {
|
|||
homepage = "https://bcachefs.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ davidak chiiruno ];
|
||||
platforms = [ "x86_64-linux" ]; # does not build on aarch64, see https://github.com/koverstreet/bcachefs-tools/issues/39
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -189,7 +189,7 @@ in {
|
|||
};
|
||||
|
||||
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
||||
kernel = linux_5_14;
|
||||
kernel = linux_5_15;
|
||||
kernelPatches = kernel.kernelPatches;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue