diff options
Diffstat (limited to 'pkgs/servers')
94 files changed, 873 insertions, 442 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 10de85b0d365..b5a2c61e23e7 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,30 +1,37 @@ { stdenv, fetchFromGitHub, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka -, readline, sparsehash, unixODBC, zstd +, readline, sparsehash, unixODBC, zstd, ninja }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; - - version = "18.1.0"; + version = "18.5.1"; src = fetchFromGitHub { - owner = "yandex"; - repo = "ClickHouse"; - rev = "v${version}-stable"; - sha256 = "1vsfnggf69xh91ndycdxwfz6m2bs7psaxf2bh04svgk1vzj2z4l0"; + owner = "yandex"; + repo = "ClickHouse"; + rev = "v${version}-stable"; + sha256 = "1bw1hx3ssd1jcg6jj85nmp6dnyhvaaphjpcr6x4xs410k140qx31"; }; - nativeBuildInputs = [ cmake libtool ]; - + nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ boost capnproto cctz clang-unwrapped double-conversion gperftools icu libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka readline sparsehash unixODBC zstd ]; - cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; + cmakeFlags = [ + "-DENABLE_TESTS=OFF" + "-DUNBUNDLED=ON" + "-DUSE_STATIC_LIBRARIES=OFF" + ]; + hardeningDisable = [ "format" ]; + + patchPhase = '' + patchShebangs . + ''; postInstall = '' rm -rf $out/share/clickhouse-test 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/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index d35a9a683031..3c04a678def5 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool ]; - # configureFlags = "--datadir=/var/run/current-system/share/dictd"; + # configureFlags = [ "--datadir=/var/run/current-system/share/dictd" ]; meta = with stdenv.lib; { description = "Dict protocol server and client"; diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index a233b6ba4cf8..eba73b2692a2 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "An I/O forwarding server that implements a variant of the 9P protocol"; maintainers = [ stdenv.lib.maintainers.rickynils]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 2bdd758b9802..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" ]; @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { CFLAGS = [ "-O2" "-DNDEBUG" ]; - #doCheck = true; problems in combination with dynamic linking + doCheck = true; + doInstallCheck = false; # needs pykeymgr? postInstall = ''rm -r "$out"/var "$out"/lib/*.la''; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 6d48ed20e0ae..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" ]; @@ -27,11 +27,12 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ] - ++ optional doCheck cmocka ++ optional stdenv.isLinux systemd # sd_notify ## optional dependencies; TODO: libedit, dnstap ; + checkInputs = [ cmocka ]; + makeFlags = [ "PREFIX=$(out)" "ROOTHINTS=${dns-root-data}/root.hints" @@ -65,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 { @@ -83,4 +85,3 @@ wrapped-full = with luajitPackages; let ''; in result - diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 1ac1d3948942..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.22"; + name = "nsd-4.1.24"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1704masmx77qcj7b7shzrmgp9hpf9vpd265cnvn3b2kn0mkyi1pi"; + sha256 = "04ck8ia6xq1xqdk2g922262xywzd070pl4iad7c0lqclwk48gdjg"; }; prePatch = '' diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 7c7da3612465..265255c2f78a 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -88,7 +88,7 @@ let separateDebugInfo = true; enableParallelBuilding = true; - makeFlags = [ "all" "fdb_java" ] + makeFlags = [ "all" "fdb_java" "fdb_python" ] # Don't compile FDBLibTLS if we don't need it in 6.0 or later; # it gets statically linked in ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] @@ -106,17 +106,28 @@ let installPhase = '' mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb + mkdir -vp $python/lib/${python.libPrefix}/site-packages - cp -v ./lib/libfdb_c.so $lib/lib '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' + # we only copy the TLS library on < 6.0, since it's compiled-in otherwise cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so '' + '' + # C API + cp -v ./lib/libfdb_c.so $lib/lib cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb + # java cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar + # python + rm -f ./bindings/python/fdb/*.pth # remove useless files + cp -R ./bindings/python/fdb $python/lib/${python.libPrefix}/site-packages/fdb + # symlink a copy of the shared object into place, so that impl.py can load it + ln -sv $lib/lib/libfdb_c.so $python/lib/${python.libPrefix}/site-packages/fdb/libfdb_c.so + + # binaries for x in fdbbackup fdbcli fdbserver fdbmonitor; do cp -v "./bin/$x" $out/bin; done @@ -128,7 +139,7 @@ let ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent ''; - outputs = [ "out" "lib" "dev" ]; + outputs = [ "out" "lib" "dev" "python" ]; meta = with stdenv.lib; { description = "Open source, distributed, transactional key-value store"; @@ -148,16 +159,15 @@ in with builtins; { }; foundationdb52 = makeFdb rec { - version = "5.2.6"; + version = "5.2.8"; branch = "release-5.2"; - rev = "refs/tags/v5.2.6"; # seemed to be tagged incorrectly - sha256 = "1q3lq1hqq0f53n51gd4cw5cpayyw65dmkfplhsw1m5mghymzmskk"; + sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb"; }; foundationdb60 = makeFdb rec { - version = "6.0.3pre2446_${substring 0 8 rev}"; + version = "6.0.4pre2497_${substring 0 8 rev}"; branch = "release-6.0"; - rev = "dd5481fb60ee1652986b2a028b31dcbb6cb171b5"; - sha256 = "0mhlb728badk1h3410jbhy7f48m3jjnjna26wwyw5680xz72d6dm"; + rev = "73d64cb244714c19bcc651122f6e7a9236aa11b5"; + sha256 = "1jzmrf9kj0brqddlmxvzhj27r6843790jnqwkv1s3ri21fqb3hs7"; }; } diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 2386acf1b79a..cc7493f9533c 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix new file mode 100644 index 000000000000..81ea4056e091 --- /dev/null +++ b/pkgs/servers/gnatsd/default.nix @@ -0,0 +1,26 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +with lib; + +buildGoPackage rec { + name = "gnatsd-${version}"; + version = "1.2.0"; + rev = "v${version}"; + + goPackagePath = "github.com/nats-io/gnatsd"; + + src = fetchFromGitHub { + inherit rev; + owner = "nats-io"; + repo = "gnatsd"; + sha256 = "186xywzdrmvlhlh9wgjs71rqvgab8vinlr3gkzkknny82nv7hcjw"; + }; + + meta = { + description = "High-Performance server for NATS"; + license = licenses.asl20; + maintainers = [ maintainers.swdunlop ]; + homepage = https://nats.io/; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5f41dbbdfa19..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.74.2"; + version = "0.76.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -47,6 +47,7 @@ "august" = ps: with ps; [ ]; "auth" = ps: with ps; [ aiohttp-cors ]; "auth.indieauth" = ps: with ps; [ ]; + "auth.login_flow" = ps: with ps; [ ]; "automation" = ps: with ps; [ ]; "automation.event" = ps: with ps; [ ]; "automation.homeassistant" = ps: with ps; [ ]; @@ -111,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; [ ]; @@ -128,6 +130,7 @@ "binary_sensor.skybell" = ps: with ps; [ ]; "binary_sensor.sleepiq" = ps: with ps; [ ]; "binary_sensor.spc" = ps: with ps; [ ]; + "binary_sensor.tahoma" = ps: with ps; [ ]; "binary_sensor.tapsaff" = ps: with ps; [ ]; "binary_sensor.tcp" = ps: with ps; [ ]; "binary_sensor.tellduslive" = ps: with ps; [ ]; @@ -225,10 +228,12 @@ "climate.proliphix" = ps: with ps; [ ]; "climate.radiotherm" = ps: with ps; [ ]; "climate.sensibo" = ps: with ps; [ ]; + "climate.spider" = ps: with ps; [ ]; "climate.tado" = ps: with ps; [ ]; "climate.tesla" = ps: with ps; [ ]; "climate.toon" = ps: with ps; [ ]; "climate.touchline" = ps: with ps; [ ]; + "climate.tuya" = ps: with ps; [ ]; "climate.venstar" = ps: with ps; [ ]; "climate.vera" = ps: with ps; [ ]; "climate.wink" = ps: with ps; [ ]; @@ -259,6 +264,8 @@ "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; "cover.abode" = ps: with ps; [ ]; + "cover.aladdin_connect" = ps: with ps; [ ]; + "cover.brunt" = ps: with ps; [ ]; "cover.command_line" = ps: with ps; [ ]; "cover.demo" = ps: with ps; [ ]; "cover.garadget" = ps: with ps; [ ]; @@ -282,6 +289,7 @@ "cover.tellduslive" = ps: with ps; [ ]; "cover.tellstick" = ps: with ps; [ ]; "cover.template" = ps: with ps; [ ]; + "cover.tuya" = ps: with ps; [ ]; "cover.velbus" = ps: with ps; [ ]; "cover.vera" = ps: with ps; [ ]; "cover.wink" = ps: with ps; [ ]; @@ -330,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; [ ]; @@ -375,7 +384,7 @@ "fan.isy994" = ps: with ps; [ ]; "fan.mqtt" = ps: with ps; [ paho-mqtt ]; "fan.template" = ps: with ps; [ ]; - "fan.velbus" = ps: with ps; [ ]; + "fan.tuya" = ps: with ps; [ ]; "fan.wink" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ construct ]; "fan.zha" = ps: with ps; [ ]; @@ -482,6 +491,7 @@ "light.enocean" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; + "light.futurenow" = ps: with ps; [ ]; "light.greenwave" = ps: with ps; [ ]; "light.group" = ps: with ps; [ ]; "light.hive" = ps: with ps; [ ]; @@ -518,6 +528,7 @@ "light.rpi_gpio_pwm" = ps: with ps; [ ]; "light.scsgate" = ps: with ps; [ ]; "light.sensehat" = ps: with ps; [ ]; + "light.sisyphus" = ps: with ps; [ ]; "light.skybell" = ps: with ps; [ ]; "light.tellduslive" = ps: with ps; [ ]; "light.tellstick" = ps: with ps; [ ]; @@ -526,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; [ ]; @@ -590,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; [ ]; @@ -615,11 +626,13 @@ "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; [ ]; "media_player.russound_rnet" = ps: with ps; [ ]; "media_player.samsungtv" = ps: with ps; [ wakeonlan ]; + "media_player.sisyphus" = ps: with ps; [ ]; "media_player.snapcast" = ps: with ps; [ ]; "media_player.songpal" = ps: with ps; [ ]; "media_player.sonos" = ps: with ps; [ soco ]; @@ -680,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; [ ]; @@ -712,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; [ ]; @@ -725,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; [ ]; @@ -770,6 +783,7 @@ "scene.litejet" = ps: with ps; [ ]; "scene.lutron_caseta" = ps: with ps; [ ]; "scene.tahoma" = ps: with ps; [ ]; + "scene.tuya" = ps: with ps; [ ]; "scene.velux" = ps: with ps; [ ]; "scene.vera" = ps: with ps; [ ]; "scene.wink" = ps: with ps; [ ]; @@ -838,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; [ ]; @@ -896,6 +911,7 @@ "sensor.loopenergy" = ps: with ps; [ ]; "sensor.luftdaten" = ps: with ps; [ luftdaten ]; "sensor.lyft" = ps: with ps; [ ]; + "sensor.magicseaweed" = ps: with ps; [ ]; "sensor.melissa" = ps: with ps; [ ]; "sensor.metoffice" = ps: with ps; [ ]; "sensor.mfi" = ps: with ps; [ ]; @@ -929,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; [ ]; @@ -952,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 ]; @@ -1048,6 +1066,7 @@ "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; + "sisyphus" = ps: with ps; [ ]; "skybell" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; @@ -1055,6 +1074,7 @@ "sonos" = ps: with ps; [ soco ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ websockets ]; + "spider" = ps: with ps; [ ]; "splunk" = ps: with ps; [ ]; "statsd" = ps: with ps; [ statsd ]; "sun" = ps: with ps; [ ]; @@ -1070,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 ]; @@ -1128,6 +1149,7 @@ "switch.skybell" = ps: with ps; [ ]; "switch.smappee" = ps: with ps; [ ]; "switch.snmp" = ps: with ps; [ pysnmp ]; + "switch.spider" = ps: with ps; [ ]; "switch.tahoma" = ps: with ps; [ ]; "switch.tellduslive" = ps: with ps; [ ]; "switch.tellstick" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 700f8ed78627..9950c7bb81b1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3 +{ lib, fetchFromGitHub, fetchpatch, python3 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] @@ -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.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918"; - }; - }); - 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.74.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 = "02wdvkcl4zjw009a5ylblk5blpf5rhlvch8vsg4cx07sj9xgjzmw"; + 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 4a4201b67330..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 = "20180720.0"; + version = "20180818.0"; src = fetchPypi { inherit pname version; - sha256 = "4a9d570cfc1d6b0e4b914897197d6772d48aa38b10202a648e79c5fb2a6a0293"; + 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/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 4822b5109e81..d7f7660bf61f 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -47,26 +47,32 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --includedir=$dev/include" ''; - configureFlags = '' - --with-apr=${apr.dev} - --with-apr-util=${aprutil.dev} - --with-z=${zlib.dev} - --with-pcre=${pcre.dev} - --disable-maintainer-mode - --disable-debugger-mode - --enable-mods-shared=all - --enable-mpms-shared=all - --enable-cern-meta - --enable-imagemap - --enable-cgi - ${optionalString brotliSupport "--enable-brotli --with-brotli=${brotli}"} - ${optionalString proxySupport "--enable-proxy"} - ${optionalString sslSupport "--enable-ssl"} - ${optionalString http2Support "--enable-http2 --with-nghttp2"} - ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} - ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"} - --docdir=$(doc)/share/doc - ''; + configureFlags = [ + "--with-apr=${apr.dev}" + "--with-apr-util=${aprutil.dev}" + "--with-z=${zlib.dev}" + "--with-pcre=${pcre.dev}" + "--disable-maintainer-mode" + "--disable-debugger-mode" + "--enable-mods-shared=all" + "--enable-mpms-shared=all" + "--enable-cern-meta" + "--enable-imagemap" + "--enable-cgi" + (stdenv.lib.enableFeature proxySupport "proxy") + (stdenv.lib.enableFeature sslSupport "ssl") + (stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") + "--docdir=$(doc)/share/doc" + + (stdenv.lib.enableFeature brotliSupport "brotli") + (stdenv.lib.withFeatureAs brotliSupport "brotli" brotli) + + (stdenv.lib.enableFeature http2Support "http2") + (stdenv.lib.withFeature http2Support "nghttp2") + + (stdenv.lib.enableFeature luaSupport "lua") + (stdenv.lib.withFeatureAs luaSupport "lua" lua5) + ]; enableParallelBuilding = true; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 58ae8f85b81f..e569ae8f8706 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; - configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; + configureFlags = [ + "--with-apxs=${apacheHttpd.dev}/bin/apxs" + "--with-java-home=${jdk}" + ]; setSourceRoot = '' sourceRoot=$(echo */native) 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/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 5a873c7e84b1..5239c027b8fa 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { If you wish to ignore this error pass --enable-js-trunk to ./configure. */ - configureFlags = '' - --enable-js-trunk - ''; + configureFlags = [ + "--enable-js-trunk" + ]; meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index e05624fa46c8..ceffd3e0260d 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , pkgconfig, cmake -, libressl_2_6, libuv, zlib +, libressl, libuv, zlib }: with builtins; @@ -16,8 +16,17 @@ stdenv.mkDerivation rec { sha256 = "0jyvbp6cjiirj44nxqa2fi5y473gnc8awfn8zv82hb1y9rlxqfyv"; }; + # 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_' + ''; + nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libressl_2_6 libuv zlib ]; + buildInputs = [ libressl libuv zlib ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 4596dac09086..65679e4ac86e 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -3,6 +3,7 @@ , enableMysql ? false, mysql ? null , enableLdap ? false, openldap ? null , enableWebDAV ? true, sqlite ? null, libuuid ? null +, perl }: assert enableMagnet -> lua5_1 != null; @@ -12,13 +13,17 @@ assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.49"; + name = "lighttpd-1.4.50"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf"; + sha256 = "1sr9avcnld22a5wl5s8vgrz8r86mybggm9z8zwabqz48v0986dr9"; }; + postPatch = '' + patchShebangs tests + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 @@ -38,6 +43,9 @@ stdenv.mkDerivation rec { sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; + checkInputs = [ perl ]; + doCheck = false; # fails 2 tests + postInstall = '' mkdir -p "$out/share/lighttpd/doc/config" cp -vr doc/config "$out/share/lighttpd/doc/" diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index a18ac202a4a2..b4ed3324491a 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { patches = [ ./disable-dns-lookup-in-chroot.patch ]; - buildInputs = - [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo ] - ++ lib.optional doCheck cppunit; + buildInputs = [ + libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo + ]; + + checkInputs = [ cppunit ]; makeFlags = [ "V=1" ]; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 5afd73c88686..ecde2430f522 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.1"; - sha256 = "0q2lkpnfqf74p22vrcldx0gcnss3is7rnp54fgpvhcpqsxc6h867"; + version = "1.15.2"; + sha256 = "145dcypq8dqc5as03iy1ycwifwynq9p4i8m56fn7g0myryp0kfpf"; }) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 9f2cd319f0e7..0501bcc9e58b 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -94,6 +94,16 @@ ''; }; + lua-upstream = { + src = fetchFromGitHub { + owner = "openresty"; + repo = "lua-upstream-nginx-module"; + rev = "v0.07"; + sha256 = "1gqccg8airli3i9103zv1zfwbjm27h235qjabfbfqk503rjamkpk"; + }; + inputs = [ pkgs.luajit ]; + }; + modsecurity = { src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; @@ -215,6 +225,33 @@ }; }; + stream-sts = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-stream-sts"; + rev = "v0.1.1"; + sha256 = "1jdj1kik6l3rl9nyx61xkqk7hmqbncy0rrqjz3dmjqsz92y8zaya"; + }; + }; + + sts = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-sts"; + rev = "v0.1.1"; + sha256 = "0nvb29641x1i7mdbydcny4qwlvdpws38xscxirajd2x7nnfdflrk"; + }; + }; + + sysguard = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-sysguard"; + rev = "e512897f5aba4f79ccaeeebb51138f1704a58608"; + sha256 = "19c6w6wscbq9phnx7vzbdf4ay6p2ys0g7kp2rmc9d4fb53phrhfx"; + }; + }; + upstream-check = { src = fetchFromGitHub { owner = "yaoweibin"; @@ -234,6 +271,15 @@ inputs = [ pkgs.msgpuck.dev pkgs.yajl ]; }; + url = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-url"; + rev = "9299816ca6bc395625c3683fbd2aa7b916bfe91e"; + sha256 = "0mk1gjmfnry6hgdsnlavww9bn7223idw50jlkhh5k00q5509w4ip"; + }; + }; + vts = { src = fetchFromGitHub { owner = "vozlt"; diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index a0a1addeeebf..c38ca046a35b 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -15,13 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ libevent file qrencode miniupnpc ]; # SSL requires libevent at 2.1 with ssl support - configureFlags = "--disable-ssl"; + configureFlags = [ "--disable-ssl" ]; meta = { description = "Pretty small HTTP server - a command-line tool to share files"; homepage = https://github.com/mgorny/pshs; license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix new file mode 100644 index 000000000000..36f326d5590b --- /dev/null +++ b/pkgs/servers/http/tengine/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt +, gd, geoip +, withDebug ? false +, withMail ? false +, withIPv6 ? true +, modules ? [] +, ... +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "2.2.2"; + name = "tengine-${version}"; + + src = fetchurl { + url = "https://github.com/alibaba/tengine/archive/${name}.tar.gz"; + sha256 = "1vq73wsldvj7rc61ag85pvnaacrrq9rs0pfqv71z5iyvb5r3bxc2"; + }; + + buildInputs = + [ openssl zlib pcre libxml2 libxslt gd geoip ] + ++ concatMap (mod: mod.inputs or []) modules; + + configureFlags = [ + "--with-http_ssl_module" + "--with-http_v2_module" + "--with-http_realip_module" + "--with-http_addition_module" + "--with-http_xslt_module" + "--with-http_geoip_module" + "--with-http_sub_module" + "--with-http_dav_module" + "--with-http_flv_module" + "--with-http_mp4_module" + "--with-http_gunzip_module" + "--with-http_gzip_static_module" + "--with-http_auth_request_module" + "--with-http_concat_module" + "--with-http_random_index_module" + "--with-http_secure_link_module" + "--with-http_degradation_module" + "--with-http_stub_status_module" + "--with-http_sysguard_module" + "--with-threads" + "--with-pcre-jit" + "--with-http_slice_module" + ] ++ optional withDebug [ + "--with-debug" + ] ++ optional withMail [ + "--with-mail" + "--with-mail_ssl_module" + ] ++ optional (withMail != true) [ + "--without-mail_pop3_module" + "--without-mail_imap_module" + "--without-mail_smtp_module" + ] ++ optional withIPv6 [ + "--with-ipv6" + ] ++ optional (gd != null) "--with-http_image_filter_module" + ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" + ++ map (mod: "--add-module=${mod.src}") modules; + + NIX_CFLAGS_COMPILE = [ + "-I${libxml2.dev}/include/libxml2" + "-Wno-error=implicit-fallthrough" + ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + + preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); + + hardeningEnable = optional (!stdenv.isDarwin) "pie"; + + enableParallelBuilding = true; + + postInstall = '' + mv $out/sbin $out/bin + ''; + + meta = { + description = "A web server based on Nginx and has many advanced features, originated by Taobao."; + homepage = https://tengine.taobao.org; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 5f92fbf2c03f..827f6122b573 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cd $name ''; - configureFlags = "--with-extrainclude=${pam}/include/security"; + configureFlags = [ "--with-extrainclude=${pam}/include/security" ]; buildInputs = [ erlang pam perl ]; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 22191e199766..03fdf7908cc4 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,26 +3,21 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-07-15"; + version = "2018-08-18"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { - rev = "3906ace0b4cf48ba9acccf372377c7feb0665be4"; owner = "bakape"; repo = "hydron"; - sha256 = "079a88740wxgq73sq8w96zppfng7af76k7h484x3w695qk83j33r"; + rev = "78257f1c1f34cdad1931531601163071f7f29aa9"; + sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ]; - # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/43593 - preBuild = '' - rm go/src/github.com/bakape/hydron/ico.syso - ''; - meta = with stdenv.lib; { homepage = "https://github.com/bakape/hydron"; description = "High performance media tagger and organizer"; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index 9ef0fd23b455..c5d584f1bcd3 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a"; - sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg"; + rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29"; + sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; - sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; + rev = "326c44736983c316d20c036ce34ca79ce9b96b01"; + sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572"; - sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v"; + rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"; + sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/lann/builder"; - rev = "1b87b36280d04fe7882d1512bf038ea2967ad534"; - sha256 = "015q46awbyp47vld07yi7d27i0lkd82r7qn5230bb9qxl4mcfiqc"; + rev = "47ae307949d02aa1f1069fdafc00ca08e1dbabac"; + sha256 = "1kg9jy1rciznj627hafpq2mi7hr5d3ssgqcpwrm3bnlk9sqnydil"; }; } { @@ -55,12 +55,21 @@ }; } { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; + sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + }; + } + { goPackagePath = "github.com/mailru/easyjson"; fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; + sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; }; } { @@ -68,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "3aefd9f0a162514f66d0e4ceda3edc44e66b502e"; - sha256 = "0as2kqmlvd21r481vxl457n5lxxp4i1jdjkmyqsjf5vg6xr9gd2d"; + rev = "b3511bfdd742af558b54eb6160aca9446d762a19"; + sha256 = "1v41is0h05p4jgv8nal3l8lcdcggylsyblq0ihycnprkdzwls808"; }; } { @@ -90,4 +99,13 @@ sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; }; } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "aaf60122140d3fcf75376d319f0554393160eb50"; + sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv"; + }; + } ] diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index c73c69e6ee5a..cf5b572c9eb4 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -10,8 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ]; - configureFlags = - "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl.dev}"; + configureFlags = [ + "--with-nicklen=100" + "--with-topiclen=360" + "--enable-openssl=${openssl.dev}" + ]; postInstall = "echo postinstall; mkdir -p \${out}/ ; rm -rf \${out}/logs ; ln -s /home/ircd \${out}/logs;"; 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/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 7e368bf295b6..0518a78f9d6b 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, gawk }: stdenv.mkDerivation rec { name = "youtrack-${version}"; - version = "2018.1.41051"; + version = "2018.2.44329"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${name}.jar"; - sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb"; + sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; buildInputs = [ makeWrapper ]; - unpackPhase = "true"; + unpackPhase = ":"; installPhase = '' runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/youtrack --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" + makeWrapper ${jre}/bin/java $out/bin/youtrack \ + --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ gawk ]}" \ + --set JRE_HOME ${jre} runHook postInstall ''; meta = with stdenv.lib; { - description = '' - Issue Tracking and Project Management Tool for Developers - ''; + description = "Issue tracking and project management tool for developers"; maintainers = with maintainers; [ yorickvp ]; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 8ff20869b94e..a38c0b277dae 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pythonPackages }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "mailman-${version}"; @@ -9,13 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7"; }; - buildInputs = [ python pythonPackages.dnspython ]; + buildInputs = [ python2 python2.pkgs.dnspython ]; patches = [ ./fix-var-prefix.patch ]; - configureFlags = "--without-permcheck --with-cgi-ext=.cgi --with-var-prefix=/var/lib/mailman"; + configureFlags = [ + "--without-permcheck" + "--with-cgi-ext=.cgi" + "--with-var-prefix=/var/lib/mailman" + ]; - installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. + installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. makeFlags = [ "DIRSETGID=:" ]; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 8ccd783b6ad8..c97d8e4ccf38 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison ]; - configureFlags = "--with-mta=${sendmailPath}"; + configureFlags = [ "--with-mta=${sendmailPath}" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 62fd3397cb63..d0c496d38577 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages, fetchurl, fetchFromGitHub }: +{ stdenv, python2Packages, fetchurl, fetchFromGitHub }: let - matrix-angular-sdk = pythonPackages.buildPythonPackage rec { + matrix-angular-sdk = python2Packages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; version = "0.6.8"; @@ -9,7 +9,7 @@ let sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; - matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec { + matrix-synapse-ldap3 = python2Packages.buildPythonPackage rec { pname = "matrix-synapse-ldap3"; version = "0.1.3"; @@ -20,11 +20,11 @@ let sha256 = "0ss7ld3bpmqm8wcs64q1kb7vxlpmwk9lsgq0mh21a9izyfc7jb2l"; }; - propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ]; + propagatedBuildInputs = with python2Packages; [ service-identity ldap3 twisted ]; - checkInputs = with pythonPackages; [ ldaptor mock ]; + checkInputs = with python2Packages; [ ldaptor mock ]; }; -in pythonPackages.buildPythonApplication rec { +in python2Packages.buildPythonApplication rec { name = "matrix-synapse-${version}"; version = "0.33.0"; @@ -39,7 +39,7 @@ in pythonPackages.buildPythonApplication rec { ./matrix-synapse.patch ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ blist canonicaljson daemonize dateutil frozendict pillow pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client @@ -51,7 +51,7 @@ in pythonPackages.buildPythonApplication rec { # Checks fail because of Tox. doCheck = false; - buildInputs = with pythonPackages; [ + buildInputs = with python2Packages; [ mock setuptoolsTrial ]; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 14662ff6cc25..9e5a9ffe780d 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterbridge-${version}"; - version = "1.7.1"; + version = "1.11.0"; goPackagePath = "github.com/42wim/matterbridge"; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "0ajc7xswmwhc2xn937sv3b76s8hblfn9x9rj5825hi3d3s8zqq88"; + sha256 = "1fjpgdaq4mfgf36gzk3hhmlbpfn44b7xll2rdpy69y460jrjfg6k"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 67b2685262d8..f6f4ee2e121e 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,30 +1,26 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, ffmpeg-full, ghostscript +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript , graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-07-01"; - rev = "80db8298b6546c93944251c17fe03371e521671f"; + version = "2018-08-13"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; - src = fetchgit { - inherit rev; - url = "https://github.com/bakape/meguca"; - sha256 = "1yix0kxsjm9f3zw9jx2nb3pl8pbqjfhbvbrz42m1h20b1h02s5ml"; + src = fetchFromGitHub { + owner = "bakape"; + repo = "meguca"; + rev = "f8b54370ba74b90f2814e6b42ac003a51fe02ce9"; + sha256 = "1036qlvvz0la3fp514kw5qrplm1zsh23ywn2drigniacmqz4m7dv"; fetchSubmodules = true; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ]; - - buildInputs = [ - ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson - emscripten - ]; + buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ]; buildPhase = '' - export HOME=$PWD + export HOME=`pwd` export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go cd $HOME/go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index b2e31515ab48..cc08645547d3 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/ErikDubbelboer/gspt"; - rev = "08ed213262b5bb2cf6ccb0baa71c6b201d353e63"; - sha256 = "1vdgvwjagk1n4mwvpil59idgg7ibdj6frk9mz8c2ckbmxsfpp8rq"; + rev = "e39e726e09cc23d1ccf13b36ce10dbdb4a4510e0"; + sha256 = "1l0s9srl7kbi7rs9ki989rgvx1kx6an7d6pwfqyy42x48f7a5g81"; }; } { @@ -14,8 +14,17 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a"; - sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg"; + rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29"; + sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/goquery"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/goquery"; + rev = "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2"; + sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; }; } { @@ -28,6 +37,15 @@ }; } { + goPackagePath = "github.com/andybalholm/cascadia"; + fetch = { + type = "git"; + url = "https://github.com/andybalholm/cascadia"; + rev = "901648c87902174f774fac311d7f176f8647bdaa"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + }; + } + { goPackagePath = "github.com/aquilax/tripcode"; fetch = { type = "git"; @@ -59,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; - sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; + rev = "326c44736983c316d20c036ce34ca79ce9b96b01"; + sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk"; }; } { @@ -91,6 +109,15 @@ }; } { + goPackagePath = "github.com/dsnet/compress"; + fetch = { + type = "git"; + url = "https://github.com/dsnet/compress"; + rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; + sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; + }; + } + { goPackagePath = "github.com/go-playground/ansi"; fetch = { type = "git"; @@ -104,8 +131,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/errors"; - rev = "14d2d30656a95a5fa5a17d2e33540269eda5f158"; - sha256 = "0w13vgxwc1x780x716kqzzwp9ld3w3jpkclabh2qwpcwx821nhpy"; + rev = "9aa88f624b398d37201c30583065aee54071bc0c"; + sha256 = "0d4b73m564gc12ddbss78929kcya81ifqxv28f05zqhrywkih4mh"; }; } { @@ -118,12 +145,21 @@ }; } { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; + sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + }; + } + { goPackagePath = "github.com/gorilla/handlers"; fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572"; - sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v"; + rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"; + sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; }; } { @@ -149,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/lann/builder"; - rev = "1b87b36280d04fe7882d1512bf038ea2967ad534"; - sha256 = "015q46awbyp47vld07yi7d27i0lkd82r7qn5230bb9qxl4mcfiqc"; + rev = "47ae307949d02aa1f1069fdafc00ca08e1dbabac"; + sha256 = "1kg9jy1rciznj627hafpq2mi7hr5d3ssgqcpwrm3bnlk9sqnydil"; }; } { @@ -176,8 +212,26 @@ fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; + sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; + }; + } + { + goPackagePath = "github.com/mholt/archiver"; + fetch = { + type = "git"; + url = "https://github.com/mholt/archiver"; + rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3"; + sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb"; + }; + } + { + goPackagePath = "github.com/nwaples/rardecode"; + fetch = { + type = "git"; + url = "https://github.com/nwaples/rardecode"; + rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; + sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw"; }; } { @@ -199,6 +253,24 @@ }; } { + goPackagePath = "github.com/otium/ytdl"; + fetch = { + type = "git"; + url = "https://github.com/otium/ytdl"; + rev = "b071cb3eb1579608df3b52084a017c5753b325e6"; + sha256 = "01ankrjgdcw0ncwv0xzqh74xy22vdl2nza0arga72zrakpgk8nw0"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "6b9367c9ff401dbc54fabce3fb8d972e799b702d"; + sha256 = "0bxxap7jn3wvqxr2yqn8m3aqgb9y94j9ci6fwjrk01caq575r1qs"; + }; + } + { goPackagePath = "github.com/sevlyar/go-daemon"; fetch = { type = "git"; @@ -208,12 +280,21 @@ }; } { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "e4b0c6d7829bcf64435536c4a88f4088a3c76203"; + sha256 = "1s3m83wv1wjv95nhkbvml56c12z75x85wlmqill3zqvlm9az6bzg"; + }; + } + { goPackagePath = "github.com/ulikunitz/xz"; fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; - sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; + rev = "636d36a76670e6c700f22fd5f4588679ff2896c4"; + sha256 = "01d71xnhdd60cmd9xk8zcjiq2n7fhgc6kzxd0s0plvs70y6dk27g"; }; } { @@ -239,8 +320,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; - sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; + sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; }; } { @@ -248,8 +329,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9"; - sha256 = "05xdcj0pn245y3gpy9p5iamx09424zqwh1w34gwwn5kh51ybgv7k"; + rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54"; + sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3"; }; } { @@ -257,8 +338,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; - sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; + rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031"; + sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5"; }; } { @@ -266,8 +347,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "c0fe8dde8a10c9b32154bd9bdf080b8b3d635127"; - sha256 = "0zi15k236nmqrlpfy3hgnxnh3f0n1aag0h6gs41xlxdkr9lpmnsz"; + rev = "6e3c4e7365ddcc329f090f96e4348398f6310088"; + sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4"; }; } { 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/metabase/default.nix b/pkgs/servers/metabase/default.nix index 588f1dda50cc..5387a93b5e62 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.29.3"; + version = "0.30.0"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "18yvjxlgdbg7h7ipj1wlic5m0gv5s2943c72shs44jvic6g42pzv"; + sha256 = "1wnzd2g1qxqpqjsqq1kfr0zrvjvqg54dvznbhf3637b0iqq3ahkh"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 7fc041d81984..059a6b8f0aaa 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.1.1"; + version = "10.1.2"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "0acj6la88lnbfdp0nilvsll48zfig7sgibgwfjjckialppyg4ir6"; + sha256 = "0hpk801dipmzsswgx0y6m0xhwn5iz97agnb2bzbr5xhkl4a0d33k"; }; buildCommand = '' diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 0e256d907dc2..bab3faa79695 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.29.1"; + version = "0.30.2"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "132mpcp35cymm2zqig0yrvhnvgn72k7cmn6gla0v7r0yxfl879m3"; + sha256 = "143jsm0pbfhsa2iwkg5zanl9qxbpmsdvay5djyac4rvgl53m0wy9"; }; nativeBuildInputs = [ go ]; 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/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 4385a4e020c2..fb7418551ae6 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.2.2"; + version = "5.2.3"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "17w8ljq4p1sxcdpsiz4221gwhi3ykggpisnx1wdw22g2160q9sdj"; + sha256 = "08ws8kpqxl0rihw8xa93285gal6f6c3imymdi9iif13vsn458hiw"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1frbk13sww3sw09mpkijii1kf7m19hqg58ps8gvs4dvxg12bbv3l"; + sha256 = "098xrzq7wkizww9552bk8cn300336y51qfzf1fkfwrn1fqf9nswl"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 02a6197d3846..bb86e59e4c33 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,6 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGo19Package, fetchFromGitHub }: -buildGoPackage rec { +# Go 1.10 causes segfaults: +# https://github.com/prometheus/node_exporter/issues/870 +buildGo19Package rec { name = "node_exporter-${version}"; version = "0.16.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index e7cf3e8f70e4..1de1edfa8e11 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -15,6 +15,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' + mkdir $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 9f1a2baeb9ac..ce660fa6e88b 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -77,7 +77,7 @@ in inherit src preConfigure; - configureFlags = "--enable-agent"; + configureFlags = [ "--enable-agent" ]; meta = with stdenv.lib; { inherit branch; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index bf3849e6524b..ac0e6bb81f8b 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -89,7 +89,7 @@ in inherit src preConfigure; - configureFlags = "--enable-agent"; + configureFlags = [ "--enable-agent" ]; meta = with stdenv.lib; { inherit branch; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index be52698ed839..4b6bd5e0b250 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -27,7 +27,12 @@ in inherit src preConfigure; - configureFlags = "--enable-agent --enable-server --with-pgsql --with-libcurl"; + configureFlags = [ + "--enable-agent" + "--enable-server" + "--with-pgsql" + "--with-libcurl" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ postgresql curl openssl zlib ]; @@ -56,7 +61,7 @@ in inherit src preConfigure; - configureFlags = "--enable-agent"; + configureFlags = [ "--enable-agent" ]; meta = with stdenv.lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index f8523e8607d3..500f612eb02e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -26,6 +26,8 @@ , clientSupport ? true, mpd_clientlib , opusSupport ? true, libopus , soundcloudSupport ? true, yajl +, nfsSupport ? true, libnfs +, smbSupport ? true, samba }: assert avahiSupport -> avahi != null && dbus != null; @@ -34,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}"; @@ -44,7 +46,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0v7xpsr8b4d0q9vh1wni0qbkbkxdjpn639qm2q553ckk5idas4lm"; + sha256 = "0qchvycwiai5gwkvvf44nc1jw16yhpcjmlppqlrlvicgzsanhmy3"; }; patches = [ ./x86.patch ]; @@ -81,7 +83,9 @@ in stdenv.mkDerivation rec { ++ opt icuSupport icu ++ opt clientSupport mpd_clientlib ++ opt opusSupport libopus - ++ opt soundcloudSupport yajl; + ++ opt soundcloudSupport yajl + ++ opt (!stdenv.isDarwin && nfsSupport) libnfs + ++ opt (!stdenv.isDarwin && smbSupport) samba; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -116,6 +120,8 @@ in stdenv.mkDerivation rec { (mkFlag clientSupport "libmpdclient") (mkFlag opusSupport "opus") (mkFlag soundcloudSupport "soundcloud") + (mkFlag (!stdenv.isDarwin && nfsSupport) "libnfs") + (mkFlag (!stdenv.isDarwin && smbSupport) "smbclient") "--enable-debug" "--with-zeroconf=avahi" ] diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 6d2bb9b9e949..955547289bc6 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "096w4gxj08m3vwmyv4sxpmbl8dn6mzqfmrhc32jgyca6qzlrdin8"; }; - configureFlags = "--enable-runas-user=nobody"; + configureFlags = [ "--enable-runas-user=nobody" ]; prePatch = '' substituteInPlace Makefile.in --replace 02770 0770 diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index f3d3fed23a41..9281bdd0af75 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.12"; + version = "3.3.14"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "18mx7bcxll1za91q090g3hps3mwrlqdg40lvs61kibci3amma7j2"; + sha256 = "00l0mvnyv8y0p13pyxx3hzsnwna9qfq7yjdpisvayipbl7zpvadc"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index fd3b2d3aa286..d73e242a9422 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.1.19"; - sha256 = "1qlc62j3hf5831yrrbydn3z19zrn6bpirarinys6bmhshr7mhpyr"; + version = "2.1.20"; + sha256 = "0ik7a4jg3s3xnyrj1sa0rvbh066fv1y2202l7cv6nbca72pgyl6a"; }) diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix index 3d276128c00d..88c361e6a91f 100644 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ b/pkgs/servers/nosql/cassandra/2.2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.2.11"; - sha256 = "0r39mm5ibdn9dqv11n4x33vcb5247r6fl6r07l6frqp6i36ilvl6"; + version = "2.2.13"; + sha256 = "19jryhjkh5jsgp6jlz2v28vwm5dks8i7mshsv3s2fpnl6147paaq"; }) diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index b6621ec95485..a1aad75ce3f6 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.15"; - sha256 = "1n92wpp5gm41r4agjwjw9ymnnn114pmaqf04c1dx3fksk100wd5g"; + version = "3.0.17"; + sha256 = "0568r5xdy78pl29zby5g4m9qngf29cb9222sc1q1wisapb7zkl2p"; }) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index f18b6256d3f0..5ca268166e03 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.2"; - sha256 = "0867i3irsji3qkjpp2s171xmjf2r8yhwzhs24ka8hljxv457f8p9"; + version = "3.11.3"; + sha256 = "1fp2sm8v7dpp7iym39c7dh1fmi25x462amgzizl93c21rdq0cbnq"; }) diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 48875b093a8d..6ac087241ce0 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -16,6 +16,7 @@ in stdenv.mkDerivation rec { name = "cassandra-${version}"; + inherit version; src = fetchurl { inherit sha256; 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/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index bf1ccbd06d56..ab2ff85939f6 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.10"; + version = "4.0.11"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx"; + sha256 = "1fqvxlpaxr80iykyvpf1fia8rxh4zz8paf5nnjncsssqwwxfflzw"; }; buildInputs = [ lua ]; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # needs tcl + meta = with stdenv.lib; { homepage = https://redis.io; description = "An open source, advanced key-value store"; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index b041aa9f35fc..a09b4543cbbe 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; + license = licenses.asl20; }; } diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index bf4f36bb250b..2818996e5d4b 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -51,7 +51,8 @@ in stdenv.mkDerivation rec { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.z77z maintainers.spacefrogg ]; - broken = versionOlder kernel.version "3.18"; + broken = versionOlder kernel.version "3.18" || + versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 356d3cf37c3b..8eeac8696c02 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -54,7 +54,9 @@ in stdenv.mkDerivation rec { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.z77z maintainers.spacefrogg ]; - broken = (versionOlder kernel.version "3.18") || stdenv.targetPlatform.isAarch64; + broken = (versionOlder kernel.version "3.18") || + (versionAtLeast kernel.version "4.18") || + stdenv.targetPlatform.isAarch64; }; } diff --git a/pkgs/servers/pulseaudio/caps-fix.patch b/pkgs/servers/pulseaudio/caps-fix.patch deleted file mode 100644 index 1d69a16982f9..000000000000 --- a/pkgs/servers/pulseaudio/caps-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 3c71472..71b5c3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -620,6 +620,8 @@ AC_ARG_WITH([caps], - - if test "x${with_caps}" != "xno"; then - AC_SEARCH_LIBS([cap_init], [cap], [], []) -+ AS_IF([test "x${with_caps}" != "xyes" -a "x${with_caps}" != "x"], -+ LIBS="-L${with_caps}/lib $LIBS") - - # Only give an error on hosts that we know could support capabilities - AC_CHECK_HEADERS([sys/capability.h], [], [ diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 73af65ef2561..ab0839de961c 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook -, libsndfile, libtool -, xorg, libcap, alsaLib, glib +{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +, libsndfile, libtool, makeWrapper +, xorg, libcap, alsaLib, glib, gnome3 , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat -, speexdsp, systemd, webrtc-audio-processing, gconf ? null +, speexdsp, systemd, webrtc-audio-processing , x11Support ? false @@ -17,8 +17,6 @@ , airtunesSupport ? false -, gconfSupport ? false - , bluetoothSupport ? false , remoteControlSupport ? false @@ -33,27 +31,16 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "11.1"; + version = "12.2"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; + sha256 = "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0"; }; - patches = [ ./caps-fix.patch (fetchpatch { - name = "glibc-2.27.patch"; - url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb"; - sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv"; - }) ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "padsp-fix.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244"; - sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q"; - }); - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkgconfig intltool autoreconfHook makeWrapper ]; propagatedBuildInputs = lib.optionals stdenv.isLinux [ libcap ]; @@ -69,7 +56,6 @@ stdenv.mkDerivation rec { ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optional airtunesSupport openssl - ++ lib.optional gconfSupport gconf ++ lib.optionals bluetoothSupport [ bluez5 sbc ] ++ lib.optional remoteControlSupport lirc ++ lib.optional zeroconfSupport avahi @@ -125,6 +111,12 @@ stdenv.mkDerivation rec { '' + ''moveToOutput lib/cmake "$dev" ''; + preFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/libexec/pulse/gsettings-helper \ + --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules" + ''; + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index b0cfc32e9117..1d8d97f4bde5 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -1,54 +1,36 @@ { stdenv, fetchFromGitHub, python3 }: -let - version = "2.1.9"; - sha256 = "1sywxn7j9bq39qwq74h327crc44j9049cykai1alv44agx8s1nhz"; - - python = python3.override { - packageOverrides = self: super: { - - # Packages pinned in setup.py. - # Starting with next release, a vendored version of vobject will be used. - python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { - version = "2.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; - }; - }); - vobject = super.vobject.overridePythonAttrs (oldAttrs: rec { - version = "0.9.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243"; - }; - }); - - }; - }; -in - -python.pkgs.buildPythonApplication { - name = "radicale-${version}"; - inherit version; +python3.pkgs.buildPythonApplication rec { + pname = "Radicale"; + version = "2.1.10"; + # No tests in PyPI tarball src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = version; - inherit sha256; + sha256 = "0ik9gvljxhmykkzzcv9kmkp4qjwgdrl9f7hp6300flx5kmqlcjb1"; }; - doCheck = false; + # We only want functional tests + postPatch = '' + sed -i "s/pytest-cov\|pytest-flake8\|pytest-isort//g" setup.py + sed -i "/^addopts/d" setup.cfg + ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ vobject + python-dateutil passlib - pytz + ]; + + checkInputs = with python3.pkgs; [ + pytestrunner + pytest ]; meta = with stdenv.lib; { - homepage = http://www.radicale.org/; + homepage = https://www.radicale.org/; description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV @@ -58,7 +40,6 @@ python.pkgs.buildPythonApplication { on mobile phones or computers. ''; license = licenses.gpl3Plus; - platforms = platforms.all; maintainers = with maintainers; [ edwtjo pSub aneeshusa infinisil ]; }; } 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/rt/default.nix b/pkgs/servers/rt/default.nix index dcbfc40d7ddd..4653946270cd 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { name = "rt-${version}"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; - sha256 = "0s5ykc5imcii66zkzcb8lf8adkr8zlbc2ikcpkaxzcccikhndqxj"; + sha256 = "1cddgp3j7qm7r3v5j1l1hl6i6laxa64f4nalaarj094hmhyb92kk"; }; patches = [ ./override-generated.patch ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index eec80cb66bcc..385674c12a86 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -22,11 +22,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.6"; + version = "4.7.9"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0vkxqp3wh7bpn1fd45lznmrpn2ma1fq75yq28vi08rggr07y7v8y"; + sha256 = "1v0pd2k4rfdzcqbzb3g5gjiy8rwqamppwzwy5swz4x5rxyr5567c"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index d8c8682d504e..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 }: @@ -7,18 +7,18 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.2"; + version = "8.0.5"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4"; + sha256 = "1w7yygqp089kmiznxrwhvyny8cfdb4lr2pazh4873r8xxb9dyfvn"; }; buildInputs = with stdenv.lib; [ 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/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index e880e490a6af..fbce457aedc2 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.2.1"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "07b0g5iyjmqyq6zxx5mv72kri66jw6wv6i3gzax6jhkdiag06lwm"; + sha256 = "1g9pd00c1x66cbp4gls93pvnrwbzl37q7p8jaag3h5d6f1431i51"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = '' - --with-alsa --with-pipe --with-pulseaudio --with-stdout - --with-avahi --with-ssl=openssl --with-soxr - --without-configfiles --without-initscript - ''; + configureFlags = [ + "--with-alsa" "--with-pipe" "--with-pulseaudio" "--with-stdout" + "--with-avahi" "--with-ssl=openssl" "--with-soxr" + "--without-configfiles" "--without-initscript" + ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 7bfea23c78b5..82d79785b11c 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; @@ -15,4 +15,8 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + + meta = { + license = stdenv.lib.licenses.mit; + }; } diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7c1b6cc8702c..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.3.8"; + 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 = "1f0syfrv0my7sm8cbpic00ldy90psimy8yvm0ld82bfi2isw3gih"; + sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 146d9d23198b..723b4e4d8d3e 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.22"; + version = "5.7.23"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "1wng15j5caz6fsv28avlcxjgq3c5n90ifk79xa0h7jws19dl1f2f"; + sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' 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/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix index 70b8abf2502d..b6b9f3a5650f 100644 --- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix +++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cstore_fdw-${version}"; - version = "1.6.0"; + version = "1.6.1"; nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "cstore_fdw"; rev = "refs/tags/v${version}"; - sha256 = "08jbx4hs2r742flilydp0ajjwv8ffnvq82nidh48irrfa4i7n0l0"; + sha256 = "1cpkpbv4c82l961anzwp74r1jc8f0n5z5cvwy4lyrqg5jr501nd4"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a727b60dd9d4..bccd54ca4ba8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata }: let @@ -22,14 +22,19 @@ let makeFlags = [ "world" ]; + NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + + # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. + preConfigure = "CC=${stdenv.cc.targetPrefix}cc"; + configureFlags = [ "--with-openssl" "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" - ] - ++ lib.optional (stdenv.isDarwin) "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; + "--with-system-tzdata=${tzdata}/share/zoneinfo" + (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") + ]; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) @@ -95,33 +100,33 @@ let in { postgresql93 = common { - version = "9.3.23"; + version = "9.3.24"; psqlSchema = "9.3"; - sha256 = "1jzncs7b6zrcgpnqjbjcc4y8303a96zqi3h31d3ix1g3vh31160x"; + sha256 = "1a8dnv16n2rxnbwhqw7c0kjpj3xqvkpwk50kvimj4d917cxaf542"; }; postgresql94 = common { - version = "9.4.18"; + version = "9.4.19"; psqlSchema = "9.4"; - sha256 = "1h64yjyrlz3ppsp9k6sm4jihg6n9i7mqhkx4p0hymqzmnbr3g0s2"; + sha256 = "12qn9h47rkn4k41gdbxkkvg0pff43k1113jmhc83f19adc1nnxq3"; }; postgresql95 = common { - version = "9.5.13"; + version = "9.5.14"; psqlSchema = "9.5"; - sha256 = "1vm55q9apja6lg672m9xl1zq3iwv2zwnn0d0qr003zan1dmbh22l"; + sha256 = "0k8s62h6qd9p3xlx315j5irniskqsnx1nz4ir5r1yhqp07mdab1y"; }; postgresql96 = common { - version = "9.6.9"; + version = "9.6.10"; psqlSchema = "9.6"; - sha256 = "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr"; + sha256 = "09l4zqs74fqnazdsyln9x657mq3wsbgng9wpvq71yh26cv2sq5c6"; }; postgresql100 = common { - version = "10.4"; + version = "10.5"; psqlSchema = "10.0"; - sha256 = "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v"; + sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc"; }; } 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/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix index 684817d309ba..2364e0913bc8 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiodbc postgresql openssl ]; - configureFlags = "--with-iodbc=${libiodbc}"; + configureFlags = [ "--with-iodbc=${libiodbc}" ]; meta = with stdenv.lib; { homepage = http://psqlodbc.projects.postgresql.org/; diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index 1eaa7775793c..fab515035ce6 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.10.1"; + version = "0.11.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "07qkkf7lbwaig26iia54vdakwmv33f71p8saqifz9lf0zy6xn0w0"; + sha256 = "06xysf45r0c2sjfl6vgdbrm7pn7nxx2n0k29bm88q0ipyyp9fr0v"; }; # Fix the install phase which tries to install into the pgsql extension dir, diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index b0b8f926d9ec..eda1f060df27 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { CPP = "${stdenv.cc}/bin/gcc -E"; - configureFlags = " - --enable-shared --disable-all-vads --with-readline=${readline.dev} - --disable-hslookup --disable-wbxml2 --without-iodbc - --enable-openssl=${openssl.dev} - "; + configureFlags = [ + "--enable-shared" "--disable-all-vads" "--with-readline=${readline.dev}" + "--disable-hslookup" "--disable-wbxml2" "--without-iodbc" + "--enable-openssl=${openssl.dev}" + ]; postInstall = '' echo Moving documentation diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index bf2a51f65963..536e96354d92 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { CPP = "${stdenv.cc}/bin/gcc -E"; - configureFlags = " - --enable-shared --disable-all-vads --with-readline=${readline.dev} - --disable-hslookup --disable-wbxml2 --without-iodbc - --enable-openssl=${openssl.dev} - "; + configureFlags = [ + "--enable-shared" "--disable-all-vads" "--with-readline=${readline.dev}" + "--disable-hslookup" "--disable-wbxml2" "--without-iodbc" + "--enable-openssl=${openssl.dev}" + ]; postInstall='' echo Moving documentation diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix new file mode 100644 index 000000000000..88ce2d5c3d08 --- /dev/null +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { + name = "tt-rss-plugin-tumblr-gdpr-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "GregThib"; + repo = "ttrss-tumblr-gdpr"; + rev = "v${version}"; + sha256 = "1qqnzysg1d0b169kr9fbgi50yjnvw7lrvgrl2zjx6px6z61jhv4j"; + }; + + installPhase = '' + mkdir -p $out/tumblr_gdpr + + cp init.php $out/tumblr_gdpr + ''; + + meta = with stdenv.lib; { + description = "Plugin for TT-RSS to workaround GDPR in Europe"; + longDescription = '' + Plugin for TT-RSS to workaround GDPR in Europe. + + The name of the plugin in TT-RSS is 'tumblr_gdpr'. + ''; + license = licenses.gpl3; + homepage = https://github.com/GregThib/ttrss-tumblr-gdpr; + maintainers = with maintainers; [ das_j ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix new file mode 100644 index 000000000000..4a9312ae459c --- /dev/null +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { + name = "tt-rss-theme-feedly-${version}"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "levito"; + repo = "tt-rss-feedly-theme"; + rev = "v${version}"; + sha256 = "1n5vci84l0wxsd2k90m2x3j8d7y9kz5fqc6fk6y7r568p1cakg9b"; + }; + + dontBuild = true; + + installPhase = '' + mkdir $out + + cp -ra feedly feedly.css $out + ''; + + meta = with stdenv.lib; { + description = "Feedly theme for Tiny Tiny RSS"; + license = licenses.wtfpl; + homepage = https://github.com/levito/tt-rss-feedly-theme; + maintainers = with maintainers; [ das_j ]; + platforms = platforms.all; + }; +} 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/varnish/default.nix b/pkgs/servers/varnish/default.nix index 68660ce6b36c..ff1acad90944 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 -, python, pythonPackages, makeWrapper }: +, python2, makeWrapper }: let common = { version, sha256 }: @@ -13,8 +13,8 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pcre libxslt groff ncurses readline python libedit - pythonPackages.docutils makeWrapper + pcre libxslt groff ncurses readline python2 libedit + python2.pkgs.docutils makeWrapper ]; buildFlags = "localstatedir=/var/spool"; 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; + }; } diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index eeb19f81c54d..e4dd9b0f2dc7 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/asciimoo/morty"; maintainers = with maintainers; [ leenaars ]; + license = licenses.agpl3; description = "Privacy aware web content sanitizer proxy as a service"; longDescription = '' Morty is a web content sanitizer proxy as a service. It rewrites web diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 3835f5ae3324..cde8f9fecbc8 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -with pythonPackages; +with python3Packages; buildPythonApplication rec { pname = "searx"; @@ -32,10 +32,13 @@ buildPythonApplication rec { pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; - checkInputs = [ splinter mock plone-testing robotsuite unittest2 ]; + checkInputs = [ + splinter mock plone-testing robotsuite unittest2 selenium + ]; preCheck = '' rm tests/test_robot.py # A variable that is imported is commented out + rm tests/unit/engines/pubmed.py ''; meta = with lib; { diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index cee098db6b27..247270f67c50 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.7"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "191nnk4p6cpbljij1a30mpidqdvcwn1x6ndb4lgkqwbpnh86q57l"; + sha256 = "0j7i8ifzjg1s9y8nw4j0as0wdns06zdsjgr99137y9rz5w223pp6"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index cc28dc73ca87..6f94929ffd67 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -171,7 +171,7 @@ let sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -183,7 +183,7 @@ let sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -195,7 +195,7 @@ let sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -207,7 +207,7 @@ let sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -219,7 +219,7 @@ let sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -243,7 +243,7 @@ let sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -255,7 +255,7 @@ let sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -267,7 +267,7 @@ let sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -279,7 +279,7 @@ let sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -291,7 +291,7 @@ let sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -303,7 +303,7 @@ let sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -315,7 +315,7 @@ let sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -327,7 +327,7 @@ let sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -339,7 +339,7 @@ let sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -351,7 +351,7 @@ let sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -363,7 +363,7 @@ let sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -375,7 +375,7 @@ let sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -387,7 +387,7 @@ let sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -399,7 +399,7 @@ let sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -411,7 +411,7 @@ let sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -423,7 +423,7 @@ let sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -435,7 +435,7 @@ let sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -447,7 +447,7 @@ let sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -459,7 +459,7 @@ let sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -471,7 +471,7 @@ let sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -483,7 +483,7 @@ let sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -495,7 +495,7 @@ let sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -507,7 +507,7 @@ let sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -519,7 +519,7 @@ let sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -531,7 +531,7 @@ let sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -543,7 +543,7 @@ let sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -567,7 +567,7 @@ let sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -591,7 +591,7 @@ let sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -603,7 +603,7 @@ let sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index dfde730fbea8..37daa0dc9bc4 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -178,7 +178,7 @@ while (<>) { } if ($isFont) { - $extraAttrs{$pkg} = " configureFlags = \"--with-fontrootdir=\$(out)/lib/X11/fonts\"; "; + $extraAttrs{$pkg} = " configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ]; "; } sub process { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2438c49d9cb9..b1a749c7ec4a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -77,7 +77,7 @@ in libxcb = attrs : attrs // { nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; - configureFlags = "--enable-xkb --enable-xinput"; + configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; }; @@ -147,7 +147,7 @@ in # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 # Once the bug is fixed upstream, this can be removed. luit = attrs: attrs // { - configureFlags = "--disable-selective-werror"; + configureFlags = [ "--disable-selective-werror" ]; }; compositeproto = attrs: attrs // { @@ -408,7 +408,7 @@ in }; xkbcomp = attrs: attrs // { - configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb"; + configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ]; }; xkeyboardconfig = attrs: attrs // { @@ -426,6 +426,10 @@ in ''; }; + xlsfonts = attrs: attrs // { + meta = attrs.meta // { license = lib.licenses.mit; }; + }; + xorgserver = with xorg; attrs_passed: # exchange attrs if abiCompat is set let @@ -597,7 +601,7 @@ in xcursorthemes = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; - configureFlags = "--with-cursordir=$(out)/share/icons"; + configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; }; xinit = attrs: attrs // { @@ -627,7 +631,7 @@ in }; buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; - configureFlags = "--with-default-dri=3 --enable-tools"; + configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; @@ -672,7 +676,7 @@ in }; xrdb = attrs: attrs // { - configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp"; + configureFlags = [ "--with-cpp=${args.mcpp}/bin/mcpp" ]; }; sessreg = attrs: attrs // { diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index c38d4e80143b..5a315b99b08b 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ libxcb xcbutil ] - ++ stdenv.lib.optional doCheck libX11; doCheck = true; + buildInputs = [ libxcb xcbutil ]; + checkInputs = [ libX11 ]; meta = with stdenv.lib; { description = "XCB utility functions for the X resource manager"; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 6a0bedeab260..1436af024cd7 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, lib, fetchurl, git, cacert +{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd , flock , withMysql ? false @@ -24,17 +24,17 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "18.01"; + version = "18.06"; name = "ejabberd-${version}"; src = fetchurl { url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6"; + sha256 = "1c4h6qrckihm8v4vm52h31j5dxg7247vk374rwz41idfb25vx7dc"; }; nativeBuildInputs = [ fakegit ]; - buildInputs = [ erlang openssl expat libyaml gd ] + buildInputs = [ erlang openssl expat libyaml gd makeWrapper ] ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1v3h0c7kfifb6wsfxyv5j1wc7rlxbb7r0pgd4s340wiyxnllzzhk"; + outputHash = "1bk3yd10cq6vlgmh2qawl82m29yi5zcbsdlz17xyy76sg2ka622a"; }; configureFlags = @@ -106,6 +106,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl + wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 6a657cc634f3..780a77c5caaf 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zookeeper-${version}"; - version = "3.4.12"; + version = "3.4.13"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; - sha256 = "1fcljn2741jw1jvjrk5a0xr8rk69wjwrq522wrc5nmjhj0qzk1n6"; + sha256 = "0karf13zks3ba2rdmma2lyabvmasc04cjmgxp227f0nj8677kvbw"; }; buildInputs = [ makeWrapper jre ]; |