diff --git a/pkgs/applications/backup/restique/default.nix b/pkgs/applications/backup/restique/default.nix deleted file mode 100644 index 64625463c83e..000000000000 --- a/pkgs/applications/backup/restique/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitea, - cmake, - libsecret, - qtkeychain, - qttools, - restic, -}: - -mkDerivation { - pname = "restique"; - version = "unstable-2022-11-29"; - - src = fetchFromGitea { - domain = "git.srcbox.net"; - owner = "stefan"; - repo = "restique"; - rev = "906b0b1726c26988c910baea9665f540c37c99c4"; - hash = "sha256-EYoADtYX+gm8T3/3gxTtdFOFGJf2rXryiTu8NIO0Ez4="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - libsecret - qtkeychain - qttools - ]; - - qtWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ restic ]) - ]; - - meta = with lib; { - description = "Restic GUI for Desktop/Laptop Backups"; - homepage = "https://git.srcbox.net/stefan/restique"; - license = with licenses; [ - gpl3Plus - cc-by-sa-40 - cc0 - ]; - maintainers = with maintainers; [ dotlambda ]; - mainProgram = "restique"; - }; -} diff --git a/pkgs/by-name/re/restique/package.nix b/pkgs/by-name/re/restique/package.nix new file mode 100644 index 000000000000..1018f2d01156 --- /dev/null +++ b/pkgs/by-name/re/restique/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + qt5, + libsForQt5, + fetchgit, + cmake, + libsecret, + restic, +}: + +stdenv.mkDerivation { + pname = "restique"; + version = "0-unstable-2024-10-20"; + + # using fetchFromGitea returns 404 + src = fetchgit { + url = "https://git.srcbox.net/stefan/restique"; + rev = "340d8326c2a2221ec155512cc6ffb2c8a866c525"; + hash = "sha256-IBg8hRJ7nugHP+JLg0fTONgZ+oRdkJpeZzflrwSG20w="; + }; + + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsecret + libsForQt5.qtkeychain + qt5.qttools + ]; + + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ restic ]) + ]; + + meta = { + description = "Restic GUI for Desktop/Laptop Backups"; + homepage = "https://git.srcbox.net/stefan/restique"; + license = with lib.licenses; [ + gpl3Plus + cc-by-sa-40 + cc0 + ]; + maintainers = with lib.maintainers; [ dotlambda ]; + mainProgram = "restique"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 732cdf69d832..c75417234128 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13643,8 +13643,6 @@ with pkgs; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; - restique = libsForQt5.callPackage ../applications/backup/restique { }; - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; rgp = libsForQt5.callPackage ../development/tools/rgp { };