From 915bfd535864d5f934836ad04c6b803eecd8b8f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 18:17:28 +0000 Subject: [PATCH 1/3] bindfs: 1.17.3 -> 1.17.4 --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 46f237d87cf5..b95610239947 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, fuse3, pkg-config }: stdenv.mkDerivation rec { - version = "1.17.3"; + version = "1.17.4"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-wWh2CRVywjJCwW6Hxb5+NRL0Q6rmNzKNjAEcBx6TAus="; + sha256 = "sha256-b9Svm6LsK9tgPvjuoqnRLbLl/py+UrhkC0FXNKWfPcw="; }; nativeBuildInputs = [ pkg-config ]; From 4474bdc5403066213191d1c1d58dc4642ccc0e49 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 Sep 2023 04:20:00 +0000 Subject: [PATCH 2/3] bindfs: add changelog to meta --- pkgs/tools/filesystems/bindfs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index b95610239947..3e0370b99adb 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; homepage = "https://bindfs.org"; + changelog = "https://github.com/mpartel/bindfs/raw/${version}/ChangeLog"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ lovek323 lovesegfault ]; platforms = lib.platforms.unix; From 22de9d970e13a98bde6474af3ac0e5bfb2ee2bff Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Sep 2023 22:14:47 +0200 Subject: [PATCH 3/3] bindfs: use `finalAttrs` pattern --- pkgs/tools/filesystems/bindfs/default.nix | 30 +++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 3e0370b99adb..dfcf6aba9e08 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,26 +1,36 @@ -{ lib, stdenv, fetchurl, fuse, fuse3, pkg-config }: +{ lib +, stdenv +, fetchurl +, pkg-config +, fuse +, fuse3 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.17.4"; pname = "bindfs"; src = fetchurl { - url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-b9Svm6LsK9tgPvjuoqnRLbLl/py+UrhkC0FXNKWfPcw="; + url = "https://bindfs.org/downloads/bindfs-${finalAttrs.version}.tar.gz"; + hash = "sha256-b9Svm6LsK9tgPvjuoqnRLbLl/py+UrhkC0FXNKWfPcw="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = if stdenv.isDarwin then [ fuse ] else [ fuse3 ]; + postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs ''; meta = { + changelog = "https://github.com/mpartel/bindfs/raw/${finalAttrs.version}/ChangeLog"; description = "A FUSE filesystem for mounting a directory to another location"; - homepage = "https://bindfs.org"; - changelog = "https://github.com/mpartel/bindfs/raw/${version}/ChangeLog"; - license = lib.licenses.gpl2Only; + homepage = "https://bindfs.org"; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ lovek323 lovesegfault ]; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix; }; -} +})