From a5a635f00bffc066a73fe5387502a6af7795aaea Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 1 Jun 2024 16:22:22 +0000 Subject: [PATCH] sftpgo: simplify my package override now that sftpgo 2.6.0 is merged --- .../servo/services/export/sftpgo/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/hosts/by-name/servo/services/export/sftpgo/default.nix b/hosts/by-name/servo/services/export/sftpgo/default.nix index 792a3a6c..5dbb5022 100644 --- a/hosts/by-name/servo/services/export/sftpgo/default.nix +++ b/hosts/by-name/servo/services/export/sftpgo/default.nix @@ -60,18 +60,8 @@ in enable = true; group = "export"; - package = lib.warnIf (lib.versionOlder "2.5.6" pkgs.sftpgo.version) "sftpgo update: safe to use nixpkgs' sftpgo but keep my own `patches`" pkgs.buildGoModule { - inherit (pkgs.sftpgo) name ldflags nativeBuildInputs doCheck subPackages postInstall passthru meta; - version = "2.5.6-unstable-2024-04-18"; - src = pkgs.fetchFromGitHub { - # need to use > 2.5.6 for sftpgo_safe_fileinfo.patch to apply - owner = "drakkan"; - repo = "sftpgo"; - rev = "950cf67e4c03a12c7e439802cabbb0b42d4ee5f5"; - hash = "sha256-UfiFd9NK3DdZ1J+FPGZrM7r2mo9xlKi0dsSlLEinYXM="; - }; - vendorHash = "sha256-n1/9A2em3BCtFX+132ualh4NQwkwewMxYIMOphJEamg="; - patches = (pkgs.sftpgo.patches or []) ++ [ + package = pkgs.sftpgo.overrideAttrs (upstream: { + patches = (upstream.patches or []) ++ [ # fix for compatibility with kodi: # ftp LIST operation returns entries over-the-wire like: # - dgrwxrwxr-x 1 ftp ftp 9 Apr 9 15:05 Videos @@ -80,7 +70,7 @@ in # the full set of bits, from which i filter, is found here: ./safe_fileinfo.patch ]; - }; + }); settings = { ftpd = {