diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-02-07 17:35:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-07 17:35:40 +0100 |
| commit | b988acd0cfd581bab32aa218df885a72fea14838 (patch) | |
| tree | 81b99efa94f5cc1a3af4d44185d7b51e9df4cbe9 | |
| parent | 77adc8879ca39b3869243bd6602b4ab928f62c0f (diff) | |
| parent | 573a0dc7fccd03ae53c4744424991b7190061061 (diff) | |
| download | nixlib-b988acd0cfd581bab32aa218df885a72fea14838.tar nixlib-b988acd0cfd581bab32aa218df885a72fea14838.tar.gz nixlib-b988acd0cfd581bab32aa218df885a72fea14838.tar.bz2 nixlib-b988acd0cfd581bab32aa218df885a72fea14838.tar.lz nixlib-b988acd0cfd581bab32aa218df885a72fea14838.tar.xz nixlib-b988acd0cfd581bab32aa218df885a72fea14838.tar.zst nixlib-b988acd0cfd581bab32aa218df885a72fea14838.zip | |
Merge pull request #282635 from Luflosi/update/apfsprogs
apfsprogs: unstable-2023-06-06 -> unstable-2023-11-30
| -rw-r--r-- | pkgs/by-name/ap/apfsprogs/package.nix (renamed from pkgs/tools/filesystems/apfsprogs/default.nix) | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/apfsprogs/default.nix b/pkgs/by-name/ap/apfsprogs/package.nix index 015bb0b88d1b..526cff28dbca 100644 --- a/pkgs/tools/filesystems/apfsprogs/default.nix +++ b/pkgs/by-name/ap/apfsprogs/package.nix @@ -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 ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 255713f3a9e7..b7667a7961eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |