diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/kicad/versions.nix | 52 | ||||
-rw-r--r-- | pkgs/applications/science/misc/foldingathome/control.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/misc/foldingathome/viewer.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 15 | ||||
-rw-r--r-- | pkgs/servers/dns/bind/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/dns/pdns-recursor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch | 29 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/component-packages.nix | 30 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/frontend.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-update/default.nix | 34 | ||||
-rw-r--r-- | pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
16 files changed, 129 insertions, 84 deletions
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 029ec23856ab..92307547531d 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.0.403652.0509"; + version = "5.0.408598.0517"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "00bprrfc7mmf3yg6jddqm2qr73m2zycr8hy19dxqpzld9gbvyzik"; + sha256 = "1irpnrxl91pc9naz0d9m252scnbfdbdi7yh19hd3arvk3fppjk7w"; }; }; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 2b7c91751e54..4a9ed0cb86dc 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,49 +3,49 @@ { "kicad" = { kicadVersion = { - version = "5.1.5"; + version = "5.1.6"; src = { - rev = "52549c5d09cbfb0e807fcbcb07819bc9f7861544"; - sha256 = "15h3rwisjss3fdc9bam9n2wq94slhacc3fbg14bnzf4n5agsnv5b"; + rev = "c6e7f7de7df655fd59b57823499efc443009de6b"; + sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622"; }; }; libVersion = { - version = "5.1.5"; + version = "5.1.6"; libSources = { - i18n.rev = "5122cbec6563fb7c8d6f960a639ac470353af91b"; - i18n.sha256 = "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3"; - symbols.rev = "dd122ec170b49e032179511c9d263126f52f4020"; - symbols.sha256 = "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h"; - templates.rev = "94761f10d06582b33cd55ea2149d72f269f65580"; - templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "e076f8f271f8db96d5fec45616b7554caebb7ef7"; - footprints.sha256 = "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j"; - packages3d.rev = "8d233cdcb109aa1c3b8ba4c934ee31f6a3b6e1f4"; - packages3d.sha256 = "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz"; + i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd"; + i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha"; + symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708"; + symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6"; + templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9"; + templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; + footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332"; + footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx"; + packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c"; + packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2020-05-06"; + version = "2020-05-14"; src = { - rev = "c92181621e2e51dc8aae1bd9f4483bb3301ffaa5"; - sha256 = "0s50xn5gbjy7yxnp9yiynxvxi2mkcrp6yghgdzclpm40rnfyi0v5"; + rev = "3b8465359135e9f6dea4b0a5fcb62377753fe890"; + sha256 = "18xsg2s0pxx176rnblygq1f8xpmryw59lcjzm897gifz0sj0nhvx"; }; }; libVersion = { - version = "2020-05-06"; + version = "2020-05-14"; libSources = { - i18n.rev = "f29cab831eb823165fa2c5efab5d9c9b443e62e2"; - i18n.sha256 = "0cc0zvpml75yxphay3281f762ls08fzvv538cd5hmkr8xqlj3vbi"; - symbols.rev = "d4245ae8cf633095a0994ab01492bd56cd124112"; - symbols.sha256 = "11pynjgji3skw42q5mryz98f8z418k43jy6s2k90w6jv638z3cb0"; + i18n.rev = "c4460d0d8e1075691d43dc928ffc332fa1282592"; + i18n.sha256 = "1gkrbfyfzsr5q7sahhlyhgfpfwm6b83lzf0q1v854gwxdfabvi0y"; + symbols.rev = "614b5f6256fbae82c2bba399086506bbe435bd94"; + symbols.sha256 = "10ix3wdcl832r4ha5q8phpx8j97gzngb41nczdli1qkhjmiw9y8r"; templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857"; templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; - footprints.rev = "3bff23ee339bc48490bb39deba5d8b2f1f42733e"; - footprints.sha256 = "0430r8k49ib6w1sjr8fx42szbz960yhlzg4w80jl5bwasq67nqwd"; - packages3d.rev = "889a3dd550233ec51baed4a04a01d4cc64a8d747"; - packages3d.sha256 = "152zv4j51v8skqlvrabblpcqpbn5yf3grisjj8vnwf7kdd41chb2"; + footprints.rev = "240804c6c89b66af808379e1fc94ea6011433cbe"; + footprints.sha256 = "1jh71004lrn7bl384zfmbqqdbs28gjb6diwn6hyb587jpivdnl3g"; + packages3d.rev = "9b560cf94a35b692ca516d37bdaf392ce10e549d"; + packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; }; }; }; diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index 72217689ff18..91c3b8c779cd 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.6.9"; + version = "7.6.13"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - sha256 = "1fh7ybbp3qlqzh18c4gva3aaymv7d31mqchrv235a1axldha1s9s"; + sha256 = "0qfvhwc29cgqkwf2bkhq4gr2d1c4jgccfs58916ss03n4rwz9gng"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index a35df650300b..cdeed6536efa 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.6.9"; + version = "7.6.13"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - sha256 = "04wr86g11wpmsczzwzak4gvalcihb47rn3zp6qriawhxyac9nf93"; + sha256 = "09yfvk16j1iwx8h1xg678ks3bc8760gfdn7n32j8r893kd32cwyk"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 50b67f455581..8bb5d5aca1f4 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -184,6 +184,8 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for mpv wrapperFlags = + ''--prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \'' + + ''--prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \'' + ''--prefix PATH : "${luaEnv}/bin" \'' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 563735deeeb4..581316dc74db 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -42,12 +42,7 @@ let inherit rev sha256; }; - patches = [ (fetchpatch { - # https://github.com/openzfs/zfs/pull/9961#issuecomment-585827288 - # will be included in zfs 0.5.4 as well - url = "https://gist.githubusercontent.com/satmandu/67cbae9c4d461be0e64428a1707aef1c/raw/ba0fb65f17ccce5b710e4ce86a095de577f7dfe1/k5.6.3.patch"; - sha256 = "0zay7cz078v7wcnk7xl96blp7j6y64q1migb91c7h66zkpikqvgb"; - }) ] ++ extraPatches; + patches = [ ] ++ extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts @@ -192,9 +187,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.8.3"; + version = "0.8.4"; - sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw"; + sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; }; zfsUnstable = common { @@ -202,9 +197,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.3"; + version = "0.8.4"; - sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw"; + sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; isUnstable = true; }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index b641699c733f..a7581ccbb119 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.11"; + version = "9.14.12"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "1v4y9308w0gd98gjzni4cgxmh8g1s37lbnnkyhsn70xs3xki5b4c"; + sha256 = "1j7ldvdschmvzxrbajjhmdsl2iqxc1lm64vk0a5sdykxpy9y8kcw"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 4964755332df..f596934a4298 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -16,11 +16,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "9ab179d1dccc6ba59aacac81a4cd10a039615c7a846d9f77f26b851da25d1a86"; + sha256 = "f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 7d6fa7d9c91b..10a18ab1d458 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "13v2iah7z10wc43v9agcjrzi3wds4jna8f0b7ph35nyzhzr31h9b"; + sha256 = "1n9gymis0h1grgg63ig3kk9cb27ayy1w6s8hcn8n4g5dzi90h8sl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch index e1cf8ada016a..0b9dd3e447d9 100644 --- a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -1,18 +1,14 @@ -From 55cb3ba4458bd43588e7921906d091d001130ab0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 9 Apr 2020 07:20:46 +0100 +From 9d730514540929dc95a7313bdb385bab95d9a28c Mon Sep 17 00:00:00 2001 +From: Martin Weinelt <hexa@darmstadt.ccc.de> +Date: Wed, 20 May 2020 23:23:23 +0200 Subject: [PATCH] setup.py: relax dependencies -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> --- - setup.py | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) + setup.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py -index 0c56e89b67..ba04546130 100755 +index 1473fd1f5f..149af58b3a 100755 --- a/setup.py +++ b/setup.py @@ -32,24 +32,24 @@ PROJECT_URLS = { @@ -23,25 +19,24 @@ index 0c56e89b67..ba04546130 100755 + "aiohttp>=3.6.1", "astral==1.10.1", "async_timeout==3.0.1", -- "attrs==19.3.0", -+ "attrs>=19.3.0", + "attrs==19.3.0", "bcrypt==3.1.7", -- "certifi>=2020.4.5.1", -+ "certifi>=2019.11.28", + "certifi>=2020.4.5.1", "ciso8601==2.1.3", - "importlib-metadata==1.6.0", + "importlib-metadata>=1.5.0", "jinja2>=2.11.1", "PyJWT==1.7.1", # PyJWT has loose dependency. We want the latest one. -- "cryptography==2.9", +- "cryptography==2.9.2", + "cryptography>=2.9", "pip>=8.0.3", "python-slugify==4.0.0", - "pytz>=2019.03", +- "pytz>=2020.1", - "pyyaml==5.3.1", - "requests==2.23.0", - "ruamel.yaml==0.15.100", ++ "pytz>=2019.03", + "pyyaml>=5.2", + "requests>=2.22", + "ruamel.yaml>=0.15.100", @@ -49,5 +44,5 @@ index 0c56e89b67..ba04546130 100755 "voluptuous-serialize==2.3.0", ] -- -2.26.1 +2.26.2 diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 96ca0c83898d..aff2e9dc0cb9 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.109.6"; + version = "0.110.1"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -10,6 +10,7 @@ "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome "ads" = ps: with ps; [ ]; # missing inputs: pyads "aftership" = ps: with ps; [ ]; # missing inputs: pyaftership + "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly "airvisual" = ps: with ps; [ pyairvisual]; @@ -75,6 +76,7 @@ "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird + "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy "blinksticklight" = ps: with ps; [ BlinkStick]; "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt @@ -94,6 +96,7 @@ "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt + "bsblan" = ps: with ps; [ ]; # missing inputs: bsblan "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar @@ -154,6 +157,7 @@ "device_automation" = ps: with ps; [ aiohttp-cors]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; + "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors]; "digital_ocean" = ps: with ps; [ digital-ocean]; @@ -243,6 +247,7 @@ "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant + "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou @@ -251,6 +256,7 @@ "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async + "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortigate" = ps: with ps; [ ]; # missing inputs: pyfgt "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam @@ -328,8 +334,9 @@ "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 + "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors]; # missing inputs: base36 fnvhash + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg]; # missing inputs: PyTurboJPEG base36 fnvhash "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip @@ -379,7 +386,7 @@ "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator "iss" = ps: with ps; [ ]; # missing inputs: pyiss - "isy994" = ps: with ps; [ ]; # missing inputs: PyISY + "isy994" = ps: with ps; [ ]; # missing inputs: pyisy "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir "itunes" = ps: with ps; [ ]; "izone" = ps: with ps; [ ]; # missing inputs: python-izone @@ -533,6 +540,7 @@ "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo "nuki" = ps: with ps; [ ]; # missing inputs: pynuki + "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "nut" = ps: with ps; [ ]; # missing inputs: pynut2 "nws" = ps: with ps; [ ]; # missing inputs: pynws "nx584" = ps: with ps; [ ]; # missing inputs: pynx584 @@ -546,14 +554,14 @@ "onboarding" = ps: with ps; [ aiohttp-cors]; "onewire" = ps: with ps; [ ]; # missing inputs: pyownet "onkyo" = ps: with ps; [ onkyo-eiscp]; - "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: onvif-zeep-async + "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; - "opengarage" = ps: with ps; [ ]; + "opengarage" = ps: with ps; [ ]; # missing inputs: open-garage "openhardwaremonitor" = ps: with ps; [ ]; "openhome" = ps: with ps; [ ]; # missing inputs: openhomedevice "opensensemap" = ps: with ps; [ ]; # missing inputs: opensensemap-api @@ -569,6 +577,7 @@ "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp]; "owntracks" = ps: with ps; [ pynacl aiohttp-cors]; + "ozw" = ps: with ps; [ ]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect]; @@ -604,7 +613,7 @@ "proxy" = ps: with ps; [ pillow]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd - "pulseaudio_loopback" = ps: with ps; [ ]; + "pulseaudio_loopback" = ps: with ps; [ pulsectl]; "push" = ps: with ps; [ aiohttp-cors]; "pushbullet" = ps: with ps; [ pushbullet]; "pushover" = ps: with ps; [ pushover-complete]; @@ -647,7 +656,7 @@ "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API - "roku" = ps: with ps; [ roku]; + "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy "route53" = ps: with ps; [ boto3]; # missing inputs: ipify "rova" = ps: with ps; [ ]; # missing inputs: rova @@ -736,7 +745,7 @@ "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime "spotify" = ps: with ps; [ aiohttp-cors spotipy]; "sql" = ps: with ps; [ sqlalchemy]; - "squeezebox" = ps: with ps; [ ]; + "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox "ssdp" = ps: with ps; [ defusedxml netdisco]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank @@ -836,6 +845,7 @@ "unifi_direct" = ps: with ps; [ pexpect]; "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled "universal" = ps: with ps; [ ]; + "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api "updater" = ps: with ps; [ distro]; @@ -883,6 +893,7 @@ "websocket_api" = ps: with ps; [ aiohttp-cors]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ ]; # missing inputs: python-whois + "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api @@ -919,8 +930,9 @@ "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; + "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ zha-quirks zigpy-deconz zigpy]; # missing inputs: bellows-homeassistant zigpy-cc zigpy-xbee-homeassistant zigpy-zigate + "zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "zigbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9471a5faad8a..2d6d73474558 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.109.6"; + hassVersion = "0.110.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -84,9 +84,9 @@ in with py.pkgs; buildPythonApplication rec { # PyPI tarball is missing tests/ directory src = fetchFromGitHub { owner = "home-assistant"; - repo = "home-assistant"; + repo = "core"; rev = version; - sha256 = "133l6n165yivnc9qmrahk423hmns0hn0dbnx4ys7yaw3x5hqwyns"; + sha256 = "1495kl997mvk9k11lk1ahv5w0yc0185qmxwa1h51j6d0zyqwz749"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 9fb543d06ce2..3481a2d1bd90 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200505.0"; + version = "20200519.1"; src = fetchPypi { inherit pname version; - sha256 = "0h19ddgnws5l49fwr4b0j99j4xkhpxkwdsmq71q36akd4s5lj0ll"; + sha256 = "149v56q5anzdfxf0dw1h39vdmcigx732a7abqjfb0xny5484iq8w"; }; # no Python tests implemented diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix new file mode 100644 index 000000000000..bd4ff86c9949 --- /dev/null +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, nix +, nix-prefetch +}: + +buildPythonApplication rec { + pname = "nix-update"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = pname; + rev = version; + sha256 = "0mw31n7kqfr7fskkxp58b0wprxj1pj6n1zs6ymvvl548gs5rgn2s"; + }; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch ]) + ]; + + checkPhase = '' + $out/bin/nix-update --help + ''; + + meta = with lib; { + description = "Swiss-knife for updating nix packages"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ mic92 zowoq ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 2c2444de4e52..ea58eb4c6b83 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -1,21 +1,22 @@ { stdenv , lib -, fetchFromGitHub +, bashInteractive , curl +, fetchFromGitHub , json_c +, nixosTests , pam -, bashInteractive }: stdenv.mkDerivation rec { pname = "google-compute-engine-oslogin"; - version = "20200325.00"; + version = "20200507.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "03hk95pgzcgy6ginp8zdy0fbk88m6n65qq22jq490z1xwbjffm8r"; + sha256 = "1np8c96sm29pwnxykc0id8kkgalhw576g43fgi1y936sr2hfvx3v"; }; postPatch = '' @@ -42,10 +43,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) google-oslogin; + }; + meta = with stdenv.lib; { homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; description = "OS Login Guest Environment for Google Compute Engine"; license = licenses.asl20; - maintainers = with maintainers; [ adisbladis flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07f051050c1c..50e3812a4aa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25756,6 +25756,8 @@ in nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { }; + nix-update = python3Packages.callPackage ../tools/package-management/nix-update { }; + nix-update-source = callPackage ../tools/package-management/nix-update-source {}; nix-script = callPackage ../tools/nix/nix-script {}; |