diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-01-25 01:11:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-25 01:11:04 +0100 |
commit | 559ddda570f61c4b66fb53162db7ce781c818f9f (patch) | |
tree | 7282bef6649eda7d23c0e6e026392a5cd55c0d2e /pkgs | |
parent | 7b1be1e6d433903eecc598729f4d4ba216a12a4c (diff) | |
parent | 874c91834c0be39e7e9dbb366d2a1d309a4f928c (diff) |
Merge pull request #279852 from Madouura/pr/bcachefs
bcachefs: update comments, release-notes, only use IFS for bcachefs, update bcachefs-tools and module
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 6 |
2 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 17b438ac46b88..f45e4b51953f7 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -19,6 +19,7 @@ , rustPlatform , makeWrapper , writeScript +, python3 , fuseSupport ? false }: @@ -26,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; version = "1.4.1"; - src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; @@ -65,12 +65,12 @@ stdenv.mkDerivation (finalAttrs: { udev ] ++ lib.optional fuseSupport fuse3; + # FIXME: Try enabling this once the default linux kernel is at least 6.7 doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; makeFlags = [ - "DESTDIR=${placeholder "out"}" - "PREFIX=" + "PREFIX=${placeholder "out"}" "VERSION=${finalAttrs.version}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; @@ -79,6 +79,17 @@ stdenv.mkDerivation (finalAttrs: { rm tests/test_fuse.py ''; + # Tries to install to the 'systemd-minimal' and 'udev' nix installation paths + installFlags = [ + "PKGCONFIG_SERVICEDIR=$(out)/lib/systemd/system" + "PKGCONFIG_UDEVDIR=$(out)/lib/udev" + ]; + + postInstall = '' + substituteInPlace $out/libexec/bcachefsck_all \ + --replace "/usr/bin/python3" "${python3}/bin/python3" + ''; + passthru = { tests = { smoke-test = nixosTests.bcachefs; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 98c3c66e780f8..8eb19333d3020 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -607,9 +607,9 @@ mapAliases ({ ''; linux_latest_hardened = linuxPackages_latest_hardened; - # Added 2023-11-18 - linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_testing', or any other linux kernel with bcachefs support"; - linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_testing', or any other linux kernel with bcachefs support"; + # Added 2023-11-18, modified 2024-01-09 + linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; + linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 |