mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

Merge pull request #71481 from eadwu/bcachefs/update-10

Browse source 
bcachefs: update 10
This commit is contained in:
Jörg Thalheim 2020-04-06 15:43:36 +01:00 committed by GitHub
parent dc8af33d85 04a5e5ab7c
commit a737f030cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file

@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
buildLinux (args // { buildLinux (args // {
version = "5.2.2019.10.12"; version = "5.3.2020.04.04";
modDirVersion = "5.2.0"; modDirVersion = "5.3.0";
src = fetchgit { src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git"; url = "https://evilpiepirate.org/git/bcachefs.git";
rev = "de906c3e2eddad291d46bd0e7c81c68eaadcd08a"; rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230";
sha256 = "1ahabp8pd9slf4lchkbyfkagg9vhic0cw3kwvwryzaxxxjmf2hkk"; sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x";
}; };
extraConfig = "BCACHEFS_FS m"; extraConfig = "BCACHEFS_FS m";

48
pkgs/tools/filesystems/bcachefs-tools/default.nix
View file

@ -1,27 +1,55 @@
{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils { stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
, liburcu, zlib, libaio, zstd, lz4 }: , liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages
, fuseSupport ? false, fuse3 ? null }:
assert fuseSupport -> fuse3 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "bcachefs-tools"; pname = "bcachefs-tools";
version = "2019-10-12"; version = "2020-04-04";
src = fetchgit { src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs-tools.git"; url = "https://evilpiepirate.org/git/bcachefs-tools.git";
rev = "6e696ea08703eecd0d1c7b8c520b6f62f06f4f26"; rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d";
sha256 = "0m3valm68vc73b4kydlga17fglxa9bldrjaszlladzl5bd0zb967"; sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g";
}; };
enableParallelBuilding = true; postPatch = ''
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ];
installFlags = [ "PREFIX=${placeholder "out"}" ];
preInstall = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "pytest-3" "pytest --verbose" \
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \ --replace "INITRAMFS_DIR=/etc/initramfs-tools" \
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
''; '';
enableParallelBuilding = true;
nativeBuildInputs = [
pkgconfig
];
buildInputs = [
libuuid libscrypt libsodium keyutils liburcu zlib libaio
zstd lz4 python3Packages.pytest
] ++ stdenv.lib.optional fuseSupport fuse3;
doCheck = true;
checkFlags = [
"BCACHEFS_TEST_USE_VALGRIND=no"
];
checkInputs = [
valgrind
];
preCheck = stdenv.lib.optionalString fuseSupport ''
rm tests/test_fuse.py
'';
installFlags = [
"PREFIX=${placeholder "out"}"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool for managing bcachefs filesystems"; description = "Tool for managing bcachefs filesystems";
homepage = https://bcachefs.org/; homepage = https://bcachefs.org/;