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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-01-28 10:46:13 +01:00
parent 778f317820 e328078fe0
commit dce0ca29d9
745 changed files with 15146 additions and 15353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@@ -1,5 +1,6 @@
{ stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto
, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat
, procps, coreutils, gnused, systemd, glibcLocales
, AppKit, Carbon, Cocoa
}:
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ]
[ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ]
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
outputs = [ "out" "man" "doc" ];
@@ -23,15 +24,31 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)" "RMQ_ERLAPP_DIR=$(out)" ];
installTargets = [ "install" "install-man" ];
runtimePath = stdenv.lib.makeBinPath [getconf erlang socat];
postInstall = ''
echo 'PATH=${runtimePath}:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
preBuild = ''
export LANG=C.UTF-8 # fix elixir locale warning
'';
# we know exactly where rabbitmq is gonna be,
# so we patch that into the env-script
substituteInPlace $out/sbin/rabbitmq-env \
--replace 'RABBITMQ_SCRIPTS_DIR=`dirname $SCRIPT_PATH`' \
"RABBITMQ_SCRIPTS_DIR=$out/sbin"
runtimePath = stdenv.lib.makeBinPath [
erlang
getconf # for getting memory limits
socat systemd procps # for systemd unit activation check
gnused coreutils # used by helper scripts
];
postInstall = ''
# rabbitmq-env calls to sed/coreutils, so provide everything early
sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|'
# rabbitmq-server script uses `dirname` to get hold of a
# rabbitmq-env, so let's provide this file directly. After that
# point everything is OK - the PATH above will kick in
substituteInPlace $out/sbin/rabbitmq-server \
--replace '`dirname $0`/rabbitmq-env' \
"$out/sbin/rabbitmq-env"
# We know exactly where rabbitmq is gonna be, so we patch that into the env-script.
# By doing it early we make sure that auto-detection for this will
# never be executed (somewhere below in the script).
sed -i $out/sbin/rabbitmq-env -e "2s|^|RABBITMQ_SCRIPTS_DIR=$out/sbin\n|"
# there’s a few stray files that belong into share
mkdir -p $doc/share/doc/rabbitmq-server
@@ -42,7 +59,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://www.rabbitmq.com/;
homepage = https://www.rabbitmq.com/;
description = "An implementation of the AMQP messaging protocol";
license = stdenv.lib.licenses.mpl11;
platforms = stdenv.lib.platforms.unix;

4
pkgs/servers/dns/bind/default.nix
View File

@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
version = "9.14.9";
version = "9.14.10";
src = fetchurl {
url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
sha256 = "0g2ph3hlw86yib8hv13qgkb4i84s9zv22r4k6yqlycm2izamwmr9";
sha256 = "0nkkc2phkkzwgl922xg41gx5pc5f4safabqslaw3880hwdf8vfaa";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

3
pkgs/servers/dns/knot-resolver/default.nix
View File

@@ -30,9 +30,6 @@ unwrapped = stdenv.mkDerivation rec {
sha256 = "0ca0f171ae2b2d76830967a5150eb0fa496b48b2a48f41b2be65d3743aaece25";
};
# https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496
postPatch = "sed '/prefill.test.lua/d' -i modules/meson.build";
outputs = [ "out" "dev" ];
preConfigure = ''

2
pkgs/servers/home-assistant/component-packages.nix
View File

@@ -339,7 +339,7 @@
"hyperion" = ps: with ps; [ ];
"ialarm" = ps: with ps; [ ];
"iaqualink" = ps: with ps; [ ];
"icloud" = ps: with ps; [ ];
"icloud" = ps: with ps; [ pyicloud ];
"idteck_prox" = ps: with ps; [ ];
"ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
"iglo" = ps: with ps; [ ];

19
pkgs/servers/home-assistant/esphome.nix
View File

@@ -3,27 +3,26 @@
let
python = python3.override {
packageOverrides = self: super: {
tornado = super.tornado.overridePythonAttrs (oldAttrs: rec {
version = "5.1.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409";
};
});
protobuf = super.protobuf.override {
protobuf = protobuf3_10;
};
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
version = "5.1.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81";
};
});
};
};
in python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "1.14.1";
version = "1.14.3";
src = python.pkgs.fetchPypi {
inherit pname version;
sha256 = "1hw1q2fck9429077w207rk65a1krzyi6qya5pzjkpw4av5s0v0g3";
sha256 = "0xnsl000c5a2li9qw9anrzzq437qn1n4hcfc24i4rfq37awzmig7";
};
ESPHOME_USE_SUBPROCESS = "";

