Merge pull request #54752 from eadwu/bcachefs/20190123
linux_testing_bcachefs,bcachefs-tools: 20190123
This commit is contained in:
commit
8626808c72
@ -1,13 +1,13 @@
|
|||||||
{ stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:
|
{ stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "4.18.2018.10.12";
|
version = "4.20.2019.01.23";
|
||||||
modDirVersion = "4.18.0";
|
modDirVersion = "4.20.0";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://evilpiepirate.org/git/bcachefs.git";
|
url = "https://evilpiepirate.org/git/bcachefs.git";
|
||||||
rev = "d7f6da1d60ec24266301231538ff6f09716537ed";
|
rev = "99750eab4d583132cf61f071082c7cf21f5295c0";
|
||||||
sha256 = "05d7dh41nc35www8vmrn47wlf2mr2b8i4rm15vq3zgm32d0xv3lk";
|
sha256 = "05wg9w5f68qg02yrciir9h1wx448869763hg3w7j23wc2qywhwqb";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = "BCACHEFS_FS m";
|
extraConfig = "BCACHEFS_FS m";
|
||||||
|
@ -3,19 +3,19 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bcachefs-tools";
|
pname = "bcachefs-tools";
|
||||||
version = "2019-01-13";
|
version = "2019-01-23";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
|
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
|
||||||
rev = "47bd483d27ec13418978b24ec5951661d564ba35";
|
rev = "35fca2f044d375b1590f499cfd34bef38ca0f8f1";
|
||||||
sha256 = "0h0mi68f8hxjplh0f8yw9h1ax9y6cz9c9hlvl95nqhs352lkdrfj";
|
sha256 = "1mmpwksszdi4n7zv3fm7qnmfk94m56d65lfw30553bnfm3yaz3k7";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ];
|
buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ];
|
||||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
substituteInPlace Makefile \
|
substituteInPlace Makefile \
|
||||||
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \
|
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \
|
||||||
|
Loading…
Reference in New Issue
Block a user