From 42036b5158a5ebd83cb2d0d82db14232d3e5c077 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 May 2021 14:32:14 +0200 Subject: [PATCH 01/12] python3Packages.locationsharinglib: init at 4.1.6 --- .../locationsharinglib/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/locationsharinglib/default.nix diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix new file mode 100644 index 00000000000..4baf8600ac7 --- /dev/null +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -0,0 +1,59 @@ +{ lib +, betamax +, buildPythonPackage +, cachetools +, coloredlogs +, emoji +, fetchPypi +, nose +, python +, pythonOlder +, pytz +, requests +}: + +buildPythonPackage rec { + pname = "locationsharinglib"; + version = "4.1.6"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "092j8z01nwjqh5zr7aj8mxl1zjd3j2irhrs39dhn47bd6db2a6ij"; + }; + + propagatedBuildInputs = [ + coloredlogs + requests + cachetools + pytz + ]; + + checkInputs = [ + betamax + emoji + nose + ]; + + postPatch = '' + # Tests requirements want to pull in multiple modules which we don't need + substituteInPlace setup.py \ + --replace "tests_require=test_requirements" "tests_require=[]" + ''; + + checkPhase = '' + runHook preCheck + # Only coverage no real unit tests + ${python.interpreter} setup.py nosetests + runHook postCheck + ''; + + pythonImportsCheck = [ "locationsharinglib" ]; + + meta = with lib; { + description = "Python package to retrieve coordinates from a Google account"; + homepage = "https://locationsharinglib.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ecf4494ff4..12da677f5d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3955,6 +3955,8 @@ in { localzone = callPackage ../development/python-modules/localzone { }; + locationsharinglib = callPackage ../development/python-modules/locationsharinglib { }; + locket = callPackage ../development/python-modules/locket { }; lockfile = callPackage ../development/python-modules/lockfile { }; From 655b7e57f58c3826cca842abd5a8e7a788735fa1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 May 2021 14:32:42 +0200 Subject: [PATCH 02/12] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 844ea8976d7..69b3d97bb28 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -316,7 +316,7 @@ "google_assistant" = ps: with ps; [ aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ ]; - "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib + "google_maps" = ps: with ps; [ locationsharinglib ]; "google_pubsub" = ps: with ps; [ google-cloud-pubsub ]; "google_translate" = ps: with ps; [ gtts ]; "google_travel_time" = ps: with ps; [ googlemaps ]; From 08cad391fdc04b20451820938ffae4a1af9fe48b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 May 2021 19:00:53 +0200 Subject: [PATCH 03/12] python3Packages.hatasmota: 0.2.12 -> 0.2.13 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 36fb5b61c74..0164e84f8f7 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-rf0EB9PxageMQhPzG96oWovt+5L/u68VPllzPT4yp2A="; + sha256 = "sha256-RzBEiO8IfeMls7ssCZ2yhL78UVrpZykwDl1IUshqOu8="; }; propagatedBuildInputs = [ From ae67ae86cc959ff929ad12bce332b45cbad94a55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 May 2021 18:56:56 +0200 Subject: [PATCH 04/12] home-assistant: 2021.5.4 -> 2021.5.5 https://github.com/home-assistant/core/releases/tag/2021.5.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 854b476bbc7..2bd83d9109a 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.5.4"; + version = "2021.5.5"; 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 bb5af00bb8f..194569924c9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -155,7 +155,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.5.4"; + hassVersion = "2021.5.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -174,7 +174,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1jxbxzhcnvxf6qkik2qmpdml41q6hlkazjqaxygyw7pyj094fp8v"; + sha256 = "1vdxygjik1ay58xgyr1rk12cgy63raqi4fldnd4mlhs4i21c7ff8"; }; # leave this in, so users don't have to constantly update their downstream patch handling From fd0e3970503c3bff0f6788a995d5670ff59297aa Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Wed, 19 May 2021 13:04:12 +0200 Subject: [PATCH 05/12] pythonPackages.karton-yaramatcher: 1.1.0 -> 1.1.1 --- .../python-modules/karton-yaramatcher/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index f64ee17f843..ac4a7b05b91 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0yb9l5z826zli5cpcj234dmjdjha2g1lcwxyvpxm95whkhapc2cf"; + sha256 = "0mv8v1gk6p21pw9kx6cxr76l6c5fxd3p6dk85cwfzz100h8mdvar"; }; propagatedBuildInputs = [ @@ -24,7 +24,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "karton-core==4.0.5" "karton-core" \ --replace "yara-python==4.0.2" "yara-python" \ ''; From 159a7e6bf4455941ff5599bd66b42be95e223a83 Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Wed, 19 May 2021 19:38:36 +0200 Subject: [PATCH 06/12] fixup! pythonPackages.karton-yaramatcher: 1.1.0 -> 1.1.1 Remove yara-python substitution --- .../python-modules/karton-yaramatcher/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index ac4a7b05b91..6183e950005 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -22,11 +22,6 @@ buildPythonPackage rec { yara-python ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "yara-python==4.0.2" "yara-python" \ - ''; - checkPhase = '' runHook preCheck ${python.interpreter} -m unittest discover From 54a5d419685a294a1dce3df5fd8a8270aa238a4f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 02:22:25 +0000 Subject: [PATCH 07/12] agi: 1.1.0-dev-20210513 -> 1.1.0-dev-20210514 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 5b2a3a7c819..afcc8b11108 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210513"; + version = "1.1.0-dev-20210514"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-epDwZpdyPreufPwiSFadmMjtZ9nq9mQsQt+Asm5rx8Y="; + sha256 = "sha256-vYq8x5uX1MfqCRZl/564YuTAYxe36iZTO+lsyxkO2JQ="; }; nativeBuildInputs = [ From 3d71a65d9c1890246692181d37f65e93af7ffa3a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 04:44:00 +0000 Subject: [PATCH 08/12] earthly: 0.5.12 -> 0.5.13 --- pkgs/development/tools/earthly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index d07d39b2a3a..68a8d1d0352 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-jG4KaDCzx0PAJu6Hr+xnKsAdz97LmGUF0El3rSiLQPo="; + sha256 = "sha256-XN3E1oCIlohALnaP17WOB7/1vaklmyAfVZLxrBOXhbo="; }; vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; From 402f6906e47047b7ab79b0509fa9e807be71d241 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 02:42:47 +0000 Subject: [PATCH 09/12] dnsproxy: 0.37.3 -> 0.37.4 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 9b715f4bb14..d48f47e638b 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.3"; + version = "0.37.4"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8lZDWvd5Lq8uHBt47gRhg0MLeJ5iRheMBUjkfaJueDI="; + sha256 = "sha256-EV/+m7Uzf7s6+J0jdsim3UP84iK/tXlPNfkyrtrx5NQ="; }; vendorSha256 = null; From 4751744636ea38d3f629c57bdd9b6cce2f0063f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 15:20:06 +0000 Subject: [PATCH 10/12] hdparm: 9.60 -> 9.61 --- pkgs/os-specific/linux/hdparm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index ada0ddef233..e925b989028 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdparm"; - version = "9.60"; + version = "9.61"; src = fetchurl { url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; - sha256 = "1k1mcv7naiacw1y6bdd1adnjfiq1kkx2ivsadjwmlkg4fff775w3"; + sha256 = "sha256-2hocOIfxC4OX6OAgE8qmEULg5yyw1zmXQhyi8vTfU0M="; }; preBuild = '' From 420b0fa3788ba535143b2eece441790ed4737108 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Mon, 17 May 2021 19:04:43 -0700 Subject: [PATCH 11/12] nixos/nebula: Add release notes --- nixos/doc/manual/release-notes/rl-2105.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index a9d1720e94b..753ceacb763 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -158,6 +158,11 @@ section of the NixOS manual for more information. + + + Nebula VPN + + From 21c1af4d0bd6380995271fd800210f39f3e1b7a0 Mon Sep 17 00:00:00 2001 From: Rakesh4G Date: Wed, 19 May 2021 15:58:51 +0530 Subject: [PATCH 12/12] pythonPackages.fastpair : Updated version and pytest enabled --- .../python-modules/fastpair/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index 9a3f8c53b1d..eaf1a78520a 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,35 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy, pytestCheckHook }: buildPythonPackage { pname = "fastpair"; - version = "2016-07-05"; + version = "2021-05-19"; src = fetchFromGitHub { owner = "carsonfarmer"; repo = "fastpair"; - rev = "92364962f6b695661f35a117bf11f96584128a8d"; - sha256 = "1pv9sxycxdk567s5gs947rhlqngrb9nn9yh4dhdvg1ix1i8dca71"; + rev = "d3170fd7e4d6e95312e7e1cb02e84077a3f06379"; + sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx"; }; nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytestCheckHook ]; propagatedBuildInputs = [ scipy ]; - # Does not support pytest 4 https://github.com/carsonfarmer/fastpair/issues/14 - doCheck = false; - - checkPhase = '' - pytest fastpair - ''; - meta = with lib; { homepage = "https://github.com/carsonfarmer/fastpair"; description = "Data-structure for the dynamic closest-pair problem"; license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai ]; + maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; }; }