diff --git a/hosts/common/fs.nix b/hosts/common/fs.nix index a1236e464..21c41bef1 100644 --- a/hosts/common/fs.nix +++ b/hosts/common/fs.nix @@ -183,7 +183,6 @@ let # drop_privileges: after `mount.fuse3` opens /dev/fuse, it will drop all capabilities before invoking sshfs "drop_privileges" "auto_unmount" #< ensures that when the fs exits, it releases its mountpoint. then systemd can recognize it as failed. - "interface=0.0.0.0" #< see: ]; # fsType = "nfs"; # options = fsOpts.nfs ++ fsOpts.lazyMount; @@ -243,7 +242,6 @@ let "-o" (lib.concatStringsSep "," ([ "exit_after_connect" - "interface=0.0.0.0" #< see: ] ++ config.fileSystems."${localPath}".options)) ]; serviceConfig.RemainAfterExit = true; diff --git a/pkgs/additional/curlftpfs-sane/default.nix b/pkgs/additional/curlftpfs-sane/default.nix index a9a678768..713de8d15 100644 --- a/pkgs/additional/curlftpfs-sane/default.nix +++ b/pkgs/additional/curlftpfs-sane/default.nix @@ -1,9 +1,21 @@ { + curl, curlftpfs, + fetchpatch, fetchFromGitea, fuse3, }: (curlftpfs.override { + curl = curl.overrideAttrs (base: { + patches = (base.patches or []) ++ [ + (fetchpatch { + # fix regression in curl 8.8.0 -> 8.9.0 which broke curlftpfs + url = "https://github.com/curl/curl/pull/14629.diff"; + name = "setopt: allow CURLOPT_INTERFACE to be set to NULL"; + hash = "sha256-cpiw0izhFY74y8xa7KEoQOtD79GBIfrm1hU3sLrObJg="; + }) + ]; + }); fuse = fuse3; }).overrideAttrs (upstream: { # my (master branch) fork includes: