From 25b397e27c345b5ffa55c9850dc9d22841a12c67 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 29 Jan 2021 17:27:28 -0300 Subject: [PATCH 01/11] anydesk: 6.0.1 -> 6.1.0 The release has dropped i386-linux support so we reworked the code to reflect this change, dropping some indirections. Signed-off-by: Otavio Salvador --- .../networking/remote/anydesk/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index a28c68a65831..c742d076f9da 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -4,16 +4,6 @@ , pulseaudio }: let - sha256 = { - x86_64-linux = "19751ygq1ng79aniqx91qawc0cw07cwdjdjd88azc9ww6z6nv0mp"; - i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in"; - }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); - - arch = { - x86_64-linux = "amd64"; - i386-linux = "i386"; - }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); - description = "Desktop sharing application, providing remote support and online meetings"; desktopItem = makeDesktopItem { @@ -28,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz" - "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-${arch}.tar.gz" + "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - inherit sha256; + sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; }; buildInputs = [ @@ -83,7 +73,7 @@ in stdenv.mkDerivation rec { inherit description; homepage = "https://www.anydesk.com"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ shyim ]; }; } From c8d207ed5a86e19b9685a253ceff10296bd952b4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 5 Feb 2021 12:14:16 +0100 Subject: [PATCH 02/11] wine{Unstable,Staging}: 6.0-rc4 -> 6.0-rc5 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 3a5abe18d754..063b4f96d4fe 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc4"; + version = "6.0-rc5"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; + sha256 = "sha256-8fEKCu9NzJz07Gfwgo/B9/Nk4ujnwvAnwlPI4gBL9FE="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; + sha256 = "sha256-xC8W87nvIzVk2pLJnf4JzBrrpwS1Opm4qqwOmF5NIeo"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From da97c80fd78f0b5b6a9c27fb98888d6e3d82aace Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 5 Feb 2021 12:35:28 +0100 Subject: [PATCH 03/11] wine{Unstable,Staging}: 6.0-rc5 -> 6.0-rc6 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 063b4f96d4fe..60d138355d6c 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc5"; + version = "6.0-rc6"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-8fEKCu9NzJz07Gfwgo/B9/Nk4ujnwvAnwlPI4gBL9FE="; + sha256 = "sha256-5nqX8ZjJazpiS2N5Ar45vmjG3FVA1VlFEweM+JeA5sE="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-xC8W87nvIzVk2pLJnf4JzBrrpwS1Opm4qqwOmF5NIeo"; + sha256 = "sha256-46OtcjbMjzEdMpCSswF3LU3SybySLQrsAH9npOgWca8="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 83c85ca7e59678680313a423c2a30f3fb3617a27 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Fri, 5 Feb 2021 12:11:45 +0000 Subject: [PATCH 04/11] vscode: 1.52.1 -> 1.53.0 --- pkgs/applications/editors/vscode/vscode.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 7324a19620dc..3cddd8273736 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c"; - x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r"; - aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8"; - armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv"; + x86_64-linux = "07wbh4sfvnmvif1a03z8bbqrjmcwmb4q5nn3l2r738i9wrxdxjja"; + x86_64-darwin = "0djcx4n17giynckhsqqx8q7j25cxd3xqgjz3jhh8xh54h4fbvmbz"; + aarch64-linux = "172x6c2pl994ps4xbrgrkzdb02gmpqag61sbxc7796cx0xk8bjpi"; + armv7l-linux = "008bf7iwfizbn67wl1cxahl6h7pg04ms4q2nmr0dndcpxgc1q5gd"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.52.1"; + version = "1.53.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From c93866be97d434fb27b677b348ccead134c1d9b2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 5 Feb 2021 13:46:40 +0100 Subject: [PATCH 05/11] wineStaging: 5.0.3 -> 6.0 --- .../emulators/wine/cert-path-stable.patch | 24 ------------------- pkgs/misc/emulators/wine/sources.nix | 8 +++---- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 pkgs/misc/emulators/wine/cert-path-stable.patch diff --git a/pkgs/misc/emulators/wine/cert-path-stable.patch b/pkgs/misc/emulators/wine/cert-path-stable.patch deleted file mode 100644 index da01a4778102..000000000000 --- a/pkgs/misc/emulators/wine/cert-path-stable.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c -index f795181..fb4926a 100644 ---- a/dlls/crypt32/rootstore.c -+++ b/dlls/crypt32/rootstore.c -@@ -18,6 +18,7 @@ - #include "config.h" - #include - #include -+#include /* getenv */ - #include - #ifdef HAVE_SYS_STAT_H - #include -@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) - - for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); -+ -+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); -+ if (nix_cert_file != NULL) -+ ret = import_certs_from_path(nix_cert_file, from, TRUE); -+ - check_and_store_certs(from, store); - } - CertCloseStore(from, 0); diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 60d138355d6c..49444463ebc9 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "5.0.3"; - url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8="; + version = "6.0"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -38,7 +38,7 @@ in rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path-stable.patch + ./cert-path.patch ]; }; From 0ec2ea8c17edc8d218dd9f3cf4bb3d9327026825 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 5 Feb 2021 13:47:29 +0100 Subject: [PATCH 06/11] wine{Unstable,Staging}: 6.0-rc6 -> 6.1 --- pkgs/misc/emulators/wine/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 49444463ebc9..15e2f80aa4ea 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc6"; - url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-5nqX8ZjJazpiS2N5Ar45vmjG3FVA1VlFEweM+JeA5sE="; + version = "6.1"; + url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; + sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-46OtcjbMjzEdMpCSswF3LU3SybySLQrsAH9npOgWca8="; + sha256 = "sha256-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 0584f0082cbb0edb3ba64008eab0499dec418c47 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Feb 2021 14:46:50 +0100 Subject: [PATCH 07/11] python3Packages.awesomeversion: 21.2.0 -> 21.2.2 --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 8f832f827edc..2a532beca473 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.2.0"; + version = "21.2.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1rzd0mcxdjnnzg35hvdvacwrr9brwmkw9bwlb5x6bcp24ry9yl0q"; + sha256 = "1yl09csypa64nhsw7dc6kj8iybm1wkhfzylyfyq8b7jpwdx7ql31"; }; postPatch = '' From 624e947f3bdfbc51164ba2f5d6ca0a0043a34d2d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 14:02:24 +0000 Subject: [PATCH 08/11] python37Packages.adafruit-platformdetect: 2.28.0 -> 3.0.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index e62e24d4ab4e..8269f09a2462 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "2.28.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "aa272605fd8a2ddcc6e5dd8151d628f76a9468c97ba7e4e315d6bc78b9bfb8f8"; + sha256 = "b22d500f674c084cefd73acd233fe12b816c8446f1da3cff58d7876477b862a3"; }; nativeBuildInputs = [ setuptools-scm ]; From 82e0a55f354d179f464adf7904daa776d4a380c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Feb 2021 14:51:50 +0100 Subject: [PATCH 09/11] python3Packages.pyicloud: 0.9.7 -> 0.10.2 --- .../python-modules/pyicloud/default.nix | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 6e808a010585..039d6259f36d 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -1,40 +1,46 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, certifi +, click , keyring , keyrings-alt -, click +, pytz +, requests , six , tzlocal -, certifi -, bitstring -, unittest2 +, pytest-mock +, pytestCheckHook , future }: buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.7"; + version = "0.10.2"; - src = fetchPypi { - inherit pname version; - sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c"; + src = fetchFromGitHub { + owner = "picklepete"; + repo = pname; + rev = version; + sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy"; }; propagatedBuildInputs = [ - requests + certifi + click + future keyring keyrings-alt - click + pytz + requests six tzlocal - certifi - bitstring - future ]; - checkInputs = [ unittest2 ]; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; postPatch = '' sed -i \ From 5684b8de3701ee41bb99785e35fb0b4073b17481 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Feb 2021 14:48:53 +0100 Subject: [PATCH 10/11] home-assistant: 2021.2.0 -> 2021.2.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b6c3a281f2e2..14bdb0f738e2 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 = "2021.2.0"; + version = "2021.2.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1c24f6dd4f86..467d46f3354c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.2.0"; + hassVersion = "2021.2.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "116aq683wy7sxdbxr43li90irpfbsz0dv8w0r1fghcjpwlj7ihwa"; + sha256 = "0a8l23n6j0x1hjcifajgbrip7b4l8xcgxn2wa1lcg27p1cghrv5m"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -101,6 +101,7 @@ in with py.pkgs; buildPythonApplication rec { astral async-timeout attrs + awesomeversion bcrypt certifi ciso8601 @@ -205,6 +206,7 @@ in with py.pkgs; buildPythonApplication rec { # RuntimeError: Event loop is closed "test_config_path" "test_info_endpoint_register_callback_timeout" + "test_scan_match_st" ]; preCheck = '' From 5bdc1c54ba3a735172b3a94e7c75b1c9e89dfe77 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Feb 2021 17:07:53 +0100 Subject: [PATCH 11/11] home-assistant: improve reliability of tests by grouping tests by file --- pkgs/servers/home-assistant/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 467d46f3354c..977c58906ac7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -182,31 +182,23 @@ in with py.pkgs; buildPythonApplication rec { pytestFlagsArray = [ "-n auto" + # assign tests grouped by file to workers + "--dist loadfile" # don't bulk test all components "--ignore tests/components" - # prone to race conditions due to parallel file access - "--ignore tests/test_config.py" # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0 "--ignore tests/auth/mfa_modules/test_notify.py" "tests" ] ++ map (component: "tests/components/" + component) componentTests; disabledTests = [ - # AssertionError: assert 'unknown' == 'not_home' - "test_device_tracker_not_home" + # AssertionError: assert 1 == 0 + "test_merge" + # ModuleNotFoundError: No module named 'pyqwikswitch' + "test_merge_id_schema" # keyring.errors.NoKeyringError: No recommended backend was available. "test_secrets_from_unrelated_fails" "test_secrets_credstash" - # AssertionError: Expected 'start' to have been called once. Called 0 times. - "test_setup_and_stop" - # AssertionError: assert {} == {'test': } - "test_get_custom_components_internal" - # assert 0 == 1 where 0 = len([]) - "test_error_posted_as_event" - # RuntimeError: Event loop is closed - "test_config_path" - "test_info_endpoint_register_callback_timeout" - "test_scan_match_st" ]; preCheck = ''