sftpgo: simplify my package override now that sftpgo 2.6.0 is merged
This commit is contained in:
@@ -60,18 +60,8 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
group = "export";
|
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 {
|
package = pkgs.sftpgo.overrideAttrs (upstream: {
|
||||||
inherit (pkgs.sftpgo) name ldflags nativeBuildInputs doCheck subPackages postInstall passthru meta;
|
patches = (upstream.patches or []) ++ [
|
||||||
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 []) ++ [
|
|
||||||
# fix for compatibility with kodi:
|
# fix for compatibility with kodi:
|
||||||
# ftp LIST operation returns entries over-the-wire like:
|
# ftp LIST operation returns entries over-the-wire like:
|
||||||
# - dgrwxrwxr-x 1 ftp ftp 9 Apr 9 15:05 Videos
|
# - 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: <https://pkg.go.dev/io/fs#FileMode>
|
# the full set of bits, from which i filter, is found here: <https://pkg.go.dev/io/fs#FileMode>
|
||||||
./safe_fileinfo.patch
|
./safe_fileinfo.patch
|
||||||
];
|
];
|
||||||
};
|
});
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
ftpd = {
|
ftpd = {
|
||||||
|
Reference in New Issue
Block a user