From 56087905b4ab65435a0de3afebdc9e901cb14e85 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 29 Jan 2024 08:05:45 -0500 Subject: [PATCH 1/2] apfs-fuse: fix pname+version, add mainProgram MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The “unstable” conventionally is a part of the version, not the pname. --- pkgs/tools/filesystems/apfs-fuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index 0beffca1a54e..0fdb8603db44 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fuse, fuse3, bzip2, zlib, attr, cmake }: stdenv.mkDerivation { - pname = "apfs-fuse-unstable"; - version = "2023-01-04"; + pname = "apfs-fuse"; + version = "unstable-2023-01-04"; src = fetchFromGitHub { owner = "sgan81"; @@ -37,8 +37,8 @@ stdenv.mkDerivation { homepage = "https://github.com/sgan81/apfs-fuse"; description = "FUSE driver for APFS (Apple File System)"; license = licenses.gpl2Plus; + mainProgram = "apfs-fuse"; maintainers = with maintainers; [ ealasu ]; platforms = platforms.unix; }; - } From 4e4b7e466c558255dcd66fb076f3278b6db3571a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 29 Jan 2024 08:11:19 -0500 Subject: [PATCH 2/2] apfs-fuse: unstable-2023-01-04 -> unstable-2023-03-12 --- pkgs/tools/filesystems/apfs-fuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index 0fdb8603db44..5881d361c549 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "apfs-fuse"; - version = "unstable-2023-01-04"; + version = "unstable-2023-03-12"; src = fetchFromGitHub { owner = "sgan81"; repo = "apfs-fuse"; - rev = "1f041d7af5df5423832e54e9f358fd9234773fcc"; - hash = "sha256-EmhCvIwyVJvib/ZHzCsULh8bOjhzKRu47LojX+L40qQ="; + rev = "66b86bd525e8cb90f9012543be89b1f092b75cf3"; + hash = "sha256-uYAlqnQp0K880XEWuH1548DUA3ii53+hfsuh/T3Vwzg="; fetchSubmodules = true; };