Unverified Commit b988acd0 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #282635 from Luflosi/update/apfsprogs

apfsprogs: unstable-2023-06-06 -> unstable-2023-11-30
parents 77adc887 573a0dc7
Loading
Loading
Loading
Loading
+17 −5
Original line number Diff line number Diff line
@@ -4,17 +4,27 @@
, nixosTests
}:

stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
  pname = "apfsprogs";
  version = "unstable-2023-06-06";
  version = "unstable-2023-11-30";

  src = fetchFromGitHub {
    owner = "linux-apfs";
    repo = "apfsprogs";
    rev = "91827679dfb1d6f5719fbe22fa67e89c17adb133";
    hash = "sha256-gF7bOozAGGpuVP23mnPW81qH2gnVUdT9cxukzGJ+ydI=";
    rev = "990163894d871f51ba102a75aed384a275c5991b";
    hash = "sha256-yCShZ+ALzSe/svErt9/i1JyyEvbIeABGPbpS4lVil0A=";
  };

  postPatch = let
    shortRev = builtins.substring 0 9 finalAttrs.src.rev;
  in ''
    substituteInPlace \
      apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile \
      --replace \
        '$(shell git describe --always HEAD | tail -c 9)' \
        '${shortRev}'
  '';

  buildPhase = ''
    runHook preBuild
    make -C apfs-snap $makeFlags
@@ -35,6 +45,8 @@ stdenv.mkDerivation {
    apfs = nixosTests.apfs;
  };

  strictDeps = true;

  meta = with lib; {
    description = "Experimental APFS tools for linux";
    homepage = "https://github.com/linux-apfs/apfsprogs";
@@ -42,4 +54,4 @@ stdenv.mkDerivation {
    platforms = platforms.linux;
    maintainers = with maintainers; [ Luflosi ];
  };
}
})
+0 −2
Original line number Diff line number Diff line
@@ -3226,8 +3226,6 @@ with pkgs;
  apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { };
  apfsprogs = callPackage ../tools/filesystems/apfsprogs { };
  api-linter = callPackage ../development/tools/api-linter { };
  apk-tools = callPackage ../tools/package-management/apk-tools {