4
pkgs/servers/http/jetty/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jetty";
version = "9.4.24.v20191120";
version = "9.4.25.v20191220";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
name = "jetty-distribution-${version}.tar.gz";
sha256 = "072vr8gfly2xdwxx1c771yymf145l8nv0j31liwqrih8zqvvhsd4";
sha256 = "1jnx4hnvd2krsdisqwpws1qd1r0f8gm9a4sx4a8c7zqrmfd2zx1a";
};
phases = [ "unpackPhase" "installPhase" ];

2
pkgs/servers/http/spawn-fcgi/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = "http://redmine.lighttpd.net/projects/spawn-fcgi";
homepage = "https://redmine.lighttpd.net/projects/spawn-fcgi";
description = "Provides an interface to external programs that support the FastCGI interface";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan ];

9
pkgs/servers/http/unit/default.nix
View File

@@ -18,16 +18,21 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.13.0";
version = "1.14.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = version;
sha256 = "1b5il05isq5yvnx2qpnihsrmj0jliacvhrm58i87d48anwpv1k8q";
sha256 = "01anczfcdwd22hb0y4zw647f86ivk5zq8lcd13xfxjvkmnsnbj9w";
};
patches = [
# https://github.com/nginx/unit/issues/357
./drop_cap.patch
];
nativeBuildInputs = [ which ];
buildInputs = [ ]

79
pkgs/servers/http/unit/drop_cap.patch Normal file
View File

