b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #163433 from JJJollyjim/bcachefs

Browse source 
bcachefs: unstable-2022-01-12 -> unstable-2022-03-09
This commit is contained in:
davidak 2022-03-14 15:34:43 +01:00 committed by GitHub
parent 5838071b79 3b01bd6249
commit d2c95bb666
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/tests/bcachefs.nix
View file

@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
virtualisation.emptyDiskImages = [ 4096 ]; virtualisation.emptyDiskImages = [ 4096 ];
networking.hostId = "deadbeef"; networking.hostId = "deadbeef";
boot.supportedFilesystems = [ "bcachefs" ]; boot.supportedFilesystems = [ "bcachefs" ];
environment.systemPackages = with pkgs; [ parted ]; environment.systemPackages = with pkgs; [ parted keyutils ];
}; };
testScript = '' testScript = ''
@ -20,10 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"parted --script /dev/vdb mklabel msdos", "parted --script /dev/vdb mklabel msdos",
"parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s", "parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s",
"udevadm settle", "udevadm settle",
# Due to #32279, we cannot use encryption for this test yet "keyctl link @u @s",
# "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
# "echo password | bcachefs unlock /dev/vdb1", "echo password | bcachefs unlock /dev/vdb1",
"bcachefs format --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
"mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt",
"udevadm settle", "udevadm settle",
"bcachefs fs usage /tmp/mnt", "bcachefs fs usage /tmp/mnt",

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

@ -1,9 +1,9 @@
{ lib { lib
, fetchpatch , fetchpatch
, kernel , kernel
, date ? "2022-01-12" , date ? "2022-03-09"
, commit ? "0e6eb60f8be14b02e0a76cb330f4b22c80ec82e9" , commit ? "2280551cebc1735f74eef75d650dd5e175461657"
, diffHash ? "091w4r7h93s5rv8hk65aix7l0rr4bd504mv998j7x360bqlb7vpi" , diffHash ? "1mrrydidbapdq0fs0vpqhs88k6ghdrvmjpk2zi7xlwj7j32h0nwp"
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
, argsOverride ? {} , argsOverride ? {}
, ... , ...
@ -16,7 +16,7 @@
extraMeta = { extraMeta = {
branch = "master"; branch = "master";
maintainers = with lib.maintainers; [ davidak chiiruno ]; maintainers = with lib.maintainers; [ davidak Madouura ];
}; };
} // argsOverride; } // argsOverride;

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

@ -22,13 +22,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "bcachefs-tools"; pname = "bcachefs-tools";
version = "unstable-2022-01-12"; version = "unstable-2022-03-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koverstreet"; owner = "koverstreet";
repo = "bcachefs-tools"; repo = "bcachefs-tools";
rev = "7b15324de1095f3e2e423e9c53da076d208b52d5"; rev = "3e2e3d468eed1d5ebbb4c6309d2eaebd081912c5";
sha256 = "0glpq0n1xv7ck28v0gahl1fak9dhyp04id8d1l8yxvnriyw19zxa"; sha256 = "1sb0dj2whlp3dxgf642z7yx7s8va5ah82zi6r4qni7l64qy1n554";
}; };
postPatch = '' postPatch = ''
@ -60,11 +60,13 @@ stdenv.mkDerivation {
smoke-test = nixosTests.bcachefs; smoke-test = nixosTests.bcachefs;
}; };
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Tool for managing bcachefs filesystems"; description = "Tool for managing bcachefs filesystems";
homepage = "https://bcachefs.org/"; homepage = "https://bcachefs.org/";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ davidak chiiruno ]; maintainers = with maintainers; [ davidak Madouura ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }