nextcloud-notify_push.app: move out of automatically generated setorigin/backport-379558-to-release-24.11

`pkgs.nextcloud-notify_push` and the app
(`nextcloudPackages.apps.notify_push`) must always have the same
version. However, the latter is updated automatically. Most recently
this happened in #374902.

With this change, the app isn't updated automatically anymore, but is
part of the server-side package (and uses the same version).

(cherry picked from commit b8eb9480dc30bb26b4b84e7312c1b253b84adeb9)

5 files changed, 20 insertions, 21 deletions

diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index b4996cfb7fde..c954c85812a0 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -3,10 +3,16 @@
   fetchFromGitHub,
   nixosTests,
   rustPlatform,
+  fetchNextcloudApp,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "notify_push";
+
+  # NOTE: make sure this is compatible with all Nextcloud versions
+  # in nixpkgs!
+  # For that, check the `<dependencies>` section of `appinfo/info.xml`
+  # in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml)
   version = "1.0.0";
 
   src = fetchFromGitHub {
@@ -19,6 +25,16 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-Mk+0LKP55Um5YiCx2O49rUZPwaXtKFnWtRC+WPGBadE=";
 
   passthru = rec {
+    app = fetchNextcloudApp {
+      appName = "notify_push";
+      appVersion = version;
+      hash = "sha256-4yCs4Q25PhYVICAIFlNiRTOFvL0JdmUwR5bNxp54GiA=";
+      license = "agpl3Plus";
+      homepage = "https://github.com/nextcloud/notify_push";
+      url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz";
+      description = "Push update support for desktop app";
+    };
+
     test_client = rustPlatform.buildRustPackage {
       pname = "${pname}-test_client";
       inherit src version;
diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json
index 291da4db2929..c77f3e1c8567 100644
--- a/pkgs/servers/nextcloud/packages/29.json
+++ b/pkgs/servers/nextcloud/packages/29.json
@@ -209,16 +209,6 @@
       "agpl"
     ]
   },
-  "notify_push": {
-    "hash": "sha256-4yCs4Q25PhYVICAIFlNiRTOFvL0JdmUwR5bNxp54GiA=",
-    "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v1.0.0/notify_push-v1.0.0.tar.gz",
-    "version": "1.0.0",
-    "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions",
-    "homepage": "",
-    "licenses": [
-      "agpl"
-    ]
-  },
   "onlyoffice": {
     "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=",
     "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 055db48628b7..72c55509960b 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -209,16 +209,6 @@
       "agpl"
     ]
   },
-  "notify_push": {
-    "hash": "sha256-4yCs4Q25PhYVICAIFlNiRTOFvL0JdmUwR5bNxp54GiA=",
-    "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v1.0.0/notify_push-v1.0.0.tar.gz",
-    "version": "1.0.0",
-    "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions",
-    "homepage": "",
-    "licenses": [
-      "agpl"
-    ]
-  },
   "onlyoffice": {
     "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=",
     "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/default.nix b/pkgs/servers/nextcloud/packages/default.nix
index 24eeec3c5557..7e0c19c5a60a 100644
--- a/pkgs/servers/nextcloud/packages/default.nix
+++ b/pkgs/servers/nextcloud/packages/default.nix
@@ -8,6 +8,7 @@
   newScope,
   callPackage,
   ncVersion,
+  nextcloud-notify_push,
 }:
 
 let
@@ -51,6 +52,9 @@ let
             inherit pname data;
           }
         ) pkgs
+        // {
+          notify_push = nextcloud-notify_push.app;
+        }
       )
     ) generatedJson;
 
diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
index 31b44e1143ff..c21d4ff22139 100644
--- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json
+++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
@@ -22,7 +22,6 @@
 , "music": "agpl3Plus"
 , "news": "agpl3Plus"
 , "notes": "agpl3Plus"
-, "notify_push": "agpl3Plus"
 , "onlyoffice": "asl20"
 , "phonetrack": "agpl3Plus"
 , "polls": "agpl3Plus"