@@ -0,0 +1,79 @@
diff -r ed17ce89119f src/nxt_capability.c
--- a/src/nxt_capability.c Fri Dec 06 17:02:23 2019 +0000
+++ b/src/nxt_capability.c Mon Dec 09 23:23:00 2019 +0000
@@ -93,6 +93,26 @@ nxt_capability_specific_set(nxt_task_t *
return NXT_OK;
}
+
+nxt_int_t
+nxt_capability_drop_all(nxt_task_t *task)
+{
+ struct __user_cap_header_struct hdr;
+ struct __user_cap_data_struct data[2];
+
+ hdr.version = nxt_capability_linux_get_version();
+ hdr.pid = nxt_pid;
+
+ nxt_memset(data, 0, sizeof(data));
+
+ if (nxt_slow_path(nxt_capset(&hdr, data) == -1)) {
+ nxt_alert(task, "failed to drop capabilities %E", nxt_errno);
+ return NXT_ERROR;
+ }
+
+ return NXT_OK;
+}
+
#else
static nxt_int_t
diff -r ed17ce89119f src/nxt_capability.h
--- a/src/nxt_capability.h Fri Dec 06 17:02:23 2019 +0000
+++ b/src/nxt_capability.h Mon Dec 09 23:23:00 2019 +0000
@@ -14,4 +14,6 @@ typedef struct {
NXT_EXPORT nxt_int_t nxt_capability_set(nxt_task_t *task,
nxt_capabilities_t *cap);
+NXT_EXPORT nxt_int_t nxt_capability_drop_all(nxt_task_t *task);
+
#endif /* _NXT_CAPABILITY_INCLUDED_ */
diff -r ed17ce89119f src/nxt_process.c
--- a/src/nxt_process.c Fri Dec 06 17:02:23 2019 +0000
+++ b/src/nxt_process.c Mon Dec 09 23:23:00 2019 +0000
@@ -264,7 +264,7 @@ cleanup:
static void
nxt_process_start(nxt_task_t *task, nxt_process_t *process)
{
- nxt_int_t ret, cap_setid;
+ nxt_int_t ret, cap_setid, drop_caps;
nxt_port_t *port, *main_port;
nxt_thread_t *thread;
nxt_runtime_t *rt;
@@ -285,9 +285,12 @@ nxt_process_start(nxt_task_t *task, nxt_
cap_setid = rt->capabilities.setid;
+ drop_caps = cap_setid;
+
#if (NXT_HAVE_CLONE_NEWUSER)
- if (!cap_setid && NXT_CLONE_USER(init->isolation.clone.flags)) {
+ if (NXT_CLONE_USER(init->isolation.clone.flags)) {
cap_setid = 1;
+ drop_caps = 0;
}
#endif
@@ -301,6 +304,12 @@ nxt_process_start(nxt_task_t *task, nxt_
if (nxt_slow_path(ret != NXT_OK)) {
goto fail;
}
+
+#if (NXT_HAVE_LINUX_CAPABILITY)
+ if (drop_caps && nxt_capability_drop_all(task) != NXT_OK) {
+ goto fail;
+ }
+#endif
}
rt->type = init->type;

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

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg,
{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-netcore, ffmpeg,
fontconfig, freetype }:
let
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
dotnet-sdk
dotnet-netcore
sqlite
];
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
install -dm 755 "$out/opt/jellyfin"
cp -r * "$out/opt/jellyfin"
makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/jellyfin \
makeWrapper "${dotnet-netcore}/bin/dotnet" $out/bin/jellyfin \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
sqlite fontconfig freetype stdenv.cc.cc.lib
]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \

47
pkgs/servers/mail/mailman/core.nix
View File

@@ -1,47 +0,0 @@
{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython
, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
, requests, zope_configuration, click, falcon, importlib-resources
, zope_component, lynx, postfix
}:
buildPythonPackage rec {
pname = "mailman";
version = "3.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6";
};
propagatedBuildInputs = [
alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock
importlib-resources lazr_config passlib requests zope_configuration
zope_component
];
patchPhase = ''
substituteInPlace src/mailman/config/postfix.cfg \
--replace /usr/sbin/postmap ${postfix}/bin/postmap
substituteInPlace src/mailman/config/schema.cfg \
--replace /usr/bin/lynx ${lynx}/bin/lynx
'';
# Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping
# them in shell code breaks this assumption. The proper way to use mailman is
# to create a specialized python interpreter:
#
# python37.withPackages (ps: [ps.mailman])
#
# This gives a properly wrapped 'mailman' command plus an interpreter that
# has all the necessary search paths to execute unwrapped 'master' and
# 'runner' scripts. The setup is a little tricky, but fortunately NixOS is
# about to get a OS module that takes care of those details.
dontWrapPythonPrograms = true;
meta = {
homepage = https://www.gnu.org/software/mailman/;
description = "Free software for managing electronic mail discussion and newsletter lists";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ peti ];
};
}

55
pkgs/servers/mail/mailman/default.nix
View File

