diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
commit | 0aa59a08d65461149552f68c638655ed2b474510 (patch) | |
tree | 95b176cf0459529707be2f16d6b87eb96fd4e01a /pkgs/servers | |
parent | 2cf343fc96b82772b9ab3700fe43eb142d100179 (diff) | |
parent | 2ab846211c52e3d7bb26b0888c9777598e921591 (diff) | |
download | nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.gz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.bz2 nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.lz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.xz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.zst nixlib-0aa59a08d65461149552f68c638655ed2b474510.zip |
Merge master into staging
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/dns/pdns-recursor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/identd/oidentd/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/jackett/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/memcached/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sip/freeswitch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sonarr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/pgroonga/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/web-apps/shaarli/material-theme.nix | 8 |
11 files changed, 26 insertions, 29 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index fe028cf812e7..b0460f21bfaf 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.3"; + version = "17.11.5"; src = fetchurl { url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "1x3i6z03d9m46fvj1cslrapm1drvgyqch9pn4xf23kvbz4gkhaps"; + sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 25b333a46188..76f1bd91e33d 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0srrw726qpwg69v75dwbxab9hk73x1wia4rcnmf7g5qr2k3h7swg"; + sha256 = "0xpd8k7ahwrwabz05zbjmg54dmd4hm5hkbfn8m1ws6y4f7qm4inv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index b8eb21e492bc..1abe9512f589 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "oidentd-2.0.8"; + name = "oidentd-${version}"; + version = "2.2.2"; CFLAGS = [ "--std=gnu89" ]; src = fetchurl { - url = "mirror://sourceforge/ojnk/${name}.tar.gz"; - sha256 = "0vzv2086rrxcaavrm3js7aqvyc0grgaqy78x61d8s7r8hz8vwk55"; + url = "https://ftp.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; + sha256 = "1svj7ymljp4s17d7jlx6602n9081714qsj5yymmv1s9wagzjqyn9"; }; meta = { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index fc43e949269b..34d242b92a8a 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.716"; + version = "0.8.823"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0i770f4h06jf76977y3cp9l5n5csnb9wzpskndc7mgk0h02m7nrc"; + sha256 = "0hicz21dvcakqkxix70akc3rrz570j3g0a512pqrr3bdq7ay0dkk"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4c7d1649832e..3cf460539699 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,20 +26,16 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.26.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "1rm15qj743k376skjxyyfmzwajx3rb8z2inzc4309kl98jfw3cw0"; + sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3"; }; patches = [ - (fetchpatch { # Update pynacl dependency - url = "https://github.com/matrix-org/synapse/pull/2888.patch"; - sha256 = "0gr9vwv02ps17d6pzassp9xmj1qbdgxwn1z4kckx4x964zzhyn4f"; - }) ./matrix-synapse.patch ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 4668702fcee6..e326aff0d7ee 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.6"; + version = "1.5.7"; name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "00szy9d4szaixi260dcd4846zci04y0sd47ia2lzg0bxkn2ywxcn"; + sha256 = "0ijfiy1w4hk3j8hhra6kablq8kjabvcdvsl8cwd4drvszjl0ddsv"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 559af3bdbef0..a952dbada66f 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -3,11 +3,11 @@ , ldns, libedit, yasm, which, lua, libopus, libsndfile }: stdenv.mkDerivation rec { - name = "freeswitch-1.6.19"; + name = "freeswitch-1.6.20"; src = fetchurl { url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; - sha256 = "019n16yyzk9yp6h7iwsg30h62zj5vqvigr5cl8pjik4106xzcjyr"; + sha256 = "0hqz68abs5x5vzf1mndcvdi35nrhmnklzdrnrk8dyvzvz67hp2ah"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 04e6e97c54e2..e7114b957dcb 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5153"; + version = "2.0.0.5163"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1zdsba5bpi87dhsa62qbpj55wbakl6w380pijs8qxn80bvapv3xy"; + sha256 = "037rs0cb7dfiblfy02x2l4amv9dmx1wiz5pa97vpczfgk5gq99y3"; }; buildInputs = [ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 25fee035cd5d..60462f83d108 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.13"; + version = "10.2.14"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "0ly7dxc7rk327liya4kalgsw8irlxl0pl8gq0agdl18a63cpwbi7"; + sha256 = "0zizf3q0hdkmsn6rpwdbfm5xkj21cwpnnzq9knjfpwcadqnyqhrl"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 24f0610cba3d..1f612116ae3a 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0jlaxkj33dgr2hgh0f861ja1z53kqw0g1syinl2sacsna2i9pdxy"; + sha256 = "0hx7bzxmjv0rsvv6b77gpmwhw4ajy8sgjbmrg7hj3dc51kiyiai0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 9831d7dabce1..939976b0a269 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "shaarli-material-${version}"; - version = "0.9.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "kalvn"; repo = "Shaarli-Material"; rev = "v${version}"; - sha256 = "0x8d9425n3jrwzsyxclbxfspvi91v1klq8r3m6wcj81kys7vmzgh"; + sha256 = "1bxw74ksvfv46995iwc7jhvl78hd84lcq3h9iyxvs8gpkhkapv55"; }; patchPhase = '' for f in material/*.html do substituteInPlace $f \ - --replace '.min.css"' '.min.css#"' \ - --replace '.min.js"' '.min.js#"' \ + --replace '.min.css?v={$version_hash}"' '.min.css#"' \ + --replace '.min.js?v={$version_hash}"' '.min.js#"' \ --replace '.png"' '.png#"' done ''; |