diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-25 12:01:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-25 12:01:46 +0000 |
| commit | ded08eff9cea84e3b63437e4fe5568c0ff03d84d (patch) | |
| tree | e8006cc5935a4a388b2ef2da0ae214a83bbf22b6 /pkgs/servers | |
| parent | 1c9f1f190b4316f083e0993a5dc6f77c4ac6b0e1 (diff) | |
| parent | 125cb5df81da531d05eaa1177b17cbbf17f49cea (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/atlassian/crowd.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/http/lighttpd/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/nextcloud/default.nix | 4 |
3 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 7714fccf5d820..606bcf0ac2e18 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -1,7 +1,14 @@ { lib, stdenv, fetchurl, home ? "/var/lib/crowd" , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: -stdenv.mkDerivation rec { +let + optionalWarning = cond: msg: + if cond then lib.warn msg + else lib.id; +in + +optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!" +(stdenv.mkDerivation rec { pname = "atlassian-crowd"; version = "5.0.1"; @@ -46,4 +53,4 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ fpletz globin ]; }; -} +}) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index d0b11d9b7c169..42c04e694c661 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -14,21 +14,13 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.64"; + version = "1.4.65"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-4Uidn6dJb78uBxwzi1k7IwDTjCPx5ZZ+UsnvSC4bDiY="; + sha256 = "sha256-vw+mimKfvEBAI6kSs3fnAEkzHWeXvLtLPo30w7QjKL4="; }; - patches = [ - (fetchpatch { - name = "macos-10.12-avoid-ccrandomgeneratebytes.patch"; - url = "https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/6791f71b20a127b5b0091020dd065f4f9c7cafb6/diff?format=diff"; - sha256 = "1x5ybkvxwinl7s1nv3rrc57m4mj38q0gbyjp1ijr4w5lhabw4vzs"; - }) - ]; - postPatch = '' patchShebangs tests # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index fe6d43e7175e7..01cdddfd398f2 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,8 +46,8 @@ in { ''; nextcloud23 = generic { - version = "23.0.6"; - sha256 = "34fbc3a6c16a623f57971b8c4df7c5e62b3650728edec7d05ec116b295040548"; + version = "23.0.7"; + sha256 = "89a53d3447d1dcb7ea382d18accf52223040336d08899f0b7568c6dd8a36cd50"; }; nextcloud24 = generic { |