From 527686e7611bb70d9d5a338dab4490821942d643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 14 Jun 2021 13:41:10 +0200 Subject: [PATCH 01/11] backport action: run only when the label starts with 'backport' --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 766b5aa831a3..79af5835463d 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -5,7 +5,7 @@ on: jobs: backport: name: Backport Pull Request - if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true + if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From b390b929bd454cec2a291b6bdcf8bee7946a87b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 14 Jun 2021 13:47:22 +0200 Subject: [PATCH 02/11] direct-push action: delay to workaround eventually consistent DB --- .github/workflows/direct-push.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/direct-push.yml b/.github/workflows/direct-push.yml index 6177004295ff..459475c3c6bc 100644 --- a/.github/workflows/direct-push.yml +++ b/.github/workflows/direct-push.yml @@ -17,6 +17,9 @@ jobs: run: | ISMERGE=$(curl -H 'Accept: application/vnd.github.groot-preview+json' -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.GITHUB_REPOSITORY }}/commits/${{ env.GITHUB_SHA }}/pulls | jq -r '.[] | select(.merge_commit_sha == "${{ env.GITHUB_SHA }}") | any') echo "::set-output name=ismerge::$ISMERGE" + # github events are eventually consistent, so wait until changes propagate to thier DB + - run: sleep 60 + if: steps.ismerge.outputs.ismerge != 'true' - name: Warn if the commit was a direct push if: steps.ismerge.outputs.ismerge != 'true' uses: peter-evans/commit-comment@v1 From 05d18bb384e9fbce3f6e2880b3114a90213a7dad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Jun 2021 23:04:09 +0200 Subject: [PATCH 03/11] python3Packages.minio: 7.0.3 -> 7.0.4 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index fdbcf09534b2..eb543a63133a 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "minio"; - version = "7.0.3"; + version = "7.0.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; rev = version; - sha256 = "14symk7b3i9xzfc2wkcnqmfsvh9j3jx2ijz7dgy1xyrbjwb7yzhc"; + sha256 = "sha256-4O6WhBoMNpqv1OEewkbA5a8hYH56liF7GrfxkooQ6Fo="; }; propagatedBuildInputs = [ From 7d245c4aee2111b72559812ea6f2b1adc398d863 Mon Sep 17 00:00:00 2001 From: Luke Worth Date: Sat, 19 Jun 2021 08:02:54 +1000 Subject: [PATCH 04/11] unused: 2.1 -> 2.2 --- pkgs/development/tools/misc/unused/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index 58e4ba0bc98e..ee89df5d8391 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/pkgs/development/tools/misc/unused/default.nix @@ -1,18 +1,18 @@ { lib, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "unused-code"; repo = pname; rev = version; - sha256 = "06r6m7k570rdm9szghnp3g4r6ij0vp8apfanqzzxv2hd7gf8v62b"; + sha256 = "0igpf0y45rrdrwq8bznq0d5nnph0vijvn6fw96mqxhbffz0csbi9"; }; nativeBuildInputs = [ cmake ]; - cargoSha256 = "0y7vsba4r4v2lwf02i2dxwicnhknajbbzsdlnn5srvg6nvl3kspi"; + cargoSha256 = "1fngn9mmvx7jw8305w465z0nf9acc2cdl7314p77c2rz25z6rlin"; meta = with lib; { description = "A tool to identify potentially unused code"; From 31c39c11ca197f2e64ca90dcb329ff052d9bde68 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 19 Jun 2021 10:33:02 +0200 Subject: [PATCH 05/11] pythonPackages.impacket: 0.9.22 -> 0.9.23 Fixes CVE-2021-31800. https://github.com/SecureAuthCorp/impacket/releases/tag/impacket_0_9_23 --- pkgs/development/python-modules/impacket/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 15d148f168f1..43fdfb6a9cee 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -1,15 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl }: +{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet }: buildPythonPackage rec { pname = "impacket"; - version = "0.9.22"; + version = "0.9.23"; src = fetchPypi { inherit pname version; - sha256 = "4bf7e7b595356585599b4b2773b8a463d7b9765c97012dcd5a44eb6d547f6a1d"; + sha256 = "113isxb9rd2n761nnh3skg3vqa0v5dalz9kbavyczqyv1jjyh6qw"; }; - propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl ]; + propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet ]; # fail with: # RecursionError: maximum recursion depth exceeded @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Network protocols Constructors and Dissectors"; - homepage = "https://github.com/CoreSecurity/impacket"; + homepage = "https://github.com/SecureAuthCorp/impacket"; # Modified Apache Software License, Version 1.1 license = licenses.free; maintainers = with maintainers; [ SuperSandro2000 ]; From 6a5010cfb85088e24aca330ceb9512879a480173 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 19 Jun 2021 08:44:07 +0000 Subject: [PATCH 06/11] hugo: 0.83.1 -> 0.84.0 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index b8ea6b83b907..9834e91309da 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.83.1"; + version = "0.84.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c9T3a6J78uLumBTy/DgE4gbxCmEXVGKd9JyF9dyrL6g="; + sha256 = "sha256-BRp4iboiaoB6zFwleFSJ7oVAd3o6OiR5BB4VRQilExc="; }; - vendorSha256 = "sha256-ddCyMmZ5RIZWzT2RYNnSW795oR7PIRudl3QTjsXtBGk="; + vendorSha256 = "sha256-jY/g92ON5OxjuZzPHJNduXYMgPU8/0ioAYvp4iqjGnU="; doCheck = false; From d900491d80b8267559811bb1226f7cf52f2791b6 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 19 Jun 2021 07:35:14 -0400 Subject: [PATCH 07/11] =?UTF-8?q?texlab:=203.1.0=20=E2=86=92=203.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/misc/texlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 2fcda04cb434..42a30cce8eb9 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - hash = "sha256-h08RRcuQG1IjuCA6Xk71+MXKprZ/w5+H2edbG3rtVSY="; + hash = "sha256-iXsV7zt190GH0kTMpdmf8xHk4cqtCVwq6LDICmhe5qU="; }; - cargoHash = "sha256-78S9Bmq6TIMiAV3HpMC8jK9fH+0Y+jXAW9V1Druyfg8="; + cargoHash = "sha256-Yqn6VpAKw93QvkxuwNcYvrQm0C4TfisRDcmFy95/yw8="; outputs = [ "out" "man" ]; From 37c5ca7b57559c15023affdac187c421b5fa245d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 17:32:13 +0200 Subject: [PATCH 08/11] python3Packages.pyheos: init at 0.7.2 --- .../python-modules/pyheos/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pyheos/default.nix diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix new file mode 100644 index 000000000000..715c609875e6 --- /dev/null +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyheos"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "andrewsayre"; + repo = "pyheos"; + rev = version; + sha256 = "0rgzg7lnqzzqrjp73c1hj1hq8p0j0msyih3yr4wa2rj81s8ihmby"; + }; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # accesses network + "test_connect_timeout" + ]; + + pythonImportsCheck = [ "pyheos" ]; + + meta = with lib; { + description = "Async python library for controlling HEOS devices through the HEOS CLI Protocol"; + homepage = "https://github.com/andrewsayre/pyheos"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58f9c3d0e023..0d2ec9d00a32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5266,6 +5266,8 @@ in { pyflick = callPackage ../development/python-modules/pyflick { }; + pyheos = callPackage ../development/python-modules/pyheos { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; pynobo = callPackage ../development/python-modules/pynobo { }; From 9518b3512787af1fd4da92b7aa33e2670e6fca69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 17:32:54 +0200 Subject: [PATCH 09/11] home-assistant: update component-packages.nix --- 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 d8ba038c0007..a72010eeafd6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -344,7 +344,7 @@ "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ pycec ]; "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 - "heos" = ps: with ps; [ ]; # missing inputs: pyheos + "heos" = ps: with ps; [ pyheos ]; "here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision From 71de28cfa822751122d6beebe2655197222e9f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 17:34:52 +0200 Subject: [PATCH 10/11] home-assistant: test heos component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3873692c3a1c..d812c1539c6c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -440,6 +440,7 @@ in with py.pkgs; buildPythonApplication rec { "harmony" "hassio" "hddtemp" + "heos" "history" "history_stats" "home_connect" From fbf187aafe8c330f6986a182d171c17a4947d168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 18:36:29 +0200 Subject: [PATCH 11/11] getmail6: 6.16 -> 6.17 https://github.com/getmail6/getmail6/releases/tag/v6.17 --- pkgs/tools/networking/getmail6/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index 673ff7f83a3f..ceec2bab490e 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -1,16 +1,20 @@ -{ fetchFromGitHub, python3Packages, lib }: +{ lib +, python3 +, fetchFromGitHub +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.16"; + version = "6.17"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1y373nzbffjjjs43441cn3wrb0yq1mw2vqixhizbzdacrs45xbfa"; + sha256 = "sha256-pPf+98zoS1t59RoqbmS4V0OsTLMR37Wcsl9BSWuvc0k="; }; + # needs a Docker setup doCheck = false; pythonImportsCheck = [ "getmailcore" ]; @@ -26,6 +30,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://getmail6.org"; updateWalker = true; license = licenses.gpl2Plus; - maintainers = with maintainers; [ abbe ]; + maintainers = with maintainers; [ abbe dotlambda ]; }; }