colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #232828 from Luflosi/update/apfsprogs

Browse Source 
apfsprogs: unstable-2023-03-21 -> unstable-2023-05-16
This commit is contained in:
Nick Cao 2023-05-21 23:51:46 -06:00 committed by GitHub
commit cf577b1ef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/tests/apfs.nix
View File

@ -48,5 +48,18 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"umount /tmp/mnt",
"apfsck /dev/vdb",
)
with subtest("Snapshots"):
machine.succeed(
"mkapfs /dev/vdb",
"mount -o cknodes,readwrite /dev/vdb /tmp/mnt",
"echo 'Hello World' > /tmp/mnt/test.txt",
"apfs-snap /tmp/mnt snap-1",
"rm /tmp/mnt/test.txt",
"umount /tmp/mnt",
"mount -o cknodes,readwrite,snap=snap-1 /dev/vdb /tmp/mnt",
"echo 'Hello World' | diff - /tmp/mnt/test.txt",
"umount /tmp/mnt",
"apfsck /dev/vdb",
)
'';
})

8
pkgs/tools/filesystems/apfsprogs/default.nix
View File

@ -6,17 +6,18 @@
stdenv.mkDerivation {
pname = "apfsprogs";
version = "unstable-2023-03-21";
version = "unstable-2023-05-16";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "apfsprogs";
rev = "be41cc38194bd41a41750631577e6d8b31953103";
hash = "sha256-9o8DKXyK5qIoVGVKMJxsinEkbJImyuDglf534kanzFE=";
rev = "7be75bcf1a533272bc69684b4b7d33c2adba315c";
hash = "sha256-WHAUrDiXy5HCwN876bZGc/OUHJITf6Fnpx4kAwAhcAs=";
};
buildPhase = ''
runHook preBuild
make -C apfs-snap $makeFlags
make -C apfsck $makeFlags
make -C mkapfs $makeFlags
runHook postBuild
@ -24,6 +25,7 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
make -C apfs-snap install DESTDIR="$out" $installFlags
make -C apfsck install DESTDIR="$out" $installFlags
make -C mkapfs install DESTDIR="$out" $installFlags
runHook postInstall