diff options
Diffstat (limited to 'nixpkgs/pkgs/servers')
22 files changed, 362 insertions, 69 deletions
diff --git a/nixpkgs/pkgs/servers/caddy/default.nix b/nixpkgs/pkgs/servers/caddy/default.nix index 675f1beb891d..56fa95391cc7 100644 --- a/nixpkgs/pkgs/servers/caddy/default.nix +++ b/nixpkgs/pkgs/servers/caddy/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "caddy"; - version = "1.0.0"; + version = "1.0.3"; - goPackagePath = "github.com/mholt/caddy"; + goPackagePath = "github.com/caddyserver/caddy"; subPackages = [ "caddy" ]; src = fetchFromGitHub { - owner = "mholt"; - repo = "caddy"; + owner = "caddyserver"; + repo = pname; rev = "v${version}"; - sha256 = "08hknms0lg5c6yhkz9g1i32d11xch2kqkjbk4w4kd1f1xpa6jvmz"; + sha256 = "1n7i9w4vva5x5wry7gzkyfylk39x40ykv7ypf1ca3zbbk7w5x6mw"; }; - modSha256 = "02cb3swc180kh5vc2s5w8a6vidvw768l9bv5zg8zya183wzvfczs"; + modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q"; buildFlagsArray = '' -ldflags= - -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} + -s -w -X github.com/caddyserver/caddy/caddy/caddymain.gitTag=v${version} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/servers/consul/default.nix b/nixpkgs/pkgs/servers/consul/default.nix index b7c2e01e97a2..e993f70b1053 100644 --- a/nixpkgs/pkgs/servers/consul/default.nix +++ b/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "consul"; - version = "1.6.0"; + version = "1.6.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52"; + sha256 = "00dvvxi7y80v2b6wzwyfzhxv1ksnl1m0nmdjl98dhq5ikb0v7p28"; }; preBuild = '' diff --git a/nixpkgs/pkgs/servers/dante/default.nix b/nixpkgs/pkgs/servers/dante/default.nix index 24e607f4b00c..ae083f17ada9 100644 --- a/nixpkgs/pkgs/servers/dante/default.nix +++ b/nixpkgs/pkgs/servers/dante/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ]; - configureFlags = [ - "--with-libc=libc.so.6" - ]; + configureFlags = ["--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}"]; + + dontAddDisableDepTrack = stdenv.isDarwin; meta = with stdenv.lib; { description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity."; homepage = "https://www.inet.no/dante/"; maintainers = [ maintainers.arobyn ]; license = licenses.bsdOriginal; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/servers/dex/default.nix b/nixpkgs/pkgs/servers/dex/default.nix index 21aa31d6235e..799b73294e80 100644 --- a/nixpkgs/pkgs/servers/dex/default.nix +++ b/nixpkgs/pkgs/servers/dex/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "dex"; version = "2.17.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn"; }; - modSha256 = "043sjq547nwg5v8708nhij0g7d2j28pyn676fgbnpps35ymnywfi"; + goPackagePath = "github.com/dexidp/dex"; subPackages = [ "cmd/dex" @@ -22,8 +22,8 @@ buildGoModule rec { ]; postInstall = '' - mkdir -p $out/share - cp -r $src/web $out/share/web + mkdir -p $bin/share + cp -r $src/web $bin/share/web ''; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 8191bf5acbf1..ad1bb26a54d9 100644 --- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/nixpkgs/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 { pname = "knot-dns"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad"; + sha256 = "541e7e43503765c91405c5797b3838103bb656154712e69b3f959c6ab0e700a9"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 104a11ad2817..9ea2aa7ae8ed 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.96.2"; + version = "0.99.2"; components = { "abode" = ps: with ps; [ ]; "acer_projector" = ps: with ps; [ pyserial ]; @@ -28,6 +28,7 @@ "androidtv" = ps: with ps; [ ]; "anel_pwrctrl" = ps: with ps; [ ]; "anthemav" = ps: with ps; [ ]; + "apache_kafka" = ps: with ps; [ ]; "apcupsd" = ps: with ps; [ ]; "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; @@ -44,12 +45,14 @@ "asterisk_cdr" = ps: with ps; [ ]; "asterisk_mbox" = ps: with ps; [ ]; "asuswrt" = ps: with ps; [ ]; + "atome" = ps: with ps; [ ]; "august" = ps: with ps; [ ]; "aurora" = ps: with ps; [ ]; "aurora_abb_powerone" = ps: with ps; [ ]; "auth" = ps: with ps; [ aiohttp-cors ]; "automatic" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; + "avea" = ps: with ps; [ ]; "avion" = ps: with ps; [ ]; "awair" = ps: with ps; [ ]; "aws" = ps: with ps; [ ]; @@ -59,6 +62,7 @@ "bayesian" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; "bbox" = ps: with ps; [ ]; + "beewi_smartclim" = ps: with ps; [ ]; "bh1750" = ps: with ps; [ ]; "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ ]; @@ -131,6 +135,7 @@ "decora" = ps: with ps; [ ]; "decora_wifi" = ps: with ps; [ ]; "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy zeroconf ]; + "delijn" = ps: with ps; [ ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; @@ -173,7 +178,6 @@ "ecovacs" = ps: with ps; [ ]; "eddystone_temperature" = ps: with ps; [ construct ]; "edimax" = ps: with ps; [ ]; - "edp_redy" = ps: with ps; [ ]; "ee_brightbox" = ps: with ps; [ ]; "efergy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; @@ -222,6 +226,7 @@ "fints" = ps: with ps; [ fints ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; + "fleetgo" = ps: with ps; [ ]; "flexit" = ps: with ps; [ ]; "flic" = ps: with ps; [ ]; "flock" = ps: with ps; [ ]; @@ -231,6 +236,8 @@ "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ ]; + "fortigate" = ps: with ps; [ ]; + "fortios" = ps: with ps; [ ]; "foscam" = ps: with ps; [ ]; "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; @@ -256,6 +263,7 @@ "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ ]; "geofency" = ps: with ps; [ aiohttp-cors ]; + "geonetnz_quakes" = ps: with ps; [ ]; "github" = ps: with ps; [ PyGithub ]; "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; @@ -272,7 +280,6 @@ "google_translate" = ps: with ps; [ gtts-token ]; "google_travel_time" = ps: with ps; [ ]; "google_wifi" = ps: with ps; [ ]; - "googlehome" = ps: with ps; [ ]; "gpmdp" = ps: with ps; [ websocket_client ]; "gpsd" = ps: with ps; [ ]; "gpslogger" = ps: with ps; [ aiohttp-cors ]; @@ -280,6 +287,7 @@ "greeneye_monitor" = ps: with ps; [ ]; "greenwave" = ps: with ps; [ ]; "group" = ps: with ps; [ ]; + "growatt_server" = ps: with ps; [ ]; "gstreamer" = ps: with ps; [ ]; "gtfs" = ps: with ps; [ ]; "gtt" = ps: with ps; [ ]; @@ -323,6 +331,7 @@ "hydroquebec" = ps: with ps; [ ]; "hyperion" = ps: with ps; [ ]; "ialarm" = ps: with ps; [ ]; + "iaqualink" = ps: with ps; [ ]; "icloud" = ps: with ps; [ ]; "idteck_prox" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; @@ -357,6 +366,7 @@ "joaoapps_join" = ps: with ps; [ ]; "juicenet" = ps: with ps; [ ]; "kankun" = ps: with ps; [ ]; + "keba" = ps: with ps; [ ]; "keenetic_ndms2" = ps: with ps; [ ]; "keyboard" = ps: with ps; [ ]; "keyboard_remote" = ps: with ps; [ evdev ]; @@ -402,7 +412,7 @@ "london_underground" = ps: with ps; [ ]; "loopenergy" = ps: with ps; [ ]; "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ ]; + "luci" = ps: with ps; [ packaging ]; "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ ]; "lutron" = ps: with ps; [ ]; @@ -440,6 +450,7 @@ "mikrotik" = ps: with ps; [ ]; "mill" = ps: with ps; [ ]; "min_max" = ps: with ps; [ ]; + "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; "mjpeg" = ps: with ps; [ ]; "mobile_app" = ps: with ps; [ pynacl aiohttp-cors ]; @@ -497,9 +508,11 @@ "nuimo_controller" = ps: with ps; [ ]; "nuki" = ps: with ps; [ ]; "nut" = ps: with ps; [ ]; + "nws" = ps: with ps; [ ]; "nx584" = ps: with ps; [ ]; "nzbget" = ps: with ps; [ ]; "oasa_telematics" = ps: with ps; [ ]; + "obihai" = ps: with ps; [ ]; "octoprint" = ps: with ps; [ ]; "oem" = ps: with ps; [ ]; "ohmconnect" = ps: with ps; [ defusedxml ]; @@ -546,6 +559,7 @@ "plaato" = ps: with ps; [ aiohttp-cors ]; "plant" = ps: with ps; [ ]; "plex" = ps: with ps; [ ]; + "plugwise" = ps: with ps; [ ]; "plum_lightpad" = ps: with ps; [ ]; "pocketcasts" = ps: with ps; [ ]; "point" = ps: with ps; [ aiohttp-cors ]; @@ -578,6 +592,7 @@ "radiotherm" = ps: with ps; [ ]; "rainbird" = ps: with ps; [ ]; "raincloud" = ps: with ps; [ ]; + "rainforest_eagle" = ps: with ps; [ ]; "rainmachine" = ps: with ps; [ ]; "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ ]; @@ -597,7 +612,6 @@ "rfxtrx" = ps: with ps; [ ]; "ring" = ps: with ps; [ ha-ffmpeg ]; "ripple" = ps: with ps; [ ]; - "ritassist" = ps: with ps; [ ]; "rmvtransport" = ps: with ps; [ ]; "rocketchat" = ps: with ps; [ ]; "roku" = ps: with ps; [ ]; @@ -613,7 +627,6 @@ "rtorrent" = ps: with ps; [ ]; "russound_rio" = ps: with ps; [ ]; "russound_rnet" = ps: with ps; [ ]; - "ruter" = ps: with ps; [ ]; "sabnzbd" = ps: with ps; [ ]; "samsungtv" = ps: with ps; [ wakeonlan ]; "satel_integra" = ps: with ps; [ ]; @@ -647,6 +660,7 @@ "skybell" = ps: with ps; [ ]; "slack" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; + "slide" = ps: with ps; [ ]; "sma" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; "smarthab" = ps: with ps; [ ]; @@ -689,6 +703,7 @@ "stream" = ps: with ps; [ aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ ]; "stride" = ps: with ps; [ ]; + "suez_water" = ps: with ps; [ ]; "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; "supla" = ps: with ps; [ ]; @@ -724,7 +739,7 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; + "tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow ]; "tesla" = ps: with ps; [ ]; "tfiac" = ps: with ps; [ ]; "thermoworks_smoke" = ps: with ps; [ stringcase ]; @@ -748,7 +763,7 @@ "touchline" = ps: with ps; [ ]; "tplink" = ps: with ps; [ ]; "tplink_lte" = ps: with ps; [ ]; - "traccar" = ps: with ps; [ stringcase ]; + "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; "trackr" = ps: with ps; [ ]; "tradfri" = ps: with ps; [ ]; "trafikverket_train" = ps: with ps; [ ]; @@ -759,6 +774,7 @@ "trend" = ps: with ps; [ numpy ]; "tts" = ps: with ps; [ aiohttp-cors mutagen ]; "tuya" = ps: with ps; [ ]; + "twentemilieu" = ps: with ps; [ ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; @@ -771,7 +787,7 @@ "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; "universal" = ps: with ps; [ ]; - "upc_connect" = ps: with ps; [ defusedxml ]; + "upc_connect" = ps: with ps; [ ]; "upcloud" = ps: with ps; [ ]; "updater" = ps: with ps; [ distro ]; "upnp" = ps: with ps; [ ]; @@ -794,6 +810,8 @@ "version" = ps: with ps; [ ]; "vesync" = ps: with ps; [ ]; "viaggiatreno" = ps: with ps; [ ]; + "vicare" = ps: with ps; [ ]; + "vivotek" = ps: with ps; [ ]; "vizio" = ps: with ps; [ ]; "vlc" = ps: with ps; [ ]; "vlc_telnet" = ps: with ps; [ ]; @@ -819,6 +837,7 @@ "whois" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; "wirelesstag" = ps: with ps; [ ]; + "withings" = ps: with ps; [ aiohttp-cors ]; "workday" = ps: with ps; [ ]; "worldclock" = ps: with ps; [ ]; "worldtidesinfo" = ps: with ps; [ ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index c36388b26fc3..f8eeb97849ad 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -98,7 +98,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.96.2"; + hassVersion = "0.99.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; diff --git a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py index a2cf2d0386a2..647e4513de44 100755 --- a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -33,7 +33,9 @@ PKG_SET = 'python3Packages' # the following can be used to choose one of them PKG_PREFERENCES = { # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl - 'youtube-dl': 'youtube-dl-light' + 'youtube-dl': 'youtube-dl-light', + 'tensorflow-bin': 'tensorflow', + 'tensorflowWithoutCuda': 'tensorflow' } def get_version(): diff --git a/nixpkgs/pkgs/servers/http/h2o/default.nix b/nixpkgs/pkgs/servers/http/h2o/default.nix index 26c320499e55..a8de0d7e0849 100644 --- a/nixpkgs/pkgs/servers/http/h2o/default.nix +++ b/nixpkgs/pkgs/servers/http/h2o/default.nix @@ -1,39 +1,30 @@ { stdenv, fetchFromGitHub -, pkgconfig, cmake +, pkgconfig, cmake, ninja , libressl, libuv, zlib }: -with builtins; - stdenv.mkDerivation rec { - pname = "h2o"; - version = "2.2.6"; + pname = "h2o"; + version = "2.3.0-beta2"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; rev = "refs/tags/v${version}"; - sha256 = "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7"; + sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n"; }; - # We have to fix up some function prototypes, because despite upstream h2o - # issue #1705 (https://github.com/h2o/h2o/issues/1706), libressl 2.7+ doesn't - # seem to work - patchPhase = '' - substituteInPlace ./deps/neverbleed/neverbleed.c \ - --replace 'static void RSA_' 'void RSA_' \ - --replace 'static int RSA_' 'int RSA_' - ''; + outputs = [ "out" "man" "dev" "lib" ]; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libressl libuv zlib ]; enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig cmake ninja ]; + buildInputs = [ libressl libuv zlib ]; - meta = { + meta = with stdenv.lib; { description = "Optimized HTTP/1 and HTTP/2 server"; homepage = https://h2o.examp1e.net; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index 8d015a92a8f1..88a26a229173 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/pkgs/servers/http/unit/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.10.0"; + version = "1.11.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a"; + sha256 = "05qplbwki8kcj0xy9d39gf8lhwwg2cx24waxd1q5cb0fq9a5hprm"; }; nativeBuildInputs = [ which ]; diff --git a/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index 5ee491a0b8a0..2908c14b4e0e 100644 --- a/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "fbed41838e1ef7e43f6e47ff38f9906cb311cfc5b3b6bc6f704babd7c83b193d"; + sha256 = "1lsi6x5yr8f9yjxsh1rmcd6wnxr6s6rpr720lg7sq629m42d9p1d"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/miniflux/default.nix b/nixpkgs/pkgs/servers/miniflux/default.nix index 1445d0b523c6..df3022536ea7 100644 --- a/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/nixpkgs/pkgs/servers/miniflux/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "miniflux"; version = "2.0.17"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0bvlsa3ymhdl35bkv2v8lzkbjanyg7y474kbpbabmhwh5lvzgxlm"; }; - modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr"; + goPackagePath = "miniflux.app"; doCheck = true; @@ -20,7 +20,7 @@ buildGoModule rec { ''; postInstall = '' - mv $out/bin/miniflux.app $out/bin/miniflux + mv $bin/bin/miniflux.app $bin/bin/miniflux ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 615edeb81ec1..3d61961321d4 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.3.5"; + version = "6.3.6"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2"; + sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101"; + sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/openvpn.nix b/nixpkgs/pkgs/servers/monitoring/plugins/openvpn.nix new file mode 100644 index 000000000000..2b7e69ab8f0b --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/plugins/openvpn.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "check-openvpn"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "liquidat"; + repo = "nagios-icinga-openvpn"; + rev = version; + sha256 = "1vz3p7nckc5k5f06nm1xfzpykhyndh2dzyagmifrzg5k478p1lpm"; + }; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A nagios/icinga/sensu check plugin for OpenVPN"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix b/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix new file mode 100644 index 000000000000..9a4e5d706e93 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/default.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, txt2man +, monitoring-plugins +, wmic-bin ? null }: + +stdenv.mkDerivation rec { + pname = "check-wmiplus"; + version = "1.64"; + + # We fetch from github.com instead of the proper upstream as nix-build errors + # out with 406 when trying to fetch the sources + src = fetchFromGitHub { + owner = "speartail"; + repo = "checkwmiplus"; + rev = "v${version}"; + sha256 = "1m36rd2wnc5dk4mm9q4ch67w19144dl112p9s6lhc1sh6h25ln6r"; + }; + + patches = [ + ./wmiplus_fix_manpage.patch + ]; + + propagatedBuildInputs = with perlPackages; [ + BHooksEndOfScope ClassDataInheritable ClassInspector ClassSingleton + ConfigIniFiles DateTime DateTimeLocale DateTimeTimeZone DevelStackTrace + EvalClosure ExceptionClass FileShareDir ModuleImplementation ModuleRuntime + MROCompat namespaceautoclean namespaceclean NumberFormat PackageStash + ParamsValidate ParamsValidationCompiler RoleTiny Specio + SubExporterProgressive SubIdentify TryTiny + ]; + + nativeBuildInputs = [ makeWrapper txt2man ]; + + dontConfigure = true; + dontBuild = true; + doCheck = false; # no checks + + postPatch = '' + substituteInPlace check_wmi_plus.pl \ + --replace /usr/bin/wmic ${wmic-bin}/bin/wmic \ + --replace /etc/check_wmi_plus $out/etc/check_wmi_plus \ + --replace /opt/nagios/bin/plugins $out/etc/check_wmi_plus \ + --replace /usr/lib/nagios/plugins ${monitoring-plugins}/libexec \ + --replace '$base_dir/check_wmi_plus_help.pl' "$out/bin/check_wmi_plus_help.pl" + + for f in *.pl ; do + substituteInPlace $f --replace /usr/bin/perl ${perlPackages.perl}/bin/perl + done + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin *.pl + install -Dm644 -t $out/share/doc/${pname} *.txt + cp -r etc $out/ + + runHook postInstall + ''; + + # 1. we need to wait until the main binary has been fixed up with proper perl paths before we can run it to generate the man page + # 2. txt2man returns exit code 3 even if it works, so we add the || true bit + postFixup = '' + wrapProgram $out/bin/check_wmi_plus.pl \ + --set PERL5LIB "${perlPackages.makePerlPath propagatedBuildInputs}" + + mkdir -p $out/share/man/man1 + $out/bin/check_wmi_plus.pl --help | txt2man -d 1970-01-01 -s 1 -t check_wmi_plus -r "Check WMI Plus ${version}" > $out/share/man/man1/check_wmi_plus.1 || true + gzip $out/share/man/man1/check_wmi_plus.1 + ''; + + meta = with stdenv.lib; { + description = "A sensu/nagios plugin using WMI to query Windows hosts"; + homepage = "http://edcint.co.nz/checkwmiplus"; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch b/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch new file mode 100644 index 000000000000..16e81d1014d2 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch @@ -0,0 +1,40 @@ +diff --git a/check_wmi_plus.makeman.sh b/check_wmi_plus.makeman.sh +index 38dc7a4..3fe4369 100755 +--- a/check_wmi_plus.makeman.sh ++++ b/check_wmi_plus.makeman.sh +@@ -19,15 +19,6 @@ mkdir -p "$manpage_dir/man1" + # the full path to the manpage file + manfile="$manpage_dir/man1/check_wmi_plus.1" + +-# if we are not running in a terminal then only show the text-based help +-if [ ! -t 0 ]; then +- # we are not running in a terminal +- echo "Not running in a terminal - showing text-based help" +- echo +- exec $check_wmi_plus_text_help +-fi +- +- + usage() + { + cat << EOT +diff --git a/check_wmi_plus_help.pl b/check_wmi_plus_help.pl +index 3440db2..2982da2 100755 +--- a/check_wmi_plus_help.pl ++++ b/check_wmi_plus_help.pl +@@ -24,7 +24,7 @@ if ($opt_help) { + # we have the script to make the manpage and have not been asked to show text only help + exec ("$make_manpage_script \"$0 --itexthelp\" \"$manpage_dir\"") or print STDERR "couldn't exec $make_manpage_script: $!"; + } else { +- print "Warning: Can not access/execute Manpage script ($make_manpage_script).\nShowing help in text-only format.\n\n"; ++ # print "Warning: Can not access/execute Manpage script ($make_manpage_script).\nShowing help in text-only format.\n\n"; + } + } + +@@ -692,4 +692,4 @@ show_ini_help_overview(1); + finish_program($ERRORS{'UNKNOWN'}); + } + +-1; +\ No newline at end of file ++1; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix new file mode 100644 index 000000000000..c1d7f7928302 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "apcupsd-exporter"; + version = "unstable-2019-03-14"; + + goPackagePath = "github.com/mdlayher/apcupsd_exporter"; + + goDeps = ./apcupsd-exporter_deps.nix; + + src = fetchFromGitHub { + owner = "mdlayher"; + repo = "apcupsd_exporter"; + rev = "cbd49be"; + sha256 = "1h5z295m9bddch5bc8fppn02b31h370yns6026a1d4ygfy3w46y0"; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)"; + homepage = "https://github.com/mdlayher/apcupsd_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ maintainers."1000101" ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix new file mode 100644 index 000000000000..3950ae89bf29 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix @@ -0,0 +1,93 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + 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/mdlayher/apcupsd"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/apcupsd"; + rev = "eb3dd99a75fe"; + sha256 = "0s1m6l4pnazqiymb8y89ajbxfl2cn0ahvhws10nvxvc4jjivlbbq"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.9.2"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "4724e9255275"; + sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "1dc9a6cbc91a"; + sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "351d144fa1fc"; + sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } +] diff --git a/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/nixpkgs/pkgs/servers/openafs/1.8/module.nix index 95084458f47f..d58d2bff8139 100644 --- a/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos }: +, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; }); @@ -11,6 +11,20 @@ in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; + patches = [ + # Linux 5.3 + (fetchpatch { + name = "openafs_1_8-recurse-keyring_search.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=02d82275c17284d04629282aa374bb39f511c989"; + sha256 = "03pkldwf6i67yf6i1705qp18rx5b0b342ryda8vfjw9lnvpinygs"; + }) + (fetchpatch { + name = "openafs_1_8-send-sig.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=2b7af1243f46496c0b5973b3fa2a6396243f7613"; + sha256 = "13gyh5ncpp15dl7056gdzl5xhp2bmafc557bd2a4bwx9nyj53bag"; + }) + ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; diff --git a/nixpkgs/pkgs/servers/plex/raw.nix b/nixpkgs/pkgs/servers/plex/raw.nix index cbe0dae3e14a..b617fe6fa0ef 100644 --- a/nixpkgs/pkgs/servers/plex/raw.nix +++ b/nixpkgs/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.16.5.1554-1e5ff713d"; + version = "1.16.6.1592-b9d49bdb7"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "1h2f8dgwz9bnvj7h4nk61a5rpl62918nwq6v85d97miwjfc1mv6n"; + sha256 = "12wff06nlvcssa6sf6vhxajfd1dnr9870xn9fac4q7gf0yayj27j"; }; outputs = [ "out" "basedb" ]; diff --git a/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix index b188b2295a8b..b0fdd333238b 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -3,7 +3,7 @@ , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons -, less +, less, fetchpatch , withoutClient ? false }: @@ -48,12 +48,20 @@ common = rec { # attributes common to both builds prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt + '' + optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace cmake/build_configurations/mysql_release.cmake \ + --replace "SET(PLUGIN_AUTH_PAM YES)" "" ''; 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" diff --git a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 4a9af9d329cc..9dbf060aa9a7 100644 --- a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq"; + sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr"; }; installPhase = '' |