diff options
Diffstat (limited to 'nixpkgs/pkgs/servers')
42 files changed, 363 insertions, 152 deletions
diff --git a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index 5f8358a45d64..b34a44715a57 100644 --- a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.11"; + version = "3.7.12"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "04m9ikm7ywx63y68lf3rxds97nr9czdzg82c1m1f823m89kmpgi0"; + sha256 = "14w7czxqdxgmsqxrvphzpyha1nq3yfhka4vy8wyzwixindgj493q"; }; buildInputs = diff --git a/nixpkgs/pkgs/servers/atlassian/confluence.nix b/nixpkgs/pkgs/servers/atlassian/confluence.nix index db80682d8993..586b51ee346d 100644 --- a/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.13.0"; + version = "6.14.1"; src = fetchurl { - url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1ckpcb0dq964gwdls5q71260r0i8zxgx8nzv8y4sizr37jvpi8mw"; + url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; + sha256 = "1pmxfikkydfi2m0bx1rgaj1ijhwh84zwwxkpw1f0vryvkl7av2gz"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/servers/atlassian/crowd.nix b/nixpkgs/pkgs/servers/atlassian/crowd.nix index 6bde7e187d78..2b32357089e0 100644 --- a/nixpkgs/pkgs/servers/atlassian/crowd.nix +++ b/nixpkgs/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "1mdjxr4p56rlsgnv78bfnlwmniv8hv3hdxnfvqzsmvv88s3z7c66"; + sha256 = "007jyizrkmn97kfkczpsk8128qsd5lj2343vfhd70w82p01qjy21"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/servers/consul/default.nix b/nixpkgs/pkgs/servers/consul/default.nix index 38d79eb2ba4c..7fc2f8779f60 100644 --- a/nixpkgs/pkgs/servers/consul/default.nix +++ b/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "1.4.1"; + version = "1.4.2"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "1xd2chx69jdbq2r82d4cgyc8pf1cmmxqvbfz29bf3nvvi6bgq7d5"; + sha256 = "1nprl9kcb98ikcmk7safji3hl4kfacx0gnh05k8m4ysfz6mr7zri"; }; preBuild = '' diff --git a/nixpkgs/pkgs/servers/dns/bind/default.nix b/nixpkgs/pkgs/servers/dns/bind/default.nix index 550a8fa13cca..0183d745990b 100644 --- a/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.3-P1"; in +let version = "9.12.3-P4"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0wzdbn6ig851354cjdys5q3gvqcvl2gmmih1gzr8ldl7sy4r7dvc"; + sha256 = "01pj47z5582rd538dmbzf1msw4jc8j4zr0zx4ciy88r6qr9l80fi"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 2affc8ceff25..04d0a0cf8d0c 100644 --- a/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -19,6 +19,11 @@ unwrapped = stdenv.mkDerivation rec { sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b"; }; + # Short-lived cross fix, as upstream is migrating to meson anyway. + postPatch = '' + substituteInPlace platform.mk --replace "objdump" "$OBJDUMP" + ''; + outputs = [ "out" "dev" ]; configurePhase = "patchShebangs scripts/"; diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 3b3d997e6aa6..082f7ed4e69b 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,12 +2,13 @@ # Do not edit! { - version = "0.86.4"; + version = "0.87.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; "air_quality" = ps: with ps; [ ]; "air_quality.demo" = ps: with ps; [ ]; + "air_quality.nilu" = ps: with ps; [ ]; "air_quality.opensensemap" = ps: with ps; [ ]; "alarm_control_panel" = ps: with ps; [ ]; "alarm_control_panel.abode" = ps: with ps; [ ]; @@ -21,7 +22,6 @@ "alarm_control_panel.egardia" = ps: with ps; [ ]; "alarm_control_panel.elkm1" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ]; - "alarm_control_panel.homekit_controller" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; @@ -44,6 +44,10 @@ "alexa.flash_briefings" = ps: with ps; [ ]; "alexa.intent" = ps: with ps; [ ]; "alexa.smart_home" = ps: with ps; [ ]; + "ambient_station" = ps: with ps; [ ]; + "ambient_station.config_flow" = ps: with ps; [ ]; + "ambient_station.const" = ps: with ps; [ ]; + "ambient_station.sensor" = ps: with ps; [ ]; "amcrest" = ps: with ps; [ ha-ffmpeg ]; "android_ip_webcam" = ps: with ps; [ ]; "apcupsd" = ps: with ps; [ ]; @@ -214,7 +218,6 @@ "camera.xeoma" = ps: with ps; [ ]; "camera.xiaomi" = ps: with ps; [ ha-ffmpeg ]; "camera.yi" = ps: with ps; [ ha-ffmpeg ]; - "camera.zoneminder" = ps: with ps; [ zm-py ]; "canary" = ps: with ps; [ ]; "cast" = ps: with ps; [ PyChromecast ]; "climate" = ps: with ps; [ ]; @@ -231,7 +234,6 @@ "climate.generic_thermostat" = ps: with ps; [ ]; "climate.heatmiser" = ps: with ps; [ ]; "climate.hive" = ps: with ps; [ ]; - "climate.homekit_controller" = ps: with ps; [ ]; "climate.homematic" = ps: with ps; [ pyhomematic ]; "climate.homematicip_cloud" = ps: with ps; [ ]; "climate.honeywell" = ps: with ps; [ ]; @@ -269,10 +271,12 @@ "cloud.http_api" = ps: with ps; [ ]; "cloud.iot" = ps: with ps; [ ]; "cloud.prefs" = ps: with ps; [ ]; + "cloud.utils" = ps: with ps; [ ]; "cloudflare" = ps: with ps; [ ]; "coinbase" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; "config" = ps: with ps; [ aiohttp-cors ]; + "config.area_registry" = ps: with ps; [ aiohttp-cors ]; "config.auth" = ps: with ps; [ ]; "config.automation" = ps: with ps; [ ]; "config.config_entries" = ps: with ps; [ ]; @@ -298,8 +302,8 @@ "cover.garadget" = ps: with ps; [ ]; "cover.gogogate2" = ps: with ps; [ ]; "cover.group" = ps: with ps; [ ]; - "cover.homekit_controller" = ps: with ps; [ ]; "cover.homematic" = ps: with ps; [ pyhomematic ]; + "cover.homematicip_cloud" = ps: with ps; [ ]; "cover.insteon" = ps: with ps; [ ]; "cover.isy994" = ps: with ps; [ ]; "cover.knx" = ps: with ps; [ ]; @@ -325,6 +329,9 @@ "daikin" = ps: with ps; [ ]; "daikin.config_flow" = ps: with ps; [ ]; "daikin.const" = ps: with ps; [ ]; + "danfoss_air" = ps: with ps; [ ]; + "danfoss_air.binary_sensor" = ps: with ps; [ ]; + "danfoss_air.sensor" = ps: with ps; [ ]; "datadog" = ps: with ps; [ datadog ]; "deconz" = ps: with ps; [ ]; "deconz.binary_sensor" = ps: with ps; [ ]; @@ -353,11 +360,11 @@ "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; "device_tracker.ddwrt" = ps: with ps; [ ]; "device_tracker.demo" = ps: with ps; [ ]; + "device_tracker.ee_brightbox" = ps: with ps; [ ]; "device_tracker.freebox" = ps: with ps; [ ]; "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; "device_tracker.google_maps" = ps: with ps; [ ]; "device_tracker.googlehome" = ps: with ps; [ ]; - "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ]; "device_tracker.hitron_coda" = ps: with ps; [ ]; "device_tracker.huawei_lte" = ps: with ps; [ ]; "device_tracker.huawei_router" = ps: with ps; [ ]; @@ -365,7 +372,6 @@ "device_tracker.keenetic_ndms2" = ps: with ps; [ ]; "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; "device_tracker.linksys_smart" = ps: with ps; [ ]; - "device_tracker.locative" = ps: with ps; [ aiohttp-cors ]; "device_tracker.luci" = ps: with ps; [ ]; "device_tracker.meraki" = ps: with ps; [ aiohttp-cors ]; "device_tracker.mikrotik" = ps: with ps; [ ]; @@ -381,6 +387,7 @@ "device_tracker.sky_hub" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; "device_tracker.swisscom" = ps: with ps; [ ]; + "device_tracker.synology_srm" = ps: with ps; [ ]; "device_tracker.tado" = ps: with ps; [ ]; "device_tracker.tesla" = ps: with ps; [ ]; "device_tracker.thomson" = ps: with ps; [ ]; @@ -401,10 +408,14 @@ "discovery" = ps: with ps; [ netdisco ]; "dominos" = ps: with ps; [ aiohttp-cors ]; "doorbird" = ps: with ps; [ ]; + "dovado" = ps: with ps; [ ]; + "dovado.notify" = ps: with ps; [ ]; + "dovado.sensor" = ps: with ps; [ ]; "downloader" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dweet" = ps: with ps; [ ]; "dyson" = ps: with ps; [ ]; + "ecoal_boiler" = ps: with ps; [ ]; "ecobee" = ps: with ps; [ ]; "ecovacs" = ps: with ps; [ ]; "edp_redy" = ps: with ps; [ ]; @@ -470,6 +481,7 @@ "google_assistant.trait" = ps: with ps; [ ]; "google_domains" = ps: with ps; [ ]; "gpslogger" = ps: with ps; [ aiohttp-cors ]; + "gpslogger.device_tracker" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; "group" = ps: with ps; [ ]; @@ -494,6 +506,13 @@ "homekit.const" = ps: with ps; [ ]; "homekit.util" = ps: with ps; [ ]; "homekit_controller" = ps: with ps; [ ]; + "homekit_controller.alarm_control_panel" = ps: with ps; [ ]; + "homekit_controller.binary_sensor" = ps: with ps; [ ]; + "homekit_controller.climate" = ps: with ps; [ ]; + "homekit_controller.cover" = ps: with ps; [ ]; + "homekit_controller.light" = ps: with ps; [ ]; + "homekit_controller.lock" = ps: with ps; [ ]; + "homekit_controller.switch" = ps: with ps; [ ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; "homematicip_cloud.config_flow" = ps: with ps; [ ]; @@ -534,6 +553,7 @@ "image_processing.openalpr_cloud" = ps: with ps; [ ]; "image_processing.openalpr_local" = ps: with ps; [ ]; "image_processing.opencv" = ps: with ps; [ numpy ]; + "image_processing.qrcode" = ps: with ps; [ pillow ]; "image_processing.seven_segments" = ps: with ps; [ ]; "image_processing.tensorflow" = ps: with ps; [ numpy pillow protobuf ]; "influxdb" = ps: with ps; [ influxdb ]; @@ -572,13 +592,13 @@ "light.elkm1" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; + "light.everlights" = ps: with ps; [ ]; "light.fibaro" = 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; [ ]; - "light.homekit_controller" = ps: with ps; [ ]; "light.homematic" = ps: with ps; [ pyhomematic ]; "light.homematicip_cloud" = ps: with ps; [ ]; "light.homeworks" = ps: with ps; [ ]; @@ -638,12 +658,12 @@ "lirc" = ps: with ps; [ ]; "litejet" = ps: with ps; [ ]; "locative" = ps: with ps; [ aiohttp-cors ]; + "locative.device_tracker" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; "lock.abode" = ps: with ps; [ ]; "lock.august" = ps: with ps; [ ]; "lock.bmw_connected_drive" = ps: with ps; [ ]; "lock.demo" = ps: with ps; [ ]; - "lock.homekit_controller" = ps: with ps; [ ]; "lock.homematic" = ps: with ps; [ pyhomematic ]; "lock.isy994" = ps: with ps; [ ]; "lock.kiwi" = ps: with ps; [ ]; @@ -699,7 +719,7 @@ "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; "media_player.epson" = ps: with ps; [ ]; - "media_player.firetv" = ps: with ps; [ ]; + "media_player.firetv" = ps: with ps; [ firetv ]; "media_player.frontier_silicon" = ps: with ps; [ ]; "media_player.gpmdp" = ps: with ps; [ websocket_client ]; "media_player.gstreamer" = ps: with ps; [ ]; @@ -935,7 +955,6 @@ "sensor.airvisual" = ps: with ps; [ pyairvisual ]; "sensor.alarmdecoder" = ps: with ps; [ ]; "sensor.alpha_vantage" = ps: with ps; [ ]; - "sensor.ambient_station" = ps: with ps; [ ]; "sensor.amcrest" = ps: with ps; [ ha-ffmpeg ]; "sensor.android_ip_webcam" = ps: with ps; [ ]; "sensor.apcupsd" = ps: with ps; [ ]; @@ -963,6 +982,7 @@ "sensor.canary" = ps: with ps; [ ]; "sensor.cert_expiry" = ps: with ps; [ ]; "sensor.citybikes" = ps: with ps; [ ]; + "sensor.co2signal" = ps: with ps; [ ]; "sensor.coinbase" = ps: with ps; [ ]; "sensor.coinmarketcap" = ps: with ps; [ coinmarketcap ]; "sensor.comed_hourly_pricing" = ps: with ps; [ ]; @@ -980,7 +1000,6 @@ "sensor.dht" = ps: with ps; [ ]; "sensor.discogs" = ps: with ps; [ discogs_client ]; "sensor.dnsip" = ps: with ps; [ aiodns ]; - "sensor.dovado" = ps: with ps; [ ]; "sensor.dsmr" = ps: with ps; [ ]; "sensor.dte_energy_bridge" = ps: with ps; [ ]; "sensor.dublin_bus_transport" = ps: with ps; [ ]; @@ -989,6 +1008,7 @@ "sensor.dweet" = ps: with ps; [ ]; "sensor.dyson" = ps: with ps; [ ]; "sensor.ebox" = ps: with ps; [ ]; + "sensor.ecoal_boiler" = ps: with ps; [ ]; "sensor.ecobee" = ps: with ps; [ ]; "sensor.eddystone_temperature" = ps: with ps; [ construct ]; "sensor.edp_redy" = ps: with ps; [ ]; @@ -1018,6 +1038,7 @@ "sensor.folder" = ps: with ps; [ ]; "sensor.foobot" = ps: with ps; [ ]; "sensor.freebox" = ps: with ps; [ ]; + "sensor.fritzbox" = ps: with ps; [ ]; "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "sensor.gearbest" = ps: with ps; [ ]; @@ -1045,10 +1066,12 @@ "sensor.hydrawise" = ps: with ps; [ ]; "sensor.hydroquebec" = ps: with ps; [ ]; "sensor.ihc" = ps: with ps; [ defusedxml ]; - "sensor.imap" = ps: with ps; [ aioimaplib ]; + "sensor.iliad_italy" = ps: with ps; [ ]; + "sensor.imap" = ps: with ps; [ ]; "sensor.imap_email_content" = ps: with ps; [ ]; "sensor.influxdb" = ps: with ps; [ influxdb ]; "sensor.insteon" = ps: with ps; [ ]; + "sensor.integration" = ps: with ps; [ ]; "sensor.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "sensor.iota" = ps: with ps; [ ]; "sensor.iperf3" = ps: with ps; [ ]; @@ -1128,12 +1151,14 @@ "sensor.rainbird" = ps: with ps; [ ]; "sensor.raincloud" = ps: with ps; [ ]; "sensor.random" = ps: with ps; [ ]; + "sensor.recollect_waste" = ps: with ps; [ ]; "sensor.rest" = ps: with ps; [ ]; "sensor.rflink" = ps: with ps; [ ]; "sensor.rfxtrx" = ps: with ps; [ ]; "sensor.ring" = ps: with ps; [ ]; "sensor.ripple" = ps: with ps; [ ]; "sensor.rmvtransport" = ps: with ps; [ ]; + "sensor.rova" = ps: with ps; [ ]; "sensor.rtorrent" = ps: with ps; [ ]; "sensor.ruter" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ]; @@ -1234,7 +1259,6 @@ "sensor.zamg" = ps: with ps; [ ]; "sensor.zestimate" = ps: with ps; [ xmltodict ]; "sensor.zigbee" = ps: with ps; [ ]; - "sensor.zoneminder" = ps: with ps; [ zm-py ]; "sensor.zwave" = ps: with ps; [ ]; "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; @@ -1247,6 +1271,14 @@ "skybell" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; + "smartthings" = ps: with ps; [ aiohttp-cors ]; + "smartthings.binary_sensor" = ps: with ps; [ aiohttp-cors ]; + "smartthings.config_flow" = ps: with ps; [ ]; + "smartthings.const" = ps: with ps; [ ]; + "smartthings.fan" = ps: with ps; [ aiohttp-cors ]; + "smartthings.light" = ps: with ps; [ aiohttp-cors ]; + "smartthings.smartapp" = ps: with ps; [ ]; + "smartthings.switch" = ps: with ps; [ aiohttp-cors ]; "smhi" = ps: with ps; [ ]; "smhi.config_flow" = ps: with ps; [ ]; "smhi.const" = ps: with ps; [ ]; @@ -1277,6 +1309,7 @@ "switch.digitalloggers" = ps: with ps; [ ]; "switch.dlink" = ps: with ps; [ ]; "switch.doorbird" = ps: with ps; [ ]; + "switch.ecoal_boiler" = ps: with ps; [ ]; "switch.edimax" = ps: with ps; [ ]; "switch.edp_redy" = ps: with ps; [ ]; "switch.elkm1" = ps: with ps; [ ]; @@ -1291,7 +1324,6 @@ "switch.hikvisioncam" = ps: with ps; [ ]; "switch.hive" = ps: with ps; [ ]; "switch.hlk_sw16" = ps: with ps; [ ]; - "switch.homekit_controller" = ps: with ps; [ ]; "switch.homematic" = ps: with ps; [ pyhomematic ]; "switch.homematicip_cloud" = ps: with ps; [ ]; "switch.hook" = ps: with ps; [ ]; @@ -1302,6 +1334,7 @@ "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; "switch.konnected" = ps: with ps; [ aiohttp-cors ]; + "switch.lcn" = ps: with ps; [ ]; "switch.lightwave" = ps: with ps; [ ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; @@ -1351,7 +1384,7 @@ "switch.tradfri" = ps: with ps; [ ]; "switch.transmission" = ps: with ps; [ transmissionrpc ]; "switch.tuya" = ps: with ps; [ ]; - "switch.unifi" = ps: with ps; [ ]; + "switch.unifi" = ps: with ps; [ aiounifi ]; "switch.upcloud" = ps: with ps; [ ]; "switch.velbus" = ps: with ps; [ ]; "switch.vera" = ps: with ps; [ ]; @@ -1366,8 +1399,8 @@ "switch.xiaomi_aqara" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ construct ]; "switch.zigbee" = ps: with ps; [ ]; - "switch.zoneminder" = ps: with ps; [ zm-py ]; "switch.zwave" = ps: with ps; [ ]; + "system_health" = ps: with ps; [ aiohttp-cors ]; "system_log" = ps: with ps; [ aiohttp-cors ]; "tado" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ ]; @@ -1390,6 +1423,7 @@ "tradfri" = ps: with ps; [ ]; "tradfri.config_flow" = ps: with ps; [ ]; "tradfri.const" = ps: with ps; [ ]; + "transmission" = ps: with ps; [ transmissionrpc ]; "tts" = ps: with ps; [ aiohttp-cors mutagen ]; "tts.amazon_polly" = ps: with ps; [ boto3 ]; "tts.baidu" = ps: with ps; [ ]; @@ -1402,7 +1436,7 @@ "tts.yandextts" = ps: with ps; [ ]; "tuya" = ps: with ps; [ ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ]; - "unifi" = ps: with ps; [ ]; + "unifi" = ps: with ps; [ aiounifi ]; "unifi.const" = ps: with ps; [ ]; "unifi.controller" = ps: with ps; [ ]; "unifi.errors" = ps: with ps; [ ]; @@ -1412,6 +1446,9 @@ "upnp.const" = ps: with ps; [ ]; "upnp.device" = ps: with ps; [ ]; "usps" = ps: with ps; [ ]; + "utility_meter" = ps: with ps; [ ]; + "utility_meter.const" = ps: with ps; [ ]; + "utility_meter.sensor" = ps: with ps; [ ]; "vacuum" = ps: with ps; [ ]; "vacuum.demo" = ps: with ps; [ ]; "vacuum.dyson" = ps: with ps; [ ]; @@ -1469,10 +1506,11 @@ "zha.binary_sensor" = ps: with ps; [ ]; "zha.config_flow" = ps: with ps; [ ]; "zha.const" = ps: with ps; [ ]; - "zha.entities" = ps: with ps; [ ]; + "zha.core" = ps: with ps; [ ]; + "zha.device_entity" = ps: with ps; [ ]; + "zha.entity" = ps: with ps; [ ]; "zha.event" = ps: with ps; [ ]; "zha.fan" = ps: with ps; [ ]; - "zha.helpers" = ps: with ps; [ ]; "zha.light" = ps: with ps; [ ]; "zha.sensor" = ps: with ps; [ ]; "zha.switch" = ps: with ps; [ ]; @@ -1482,6 +1520,10 @@ "zone.const" = ps: with ps; [ ]; "zone.zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ zm-py ]; + "zoneminder.binary_sensor" = ps: with ps; [ zm-py ]; + "zoneminder.camera" = ps: with ps; [ zm-py ]; + "zoneminder.sensor" = ps: with ps; [ zm-py ]; + "zoneminder.switch" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave.config_flow" = ps: with ps; [ ]; "zwave.const" = ps: with ps; [ ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 27eff24d7043..519ae013f1cc 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -20,18 +20,35 @@ let # Override the version of some packages pinned in Home Assistant's setup.py (mkOverride "aiohttp" "3.5.4" "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf") - (mkOverride "astral" "1.7.1" - "88086fd2006c946567285286464b2da3294a3b0cbba4410b7008ec2458f82a07") + (mkOverride "astral" "1.8" + "7d624ccd09c591e56103f077733bc36194940076939875d84909d5086afd99c8") (mkOverride "async-timeout" "3.0.1" "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "18.2.0" "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") (mkOverride "bcrypt" "3.1.5" "136243dc44e5bab9b61206bd46fff3018bd80980b1a1dfbab64a22ff5745957f") - (mkOverride "pyjwt" "1.6.4" - "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176") - (mkOverride "cryptography" "2.3.1" - "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") + (self: super: { + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.6.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176"; + }; + doCheck = false; # https://github.com/jpadilla/pyjwt/issues/382 + }); + }) + (self: super: { + cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec { + version = "2.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6"; + }; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.idna ]; + checkInputs = with self; [ pytest_3 pretend iso8601 pytz hypothesis ]; + }); + }) (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1 "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") (mkOverride "python-slugify" "1.2.6" @@ -87,7 +104,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.86.4"; + hassVersion = "0.87.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -102,7 +119,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "13yyzcwz44gz6j0fh1awws83p6fmpib9ribm1453qr172knanhjy"; + sha256 = "1f1l4a78dix1mwkpg84b3iw69nxx1dqbl3c698qg857kwac6w9d5"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/home-assistant/esphome.nix b/nixpkgs/pkgs/servers/home-assistant/esphome.nix index 2e0b4abc9391..d4420be94b5a 100644 --- a/nixpkgs/pkgs/servers/home-assistant/esphome.nix +++ b/nixpkgs/pkgs/servers/home-assistant/esphome.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.11.1"; + version = "1.11.2"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1764q4wyl8qlk2514gikv8178c8fwhhvbw64zkd76nb107hxzrk5"; + sha256 = "0kg8fqv3mv8i852jr42p4mipa9wjlzjwj60j1r2zpgzgr8p8wfs8"; }; ESPHOME_USE_SUBPROCESS = ""; diff --git a/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 1ea9e96d8f98..35fafa3e1002 100644 --- a/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190121.1"; + version = "20190203.0"; src = fetchPypi { inherit pname version; - sha256 = "7d1e127249dbefd0c8e101d8b178eeae6bf76a0296d8b22ed33759e23ef07856"; + sha256 = "8f71a63e1c35ec088ed46e4529b30df7dd44f4968d84068306718c912d3a1410"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 647589621029..ff767d9ad437 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchurl, apacheHttpd }: -stdenv.mkDerivation rec { - name = "mod_fastcgi-2.4.6"; +let + version = "2.4.7.1"; + + apache-24-patch = fetchurl { + name = "compile-against-apache24.diff"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; + sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; + }; +in +stdenv.mkDerivation { + name = "mod_fastcgi-${version}"; src = fetchurl { - url = "http://www.fastcgi.com/dist/${name}.tar.gz"; + url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz"; sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55"; }; - patches = - [ (fetchurl { - name = "compile-against-apache24.diff"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; - sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; - }) - ]; + patches = [ apache-24-patch ]; buildInputs = [ apacheHttpd ]; @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.fastcgi.com/; + homepage = https://github.com/FastCGI-Archives/mod_fastcgi; description = "Provide support for the FastCGI protocol"; longDescription = '' diff --git a/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix index 3f4f99acbc65..d86a78187e5f 100644 --- a/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.8"; - sha256 = "11q7njr0khv8hb96bclyw5f75gvm12nw3jjgmq9rifbym2yazgd8"; + version = "1.15.9"; + sha256 = "0hxfsz1117r91b9fb5hjddyrf1czvb36lh1z7zalqqdskfcbmkz4"; }) diff --git a/nixpkgs/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix index a418e2af4685..33443552f601 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0nxkszdgs6fs86j6w1lf3vhxvjh1hw2jmrii5icqx9a9xqgg74rw"; + sha256 = "1sgy9apffi6daf3zsmkg8b3wzbhz8x9j7pr45mvqsf2hwm1ds6sr"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix index 431e66e38fb8..094b782abf9e 100644 --- a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix +++ b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, makeWrapper, gnupg1 }: perlPackages.buildPerlPackage rec { - name = "SpamAssassin-3.4.1"; + name = "SpamAssassin-3.4.2"; src = fetchurl { url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2"; - sha256 = "0la6s5ilamf9129kyjckcma8cr6fpb6b5f2fb64v7106iy0ckhd0"; + sha256 = "1np8h293bzg33i0xn9gj9krwgr7k6xbyf1yhxr2j2xci95d080yg"; }; # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434 diff --git a/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix b/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix index fe0aeb5b3afa..7bd7df849244 100644 --- a/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix +++ b/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeText }: +{ stdenv, writeText, runtimeShell }: let script = writeText "script" '' - #!${stdenv.shell} + #!${runtimeShell} if command -v sendmail > /dev/null 2>&1 && [ "$(command -v sendmail)" != "{{MYPATH}}" ]; then exec sendmail "$@" diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 1b97e0049ed5..783c0b5bde82 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.1.1"; + version = "0.99.2"; src = fetchPypi { inherit pname version; - sha256 = "1ych13x3c2cam7af4q2ariwvzwvr65g3j2x8ajjn33ydwxxbqbg6"; + sha256 = "0y6vic0fjx9k8178vsns0ab4ngqx8qhiyampqnil0b1biqcd68bw"; }; patches = [ @@ -75,7 +75,7 @@ in buildPythonApplication rec { checkInputs = [ mock parameterized ]; checkPhase = '' - PYTHONPATH=".:$PYTHONPATH" trial tests + PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/servers/meteor/default.nix b/nixpkgs/pkgs/servers/meteor/default.nix index 132f812bf464..b677b6080d1f 100644 --- a/nixpkgs/pkgs/servers/meteor/default.nix +++ b/nixpkgs/pkgs/servers/meteor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, patchelf }: +{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let bootstrap = fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # otherwise it fails spectacularly. mkdir -p $out/bin cat << EOF > $out/bin/meteor - #!${stdenv.shell} + #!${runtimeShell} if [[ ! -f \$HOME/.meteor/package-metadata/v2.0.1/packages.data.db ]]; then mkdir -p \$HOME/.meteor/package-metadata/v2.0.1 diff --git a/nixpkgs/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix index 1dcac1f9a822..faec807c4b8e 100644 --- a/nixpkgs/pkgs/servers/minio/default.nix +++ b/nixpkgs/pkgs/servers/minio/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2019-01-31T00-31-19Z"; + version = "2019-02-26T19-51-46Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0rvvjgnbk9khi443bahrg6iqa5lhmv8gydg96vgkrby13r1yy84k"; + sha256 = "1f2c7wzcb47msb0iqrcc0idz39wdm9fz61q835ks1nx4qs6hi2db"; }; goPackagePath = "github.com/minio/minio"; diff --git a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix index ff0c926de595..58ef9fa32b91 100644 --- a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ go ]; + GOCACHE="$TMPDIR/go-cache"; + buildPhase = '' mkdir -p Godeps/_workspace/src/github.com/google/ ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 1d8f9ca3c799..721f4a043028 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,20 +1,22 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.4.3"; + version = "6.0.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; + excludedPackages = [ "release_publisher" ]; + src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "11fwb80a9qqlzmg11vw4llfa0mz80jkljg0gmp0sbv6c9jspqncv"; + sha256 = "1dacji3b8iqfx92cb6psrhvg2hym8xl1lzfn7yvyss4vjj7pmbbc"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "141msgrxdn4nmwp6jhh3zg5zcbj82pxdr7ysc5v28rh9paj79yyd"; + sha256 = "02c7klma5zl1mcis7gnbfi56i59ps7i757yyy8v9gnp5ynnb55v4"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/default.nix b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix index a0f7341571ce..3e6eaa4766e8 100644 --- a/nixpkgs/pkgs/servers/monitoring/plugins/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook -, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }: +, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +, runtimeShell }: with stdenv.lib; @@ -50,7 +51,7 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p $out cat <<_EOF > $out/share -#!${stdenv.shell} +#!${runtimeShell} exit 0 _EOF chmod 755 $out/share diff --git a/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index a8203ce1b168..75a0498dd3f1 100644 --- a/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt -, openssl, libuuid, libwebsockets, c-ares, libuv }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt +, openssl, libuuid, libwebsockets, c-ares, libuv +, systemd ? null }: -stdenv.mkDerivation rec { +let + withSystemd = stdenv.isLinux; + +in stdenv.mkDerivation rec { name = "mosquitto-${version}"; - version = "1.5.5"; + version = "1.5.8"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1sfwmvrglfy5gqfk004kvbjldqr36dqz6xmppbgfhr47j5zs66xc"; + sha256 = "1rf8g6fq7g1mhwsajsgvvlynasybgc51v0qg5j6ynsxfh8yi7s6r"; }; postPatch = '' - substituteInPlace man/manpage.xsl \ - --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/ + for f in html manpage ; do + substituteInPlace man/$f.xsl \ + --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl + done for f in {lib,lib/cpp,src}/CMakeLists.txt ; do - substituteInPlace $f --replace /sbin/ldconfig ldconfig + substituteInPlace $f --replace /sbin/ldconfig true done # the manpages are not generated when using cmake @@ -26,7 +32,9 @@ stdenv.mkDerivation rec { popd ''; - buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]; + buildInputs = [ + openssl libuuid libwebsockets c-ares libuv + ] ++ lib.optional withSystemd systemd; nativeBuildInputs = [ cmake docbook_xsl libxslt ]; @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_THREADING=ON" "-DWITH_WEBSOCKETS=ON" - ]; + ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; meta = with stdenv.lib; { description = "An open source MQTT v3.1/3.1.1 broker"; diff --git a/nixpkgs/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix index e26a97dc6f30..d0d0480e5eae 100644 --- a/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.4"; + version = "15.0.5"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0xwg7p31y1pkjk1pzygh9shpqxnfkafrab52j7in7xblq53v0zgq"; + sha256 = "125ra0rdgk17d8s80i54w0s58dqvjgkdpcxbczchqd3sg6dqcqa6"; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 63b222529a86..d165a34d5f62 100644 --- a/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "3.9.0"; + version = "3.10.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "1kf524j7wmvbjrr3grrhfddv3c3niddhj2f6m7hz9pqvf7nykvi4"; + sha256 = "0v7srssivhx0bswvbr8ifaahcknlajwqqhr449v5zzi6nbyc613a"; }; buildInputs = [ makeWrapper diff --git a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index 1d3240fae716..7880c6db7fd9 100644 --- a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8, runtimeShell }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/eventstore/clusternode} cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ cat > $out/bin/clusternode << EOF - #!${stdenv.shell} + #!${runtimeShell} exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" EOF chmod +x $out/bin/clusternode diff --git a/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix b/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix index cf807e70596d..36b29b57bf97 100644 --- a/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; maintainers = with maintainers; [ mdaiter ]; + knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; }; } diff --git a/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix b/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix index a09b4543cbbe..170b0d5f22f9 100644 --- a/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix +++ b/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; license = licenses.asl20; + knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; }; } diff --git a/nixpkgs/pkgs/servers/openafs/1.8/linux-4.20.patch b/nixpkgs/pkgs/servers/openafs/1.8/linux-4.20.patch new file mode 100644 index 000000000000..bb896d82b693 --- /dev/null +++ b/nixpkgs/pkgs/servers/openafs/1.8/linux-4.20.patch @@ -0,0 +1,62 @@ +--- a/src/afs/LINUX/osi_machdep.h ++++ b/src/afs/LINUX/osi_machdep.h +@@ -75,7 +75,14 @@ + #if defined(HAVE_LINUX_CRED_H) + #include "h/cred.h" + #endif +-#if defined(HAVE_LINUX_CURRENT_KERNEL_TIME) ++ ++#if defined(HAVE_LINUX_KTIME_GET_COARSE_REAL_TS64) ++static inline time_t osi_Time(void) { ++ struct timespec64 xtime; ++ ktime_get_coarse_real_ts64(&xtime); ++ return xtime.tv_sec; ++} ++#elif defined(HAVE_LINUX_CURRENT_KERNEL_TIME) + static inline time_t osi_Time(void) { + struct timespec xtime; + xtime = current_kernel_time(); +--- a/src/cf/linux-kernel-func.m4 ++++ b/src/cf/linux-kernel-func.m4 +@@ -72,6 +72,10 @@ AC_CHECK_LINUX_FUNC([iter_file_splice_write], + AC_CHECK_LINUX_FUNC([kernel_setsockopt], + [#include <linux/net.h>], + [kernel_setsockopt(NULL, 0, 0, NULL, 0);]) ++AC_CHECK_LINUX_FUNC([ktime_get_coarse_real_ts64], ++ [#include <linux/time.h>], ++ [struct timespec64 *s; ++ ktime_get_coarse_real_ts64(s);]) + AC_CHECK_LINUX_FUNC([locks_lock_file_wait], + [#include <linux/fs.h>], + [locks_lock_file_wait(NULL, NULL);]) +--- a/src/afs/LINUX/osi_misc.c ++++ b/src/afs/LINUX/osi_misc.c +@@ -28,18 +28,6 @@ + int afs_osicred_initialized = 0; + afs_ucred_t afs_osi_cred; + +-void +-afs_osi_SetTime(osi_timeval_t * tvp) +-{ +- struct timespec tv; +- tv.tv_sec = tvp->tv_sec; +- tv.tv_nsec = tvp->tv_usec * NSEC_PER_USEC; +- +- AFS_STATCNT(osi_SetTime); +- +- do_settimeofday(&tv); +-} +- + void + osi_linux_mask(void) + { +--- a/src/afs/LINUX/osi_prototypes.h ++++ b/src/afs/LINUX/osi_prototypes.h +@@ -45,7 +45,6 @@ extern void osi_ioctl_init(void); + extern void osi_ioctl_clean(void); + + /* osi_misc.c */ +-extern void afs_osi_SetTime(osi_timeval_t * tvp); + extern int osi_lookupname_internal(char *aname, int followlink, + struct vfsmount **mnt, struct dentry **dpp); + extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink, diff --git a/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/nixpkgs/pkgs/servers/openafs/1.8/module.nix index 958fcd578c2b..36a73bf5878b 100644 --- a/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -11,6 +11,8 @@ in stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; + patches = [ ./linux-4.20.patch ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; diff --git a/nixpkgs/pkgs/servers/search/groonga/default.nix b/nixpkgs/pkgs/servers/search/groonga/default.nix index b86077a53f56..3e76cd163c8c 100644 --- a/nixpkgs/pkgs/servers/search/groonga/default.nix +++ b/nixpkgs/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1qwrzw0rvzkkmpgbk0rd5slj6h7jj53f0g685f5gwhg2dpxk52br"; + sha256 = "0laijnx05xc90jjmza4kq2h8pxn3lgsmn2fgn3zl66fy4fxm1fy4"; }; buildInputs = with stdenv.lib; diff --git a/nixpkgs/pkgs/servers/search/solr/default.nix b/nixpkgs/pkgs/servers/search/solr/default.nix index 8e72605b834f..6a32ce39d5ca 100644 --- a/nixpkgs/pkgs/servers/search/solr/default.nix +++ b/nixpkgs/pkgs/servers/search/solr/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "solr-${version}"; - version = "7.6.0"; + pname = "solr"; + version = "7.7.1"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "1marwyn7r85k5j28vwkl9n942gp52kjh6s1hbm357w8gnfh2bd1c"; + sha256 = "1i189xhlxrpdqx2gx3r8s4dcd7nm74vjynwkrgv2hnq4mw95zf2g"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/smcroute/default.nix b/nixpkgs/pkgs/servers/smcroute/default.nix index 8111991cd38a..3409fc00066f 100644 --- a/nixpkgs/pkgs/servers/smcroute/default.nix +++ b/nixpkgs/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "1bdz3dic12lwl3rfczd9bxpgjbpw2g7yap2zddz6dvgkqvyjjf1h"; + sha256 = "0mjq9cx093b0825rqbcq3z0lzy81pd8h0fz6rda6npg3604rxj81"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix b/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix index c23bdcd24761..249a5af5d480 100644 --- a/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix +++ b/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix @@ -57,7 +57,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = "-fpermissive -std=c++11"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix index 6342be5fe492..1d523351d1eb 100644 --- a/nixpkgs/pkgs/servers/traefik/default.nix +++ b/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.7.8"; + version = "1.7.9"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "19x2shx5a6ccnc1r0jl51b9qrypzl38npdcy07352lm6jdffi8i4"; + sha256 = "0lncygkqws5jvbhpx2qlr18y8b325y9a6690ll9azlphxydrv44m"; }; buildInputs = [ go-bindata bash ]; diff --git a/nixpkgs/pkgs/servers/ttyd/default.nix b/nixpkgs/pkgs/servers/ttyd/default.nix new file mode 100644 index 000000000000..bae43412e784 --- /dev/null +++ b/nixpkgs/pkgs/servers/ttyd/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, cmake, xxd +, openssl, libwebsockets, json_c, libuv +}: + +with builtins; + +let + # ttyd hasn't seen a release in quite a while. remove all this + # junk when a new one happens (eventually) + revCount = 174; + src = fetchFromGitHub { + owner = "tsl0922"; + repo = "ttyd"; + rev = "6df6ac3e03b705ddd46109c2ac43a1cba439c0df"; + sha256 = "0g5jlfa7k6qd59ysdagczlhwgjfjspb3sfbd8b790hcil933qrxm"; + }; + +in stdenv.mkDerivation rec { + name = "ttyd-${version}"; + version = "1.4.2_pre${toString revCount}_${substring 0 8 src.rev}"; + inherit src; + + nativeBuildInputs = [ pkgconfig cmake xxd ]; + buildInputs = [ openssl libwebsockets json_c libuv ]; + enableParallelBuilding = true; + + outputs = [ "out" "man" ]; + + meta = { + description = "Share your terminal over the web"; + homepage = https://github.com/tsl0922/ttyd; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/default.nix b/nixpkgs/pkgs/servers/web-apps/codimd/default.nix index c48a9f938bdf..d5e84cce9849 100644 --- a/nixpkgs/pkgs/servers/web-apps/codimd/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/codimd/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper -, fetchpatch, nodejs-6_x, phantomjs2 }: +, fetchpatch, nodejs-6_x, phantomjs2, runtimeShell }: let nodePackages = import ./node.nix { inherit pkgs; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/codimd <<EOF - #!${stdenv.shell} + #!${runtimeShell} ${nodejs-6_x}/bin/node $out/app.js EOF cp -R {app.js,bin,lib,locales,package.json,public} $out/ diff --git a/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix index bfb98add9433..3083512e1b4e 100644 --- a/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "0h8sspj7siy3vgpi2i3gdrjcr5935fr4dfwq2zwd70sjx2sh9s78"; + sha256 = "1jcjkyhqwh1pv0a98bidf8az6mc34l4snnsl6lc7m2gxr55099j8"; }; outputs = [ "out" "doc" ]; diff --git a/nixpkgs/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix index 90ebe4fad44b..88e183bc3f25 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -32,11 +32,11 @@ lib.makeScope newScope (self: with self; { }) {}; bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "bitmap-1.0.8"; + name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz; - sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs"; + url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz; + sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -729,11 +729,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXau-1.0.8"; + name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; - sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; + url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2; + sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1417,6 +1417,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + name = "xcalc-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2; + sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { name = "xcb-proto-1.13"; builder = ./builder.sh; @@ -1574,11 +1587,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { - name = "xcursorgen-1.0.6"; + name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; - sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; + url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2; + sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1587,11 +1600,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { - name = "xcursor-themes-1.0.5"; + name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2; - sha256 = "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf"; + url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2; + sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1599,16 +1612,16 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation { - name = "xdm-1.1.11"; + xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xdm-1.1.12"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; - sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; + url = mirror://xorg/individual/app/xdm-1.1.12.tar.bz2; + sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1781,6 +1794,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-apm-1.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2; + sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; @@ -1821,11 +1847,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-chips-1.3.0"; + name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2; - sha256 = "00nsyz0z8mkzinr5czkkajbw1fm6437q7f3dx027017jdhh4qb4p"; + url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2; + sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2094,11 +2120,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-s3virge-1.10.7"; + name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; - sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; + url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2; + sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2198,11 +2224,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tdfx-1.4.7"; + name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; - sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; + url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2; + sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2393,11 +2419,11 @@ lib.makeScope newScope (self: with self; { }) {}; xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xinit-1.4.0"; + name = "xinit-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2; - sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213"; + url = mirror://xorg/individual/app/xinit-1.4.1.tar.bz2; + sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2627,11 +2653,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.3"; + name = "xorg-server-1.20.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2; - sha256 = "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"; + url = mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2; + sha256 = "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index ec1e6a413b4f..06f7c2b93a8c 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -11,7 +11,7 @@ https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 -mirror://xorg/individual/app/bitmap-1.0.8.tar.gz +mirror://xorg/individual/app/bitmap-1.0.9.tar.gz mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 @@ -29,12 +29,13 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 +mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 -mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 -mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 +mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 +mirror://xorg/individual/app/xdm-1.1.12.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xev-1.2.2.tar.bz2 @@ -44,7 +45,7 @@ mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 -mirror://xorg/individual/app/xinit-1.4.0.tar.bz2 +mirror://xorg/individual/app/xinit-1.4.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 @@ -72,7 +73,7 @@ mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 -mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2 +mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 @@ -85,10 +86,11 @@ mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 @@ -109,7 +111,7 @@ mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 @@ -117,7 +119,7 @@ mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2 @@ -173,7 +175,7 @@ mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 -mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 @@ -212,4 +214,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2 diff --git a/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix index 535fb061de9b..8df8499d11eb 100644 --- a/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages } : +{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : stdenv.mkDerivation rec { name = "pyIRCt-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/${name} cat > $out/bin/pyIRCt <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/${name} ./irc.py \"$@\" EOF diff --git a/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix index b1c4d93f687e..76861ab842b5 100644 --- a/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, xmpppy, pythonPackages, fetchcvs } : +{ stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } : stdenv.mkDerivation rec { name = "pyMAILt-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/$name cat > $out/bin/pyMAILt <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/${name} ./mail.py \"$@\" EOF diff --git a/nixpkgs/pkgs/servers/zookeeper/default.nix b/nixpkgs/pkgs/servers/zookeeper/default.nix index 780a77c5caaf..5bacaf2982e9 100644 --- a/nixpkgs/pkgs/servers/zookeeper/default.nix +++ b/nixpkgs/pkgs/servers/zookeeper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils }: +{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }: stdenv.mkDerivation rec { name = "zookeeper-${version}"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done cat << EOF > $out/bin/zooInspector.sh - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/zooinspector exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector EOF |