diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-03 09:48:58 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-03 09:48:58 +0200 |
commit | d1a89ae9d702a4b91b6d661af256552e330bb995 (patch) | |
tree | b34b95d1204ad7b4423b10cf1572d11b3293319f /pkgs/servers | |
parent | 343ad1697d6967b7aa949752fd5c4471f691b4eb (diff) | |
parent | 0b1c8793fc20944b68562d9a73a5ce391f1603e0 (diff) | |
download | nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.gz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.bz2 nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.lz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.xz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.zst nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/dns/bind/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/emby/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/news/leafnode/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/radicale/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 3 |
7 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 61f9604b9252..45abcff27767 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.10.5-P2"; in +let version = "9.11.1-P2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0cwrwlkfd6wnkw2ylkz2iyqlz73s3kf6q0fxsfwnh3fhxps2i90r"; + sha256 = "19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 24e6def856db..7e4c69e3862d 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.20.0"; + version = "3.2.22.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0n5b40vl0dg2pd0j7rzbck62cji6ws91jgsh8r1maig9p00xmwv7"; + sha256 = "0vc9391q1mi16k05yl5lqs2cmsgcid339pbqm9fyqzm33fk7d73r"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index b18ab016c441..3c028b1ac170 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. + makeFlags = [ "DIRSETGID=:" ]; + meta = { homepage = "http://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and e-newsletter lists"; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index a3579aa83099..9a8a0a80e522 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { configureFlags = "--enable-runas-user=nobody"; + prePatch = '' + substituteInPlace Makefile.in --replace 02770 0770 + ''; + preConfigure = '' # configure uses id to check environment; we don't want this check sed -re 's/^ID[=].*/ID="echo whatever"/' -i configure diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d87aefd37fb5..2666ddc5a43e 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "3.2.8"; + version = "3.2.9"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "0b28d0fpkvf4m186gr2k53f1cqkccxzspmb959swrrhq7p177cv1"; + sha256 = "09pzb468jfps1w7bx2xpsvalj5r3q8hav7l3s10f91xjhflwzakf"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index f36d19bfb209..b6d61e293951 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "radicale-${version}"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz"; - sha256 = "1g20p3998f46ywda7swv0py63wjbrhvk0nrafajlbb6wgzxjmqpb"; + sha256 = "17p0hayyw30pfb81xqvd7jhjm6yrk2dnbgvqagx1nqdsr89ar0ss"; }; propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 4f64afe3d92b..1356915c1fac 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -18,8 +18,9 @@ common = rec { # attributes common to both builds version = "10.1.21"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; + url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; sha256 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as"; + name = "mariadb-${version}.tar.gz"; }; prePatch = '' |