diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-23 11:31:13 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-23 11:31:13 +0100 |
| commit | eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed (patch) | |
| tree | 414bb33ccff27e022cfcdcf03e88b00f787344a7 /pkgs/tools/filesystems | |
| parent | 91b7e73bbcb688e4b7de44752ebaee892d6fa31b (diff) | |
| parent | cdfb32d17a988c9fe2952c586f7ea8c2b6ca7115 (diff) | |
| download | nixpkgs-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar nixpkgs-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.gz nixpkgs-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.bz2 nixpkgs-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.lz nixpkgs-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.xz nixpkgs-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.zst nixpkgs-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.zip | |
Merge branch 'staging' into glibc230
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 1da8470280b..e3545315d6f 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.4"; + version = "5.4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1ykhasv0jc3qi3xrm5841mzkmlbkjw6rm70gl4aww90jj6ak55qg"; + sha256 = "0scxg9p6z0wss92gmv5a8yxdmr8x449kb5v3bfnvs26n92r7zq7k"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 9c770441025..34f8ff8f447 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -134,7 +134,7 @@ in rec { substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" # for pybind/rgw to find internal dep - export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" # install target needs to be in PYTHONPATH for "*.pth support" check to succeed patchShebangs src/script src/spdk src/test src/tools |