diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:33 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:38 +0300 |
commit | 003473613a084b38a1f0335ba8035461b4190e5d (patch) | |
tree | cc4598d81eb607acba0d89664fe13fd44138dd7e /pkgs/servers | |
parent | 39696b6d56fbe93834a8997057b3507e8cd2a234 (diff) | |
parent | 50bbc56b0bd87715bc17230365fe5eb441bfac68 (diff) |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/apache-kafka/default.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/dns/knot-dns/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/lighttpd/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/http/openresty/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/minio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 4 |
8 files changed, 28 insertions, 16 deletions
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 152e604557464..fe67bdd0282cb 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -19,9 +19,14 @@ let sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7"; }; "1.0" = { - kafkaVersion = "1.0.0"; + kafkaVersion = "1.0.1"; scalaVersion = "2.12"; - sha256 = "1cs4nmp39m99gqjpy5klsffqksc0h9pz514jkq99qb95a83x1cfm"; + sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m"; + }; + "1.1" = { + kafkaVersion = "1.1.0"; + scalaVersion = "2.12"; + sha256 = "04idhsr6pbkb0xkx38faxv2pn5nkjcflz6wl4s3ka82h1fbq74j9"; }; }; in diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 88fa07009f835..5fe7a8608c59a 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.6"; + version = "2.6.7"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci"; + sha256 = "1c2a004b05c161f7b36d5eeccebd9d4cdf60aa09930a7cc766514e468ca92243"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 7bf1b1ffa6465..31b3449d5f64d 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -2,11 +2,14 @@ , openssl, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, mysql ? null , enableLdap ? false, openldap ? null +, enableWebDAV ? true, sqlite ? null, libuuid ? null }: assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; assert enableLdap -> openldap != null; +assert enableWebDAV -> sqlite != null; +assert enableWebDAV -> libuuid != null; stdenv.mkDerivation rec { name = "lighttpd-1.4.49"; @@ -20,12 +23,16 @@ stdenv.mkDerivation rec { buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 ++ stdenv.lib.optional enableMysql mysql.connector-c - ++ stdenv.lib.optional enableLdap openldap; + ++ stdenv.lib.optional enableLdap openldap + ++ stdenv.lib.optional enableWebDAV sqlite + ++ stdenv.lib.optional enableWebDAV libuuid; configureFlags = [ "--with-openssl" ] ++ stdenv.lib.optional enableMagnet "--with-lua" ++ stdenv.lib.optional enableMysql "--with-mysql" - ++ stdenv.lib.optional enableLdap "--with-ldap"; + ++ stdenv.lib.optional enableLdap "--with-ldap" + ++ stdenv.lib.optional enableWebDAV "--with-webdav-props" + ++ stdenv.lib.optional enableWebDAV "--with-webdav-locks"; preConfigure = '' sed -i "s:/usr/bin/file:${file}/bin/file:g" configure diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 093f5f0e50278..252e1a97dfdba 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.13.6.1"; + version = "1.13.6.2"; src = fetchurl { url = "http://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "0sv93nw1j597mdpnibmgaa3nnghdk0z6k27vavm8w2c1z9n6w96i"; + sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 786a188bbfd8a..7f590461d9dee 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2018-03-30T00-38-44Z"; + version = "2018-05-11T00-29-24Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "17vam9ifi632yfxakanxi2660wqgqrhrhhzywrgh2jmzljippf80"; + sha256 = "01jw1djfs0jbhsx9pmx3kj31mfhrw45lr1i4lwkmh8k7fxn8w13x"; }; goPackagePath = "github.com/minio/minio"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index f9fb4efa04bef..646401ce02f91 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.1.2"; + version = "5.1.3"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0iw0mr6m99z6vy9mz9fdhmn4fxi359n3ns71bm5a71np8lf4qs36"; + sha256 = "09q4xrh4j02b8nrkskndahs039rhmcs8hrcgvnnpg36qqyvs1x0g"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "18bqmvyfjkvkrdbxa989aa6c7ri3b4wdb7ai543hiaz00s9mnpzm"; + sha256 = "131dxpjnzhsjh6c0fp48jhxf5piy6wh287pfm2s7pm4ywq9m0q46"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 3287bc6f2583c..b71d9b8e58b8b 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -19,7 +19,7 @@ let doCheck = true; - buildFlagsArray = let t = "${goPackagePath}/version"; in '' + buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' -ldflags= -X ${t}.Version=${version} -X ${t}.Revision=unknown diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 2d0e1a529dac9..6f092dd80cde6 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -25,12 +25,12 @@ let in stdenv.mkDerivation rec { - version = "0.10.0"; + version = "0.10.1"; name = "prosody-${version}"; src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l"; + sha256 = "1kmmpkkgymg1r8r0k8j83pgmiskg1phl8hmpzjrnvlvsfnrnjplr"; }; communityModules = fetchhg { |