From c6c38b61a8293b2127ceda0bbf754755cd22ba61 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 13 Jan 2019 20:24:53 -0600 Subject: [PATCH] bcachefs-tools: 2018-10-12 -> 2019-01-13 (fix w/attr bump, touchups) --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 75737e2da7f..9f81db43713 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -2,22 +2,24 @@ , liburcu, zlib, libaio, zstd, lz4 }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-10-12"; + pname = "bcachefs-tools"; + version = "2019-01-13"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "55fbb25501330038e1714905b9ddeb25d875c11c"; - sha256 = "0cwzbyf133jc0fkc8nmjcvv3wmglqhyxda1hh10hgxrbq5vm39wx"; + rev = "47bd483d27ec13418978b24ec5951661d564ba35"; + sha256 = "0h0mi68f8hxjplh0f8yw9h1ax9y6cz9c9hlvl95nqhs352lkdrfj"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ]; - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; preInstall = '' - sed -i \ - "s,INITRAMFS_DIR=/etc/initramfs-tools,INITRAMFS_DIR=$out/etc/initramfs-tools,g" Makefile + substituteInPlace Makefile \ + --replace "INITRAMFS_DIR=/etc/initramfs-tools" \ + "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; meta = with stdenv.lib; {