nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-21.11 into staging-next-21.11

Browse Source
This commit is contained in:
github-actions[bot]
2022-05-19 00:15:44 +00:00
committed by GitHub
parent a9a50249ea 2d474d6a4a
commit 4917b9fd54
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-apps/nextcloud.nix
View File

@@ -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;

2
nixos/modules/services/web-apps/nextcloud.xml
View File

@@ -12,7 +12,7 @@
</para>
<para>
The current default by NixOS is <package>nextcloud22</package>, the latest version available
is <package>nextcloud23</package>.
is <package>nextcloud24</package>.
</para>
<section xml:id="module-services-nextcloud-basic-usage">
<title>Basic usage</title>

2
nixos/tests/nextcloud/default.nix
View File

@@ -18,4 +18,4 @@ foldl
};
})
{}
[ 21 22 23 ]
[ 21 22 23 24 ]

4
pkgs/applications/graphics/drawio/default.nix
View File

@@ -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 = [

4
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View File

@@ -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 = [

6
pkgs/servers/nextcloud/default.nix
View File

@@ -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'
}

2
pkgs/top-level/all-packages.nix
View File

@@ -7917,7 +7917,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 { };