diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-21 15:41:53 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-21 15:41:53 -0500 |
commit | 379fc894de3b3ec69cde73454853b4ac4eee4065 (patch) | |
tree | 79b5e82daccf2de704d0230d191f3313f16a1694 /pkgs/servers | |
parent | 9c35796ee31939f6c12fc05e6d1a4a0f544ecc5d (diff) | |
parent | 28e51c7ceac1c3df219dbf8388bf122f817459b7 (diff) | |
download | nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.gz nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.bz2 nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.lz nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.xz nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.zst nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/servers')
24 files changed, 158 insertions, 101 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 64e4005f53f3..a191d7a721d5 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.7"; + version = "17.11.9-2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. src = fetchFromGitHub { owner = "SchedMD"; repo = "slurm"; - # The release tags use - instead of ., and have an extra -1 suffix. - rev = "${builtins.replaceStrings ["."] ["-"] name}-1"; - sha256 = "00dgirjd75i1x6pj80avp18hx5gr3dsnh13vbkqbf0iwpd72qyhp"; + # The release tags use - instead of . + rev = "${builtins.replaceStrings ["."] ["-"] name}"; + sha256 = "1lq4ac6yjai6wh979dciw8v3d99zbd3w36rfh0vpncqm672fg1qy"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 50951c8cb82b..047729aa937f 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.8"; + version = "2.7.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15"; + sha256 = "7d6ae20ada0f0ee7700d5df17f47f86b49eb21ee34977d0d70de6a0947371381"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 6ccd849e1c8f..b760b080ab78 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.4.1"; + version = "3.0.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "e8044316cd897ad29b3c5284de06652e1568c4d5861e3147ec2191fbacd8d9ff"; + sha256 = "68a0137e0e15061ee7dec53a2e424aa3266611720db3843853c6e7774a414f40"; }; outputs = [ "out" "dev" ]; @@ -66,7 +66,8 @@ wrapped-full = with luajitPackages; let luaPkgs = [ luasec luasocket # trust anchor bootstrap, prefill module lfs # prefill module - # TODO: cqueues and others for http2 module + # Almost all is for the 'http' module: + http cqueues fifo lpeg lpeg_patterns luaossl compat53 basexx ]; in runCommand unwrapped.name { diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index f63a61bf2197..ee09024dc0eb 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.23"; + name = "nsd-4.1.24"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1zc59cj1851scwhwy3k6aals3fk13njyhda37k4a353bcyyxh3pn"; + sha256 = "04ck8ia6xq1xqdk2g922262xywzd070pl4iad7c0lqclwk48gdjg"; }; prePatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 30b16ea3bde6..bc389146e756 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.75.2"; + version = "0.76.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -112,6 +112,7 @@ "binary_sensor.netatmo" = ps: with ps; [ ]; "binary_sensor.nx584" = ps: with ps; [ ]; "binary_sensor.octoprint" = ps: with ps; [ ]; + "binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ]; "binary_sensor.qwikswitch" = ps: with ps; [ ]; @@ -337,6 +338,7 @@ "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ]; "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ]; "device_tracker.ping" = ps: with ps; [ ]; + "device_tracker.ritassist" = ps: with ps; [ ]; "device_tracker.sky_hub" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; "device_tracker.swisscom" = ps: with ps; [ ]; @@ -383,7 +385,6 @@ "fan.mqtt" = ps: with ps; [ paho-mqtt ]; "fan.template" = ps: with ps; [ ]; "fan.tuya" = ps: with ps; [ ]; - "fan.velbus" = ps: with ps; [ ]; "fan.wink" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ construct ]; "fan.zha" = ps: with ps; [ ]; @@ -536,7 +537,6 @@ "light.tplink" = ps: with ps; [ ]; "light.tradfri" = ps: with ps; [ ]; "light.tuya" = ps: with ps; [ ]; - "light.velbus" = ps: with ps; [ ]; "light.vera" = ps: with ps; [ ]; "light.wemo" = ps: with ps; [ ]; "light.wink" = ps: with ps; [ ]; @@ -600,6 +600,7 @@ "media_player.denon" = ps: with ps; [ ]; "media_player.denonavr" = ps: with ps; [ ]; "media_player.directv" = ps: with ps; [ ]; + "media_player.dlna_dmr" = ps: with ps; [ ]; "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; "media_player.epson" = ps: with ps; [ ]; @@ -625,6 +626,7 @@ "media_player.pandora" = ps: with ps; [ pexpect ]; "media_player.philips_js" = ps: with ps; [ ]; "media_player.pioneer" = ps: with ps; [ ]; + "media_player.pjlink" = ps: with ps; [ ]; "media_player.plex" = ps: with ps; [ ]; "media_player.roku" = ps: with ps; [ ]; "media_player.russound_rio" = ps: with ps; [ ]; @@ -691,7 +693,7 @@ "notify.gntp" = ps: with ps; [ ]; "notify.group" = ps: with ps; [ ]; "notify.hipchat" = ps: with ps; [ ]; - "notify.html5" = ps: with ps; [ pyjwt aiohttp-cors ]; + "notify.html5" = ps: with ps; [ aiohttp-cors ]; "notify.instapush" = ps: with ps; [ ]; "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "notify.joaoapps_join" = ps: with ps; [ ]; @@ -723,7 +725,6 @@ "notify.synology_chat" = ps: with ps; [ ]; "notify.syslog" = ps: with ps; [ ]; "notify.telegram" = ps: with ps; [ python-telegram-bot ]; - "notify.telstra" = ps: with ps; [ ]; "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twitter" = ps: with ps; [ ]; @@ -736,6 +737,7 @@ "onboarding" = ps: with ps; [ aiohttp-cors ]; "onboarding.const" = ps: with ps; [ ]; "onboarding.views" = ps: with ps; [ ]; + "openuv" = ps: with ps; [ ]; "panel_custom" = ps: with ps; [ aiohttp-cors ]; "panel_iframe" = ps: with ps; [ aiohttp-cors ]; "persistent_notification" = ps: with ps; [ ]; @@ -850,6 +852,7 @@ "sensor.eliqonline" = ps: with ps; [ ]; "sensor.emoncms" = ps: with ps; [ ]; "sensor.enocean" = ps: with ps; [ ]; + "sensor.enphase_envoy" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.envisalink" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; @@ -942,6 +945,7 @@ "sensor.openexchangerates" = ps: with ps; [ ]; "sensor.openhardwaremonitor" = ps: with ps; [ ]; "sensor.opensky" = ps: with ps; [ ]; + "sensor.openuv" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ ]; "sensor.pi_hole" = ps: with ps; [ ]; @@ -965,6 +969,7 @@ "sensor.rfxtrx" = ps: with ps; [ ]; "sensor.ring" = ps: with ps; [ ]; "sensor.ripple" = ps: with ps; [ ]; + "sensor.rmvtransport" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ]; "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; "sensor.season" = ps: with ps; [ ephem ]; @@ -1085,6 +1090,7 @@ "switch.bbb_gpio" = ps: with ps; [ ]; "switch.broadlink" = ps: with ps; [ ]; "switch.command_line" = ps: with ps; [ ]; + "switch.deconz" = ps: with ps; [ ]; "switch.deluge" = ps: with ps; [ deluge-client ]; "switch.demo" = ps: with ps; [ ]; "switch.digital_ocean" = ps: with ps; [ digital-ocean ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5446398aa8b0..9950c7bb81b1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -6,60 +6,59 @@ # Additional packages to add to propagatedBuildInputs , extraPackages ? ps: [] +# Override Python packages using +# self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } +# Applied after defaultOverrides +, packageOverrides ? self: super: { } + # Skip pip install of required packages on startup , skipPip ? true }: let - py = python3.override { + defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py - packageOverrides = self: super: { - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.3.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; - }; - }); - requests = super.requests.overridePythonAttrs (oldAttrs: rec { - version = "2.19.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a"; - }; - }); - voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { - version = "0.11.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef"; - }; - }); - attrs = super.attrs.overridePythonAttrs (oldAttrs: rec { - version = "18.1.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b"; - }; - }); - astral = super.astral.overridePythonAttrs (oldAttrs: rec { - version = "1.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d"; - }; - }); - # used by check_config script - # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved - colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec { - version = "3.1.4"; + (mkOverride "aiohttp" "3.3.2" + "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12") + (mkOverride "astral" "1.6.1" + "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d") + (mkOverride "attrs" "18.1.0" + "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b") + (mkOverride "pyjwt" "1.6.4" + "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176") + (mkOverride "cryptography" "2.3.1" + "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") + (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1 + "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") + (mkOverride "requests" "2.19.1" + "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a") + (mkOverride "voluptuous" "0.11.5" + "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") + + # used by check_config script + # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved + (mkOverride "colorlog" "3.1.4" + "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d") + + # hass-frontend does not exist in python3.pkgs + (self: super: { + hass-frontend = self.callPackage ./frontend.nix { }; + }) + ]; + + mkOverride = attrname: version: sha256: + self: super: { + ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + inherit version; src = oldAttrs.src.override { - inherit version; - sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d"; + inherit version sha256; }; }); - hass-frontend = super.callPackage ./frontend.nix { }; }; + + py = python3.override { + # Put packageOverrides at the start so they are applied after defaultOverrides + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; componentPackages = import ./component-packages.nix; @@ -74,7 +73,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.75.2"; + hassVersion = "0.76.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -89,12 +88,12 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1ib76wz3f6jfi7a0w2v561g8vf5w4p2b2d79667api6ynvbw2l9d"; + sha256 = "0bqvb6wsbv1irp92ijdvx62vqicsqhyk301ixf8yb2d1dwwwmid3"; }; propagatedBuildInputs = [ # From setup.py - requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs + aiohttp astral async-timeout attrs certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous # From http, frontend, recorder and config.config_entries components sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize ] ++ componentBuildInputs ++ extraBuildInputs; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 864a91683eea..e73b239bb05d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180804.0"; + version = "20180818.0"; src = fetchPypi { inherit pname version; - sha256 = "50a9e74efe2b56fbc34fba07205829e0ea77315183e85c235d177cabff3b62ee"; + sha256 = "b6101c342e49c943c59e3525d6741cd3a23af94b65549d59bdeee8cf3f07b294"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 068b89d9a9fe..95b731926984 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs ])" +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ aiohttp astral async-timeout attrs certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous ])" # # This script downloads Home Assistant's source tarball. # Inside the homeassistant/components directory, each component has an associated .py file, diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 80caa3779912..6e52bdc32707 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "1c1ghrmrcyjd3s3pzml6akxf8xxcqy4mfzn5xf8jg158dzarmk53"; + sha256 = "11brqv302j999sd5x8amhj9iqns9cbrlkjg2l9a8xbvkmf5fng0f"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 400f15565ef2..03fdf7908cc4 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-08-15"; + version = "2018-08-18"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "4c219dc016f18e11a50e52485cbeb28135921386"; - sha256 = "0xj705wdyajzli66p0cxvl47gx6z7nx9cbzm7lbbqn51qxw71p64"; + rev = "78257f1c1f34cdad1931531601163071f7f29aa9"; + sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index 9b0890d36f40..c5d584f1bcd3 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54"; - sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3"; + rev = "aaf60122140d3fcf75376d319f0554393160eb50"; + sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv"; }; } ] diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ec825f856ce5..774f8df94a7d 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.9.1"; + version = "0.9.41"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1hj6ilhv98yzhfjvrgqrsgaz7bd1yqaayifir8ivsvqq8085nlf6"; + sha256 = "0ndzn1p876rkj56g6vscgkmyzi1k0gmqby4rmrb4ilxzjpskii8m"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index a9d8714476cb..9790df9ce765 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.9"; + version = "1.5.10"; name = "memcached-${version}"; src = fetchurl { url = "https://memcached.org/files/${name}.tar.gz"; - sha256 = "01hx4hs8lgmjzpqj1iv5fpdwv1ymrii6bp4nh1s0mjvipxymgwsa"; + sha256 = "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index 3858720bed5c..efa62e261b74 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "facette-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "facette"; repo = "facette"; rev = "${version}"; - sha256 = "1m7krq439qlf7b4l4bfjw0xfvjgj67w59mh8rf7c398rky04p257"; + sha256 = "0p28s2vn18cqg8p7bzhb38wky0m98d5xv3wvf1nmg1kmwhwim6mi"; }; nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ]; buildInputs = [ rrdtool ]; @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://facette.io/; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; + broken = true; # not really broken, it just requires an internet connection to build. see #45382 }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 82c159ebc82a..500f612eb02e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -36,7 +36,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "20"; + minor = "21"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0v7xpsr8b4d0q9vh1wni0qbkbkxdjpn639qm2q553ckk5idas4lm"; + sha256 = "0qchvycwiai5gwkvvf44nc1jw16yhpcjmlppqlrlvicgzsanhmy3"; }; patches = [ ./x86.patch ]; diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index fe4d285713f6..c1fe1a84d15f 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.4.1"; + version = "3.4.5"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1hgpgkmz0rgdppk1rl41017369qp9lfbrdk7j3qc5dq54x8rxbjp"; + sha256 = "1fzzj227r5xjls6j5mkjam8pnhbyiqv1799n8k812pk4fqvq4lxg"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix new file mode 100644 index 000000000000..76f3ded78086 --- /dev/null +++ b/pkgs/servers/rainloop/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, unzip, dataPath ? "/etc/rainloop" }: let + common = { edition, sha256 }: + stdenv.mkDerivation (rec { + name = "rainloop-${edition}-${version}"; + version = "1.12.1"; + + buildInputs = [ unzip ]; + + unpackPhase = '' + mkdir rainloop + unzip -q -d rainloop $src + ''; + + src = fetchurl { + url = "https://github.com/RainLoop/rainloop-webmail/releases/download/v${version}/rainloop-${edition}${stdenv.lib.optionalString (edition != "") "-"}${version}.zip"; + sha256 = sha256; + }; + + installPhase = '' + mkdir $out + cp -r rainloop/* $out + rm -rf $out/data + ln -s ${dataPath} $out/data + ''; + + meta = with stdenv.lib; { + description = "Simple, modern & fast web-based email client"; + homepage = "https://www.rainloop.net"; + downloadPage = https://github.com/RainLoop/rainloop-webmail/releases; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ das_j ]; + }; + }); + in { + rainloop-community = common { + edition = "community"; + sha256 = "06w1vxqpcj2j8dzzjqh6azala8l46hzy85wcvqbjdlj5w789jzsx"; + }; + rainloop-standard = common { + edition = ""; + sha256 = "1fbnpk7l2fbmzn31vx36caqg9xm40g4hh4mv3s8d70slxwhlscw0"; + }; + } diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index a609476c41aa..439acd927e31 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, mecab, kytea, libedit, pkgconfig -, suggestSupport ? false, zeromq, libevent, libmsgpack +, suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { [ pkgconfig mecab kytea libedit ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib - ++ optionals suggestSupport [ zeromq libevent libmsgpack ]; + ++ optionals suggestSupport [ zeromq libevent msgpack ]; configureFlags = with stdenv.lib; optional zlibSupport "--with-zlib" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 121e42f7a978..da6143c21f0d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.2.16"; + version = "10.2.17"; 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 = "1i2dwpp96ywjk147qqpcad8vqcy4rxmfbv2cb8ww3sffpa9yx0n1"; + sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 7906546ec1ca..ef8b77ad1176 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgbouncer-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz"; - sha256 = "1j4d7rkivg3vg27pvirigq9cy4v7pi48x7w57baq131c5lmdx2zs"; + sha256 = "012zh9l68r1ramrd66yam6y3al0i85dvvg4wwwkn6qwq6dhskv1r"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index aeab9f8332f5..bccd54ca4ba8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -25,7 +25,7 @@ let NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. - preConfigure = "CC=cc"; + preConfigure = "CC=${stdenv.cc.targetPrefix}cc"; configureFlags = [ "--with-openssl" diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index a27f0ef0824c..f4c7bfb1b85f 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }: +{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.0.6"; + version = "2.0.9"; src = fetchurl { url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68"; + sha256 = "0dfkhl2im4cn2lczbsvb8zyylrzlm0vqk9ixjsalcaqxgxph2dpz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ postgresql libmsgpack groonga ]; + buildInputs = [ postgresql msgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 9002987c387b..7436c06d7b84 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -44,18 +44,18 @@ in rec { # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions unifiLTS = generic { - version = "5.6.37"; - sha256 = "0kiksqsbmmfva1blbpg2wl4c3w7j6dzzqmwp6028g7bh303c47qa"; + version = "5.6.39"; + sha256 = "025qq517j32r1pnabg2q8lhy65c6qsk17kzw3aijhrc2gpgj2pa7"; }; unifiStable = generic { - version = "5.7.23"; - sha256 = "14jkhp9jl341zsyk5adh3g98mhqwfbd42c7wahzc31bxq8a0idp7"; + version = "5.8.28"; + sha256 = "1zyc6n54dwqy9diyqnzlwypgnj3hqcv0lfx47s4rkq3kbm49nwnl"; }; unifiTesting = generic { - version = "5.8.14"; - suffix = "-7ef9535d1b"; - sha256 = "09gr7zkck6npjhhmd27c9ymyna6anwj3w9v9zjicz9skbrddkccq"; + version = "5.9.22"; + suffix = "-d2a4718971"; + sha256 = "1xxpvvn0815snag4bmmsdm8zh0cb2qjrhnvlkgn8i478ja1r3n54"; }; } diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix index 8ee6afaa8499..657bd423f3f4 100644 --- a/pkgs/servers/web-apps/frab/default.nix +++ b/pkgs/servers/web-apps/frab/default.nix @@ -43,4 +43,10 @@ stdenv.mkDerivation rec { passthru = { inherit env ruby; }; + + meta = with stdenv.lib; { + description = "Web-based conference planning and management system"; + homepage = https://github.com/frab/frab; + license = licenses.mit; + }; } |