diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2018-03-27 14:09:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 14:09:18 +0200 |
| commit | 4ba76fadeb1afc0f55c58781d6c626baf16c2c64 (patch) | |
| tree | 2022aa291f41a96a96334211dc772a574339518c /pkgs/tools | |
| parent | 182dd9894614fa89b812519e9f4387d281a148e0 (diff) | |
| parent | 1f4f6d79ac54b240f6f7120bcb18d5e9e9a16707 (diff) | |
| download | nixlib-4ba76fadeb1afc0f55c58781d6c626baf16c2c64.tar nixlib-4ba76fadeb1afc0f55c58781d6c626baf16c2c64.tar.gz nixlib-4ba76fadeb1afc0f55c58781d6c626baf16c2c64.tar.bz2 nixlib-4ba76fadeb1afc0f55c58781d6c626baf16c2c64.tar.lz nixlib-4ba76fadeb1afc0f55c58781d6c626baf16c2c64.tar.xz nixlib-4ba76fadeb1afc0f55c58781d6c626baf16c2c64.tar.zst nixlib-4ba76fadeb1afc0f55c58781d6c626baf16c2c64.zip | |
Merge pull request #37905 from Chiiruno/master
linux_testing_bcachefs: 4.15.2018.02.09 -> 4.15.2018.03.22
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/Makefile.patch | 13 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 14 |
2 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch new file mode 100644 index 000000000000..812f9954cf20 --- /dev/null +++ b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index af7a206..553ac70 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr) + INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools + else + ROOT_SBINDIR=$(PREFIX)/sbin +- INITRAMFS_DIR=/etc/initramfs-tools ++ INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools + endif + + .PHONY: all diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 0a5017de53c4..3684b216cd75 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,17 +1,19 @@ { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium -, keyutils, liburcu, zlib, libaio }: +, keyutils, liburcu, zlib, libaio, zstd }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-02-08"; + name = "bcachefs-tools-unstable-2018-03-20"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "fc96071b58c28ea492103e7649c0efd5bab50ead"; - sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy"; + rev = "ff5e165532a2eed87700649d03f91a612a58e92a"; + sha256 = "1mikhffkr4a1yhy36yh70dhgcimcpvdm5mjl5fyni0bpgqrw67dn"; }; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; + buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ]; + patches = [ ./Makefile.patch ]; installFlags = [ "PREFIX=$(out)" ]; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { description = "Tool for managing bcachefs filesystems"; homepage = https://bcachefs.org/; license = licenses.gpl2; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ davidak chiiruno]; platforms = platforms.linux; }; } |