@@ -1,33 +1,48 @@
{ stdenv, fetchurl, python2 }:
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, alembic, aiosmtpd, dnspython
, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
, requests, zope_configuration, click, falcon, importlib-resources
, zope_component, lynx, postfix, authheaders, gunicorn
}:
stdenv.mkDerivation rec {
buildPythonPackage rec {
pname = "mailman";
version = "2.1.29";
version = "3.3.0";
disabled = !isPy3k;
src = fetchurl {
url = "mirror://gnu/mailman/${pname}-${version}.tgz";
sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
src = fetchPypi {
inherit pname version;
sha256 = "1qph9i93ndahfxi3bb2sd0kjm2c0pkh844ai6zacfmvihl1k3pvy";
};
buildInputs = [ python2 python2.pkgs.dnspython ];
patches = [ ./fix-var-prefix.patch ];
configureFlags = [
"--without-permcheck"
"--with-cgi-ext=.cgi"
"--with-var-prefix=/var/lib/mailman"
propagatedBuildInputs = [
alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock
importlib-resources lazr_config passlib requests zope_configuration
zope_component authheaders gunicorn
];
installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'.
patchPhase = ''
substituteInPlace src/mailman/config/postfix.cfg \
--replace /usr/sbin/postmap ${postfix}/bin/postmap
substituteInPlace src/mailman/config/schema.cfg \
--replace /usr/bin/lynx ${lynx}/bin/lynx
'';
makeFlags = [ "DIRSETGID=:" ];
# Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping
# them in shell code breaks this assumption. The proper way to use mailman is
# to create a specialized python interpreter:
#
# python37.withPackages (ps: [ps.mailman])
#
# This gives a properly wrapped 'mailman' command plus an interpreter that
# has all the necessary search paths to execute unwrapped 'master' and
# 'runner' scripts. The setup is a little tricky, but fortunately NixOS is
# about to get a OS module that takes care of those details.
dontWrapPythonPrograms = true;
meta = {
homepage = https://www.gnu.org/software/mailman/;
description = "Free software for managing electronic mail discussion and e-newsletter lists";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.peti ];
description = "Free software for managing electronic mail discussion and newsletter lists";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ peti ];
};
}

23
pkgs/servers/mail/mailman/hyperkitty.nix
View File

@@ -1,27 +1,34 @@
{ stdenv, buildPythonPackage, fetchPypi, coverage, mock
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock
, robot-detection, django_extensions, rjsmin, cssmin, django-mailman3
, django-haystack, lockfile, networkx, dateutil, defusedxml
, django-haystack, flufl_lock, networkx, dateutil, defusedxml
, django-paintstore, djangorestframework, django, django-q
, django_compressor, beautifulsoup4, six, psycopg2, whoosh
, django_compressor, beautifulsoup4, six, psycopg2, whoosh, elasticsearch
}:
buildPythonPackage rec {
pname = "HyperKitty";
version = "1.2.2";
version = "1.3.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1z2zswlml6nppxhzw9a4nrj7i5wsxd29s3q78ka1rwr5m5n7s1rz";
sha256 = "092fkv0xyf5vgj33xwq0mh9h5c5d56ifwimaqbfpx5cwc6yivb88";
};
buildInputs = [ coverage mock ];
nativeBuildInputs = [ isort ];
propagatedBuildInputs = [
robot-detection django_extensions rjsmin cssmin django-mailman3
django-haystack lockfile networkx dateutil defusedxml
django-haystack flufl_lock networkx dateutil defusedxml
django-paintstore djangorestframework django django-q
django_compressor beautifulsoup4 six psycopg2 whoosh
django_compressor six psycopg2 isort
];
# Some of these are optional runtime dependencies that are not
# listed as dependencies in setup.py. To use these, they should be
# dependencies of the Django Python environment, but not of
# HyperKitty so they're not included for people who don't need them.
checkInputs = [ beautifulsoup4 coverage elasticsearch mock whoosh ];
checkPhase = ''
cd $NIX_BUILD_TOP/$sourceRoot
PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test \

16
pkgs/servers/mail/mailman/postorius.nix
View File

@@ -1,23 +1,21 @@
{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock
, django-mailman3, mailmanclient
, django-mailman3, mailmanclient, readme_renderer
}:
buildPythonPackage rec {
pname = "postorius";
version = "1.2.4";
version = "1.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "1722lnscxfl8wdigf5d80d1qmd5gblr439wa989jxlww0wkjg9fl";
sha256 = "0wrm0hda7ym9qaygxirqaaii66ndmgyy7gx8wqdg07pfx14zcyja";
};
buildInputs = [ beautifulsoup4 vcrpy mock ];
propagatedBuildInputs = [ django-mailman3 ];
propagatedBuildInputs = [ django-mailman3 readme_renderer ];
checkInputs = [ beautifulsoup4 vcrpy mock ];
checkPhase = ''
cd $NIX_BUILD_TOP/$sourceRoot
PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test --settings=test_settings postorius
'';
# Tries to connect to database.
doCheck = false;
meta = {
homepage = https://www.gnu.org/software/mailman/;

3
pkgs/servers/mail/mailman/web.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, python, hyperkitty, postorius, buildPythonPackage
{ stdenv, python, hyperkitty, postorius, buildPythonPackage, isPy3k
, serverEMail ? "postmaster@example.org"
, archiverKey ? "SecretArchiverAPIKey"
, allowedHosts ? []
@@ -17,6 +17,7 @@ in
buildPythonPackage {
name = "mailman-web-0";
disabled = !isPy3k;
propagatedBuildInputs = [ hyperkitty postorius ];

4
pkgs/servers/matrix-synapse/default.nix
View File

@@ -23,11 +23,11 @@ let
in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.8.0";
version = "1.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "0dkx53hxafqjs05g240zna2v3l3ndpa4y4z5x85v8dvv5zkibdxz";
sha256 = "0ghmxzk2njid7d7ccggda8a9zx4dg1r59n5ymp8f2n9kxz7z2rj2";
};
patches = [

6
pkgs/servers/mautrix-whatsapp/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-01-07";
version = "2020-01-12";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "302fae6649f083ae2a1d4431157e6045865f62ad";
sha256 = "0rnlbw1xqk9kjc23pmybxdznxylpfxl35wa37lkafymfardjjavb";
rev = "39e46833b471b0cf262d4ff57fcd61530b5d2b9e";
sha256 = "1r1f52advibb97vrhi2gw0d0scnsvfbmfqizsbpjmgm7ci9jjhcl";
};
modSha256 = "18bcv7x49bqnzwhafh8fvyv9z2d4j6w0iyqql0alq57hy7h7lxik";

4
pkgs/servers/metabase/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.33.7.1";
version = "0.34.1";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
sha256 = "1rx9v0vcrpsjsclap4x9ic9jwhyd24v1n1v8si18blzn3iyr8c36";
sha256 = "0fcggpv9ikx481ci7jw6phhmk3mqxbsn9pfs1kqmhwy1ka4ck6dg";
};
nativeBuildInputs = [ makeWrapper ];

10
pkgs/servers/monitoring/loki/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
buildGoPackage rec {
version = "1.2.0";
version = "1.3.0";
pname = "grafana-loki";
goPackagePath = "github.com/grafana/loki";
@@ -11,9 +11,15 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "loki";
sha256 = "04ix58gb9yy5jf8fhn3k1pbwqs69k7m96cck38ymhwml1793b4k9";
sha256 = "0b1dpb3vh5i18467qk8kpb5ic14p4p1dfyr8hjkznf6bs7g8ka1q";
};
postPatch = ''
substituteInPlace pkg/distributor/distributor_test.go --replace \
'"eth0", "en0", "lo0"' \
'"lo"'
'';
nativeBuildInputs = [ makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ];

4
pkgs/servers/mpd/clientlib.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
version = "2.17";
version = "2.18";
pname = "libmpdclient";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "libmpdclient";
rev = "v${version}";
sha256 = "0458zq12ph1pbm9mcbdj8mm31iq3yzzc1aq9fhfwz341zwpwcp21";
sha256 = "0p2dw3jwyl34azzvr9bm7q6ni8v4ix9qr5lig62xskvrrbjfc4a6";
};
nativeBuildInputs = [ meson ninja ]

4
pkgs/servers/mqtt/mosquitto/default.nix
View File

@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "mosquitto";
version = "1.6.7";
version = "1.6.8";
src = fetchFromGitHub {
owner = "eclipse";
repo = "mosquitto";
rev = "v${version}";
sha256 = "1g9g9c95ypfa9dv53ga3hjqxrrlqmcf1lmpxgrifl2l34q4zzfln";
sha256 = "1py13vg3vwwwg6jdnmq46z6rlzb84r4ggqsmsrn4yar5hrw9pa90";
};
postPatch = ''

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nextcloud";
version = "17.0.2";
version = "18.0.0";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
sha256 = "1qrxalyyfjlv3myzkn5z33smfpv8r1ph2w9ax6jqivspq3zrc9gk";
sha256 = "0yr6sh9nf15dpnpcj4ypdmm9l3y8ls57pxsmqh5h913db2jrah0r";
};
installPhase = ''

