From b80c4d7d3d793ed36e4387ec46266c2733bdba71 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Nov 2018 15:15:40 -0800 Subject: axis2: 1.6.4 -> 1.7.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/axis2/versions --- pkgs/servers/http/tomcat/axis2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 7f14f6fff195..609b14d94a84 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axis2-${version}"; - version = "1.6.4"; + version = "1.7.8"; src = fetchurl { url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip"; - sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr"; + sha256 = "0k1ppxb9v6agx4gcfkpgwcri6v29ng3arjyc0b0mxcby6ck85mny"; }; buildInputs = [ unzip apacheAnt jdk ]; -- cgit 1.4.1 From 5999cac4c961133bf18adf6675eaeade3e2b6979 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 May 2019 20:32:22 -0700 Subject: airsonic: 10.2.1 -> 10.3.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/airsonic/versions --- pkgs/servers/misc/airsonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 8dd294bcdf84..d0ce73f5410f 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "airsonic-${version}"; - version = "10.2.1"; + version = "10.3.1"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "1gjyg9qnrckm2gmym13yhlvw0iaspl8x0534zdw558gi3mjykm4v"; + sha256 = "15y56h7zy94408605cchvf2fqg3aicylpzgd1g8fxyl42h216816"; }; buildCommand = '' -- cgit 1.4.1 From 422c7fe2f611ce03e82853594ee8ca125c923dd4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 01:53:40 -0700 Subject: clickhouse: 19.6.2.11 -> 19.9.2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/clickhouse/versions --- pkgs/servers/clickhouse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 4df24a6d60c0..b61d0c7b5673 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "19.6.2.11"; + version = "19.9.2.4"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0bs38a8dm5x43klx4nc5dwkkxpab12lp2chyvc2y47c75j7rn5d7"; + sha256 = "1mw6nk8b4b91wdg6d18156x8kcivjdlpb9jp59c1zs6pspg8y0jh"; }; nativeBuildInputs = [ cmake libtool ninja ]; -- cgit 1.4.1 From f834efbdcab7a441e9f3fb3d774ae46a6e80ed82 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Aug 2019 16:35:04 -0700 Subject: neo4j: 3.5.6 -> 3.5.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neo4j/versions --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 25dfa5f47bd3..9b173e538d34 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0ajkz13qsjxjflh2dlyq8w1fiacv5gakf6n98xcvj9yfcm2j4dpm"; + sha256 = "0kj92vljxdhk9pf6gr9cvd2a2ilc4myp5djjkrj3gm37f074swgg"; }; buildInputs = [ makeWrapper jre8 which gawk ]; -- cgit 1.4.1 From 921ab87ce8fee89565d989b17b9d8985c2cd8b0b Mon Sep 17 00:00:00 2001 From: angristan Date: Tue, 6 Aug 2019 14:07:45 +0200 Subject: shaarli-material: 0.9.5 -> 0.10.4 --- pkgs/servers/web-apps/shaarli/material-theme.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 939976b0a269..5fd941e9467c 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "shaarli-material-${version}"; - version = "0.9.5"; + version = "0.10.4"; src = fetchFromGitHub { owner = "kalvn"; repo = "Shaarli-Material"; rev = "v${version}"; - sha256 = "1bxw74ksvfv46995iwc7jhvl78hd84lcq3h9iyxvs8gpkhkapv55"; + sha256 = "161kf7linyl2l2d7y60v96xz3fwa572fqm1vbm58mjgkzkfndhrv"; }; patchPhase = '' -- cgit 1.4.1 From 5c0567dcc688ee0663e06393b0f7ac02a1724738 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 9 Aug 2019 16:07:12 +0200 Subject: knot-resolver: skip a broken test The test fails from roughly today's machine date onwards. --- pkgs/servers/dns/knot-resolver/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/servers') diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 7a6c9de885a8..1d8896bfc10f 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -30,6 +30,9 @@ unwrapped = stdenv.mkDerivation rec { sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4"; }; + # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496 + postPatch = "sed '/prefill.test.lua/d' -i modules/meson.build"; + outputs = [ "out" "dev" ]; preConfigure = '' -- cgit 1.4.1 From 1b946574af66960ad78c9f5d12f9b6ccb21ace02 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 9 Aug 2019 20:51:02 +0200 Subject: meteor: 1.5 -> 1.8.1 --- pkgs/servers/meteor/default.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index b677b6080d1f..d367bcfd2e31 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,22 +1,20 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - bootstrap = fetchurl { - url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.5/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "0cwwqv88h1ji7g4zmfz34xsrxkn640wr11ddjq5c6b9ygcljci3p"; - }; + version = "1.8.1"; in stdenv.mkDerivation rec { - name = "meteor-${version}"; - version = "1.5"; + inherit version; + pname = "meteor"; + src = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "1ql58j2d1pqhzpj7c9a6zrpmxxfmlgx743q7lw7g35vz2mpq34c6"; + }; - dontStrip = true; + #dontStrip = true; - unpackPhase = '' - tar xf ${bootstrap} - sourceRoot=.meteor - ''; + sourceRoot = ".meteor"; installPhase = '' mkdir $out @@ -25,7 +23,6 @@ stdenv.mkDerivation rec { chmod -R +w $out/packages cp -r package-metadata $out - chmod -R +w $out/package-metadata devBundle=$(find $out/packages/meteor-tool -name dev_bundle) ln -s $devBundle $out/dev_bundle -- cgit 1.4.1 From 304dc5922ef23aea0c16b7331ccb040d2c491f68 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 10 Aug 2019 09:54:33 +0200 Subject: clickhouse: 19.9.2.4 -> 19.13.1.11 --- pkgs/servers/clickhouse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index b61d0c7b5673..8530d8cb068e 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "19.9.2.4"; + version = "19.13.1.11"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "1mw6nk8b4b91wdg6d18156x8kcivjdlpb9jp59c1zs6pspg8y0jh"; + sha256 = "1j9jhgl2z84id5z6rbvyal7aha5v3m8pd393cmcsf1bf0fiz8qmc"; }; nativeBuildInputs = [ cmake libtool ninja ]; -- cgit 1.4.1 From 0e679dd53e1aa60e61dc25db5e0a0ea882bb7416 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 10 Aug 2019 10:24:53 +0200 Subject: axis2: 1.7.8 -> 1.7.9 --- pkgs/servers/http/tomcat/axis2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 609b14d94a84..5da89200816f 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axis2-${version}"; - version = "1.7.8"; + version = "1.7.9"; src = fetchurl { url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip"; - sha256 = "0k1ppxb9v6agx4gcfkpgwcri6v29ng3arjyc0b0mxcby6ck85mny"; + sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; }; buildInputs = [ unzip apacheAnt jdk ]; -- cgit 1.4.1 From 72330fc275a7d0a5ad88d7c516e7aed22b1eeb9d Mon Sep 17 00:00:00 2001 From: Florian Peter Date: Sat, 10 Aug 2019 18:56:41 +0800 Subject: scylladb: init at 3.0.5 --- pkgs/servers/scylladb/default.nix | 96 ++++++++++++++++++++++ .../scylladb/seastar-configure-script-paths.patch | 13 +++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 113 insertions(+) create mode 100644 pkgs/servers/scylladb/default.nix create mode 100644 pkgs/servers/scylladb/seastar-configure-script-paths.patch (limited to 'pkgs/servers') diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix new file mode 100644 index 000000000000..1a168608bec2 --- /dev/null +++ b/pkgs/servers/scylladb/default.nix @@ -0,0 +1,96 @@ +{ + stdenv, + fetchgit, + python3Packages, + pkgconfig, + gcc8Stdenv, + boost, + git, + systemd, + gnutls, + cmake, + makeWrapper, + ninja, + ragel, + hwloc, + jsoncpp, + antlr3, + numactl, + protobuf, + cryptopp, + libxfs, + libyamlcpp, + libsystemtap, + lksctp-tools, + lz4, + libxml2, + zlib, + libpciaccess, + snappy, + libtool, + thrift +}: +gcc8Stdenv.mkDerivation rec { + pname = "scylladb"; + version = "3.0.5"; + + src = fetchgit { + url = "https://github.com/scylladb/scylla.git"; + rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13"; + sha256 = "14mg0kzpkrxvwqyiy19ndy4rsc7s5gnv2gwd3xdwm1lx1ln8ywsi"; + fetchSubmodules = true; + }; + + patches = [ ./seastar-configure-script-paths.patch ]; + + nativeBuildInputs = [ + pkgconfig + cmake + makeWrapper + ninja + ]; + + buildInputs = [ + antlr3 + python3Packages.pyparsing + boost + git + systemd + gnutls + ragel + jsoncpp + numactl + protobuf + cryptopp + libxfs + libyamlcpp + libsystemtap + lksctp-tools + lz4 + libxml2 + zlib + libpciaccess + snappy + libtool + thrift + ]; + + postPatch = '' + patchShebangs ./configure.py + ''; + + configurePhase = '' + ./configure.py --mode=release + ''; + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + meta = with stdenv.lib; { + description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; + homepage = "https://scylladb.com"; + license = licenses.agpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.farlion ]; + }; +} diff --git a/pkgs/servers/scylladb/seastar-configure-script-paths.patch b/pkgs/servers/scylladb/seastar-configure-script-paths.patch new file mode 100644 index 000000000000..19c5c8161296 --- /dev/null +++ b/pkgs/servers/scylladb/seastar-configure-script-paths.patch @@ -0,0 +1,13 @@ +diff --git a/seastar/configure.py b/seastar/configure.py +index 62d9c204..f6520635 100755 +--- a/seastar/configure.py ++++ b/seastar/configure.py +@@ -924,7 +924,7 @@ with open(buildfile, 'w') as f: + command = ragel -G2 -o $out $in && sed -i -e '1h;2,$$H;$$!d;g' -re 's/static const char _nfa[^;]*;//g' $out + description = RAGEL $out + rule gen +- command = /bin/echo -e $text > $out ++ command = echo -e $text > $out + description = GEN $out + rule swagger + command = json/json2code.py -f $in -o $out diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8f281310d0b..f1d31a4ebbb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24142,6 +24142,10 @@ in sct = callPackage ../tools/X11/sct {}; + scylladb = callPackage ../servers/scylladb { + thrift = thrift-0_10; + }; + seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; -- cgit 1.4.1 From d373b3fbb3736c331d91d7653174ef47a885d444 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sun, 11 Aug 2019 12:30:04 +0200 Subject: prometheus-nginx-exporter: 0.4.1 -> 0.4.2, run tests --- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 94cb2f74cb08..963315f00c12 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "0.4.1"; + version = "0.4.2"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; @@ -14,9 +14,11 @@ buildGoPackage rec { rev = "v${version}"; owner = "nginxinc"; repo = "nginx-prometheus-exporter"; - sha256 = "0c5bxl9xrd4gh2w5wyrzghmbcy9k1khydzml5cm0rsyqhwsvs8m5"; + sha256 = "023nl83w0fic7sj0yxxgj7jchyafqnmv6dq35amzz37ikx92mdcj"; }; + doCheck = true; + meta = with stdenv.lib; { description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; -- cgit 1.4.1 From dcc12cea9f72717a6f22e5d15c65f4042512b775 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sun, 11 Aug 2019 11:50:09 +0200 Subject: prometheus-blackbox-exporter: 0.12.0 -> 0.14.0, run tests Also added myself as maintainer. --- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 1f342adebaa0..9803ba09e16a 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.12.0"; + version = "0.14.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,14 +11,16 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "0gd3vymk3qdfjnf0rx9kwc6v0jv7f8l30igvj2v7bljar2d6hzxf"; + sha256 = "1v5n59p9jl6y1ka9mqp0ibx1kpcb3gbpl0i6bhqpbr154frmqm4x"; }; + doCheck = true; + meta = with stdenv.lib; { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; - homepage = https://github.com/prometheus/blackbox_exporter; + homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ globin fpletz ]; + maintainers = with maintainers; [ globin fpletz willibutz ]; platforms = platforms.unix; }; } -- cgit 1.4.1 From 4d7465126febf5cddc399860ba755eaaf0f51c65 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 12 Aug 2019 18:23:27 +0200 Subject: prometheus-varnish-exporter: 1.5 -> 1.5.1, use buildGoModule (#66472) --- .../monitoring/prometheus/varnish-exporter.nix | 16 +- .../prometheus/varnish-exporter_deps.nix | 300 --------------------- 2 files changed, 7 insertions(+), 309 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix (limited to 'pkgs/servers') diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 1a623a3171df..a629a2a27e26 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,24 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }: -buildGoPackage rec { - name = "prometheus_varnish_exporter-${version}"; - version = "1.5"; - - goPackagePath = "github.com/jonnenauha/prometheus_varnish_exporter"; +buildGoModule rec { + pname = "prometheus_varnish_exporter"; + version = "1.5.1"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "1040x7fk3s056yrn95siilhi8c9cci2mdncc1xfjf5xj87421qx8"; + sha256 = "1lvs44936n3s9z6c5169jbvx390n5g0qk4pcrmnkndg796ixjshd"; }; - goDeps = ./varnish-exporter_deps.nix; + modSha256 = "0w1zg9jc2466srx9pdckw7rzn7ma4pbd0617b1h98v364wjzgj72"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $bin/bin/prometheus_varnish_exporter \ + wrapProgram $out/bin/prometheus_varnish_exporter \ --prefix PATH : "${varnish}/bin" ''; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix deleted file mode 100644 index aeacbb5cee8b..000000000000 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix +++ /dev/null @@ -1,300 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0709b304e793"; - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "adae6a3d119a"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "5ac8a444bdc5"; - sha256 = "00zdrighflwc4iyizsag184nvl1cbkk02v73kpl5miprdrvzqlr4"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] -- cgit 1.4.1 From f1f59e19d299c2f4c5612c37f0273ca87b5844e0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 13 Aug 2019 04:32:11 -0700 Subject: varnish6: 6.1.1 -> 6.2.0 --- pkgs/servers/varnish/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 40d08841eac5..4ee23e68265f 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python2, makeWrapper }: +, python3, makeWrapper }: let common = { version, sha256, extraBuildInputs ? [] }: @@ -13,8 +13,8 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pcre libxslt groff ncurses readline python2 libedit - python2.pkgs.docutils makeWrapper + pcre libxslt groff ncurses readline python3 libedit + python3.pkgs.docutils makeWrapper ] ++ extraBuildInputs; buildFlags = "localstatedir=/var/spool"; @@ -47,8 +47,8 @@ in sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; }; varnish6 = common { - version = "6.1.1"; - sha256 = "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0"; - extraBuildInputs = [ python2.pkgs.sphinx ]; + version = "6.2.0"; + sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; + extraBuildInputs = [ python3.pkgs.sphinx ]; }; } -- cgit 1.4.1 From dae42566dbee37a3b7a609fa86eca9618f4f4b67 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 13 Aug 2019 12:50:52 -0700 Subject: mysql80: init at 8.0.17 (#65221) MySQL 8.0 is a significant iteration after MySQL 5.7. This patch adds it as a parallel build alongside mysql57 (similar to mysql56 and mysql55 before). --- pkgs/servers/sql/mysql/8.0.x.nix | 73 ++++++++++++++++++++++++++++++++++ pkgs/servers/sql/mysql/abi-check.patch | 18 +++++++++ pkgs/servers/sql/mysql/libutils.patch | 5 +++ pkgs/top-level/all-packages.nix | 6 +++ 4 files changed, 102 insertions(+) create mode 100644 pkgs/servers/sql/mysql/8.0.x.nix create mode 100644 pkgs/servers/sql/mysql/abi-check.patch create mode 100644 pkgs/servers/sql/mysql/libutils.patch (limited to 'pkgs/servers') diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix new file mode 100644 index 000000000000..8785e052224d --- /dev/null +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchurl, bison, cmake, pkgconfig +, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib +, numactl, perl, cctools, CoreServices, developer_cmds +}: + +let +self = stdenv.mkDerivation rec { + name = "mysql-8.0.17"; + + src = fetchurl { + url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${name}.tar.gz"; + sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; + }; + + patches = [ + ./abi-check.patch + ./libutils.patch + ]; + + nativeBuildInputs = [ bison cmake pkgconfig ]; + + buildInputs = [ + boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + ] ++ lib.optionals stdenv.isLinux [ + numactl + ] ++ lib.optionals stdenv.isDarwin [ + cctools CoreServices developer_cmds + ]; + + outputs = [ "out" "static" ]; + + cmakeFlags = [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" # For std::shared_timed_mutex. + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + postInstall = '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ''; + + passthru = { + client = self; + connector-c = self; + server = self; + mysqlVersion = "8.0"; + }; + + meta = with lib; { + homepage = "https://www.mysql.com/"; + description = "The world's most popular open source database"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; + }; +}; in self diff --git a/pkgs/servers/sql/mysql/abi-check.patch b/pkgs/servers/sql/mysql/abi-check.patch new file mode 100644 index 000000000000..de45d9c3ea21 --- /dev/null +++ b/pkgs/servers/sql/mysql/abi-check.patch @@ -0,0 +1,18 @@ +MySQL ABI check assumes that with -nostdinc any standard #include terminates +preprocessing, but we do not provide that: +https://github.com/NixOS/nixpkgs/issues/44530 + +"#error" does not terminate preprocessing, so we #include a non-existent file instead. + +--- a/cmake/do_abi_check.cmake ++++ b/cmake/do_abi_check.cmake +@@ -68,1 +68,1 @@ FOREACH(file ${ABI_HEADERS}) +- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include ++ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include/nostdinc -I${SOURCE_DIR}/include +@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS}) +- COMMAND sed -e "/^# /d" ++ COMMAND sed -e "/^# /d" -e "/^#include <-nostdinc>$/d" +--- /dev/null ++++ b/include/nostdinc/stdint.h +@@ -0,0 +1,1 @@ ++#include <-nostdinc> diff --git a/pkgs/servers/sql/mysql/libutils.patch b/pkgs/servers/sql/mysql/libutils.patch new file mode 100644 index 000000000000..fa1a35e12f23 --- /dev/null +++ b/pkgs/servers/sql/mysql/libutils.patch @@ -0,0 +1,5 @@ +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -345 +345 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) +- COMMAND /usr/bin/libtool -static -o $ ++ COMMAND libtool -static -o $ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 669aaf0f2a3f..fa74fd97b50b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14790,6 +14790,12 @@ in boost = boost159; }; + mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { + inherit (darwin) cctools developer_cmds; + inherit (darwin.apple_sdk.frameworks) CoreServices; + boost = boost169; # Configure checks for specific version. + }; + mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; -- cgit 1.4.1