diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index 8eed999ccfe8..17b438ac46b8 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.3.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yq631LPpWal0hsEJS0dOtiox1295tYgUWJVIw+bsbnw="; + hash = "sha256-+KqTiIp9dIJWG2KvgvPwXC7p754XfgvKHjvwjCdbvCs="; }; nativeBuildInputs = [ @@ -69,7 +69,8 @@ stdenv.mkDerivation (finalAttrs: { checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; makeFlags = [ - "PREFIX=${placeholder "out"}" + "DESTDIR=${placeholder "out"}" + "PREFIX=" "VERSION=${finalAttrs.version}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; |