public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next-21.05' into staging-21.05

Browse Source
This commit is contained in:
Jonathan Ringer
2021-06-25 00:15:49 -07:00
parent 0ad342052e 8112fbe212
commit 5299f12e63
160 changed files with 3797 additions and 2413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/consul/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "consul";
version = "1.9.5";
version = "1.9.7";
rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
inherit rev;
sha256 = "sha256-CKezHuCbL1I79gDz7ZQiSgPbSXo0NtssQro2MqqmeXw=";
sha256 = "sha256-+s7IwbklJ9QLe5ZagEe6+C0dx/Vvj0O5YaNUP25e9ZA=";
};
passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
vendorSha256 = "sha256-YqrW3PeFv1Y6lmjVmMMP0SZao57iPqfut3a1afIWkI0=";
vendorSha256 = "sha256-HtuWfTtooD4/SzDp6yzNMI2nryOgy2e+lgz8q3M3vfw=";
doCheck = false;
pkgs/servers/dns/knot-dns/default.nix
+5 -3
View File
@@ -1,17 +1,17 @@
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2
, autoreconfHook
, autoreconfHook, nixosTests
}:
let inherit (lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.0.6";
version = "3.0.7";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "63756ac5a00c3e4a066ed231a287faef5963a9183d77326e30bf0644cdf74f86";
sha256 = "2bad8be0be95c8f54a26d1e16299e65f31ae1b34bd6ad3819aa50e7b40521484";
};
outputs = [ "bin" "out" "dev" ];
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
rm -r "$out"/lib/*.la
'';
passthru.tests = { inherit (nixosTests) knot; };
meta = with lib; {
description = "Authoritative-only DNS server from .cz domain registry";
homepage = "https://knot-dns.cz";
pkgs/servers/dns/knot-resolver/default.nix
+2 -1
View File
@@ -79,7 +79,8 @@ unwrapped = stdenv.mkDerivation rec {
rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
'';
doInstallCheck = with stdenv; hostPlatform == buildPlatform;
doInstallCheck = with stdenv; hostPlatform == buildPlatform
&& !(isDarwin && isAarch64); # avoid luarocks, as it's broken ATM on the platform
installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ];
installCheckPhase = ''
meson test --print-errorlogs
pkgs/servers/http/apache-httpd/2.4.nix
+2 -2
View File
@@ -17,12 +17,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
version = "2.4.47";
version = "2.4.48";
pname = "apache-httpd";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "sha256-I9AG28jleBFqETj6RX7qgkBIRY6JyECHIZ8DcogMA8o=";
sha256 = "0v4npxnvih5mlxx6dywwhhfs8xvgcckc0hxzwk3hi0g8nbkjdj0v";
};
# FIXME: -dev depends on -doc
pkgs/servers/http/envoy/default.nix
+3 -3
View File
@@ -15,8 +15,8 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
version = "1.16.2";
commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3";
version = "1.16.4";
commit = "bf5d0eb44b781ac26ff1513700bcb114b7cf4300";
};
in
buildBazelPackage rec {
@@ -26,7 +26,7 @@ buildBazelPackage rec {
owner = "envoyproxy";
repo = "envoy";
rev = srcVer.commit;
hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ=";
sha256 = "0zabb9w4x3lai4ly4qq85dfslpm95ag9dyvl7y0bh4r9prbvqh7w";
extraPostFetch = ''
chmod -R +w $out
pkgs/servers/irc/solanum/bandb.patch
-12
View File
@@ -1,12 +0,0 @@
diff --git a/ircd/bandbi.c b/ircd/bandbi.c
index 29a3bfa2..16a40f17 100644
--- a/ircd/bandbi.c
+++ b/ircd/bandbi.c
@@ -83,7 +83,6 @@ start_bandb(void)
const char *suffix = "";
#endif
- rb_setenv("BANDB_DBPATH", ircd_paths[IRCD_PATH_BANDB], 1);
if(bandb_path == NULL)
{
snprintf(fullpath, sizeof(fullpath), "%s%cbandb%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix);
pkgs/servers/irc/solanum/default.nix
+5 -2
View File
@@ -23,9 +23,12 @@ stdenv.mkDerivation rec {
patches = [
./dont-create-logdir.patch
./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
];
postPatch = ''
substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum'
'';
configureFlags = [
"--enable-epoll"
"--enable-ipv6"
@@ -58,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An IRCd for unified networks";
homepage = "https://github.com/solanum-ircd/solanum";
license = licenses.gpl2Only;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ hexa ];
platforms = platforms.unix;
};
pkgs/servers/keycloak/default.nix
+2 -2
View File
@@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation rec {
pname = "keycloak";
version = "13.0.1";
version = "14.0.0";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
sha256 = "sha256-81i8Yf9rEuHtUDqYThUCn0/Lb9YokRi4tGi/Ooyyxr8=";
sha256 = "sha256-NH2uNiYZZrEYE5DG2kDXzLN7/GgXR8IfBqRb6EoKA9s=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/servers/mail/dovecot/default.nix
+9 -8
View File
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "dovecot";
version = "2.3.14";
version = "2.3.15";
nativeBuildInputs = [ perl pkg-config ];
buildInputs =
@@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8";
sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1";
};
enableParallelBuilding = true;
preConfigure = ''
patchShebangs src/config/settings-get.pl
'';
'' + lib.optionalString (stdenv.isLinux) "export systemdsystemunitdir=$out/etc/systemd/system";
# We need this for sysconfdir, see remark below.
installFlags = [ "DESTDIR=$(out)" ];
@@ -75,17 +75,18 @@ stdenv.mkDerivation rec {
"lib_cv_va_copy=yes"
"lib_cv___va_copy=yes"
"lib_cv_va_val_copy=yes"
] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
++ lib.optional (stdenv.isDarwin) "--enable-static"
] ++ lib.optional stdenv.isLinux "--with-systemd"
++ lib.optional stdenv.isDarwin "--enable-static"
++ lib.optional withMySQL "--with-mysql"
++ lib.optional withPgSQL "--with-pgsql"
++ lib.optional withSQLite "--with-sqlite";
meta = {
meta = with lib; {
homepage = "https://dovecot.org/";
description = "Open source IMAP and POP3 email server written with security primarily in mind";
maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ];
platforms = lib.platforms.unix;
license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ];
maintainers = with maintainers; [ peti fpletz globin ajs124 ];
platforms = platforms.unix;
};
passthru.tests = {
opensmtpd-interaction = nixosTests.opensmtpd;
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+4 -4
View File
@@ -3,11 +3,11 @@ let
dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
in stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole";
version = "0.5.14";
version = "0.5.15";
src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8";
sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1";
};
buildInputs = [ dovecot openssl ];
@@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://pigeonhole.dovecot.org/";
description = "A sieve plugin for the Dovecot IMAP server";
license = licenses.lgpl21;
maintainers = with maintainers; [ globin ];
license = licenses.lgpl21Only;
maintainers = with maintainers; [ globin ajs124 ];
platforms = platforms.unix;
};
}
pkgs/servers/matrix-appservice-discord/default.nix
+2 -1
View File
@@ -43,7 +43,8 @@ in mkYarnPackage rec {
doCheck = true;
checkPhase = ''
yarn --offline test
# the default 2000ms timeout is sometimes too short on our busy builders
yarn --offline test --timeout 10000
'';
postInstall = ''
pkgs/servers/matrix-synapse/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.35.1";
version = "1.36.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MJ3RG60rWbcfQxhj34k99AFg8TsPd3ECEw/x2+xU1js=";
sha256 = "sha256-OMbSd64mD2+6GVUxGL4lvQlKAiBuen0PjvyVdk/ePbI=";
};
patches = [
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix
Generated
+358 -205
View File
File diff suppressed because it is too large Load Diff
pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json
+1 -1
View File
@@ -1,3 +1,3 @@
[
{"matrix-appservice-irc": "git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.0" }
{"matrix-appservice-irc": "git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.1" }
]
pkgs/servers/mautrix-whatsapp/default.nix
+3 -3
View File
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "v${version}";
sha256 = "sha256-0nwE3+GkJAvz5s8G23TvLVO8ykQK0ZIwEWAaTWHHOuU=";
sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE=";
};
buildInputs = [ olm ];
vendorSha256 = "sha256-FRXG0HmYfum9G/LYm6oWLLx1ZYQ3Jq7qV/mq6ofN9f5=";
vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4=";
doCheck = false;
pkgs/servers/monitoring/grafana/default.nix
+4 -4
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "7.5.7";
version = "7.5.9";
excludedPackages = [ "release_publisher" ];
@@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-GTQK02zxOBTE+93vT0zLMhAeZ7F3Cq/0lbvbzwB2QZA=";
sha256 = "sha256-khk2K4V/FnvZ5/DHu/0dRBgkUipJ0vzVujyqpkttft8=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-IQ7aAuUrNa+bSh5ld6IttujM8AgKUSlu8H7pwzDi164=";
sha256 = "sha256-QMWcmedMOB7EBAWOl4t/kZ6G4Q7D9XxMzTh4BkW+pPI=";
};
vendorSha256 = "sha256-AsPRaRLomp090XAKLXLXKm40ESPO4im9qi6VLpLYRQU=";
vendorSha256 = "sha256-FdotpFi1ee92mCX59bBuqzCyjIq6yujWixReYxmKbS8=";
# grafana-aws-sdk is specified with two versions which causes a problem later:
# go: inconsistent vendoring in /build/source:
pkgs/servers/monitoring/prometheus/node-exporter.nix
+6 -2
View File
@@ -23,8 +23,12 @@ buildGoModule rec {
goPackagePath = "github.com/prometheus/node_exporter";
in ''
-ldflags=
-X ${goPackagePath}/vendor/github.com/prometheus/common/version.Version=${version}
-X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev}
-s -w
-X github.com/prometheus/common/version.Version=${version}
-X github.com/prometheus/common/version.Revision=${rev}
-X github.com/prometheus/common/version.Branch=unknown
-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs
-X github.com/prometheus/common/version.BuildDate=unknown
'';
passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
+7 -4
View File
@@ -2,19 +2,22 @@
stdenv.mkDerivation rec {
pname = "tt-rss-plugin-tumblr-gdpr";
version = "2.1";
version = "2.2";
src = fetchFromGitHub {
owner = "GregThib";
repo = "ttrss-tumblr-gdpr";
rev = "v${version}";
sha256 = "09cbghi5b6ww4i5677i39qc9rhpq70xmygp0d7x30239r3i23rpq";
sha256 = "sha256-oCdpgfOvXNui2KaS48WeyVy8Of6IlPOxQR6gmPiyH0s=";
};
installPhase = ''
mkdir -p $out/tumblr_gdpr
runHook preInstall
mkdir -p $out/tumblr_gdpr
cp init.php $out/tumblr_gdpr
runHook postInstall
'';
meta = with lib; {
@@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
The name of the plugin in TT-RSS is 'tumblr_gdpr'.
'';
license = licenses.gpl3;
license = licenses.gpl3Only;
homepage = "https://github.com/GregThib/ttrss-tumblr-gdpr";
maintainers = with maintainers; [ das_j ];
platforms = platforms.all;
pkgs/servers/web-apps/discourse/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
let
version = "2.7.0";
version = "2.7.4";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-w26pwGDL2j7qbporUzZATgw7E//E6xwahCbXv35QNnc=";
sha256 = "sha256-3cvrdWBXRM5F8qFEqbe8ru1U0wBqCkRxK7GAV0beJNk=";
};
runtimeDeps = [
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
+1 -1
View File
@@ -232,7 +232,7 @@ GEM
multipart-post (2.1.1)
mustache (1.1.1)
nio4r (2.5.7)
nokogiri (1.11.3)
nokogiri (1.11.5)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.5)
pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
+2 -2
View File
@@ -1284,10 +1284,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
type = "gem";
};
version = "1.11.3";
version = "1.11.5";
};
nokogumbo = {
dependencies = ["nokogiri"];
pkgs/servers/web-apps/searx/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub }:
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }:
with python3Packages;
@@ -14,6 +14,14 @@ toPythonModule (buildPythonApplication rec {
sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh";
};
patches = [
# Fix a crash, remove with the next update
(fetchpatch {
url = "https://github.com/searx/searx/commit/9c10b150963babb7f0b52081693a42b2e61eede9.patch";
sha256 = "0svp8799628wja2hq59da6rxqi99am8p6hb8y27ciwzsjz0wwba7";
})
];
postPatch = ''
sed -i 's/==.*$//' requirements.txt
'';
pkgs/servers/web-apps/sogo/default.nix
+6 -4
View File
@@ -1,14 +1,14 @@
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }:
, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config, nixosTests }:
with lib; gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
version = "5.0.1";
version = "5.1.1";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOGo-${version}";
sha256 = "145hdlwnqds5zmpxbh4yainsbv5vy99ji93d6pl7xkbqwncfi80i";
sha256 = "19qkznk20fi47zxvg24hqnim5bpjlawk76w04jgd93yqakidl8ax";
};
nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
@@ -66,9 +66,11 @@ with lib; gnustep.stdenv.mkDerivation rec {
done
'';
passthru.tests.sogo = nixosTests.sogo;
meta = {
description = "A very fast and scalable modern collaboration suite (groupware)";
license = with licenses; [ gpl2 lgpl21 ];
license = with licenses; [ gpl2Only lgpl21Only ];
homepage = "https://sogo.nu/";
platforms = platforms.linux;
maintainers = with maintainers; [ ajs124 das_j ];