From 32f4cabfa35bad8da8ef2a06e1f08dece6a9a6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 1 Jul 2024 18:35:53 +0200 Subject: [PATCH] nextcloud: Update to 28 since 27 is EOL We were waiting for nextcloud news to update, but we can't wait any longer. --- configuration/services/nextcloud.nix | 2 +- pkgs/_sources_nextcloud/generated.json | 24 ++++++++++++------------ pkgs/_sources_nextcloud/generated.nix | 24 ++++++++++++------------ pkgs/nextcloud-apps.toml | 13 +++++-------- 4 files changed, 30 insertions(+), 33 deletions(-) diff --git a/configuration/services/nextcloud.nix b/configuration/services/nextcloud.nix index 7c4fcf4..0d22e6c 100644 --- a/configuration/services/nextcloud.nix +++ b/configuration/services/nextcloud.nix @@ -6,7 +6,7 @@ let # Update pending on rewrite of nextcloud news, though there is an # alpha to switch to if it becomes necessary: # https://github.com/nextcloud/news/issues/2610 - nextcloud = pkgs.nextcloud27; + nextcloud = pkgs.nextcloud28; hostName = "nextcloud.${config.services.nginx.domain}"; in { diff --git a/pkgs/_sources_nextcloud/generated.json b/pkgs/_sources_nextcloud/generated.json index ce9ac04..c216c8d 100644 --- a/pkgs/_sources_nextcloud/generated.json +++ b/pkgs/_sources_nextcloud/generated.json @@ -7,11 +7,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-JXNQNnWXoii71QhtKktuEBEIqzmONVetULBhpSjM9xo=", + "sha256": "sha256-wUeXcbxNCRA2brzdCHKwl0zbhmDucKv1ZCkF3KlQ8O4=", "type": "tarball", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz" + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz" }, - "version": "13.1.3" + "version": "14.2.2" }, "calendar": { "cargoLocks": null, @@ -21,11 +21,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-hZfjWAMi/0qs5xMMgOlcoSXG6kcZ2aeDaez+NqSZFKI=", + "sha256": "sha256-cuAqJz1cZ+VfxttAKjWIe11DFwWGLdSSvcNJKQKidgk=", "type": "tarball", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.7/calendar-v4.6.7.tar.gz" + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.8/calendar-v4.7.8.tar.gz" }, - "version": "v4.6.7" + "version": "v4.7.8" }, "contacts": { "cargoLocks": null, @@ -49,11 +49,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-TE/w8SgyIPaGl5wZUAsG234nxoPj25QoRPF3zjbMoRk=", + "sha256": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=", "type": "tarball", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/Cookbook-0.10.5.tar.gz" + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/Cookbook-0.11.1.tar.gz" }, - "version": "0.10.5" + "version": "0.11.1" }, "news": { "cargoLocks": null, @@ -63,11 +63,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=", + "sha256": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=", "type": "tarball", - "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz" + "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz" }, - "version": "24.0.0" + "version": "25.0.0-alpha7" }, "notes": { "cargoLocks": null, diff --git a/pkgs/_sources_nextcloud/generated.nix b/pkgs/_sources_nextcloud/generated.nix index c77aa9c..3075206 100644 --- a/pkgs/_sources_nextcloud/generated.nix +++ b/pkgs/_sources_nextcloud/generated.nix @@ -3,18 +3,18 @@ { bookmarks = { pname = "bookmarks"; - version = "13.1.3"; + version = "14.2.2"; src = fetchTarball { - url = "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz"; - sha256 = "sha256-JXNQNnWXoii71QhtKktuEBEIqzmONVetULBhpSjM9xo="; + url = "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz"; + sha256 = "sha256-wUeXcbxNCRA2brzdCHKwl0zbhmDucKv1ZCkF3KlQ8O4="; }; }; calendar = { pname = "calendar"; - version = "v4.6.7"; + version = "v4.7.8"; src = fetchTarball { - url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.7/calendar-v4.6.7.tar.gz"; - sha256 = "sha256-hZfjWAMi/0qs5xMMgOlcoSXG6kcZ2aeDaez+NqSZFKI="; + url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.8/calendar-v4.7.8.tar.gz"; + sha256 = "sha256-cuAqJz1cZ+VfxttAKjWIe11DFwWGLdSSvcNJKQKidgk="; }; }; contacts = { @@ -27,18 +27,18 @@ }; cookbook = { pname = "cookbook"; - version = "0.10.5"; + version = "0.11.1"; src = fetchTarball { - url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/Cookbook-0.10.5.tar.gz"; - sha256 = "sha256-TE/w8SgyIPaGl5wZUAsG234nxoPj25QoRPF3zjbMoRk="; + url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/Cookbook-0.11.1.tar.gz"; + sha256 = "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68="; }; }; news = { pname = "news"; - version = "24.0.0"; + version = "25.0.0-alpha7"; src = fetchTarball { - url = "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"; - sha256 = "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4="; + url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"; + sha256 = "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4="; }; }; notes = { diff --git a/pkgs/nextcloud-apps.toml b/pkgs/nextcloud-apps.toml index 36566db..9023dd3 100644 --- a/pkgs/nextcloud-apps.toml +++ b/pkgs/nextcloud-apps.toml @@ -1,12 +1,10 @@ [bookmarks] -# src.github = "nextcloud/bookmarks" +src.github = "nextcloud/bookmarks" src.prefix = "v" -src.manual = "v13.1.3" fetch.tarball = "https://github.com/nextcloud/bookmarks/releases/download/v$ver/bookmarks-$ver.tar.gz" [calendar] -# src.github = "nextcloud-releases/calendar" -src.manual = "v4.6.7" +src.github = "nextcloud-releases/calendar" fetch.tarball = "https://github.com/nextcloud-releases/calendar/releases/download/$ver/calendar-$ver.tar.gz" [contacts] @@ -15,15 +13,14 @@ src.manual = "v5.5.3" fetch.tarball = "https://github.com/nextcloud-releases/contacts/releases/download/$ver/contacts-$ver.tar.gz" [cookbook] -# src.github = "christianlupus-nextcloud/cookbook-releases" +src.github = "christianlupus-nextcloud/cookbook-releases" src.prefix = "v" -src.manual = "0.10.5" fetch.tarball = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v$ver/Cookbook-$ver.tar.gz" [news] +# Update manually until angular rewrite is done # src.github = "nextcloud/news" -# Update to 25 when angular rewrite is done/the alpha when I need to switch to nextcloud 28+ -src.manual = "24.0.0" +src.manual = "25.0.0-alpha7" fetch.tarball = "https://github.com/nextcloud/news/releases/download/$ver/news.tar.gz" [notes]