6
pkgs/servers/search/groonga/default.nix
View File

@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "groonga";
version = "9.1.0";
version = "9.1.1";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "11mlpnaldb6z438qdb7qjq9dxbh71l6v6lrv69fxka34izpgyhkk";
sha256 = "16i5bmypawxjac6g808qgr0z3rvla6g6dr586rmwl7sbq0z2nr82";
};
buildInputs = with stdenv.lib;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
installCheckPhase = "$out/bin/groonga --version";
meta = with stdenv.lib; {
homepage = http://groonga.org/;
homepage = https://groonga.org/;
description = "An open-source fulltext search engine and column store";
license = licenses.lgpl21;
maintainers = [ maintainers.ericsagnes ];

35
pkgs/servers/search/solr/8.x.nix
View File

@@ -1,35 +0,0 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
pname = "solr";
version = "8.4.0";
src = fetchurl {
url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out $out/bin
cp -r bin/solr bin/post $out/bin/
cp -r contrib $out/
cp -r dist $out/
cp -r example $out/
cp -r server $out/
wrapProgram $out/bin/solr --set JAVA_HOME "${jre}"
wrapProgram $out/bin/post --set JAVA_HOME "${jre}"
'';
meta = with stdenv.lib; {
homepage = "https://lucene.apache.org/solr/";
description = "Open source enterprise search platform from the Apache Lucene project";
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ domenkozar aanderse ];
};
}

