diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 658666680340..eac2d9622c4e 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -391,9 +391,10 @@ in inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts; phonetrack = pkgs.fetchNextcloudApp { name = "phonetrack"; - sha256 = "0qf366vbahyl27p9mshfma1as4nvql6w75zy2zk5xwwbp343vsbc"; - url = "https://gitlab.com/eneiluj/phonetrack-oc/-/wikis/uploads/931aaaf8dca24bf31a7e169a83c17235/phonetrack-0.6.9.tar.gz"; - version = "0.6.9"; + license = "agpl3Plus"; + sha512 = "f67902d1b48def9a244383a39d7bec95bb4215054963a9751f99dae9bd2f2740c02d2ef97b3b76d69a36fa95f8a9374dd049440b195f4dad2f0c4bca645de228"; + url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz"; + version = "0.8.2"; }; } ''; diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index 193b2b82a354..79f2edeae109 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -9,6 +9,7 @@ url, hash ? "", sha256 ? "", + sha512 ? "", appName ? null, appVersion ? null, license, @@ -23,7 +24,12 @@ applyPatches ( { inherit patches; src = (if unpack then fetchzip else fetchurl) { - inherit url hash sha256; + inherit + url + hash + sha256 + sha512 + ; meta = { license = lib.licenses.${license}; longDescription = description; @@ -42,6 +48,7 @@ applyPatches ( exit 1 fi ''; + # Optionally set name if appName and appVersion are provided } // lib.optionalAttrs (appName != null && appVersion != null) { name = "nextcloud-app-${appName}-${appVersion}"; diff --git a/pkgs/build-support/fetchnextcloudapp/tests.nix b/pkgs/build-support/fetchnextcloudapp/tests.nix new file mode 100644 index 000000000000..60696a84d69c --- /dev/null +++ b/pkgs/build-support/fetchnextcloudapp/tests.nix @@ -0,0 +1,22 @@ +{ + testers, + fetchNextcloudApp, + ... +}: + +{ + simple-sha512 = testers.invalidateFetcherByDrvHash (fetchNextcloudApp { + appName = "phonetrack"; + appVersion = "0.8.2"; + license = "agpl3Plus"; + sha512 = "f67902d1b48def9a244383a39d7bec95bb4215054963a9751f99dae9bd2f2740c02d2ef97b3b76d69a36fa95f8a9374dd049440b195f4dad2f0c4bca645de228"; + url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz"; + }); + simple-sha256 = testers.invalidateFetcherByDrvHash (fetchNextcloudApp { + appName = "phonetrack"; + appVersion = "0.8.2"; + license = "agpl3Plus"; + sha256 = "7c4252186e0ff8e0b97fc3d30131eeadd51bd2f9cc6aa321eb0c1c541f9572c0"; + url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz"; + }); +}