From 9706ea618a983552f5c7d103b07c82592a2f5a78 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 6 Sep 2024 20:47:51 +0800 Subject: [PATCH 1/4] duplicati: move to by-name --- .../duplicati/default.nix => by-name/du/duplicati/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/backup/duplicati/default.nix => by-name/du/duplicati/package.nix} (100%) diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/by-name/du/duplicati/package.nix similarity index 100% rename from pkgs/tools/backup/duplicati/default.nix rename to pkgs/by-name/du/duplicati/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e69ca4d78f5b..96b523b808d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7239,8 +7239,6 @@ with pkgs; duplicacy = callPackage ../tools/backup/duplicacy { }; - duplicati = callPackage ../tools/backup/duplicati { }; - duplicity = callPackage ../tools/backup/duplicity { }; duply = callPackage ../tools/backup/duply { }; From 0374204eccb1ee66fc5c445673259b02204b32bc Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 6 Sep 2024 21:02:12 +0800 Subject: [PATCH 2/4] duplicati: 2.0.7.1 -> 2.0.8.1 --- pkgs/by-name/du/duplicati/package.nix | 29 +++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix index 2cb003d2d080..4a6f9879976a 100644 --- a/pkgs/by-name/du/duplicati/package.nix +++ b/pkgs/by-name/du/duplicati/package.nix @@ -1,14 +1,21 @@ -{ lib, stdenv, fetchzip, mono, sqlite, makeWrapper }: +{ + lib, + stdenv, + fetchzip, + mono, + sqlite, + makeWrapper, +}: stdenv.mkDerivation rec { pname = "duplicati"; - version = "2.0.7.1"; + version = "2.0.8.1"; channel = "beta"; - build_date = "2023-05-25"; + build_date = "2024-05-07"; src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - hash = "sha256-isPmRC6N+gEZgvJ0bgeFf5kOQJsicZOsGnT+CAGgg+U="; + hash = "sha256-LmW6yGutxP33ghFqyOLKrGDNCQdr8DDFn/IHigsLpzA="; stripRoot = false; }; @@ -19,12 +26,18 @@ stdenv.mkDerivation rec { cp -r * $out/share/${pname}-${version} makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \ --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - sqlite ]} + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + sqlite + ] + } makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - sqlite ]} + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + sqlite + ] + } ''; meta = with lib; { From 83d27c3878f875d96fbcbe738f3731be3cd88ddb Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 8 Sep 2024 20:49:49 +0800 Subject: [PATCH 3/4] duplicati: add bot-wxt1221 as maintainers --- pkgs/by-name/du/duplicati/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix index 4a6f9879976a..3576048d6a62 100644 --- a/pkgs/by-name/du/duplicati/package.nix +++ b/pkgs/by-name/du/duplicati/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; homepage = "https://www.duplicati.com/"; license = licenses.lgpl21; - maintainers = with maintainers; [ nyanloutre ]; + maintainers = with maintainers; [ nyanloutre bot-wxt1221 ]; platforms = platforms.all; }; } From 45d49fecefbfc06fd238a100a3223da957a0ac06 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 8 Sep 2024 20:50:24 +0800 Subject: [PATCH 4/4] duplicati: add sourceProvenance patern --- pkgs/by-name/du/duplicati/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix index 3576048d6a62..d818b7c5b537 100644 --- a/pkgs/by-name/du/duplicati/package.nix +++ b/pkgs/by-name/du/duplicati/package.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://www.duplicati.com/"; license = licenses.lgpl21; maintainers = with maintainers; [ nyanloutre bot-wxt1221 ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; }; }