14
pkgs/servers/search/solr/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, jre, makeWrapper }:
{ stdenv, fetchurl, jre, makeWrapper, nixosTests }:
stdenv.mkDerivation rec {
pname = "solr";
version = "7.7.2";
version = "8.4.1";
src = fetchurl {
url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb";
url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc";
};
nativeBuildInputs = [ makeWrapper ];
@@ -24,12 +24,16 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/post --set JAVA_HOME "${jre}"
'';
passthru.tests = {
inherit (nixosTests) solr;
};
meta = with stdenv.lib; {
homepage = "https://lucene.apache.org/solr/";
description = "Open source enterprise search platform from the Apache Lucene project";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.domenkozar maintainers.aanderse ];
maintainers = with maintainers; [ domenkozar aanderse ];
};
}

23
pkgs/servers/ser2net/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "ser2net";
version = "4.1.1";
src = fetchFromGitHub {
owner = "cminyard";
repo = "${pname}";
rev = "v${version}";
sha256 = "1zl68mmd7pp10cjv1jk8rs2dlbwvzskyb58qvc7ph7vc6957lfhc";
};
buildInputs = [ autoreconfHook gensio libyaml ];
meta = with lib; {
description = "Serial to network connection server";
homepage = "https://sourceforge.net/projects/ser2net/";
license = licenses.gpl2;
maintainers = with maintainers; [ emantor ];
platforms = with platforms; linux;
};
}

4
pkgs/servers/sql/postgresql/ext/timescaledb.nix
View File

@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
version = "1.5.1";
version = "1.6.0";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
sha256 = "1mgmkc42nksfsmjg463v03rj1v8gybwlzzi515gxz6ijx8604w4c";
sha256 = "0b42rhkycr4pwwa4fxnmppd3bl0xz7azvlm145rd7warlsr5h0lb";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ];

4
pkgs/servers/tautulli/default.nix
View File

@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, python }:
stdenv.mkDerivation rec {
version = "2.1.38";
version = "2.1.42";
pname = "Tautulli";
pythonPath = [ python.pkgs.setuptools ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "Tautulli";
repo = pname;
rev = "v${version}";
sha256 = "00kxz4i97lk3cb11vcpj894xdi7q9f1jcy29yglya8rcvsqmddwd";
sha256 = "0qrxxsrmqkc7v3irxi2226zvl16zid6q2wxvznci7dbg8f4rm7nw";
};
buildPhase = ":";

4
pkgs/servers/tt-rss/theme-feedly/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
pname = "tt-rss-theme-feedly";
version = "2.0.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "levito";
repo = "tt-rss-feedly-theme";
rev = "v${version}";
sha256 = "024hngwzfdgw5jqppc8vh75jidfqghaccy969hvbhxhgk6j6l8m4";
sha256 = "0rl5g664grx3m7yxa14rgnbvnlc3xnn44kzjji5layxww6jd8h2s";
};
dontBuild = true;

