diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-14 23:25:36 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-14 23:25:36 +0100 |
commit | da76deffd176dd273524a9b8009dca5c58a58592 (patch) | |
tree | 6ac3912d4b0afd6f35ab8ad8b7d4097c5f5fd990 /pkgs/servers | |
parent | bca2e8255e4230398edd1f91ce45521d54d6122e (diff) | |
parent | 2024d55020e5f34e9f1e41d54122264f246ea7c9 (diff) | |
download | nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.gz nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.bz2 nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.lz nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.xz nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.zst nixlib-da76deffd176dd273524a9b8009dca5c58a58592.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/monitoring/consul-alerts/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/plex/raw.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 14 |
4 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 707d0129f70b..cafccfeb8f28 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "consul-alerts"; - version = "0.5.0"; + version = "0.6.0"; rev = "v${version}"; goPackagePath = "github.com/AcalephStorage/consul-alerts"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "AcalephStorage"; repo = "consul-alerts"; - sha256 = "0dff2cpk3lkgjsh97rvlrpacpka0kwm29691diyvj7lb9ydzlx3r"; + sha256 = "0836zicv76sd6ljhbbii1mrzh65pch10w3gfa128iynaviksbgn5"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 86bd7f9d5189..9559c9b5c37f 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "prometheus"; - version = "2.13.1"; + version = "2.14.0"; goPackagePath = "github.com/prometheus/prometheus"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "055qliv683b87dwj7pkprdpjgyp6s4s3cwvpbsl1gxidhlr4y69b"; + sha256 = "0zmxj78h3cnqbhsqab940hyzpim5i9r81b15a57f3dnrrd10p287"; }; buildFlagsArray = let @@ -31,6 +31,12 @@ buildGoPackage rec { cp -a $src/console_libraries $src/consoles $bin/etc/prometheus ''; + # Disable module-mode, because Go 1.13 automatically enables it if there is + # go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380 + preCheck = '' + export GO111MODULE=off + ''; + doCheck = true; meta = with lib; { diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 67d6e954f9e1..de7167ca7408 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.0.1944-f2cae8d6b"; + version = "1.18.1.1973-0f4abfbcc"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "1yq926j817aqngq5n8gjpcq5pr8lc5mi3xff1r834vkym1i5nz7q"; + sha256 = "1lmj4yal1f072w5rwxn9m09lbclzy87xnvy89iva1kmqzl3bfz2q"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 63ad6ce3b25a..bb9818cf9bba 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,8 +2,7 @@ , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices -, asio, buildEnv, check, scons -, less, fetchpatch +, asio, buildEnv, check, scons, less , withoutClient ? false }: @@ -21,14 +20,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.3.18"; + version = "10.3.20"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1p6yvmahnkmsz50zjzp20ak7jzbqysly5bdl51nnrngrbfl6qib9"; + sha256 = "14n4zfpwhvafz02r95bidmkwq2bz9jj3safqni1h21jfd0nqz0ak"; name = "mariadb-${version}.tar.gz"; }; @@ -46,12 +45,7 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch ./cmake-libmariadb-includedir.patch - ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch { - url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch"; - extraPrefix = "libmariadb/"; - sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk"; - stripLen = 1; - }); + ]; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" |