diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
commit | fe9a3e3e63fa59c8014d454b0efd3231bdd19350 (patch) | |
tree | 3546e83902366b34599e8d5f6a698e37935a104d /pkgs/servers | |
parent | ed3cb39bfa7234e5bbf2b50ce6f658ef5fda686a (diff) | |
parent | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (diff) | |
download | nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.gz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.bz2 nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.lz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.xz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.zst nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/mainline.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/stable.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/versions.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/mqtt/mosquitto/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/pgbouncer/default.nix | 6 |
6 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index bba33d99aa2..c448e4936f6 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "19.05.1.2"; + version = "19.05.2.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { owner = "SchedMD"; repo = "slurm"; # The release tags use - instead of . - rev = "${builtins.replaceStrings ["."] ["-"] "${pname}-${version}"}"; - sha256 = "1r2hxfshz929fcys90rmnj8s7f204q364m6bazhiy8hhm3bsf42k"; + rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; + sha256 = "1k19z0qyjr6nwqxv93wbnnhy498788rc4fl9zyf0smc5yq1zbjir"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 47082bbeba0..c5e0b47e238 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.17.2"; - sha256 = "1v39gslwbvpfhqqv74q0lkfrhrwsp59xc8pwhvxns7af8s3kccsy"; + version = "1.17.3"; + sha256 = "0g0g9prwjy0rnv6n5smny5yl5dhnmflqdr3hwgyj5jpr5hfgx11v"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index ffc6f81fdc2..31aeaa6f084 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.16.0"; - sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg"; + version = "1.16.1"; + sha256 = "0az3vf463b538ajvaq94hsz9ipmjgnamfj1jy0v5flfks5njl77i"; }) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 7b6b5d8fccc..a1799839b64 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,12 +1,12 @@ generic: { v42 = generic { - version = "4.2.3"; - sha256 = "0865c1a9vcgg4syhp5133rw9v1h65lp0g1y2f758jb9x9ybrr01s"; + version = "4.2.5"; + sha256 = "135bfafydmd66q97za84micymgf38s9zydp6jssrf7azik699fjd"; }; v40 = generic { - version = "4.0.9"; - sha256 = "1lc4wx3cing5w2qa18yb6232qd70hrfjq7jmnx4ip3nawnswj2xa"; + version = "4.0.11"; + sha256 = "02c4c82vbc27v09rci7flvwvjyb5sx0mknw0fz5i8bb23k1jbbxh"; }; v30 = generic { diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index bfcc7aeacff..3357f7a16c1 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1xvfcqi6pa5pdnqd88gz9qx6kl2q47xp7l3q5wwgj0l9y9mlxp99"; + sha256 = "1kr1dgc4nzhyg3rzymbv4rka3rpb30rwsy6binb7apnw3n3ff58l"; }; postPatch = '' diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index ccf8ac264e9..30be61a805a 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libevent }: +{ stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }: stdenv.mkDerivation rec { pname = "pgbouncer"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q"; }; - buildInputs = [ libevent openssl ]; + buildInputs = [ libevent openssl c-ares pkg-config ]; meta = with stdenv.lib; { homepage = https://pgbouncer.github.io; description = "Lightweight connection pooler for PostgreSQL"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; }; } |