31
pkgs/servers/web-apps/dokuwiki/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, writeText }:
stdenv.mkDerivation rec {
pname = "dokuwiki";
@@ -11,9 +11,38 @@ stdenv.mkDerivation rec {
sha256 = "1na5pn4j4mi2la80ywzg1krwqdxz57mjkw0id6ga9rws809gkdjp";
};
preload = writeText "preload.php" ''
<?php
$config_cascade = array(
'acl' => array(
'default' => getenv('DOKUWIKI_ACL_AUTH_CONFIG'),
),
'plainauth.users' => array(
'default' => getenv('DOKUWIKI_USERS_AUTH_CONFIG'),
'protected' => "" // not used by default
),
);
'';
phpLocalConfig = writeText "local.php" ''
<?php
return require(getenv('DOKUWIKI_LOCAL_CONFIG'));
?>
'';
phpPluginsLocalConfig = writeText "plugins.local.php" ''
<?php
return require(getenv('DOKUWIKI_PLUGINS_LOCAL_CONFIG'));
?>
'';
installPhase = ''
mkdir -p $out/share/dokuwiki
cp -r * $out/share/dokuwiki
cp ${preload} $out/share/dokuwiki/inc/preload.php
cp ${phpLocalConfig} $out/share/dokuwiki/conf/local.php
cp ${phpPluginsLocalConfig} $out/share/dokuwiki/conf/plugins.local.php
'';
meta = with stdenv.lib; {

4
pkgs/servers/web-apps/matomo/default.nix
View File

@@ -3,8 +3,8 @@
let
versions = {
matomo = {
version = "3.13.0";
sha256 = "0h4jqibb86zw5l26r927qrbjhba8c79pc4xp3hgpi25p3fjncax8";
version = "3.13.1";
sha256 = "071m3sw3rrhlccbwdyklcn8rwp4mcnii5m2a7zmgx3rv87i9n2ni";
};
matomo-beta = {

6
pkgs/servers/x11/xorg/default.nix
View File

@@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
name = "xorg-server-1.20.6";
name = "xorg-server-1.20.7";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.20.6.tar.bz2;
sha256 = "1laib9z17jksgzb67z69blcmnpbvj7i7m604b5ns7s760iii85k3";
url = mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2;
sha256 = "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];

2
pkgs/servers/x11/xorg/tarballs.list
View File

@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2

4
pkgs/servers/xmpp/ejabberd/default.nix
View File

@@ -24,12 +24,12 @@ let
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
in stdenv.mkDerivation rec {
version = "19.09.1";
version = "20.01";
pname = "ejabberd";
src = fetchurl {
url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
sha256 = "1lj0zahsdg6naq007h8wp5p8ksdfwam3as7wiagvbj9gy8dgdp8q";
sha256 = "14bgwa6y17bhnwhcqb2hdl7psds0iqkcawb4kpaw6d7lzzsx4ay6";
};
nativeBuildInputs = [ fakegit ];

4
pkgs/servers/zoneminder/default.nix
View File

@@ -162,6 +162,10 @@ in stdenv.mkDerivation rec {
"-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder"
"-DZM_WEB_USER=${user}"
"-DZM_WEB_GROUP=${user}"
# Workaround issue in CMakeLists.txt where ZM_CGIDIR set to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin
# But CMAKE_INSTALL_LIBEXECDIR is already an absolute path from cmake setup-hook
"-DZM_CGIDIR=${placeholder "out"}/libexec/zoneminder/cgi-bin"
];
passthru = { inherit dirName; };