From 503aec6c4ed52e988ff9c0d2d51af7fd9309fe73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Mar 2022 18:40:48 +0000 Subject: [PATCH 1/3] psi-plus: 1.5.1600 -> 1.5.1615 (cherry picked from commit c3dfe39b617774d14dea3da209c29ce0257fb3c8) --- .../networking/instant-messengers/psi-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 9288f272134a..aeb20d6779ef 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1600"; + version = "1.5.1615"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-AZSxElEpYUYa92KdYxVyM+ppKHpXXwwlBFVOOKH/O7g="; + sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI="; }; cmakeFlags = [ From 359b998f85da7906b8ba0243b946e8381d358ab5 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Thu, 5 May 2022 22:26:54 +0000 Subject: [PATCH 2/3] nextcloud24: init at 24.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added Nextcloud 23 and set it as the default Nextcloud version for the NixOS module. Added PHP 8.1 as an option for phpPackage and default for Nextcloud ≥ 24. (cherry picked from commit ecd8d42397d0142b9b54e1e0664acb43c146fe98) Backport #171736 to release-21.11. We have multiple attributes for different majors, so this is technically a new package that can be backported. The defaults aren't changed, so nextcloud22 is still the default for NixOS 21.11. We have also removed php81 references, as that has not been backported to 21.11. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- nixos/modules/services/web-apps/nextcloud.xml | 2 +- nixos/tests/nextcloud/default.nix | 2 +- pkgs/servers/nextcloud/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a344e32d13e7..07c113d84d1a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -153,7 +153,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ]; + relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" "nextcloud24"]; }; phpPackage = mkOption { type = types.package; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index c10ba5383fc2..0af74ece7c04 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -12,7 +12,7 @@ The current default by NixOS is nextcloud22, the latest version available - is nextcloud23. + is nextcloud24.
Basic usage diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 5f6f4b3d68e5..a9bf034b7051 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -18,4 +18,4 @@ foldl }; }) {} - [ 21 22 23 ] + [ 21 22 23 24 ] diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a1b5c1fcf507..0e2d8d6837da 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -59,6 +59,12 @@ in { version = "23.0.4"; sha256 = "67191c2b8b41591ae42accfb32216313fde0e107201682cb39029f890712bc6a"; }; + + nextcloud24 = generic { + version = "24.0.0"; + sha256 = "176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780"; + }; + # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 032c8583ca83..9286fc0b4afc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7915,7 +7915,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud20 nextcloud21 nextcloud22 nextcloud23; + nextcloud20 nextcloud21 nextcloud22 nextcloud23 nextcloud24; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From a758174fd04e1a9fc8accf0188bb658b0e99f905 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 17 May 2022 18:03:47 +0200 Subject: [PATCH 3/3] drawio: 18.0.4 -> 18.0.6 (cherry picked from commit 6f0d3c8ec71dfca5a6bde1d57d85bd48483476ad) --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index d4fb7e1a8ae7..32e1d04ac3a3 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "18.0.4"; + version = "18.0.6"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "0ln9vs2zyqq0pz3af6i8ynjbg59j0y6y7f5qkrgk2yv2mpnncl3m"; + sha256 = "939d23f45f82bc4978ff3cb5d15d096f8af9658fb9f9211d3849998f6a0bd3a9"; }; nativeBuildInputs = [