From 12f9b166d738fd13c4da483bf3c0d27776b82a2e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 4 Mar 2022 15:25:54 +0800 Subject: [PATCH 01/30] mautrix-telegram: 0.11.1 -> 0.11.2 --- .../0002-Don-t-depend-on-pytest-runner.patch | 24 ------------------- pkgs/servers/mautrix-telegram/default.nix | 13 ++++------ 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch diff --git a/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch b/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch deleted file mode 100644 index f1ec3e622cf8..000000000000 --- a/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch +++ /dev/null @@ -1,24 +0,0 @@ -From eb39954acf73096d65ba1e9575cbeb3d4307d5df Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 29 Nov 2020 20:55:17 +0100 -Subject: [PATCH 2/2] Don't depend on pytest-runner - ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 95dbf89..89ea2a7 100644 ---- a/setup.py -+++ b/setup.py -@@ -57,7 +57,6 @@ setuptools.setup( - ] - }, - -- setup_requires=["pytest-runner"], - tests_require=["pytest", "pytest-asyncio", "pytest-mock"], - - classifiers=[ --- -2.28.0 - diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 267f89182fb2..e96427f30f3a 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -6,11 +6,11 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.25.0a3"; + version = "1.25.0a5"; pname = "tulir-telethon"; src = oldAttrs.src.override { inherit pname version; - sha256 = "sha256-/kau9Q2+7giVx52tmjvYIbcDcY1/om31X9BlRvZipuk="; + sha256 = "sha256-WFiWczuw6eVVid2Z1LsnGE6BCEhqeCuiQ/p0d2Ahbi8="; }; }); }; @@ -25,22 +25,17 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.11.1"; + version = "0.11.2"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; rev = "v${version}"; - sha256 = "sha256-Df+v1Q+5Iaa9GKcwIabMKjJwmVd5Qub8M54jEEiAPFc="; + sha256 = "sha256-ZECTHAP5l9tAk9Ies8XuPpH9jqYDJSRSHVKz1lA6Sjg="; }; patches = [ ./0001-Re-add-entrypoint.patch ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "telethon>=1.22,<1.23" "telethon" - ''; - propagatedBuildInputs = with python.pkgs; ([ Mako From 6285a2ea52102ec59809303eb20414937592fdd2 Mon Sep 17 00:00:00 2001 From: derjohn Date: Tue, 8 Mar 2022 21:01:57 +0100 Subject: [PATCH 02/30] ferdi: 5.7.0 -> 5.8.0 --- .../networking/instant-messengers/ferdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 92e39f091b15..0a44a37cf4bc 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c="; + sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { From 36ad60841c59828f58c36d208d1150bac4bc67f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 08:58:41 +0100 Subject: [PATCH 03/30] python3Packages.meilisearch: init at 0.18.0 --- .../python-modules/meilisearch/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/meilisearch/default.nix diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix new file mode 100644 index 000000000000..aa40394dab67 --- /dev/null +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "meilisearch"; + version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "meilisearch"; + repo = "meilisearch-python"; + rev = "v${version}"; + hash = "sha256-iIFTZKORCXr4mNeWBtbOPWXwORuTV/IKhLYkqFgd3Hw="; + }; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "meilisearch" + ]; + + # Tests spin up a local server and are not mocking the requests + doCheck = false; + + meta = with lib; { + description = "Client for the Meilisearch API"; + homepage = "https://github.com/meilisearch/meilisearch-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57c8e10d0b49..bd9c496a83b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5053,6 +5053,8 @@ in { mediafile = callPackage ../development/python-modules/mediafile { }; + meilisearch = callPackage ../development/python-modules/meilisearch { }; + meinheld = callPackage ../development/python-modules/meinheld { }; meld3 = callPackage ../development/python-modules/meld3 { }; From 72eac4c3d0c59d0b33e1abe7f03576e26a8b1dc3 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 15 Mar 2022 09:22:54 -0600 Subject: [PATCH 04/30] element-{desktop,}: 1.10.6 -> 1.10.7 --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/pin.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 6d3353c2515f..984a9cb501dd 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.6", + "version": "1.10.7", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index d1fb0fe1c622..f75dfc66ca90 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.6", - "desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=", + "version": "1.10.7", + "desktopSrcHash": "HkGny9t8dNzVGyyqgr4tABbFZgWV4xqGZt9xH4ejkew=", "desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0", - "webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r" + "webHash": "0gim79a1zpfc56ca5fndp2whmlv9jz1s32z666i268xppn4z53k1" } From a7262905c42c57d007a703c0745024c229caf051 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 14 Mar 2022 18:07:04 -0400 Subject: [PATCH 05/30] gitea: 1.16.3 -> 1.16.4 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 37000982d8e4..f08c88ab2fa5 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.16.3"; + version = "1.16.4"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-kT87CV/P1MUBLRetzYdIsIGVDjp9F6zmD2ovmcmy4Ys="; + sha256 = "sha256-7zlreX05pkhn381FMgQ8Nj3OP+BUr6o3u5f4ouo/Khg="; }; unpackPhase = '' From 65f612c02bb6679f360f174db5808148211ada33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 10:31:27 +0100 Subject: [PATCH 06/30] python3Packages.adb-enhanced: 2.5.12 -> 2.5.14 --- pkgs/development/python-modules/adb-enhanced/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index c38851160c22..bf3f124b02e2 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.12"; + version = "2.5.14"; disabled = pythonOlder "3.4"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ashishb"; repo = pname; rev = version; - sha256 = "sha256-OZSLk5qXX6rEclo6JC8o/7Mz0Y2sJqUsLhnrVK4gkVI="; + sha256 = "sha256-GaPOYBQEGI40MutjjY8exABqGge2p/buk9v+NcZ5oJs="; }; propagatedBuildInputs = [ From 45fdf8e356b22968186cfbe22f1eb9561ffcf331 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 09:49:47 +0000 Subject: [PATCH 07/30] python310Packages.check-manifest: 0.47 -> 0.48 --- pkgs/development/python-modules/check-manifest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index d55f5155b451..6c91633e8af0 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.47"; + version = "0.48"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VtrdJgqcfVULFZeW0olLbQvMF2qUy8Qm2buT5eSNEs4="; + hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc="; }; propagatedBuildInputs = [ From 45dbad3ccca4632c8dcf9e38c93500f13a22ae73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 11:12:19 +0100 Subject: [PATCH 08/30] python3Packages.aioairzone: init at 0.1.0 --- .../python-modules/aioairzone/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/aioairzone/default.nix diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix new file mode 100644 index 000000000000..5a51661b8e1a --- /dev/null +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -0,0 +1,40 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioairzone"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Noltari"; + repo = pname; + rev = version; + hash = "sha256-QruXxC/+61P2Mi0UILUIKp4S3wS1+E+WmzBbiUqlVe4="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aioairzone" + ]; + + meta = with lib; { + description = "Module to control AirZone devices"; + homepage = "https://github.com/Noltari/aioairzone"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 720f463312ff..a0c9fbc4f9e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -244,6 +244,8 @@ in { aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; + aioairzone = callPackage ../development/python-modules/aioairzone { }; + aioambient = callPackage ../development/python-modules/aioambient { }; aioapns = callPackage ../development/python-modules/aioapns { }; From 594b228a3472fa811addd4566c748bc95b78d20b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 13:51:14 +0000 Subject: [PATCH 09/30] python310Packages.pygmt: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/pygmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 6f06065457ed..f7728cfa28db 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "v${version}"; - sha256 = "1mazljxwh162df971cvv7cwnqr300r17qfs7k09s6yd6hajyhz49"; + sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ="; }; postPatch = '' From ddffdde048fec3f78a026b173f928bbdc81972ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 18:39:03 +0000 Subject: [PATCH 10/30] python310Packages.boltztrap2: 20.7.1 -> 22.3.2 --- pkgs/development/python-modules/boltztrap2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index f80a8deb9ab4..e697d97fea78 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "20.7.1"; + version = "22.3.2"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "41caa32e5778323471d87033f23537f6178a7aea64fba894c7f2b2579b51f7ed"; + sha256 = "sha256-Yo37xdXxCQKkA+lrFEZp1DxjJy216Q6aYYT68PEx9JU="; }; dontUseCmakeConfigure = true; From ac18f4de89d10a257344aefa51521a88db96688d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 20:47:22 +0100 Subject: [PATCH 11/30] checkov: 2.0.962 -> 2.0.968 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index f2f9ec46b6e8..6ebe03e2554c 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.962"; + version = "2.0.968"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-hpoOOU1Z8xVqoJJdGcSoWujm3amiPkZ1Qjiqh66J+ZM="; + hash = "sha256-F+SMgNCL6qOOhfpZi0Gg/OWPjxzMDVVvXTrPOZCfrLU="; }; nativeBuildInputs = with py.pkgs; [ From 6eaadbe4c3bba6d9471c890faffa276b4e957088 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 16 Mar 2022 22:46:03 +0100 Subject: [PATCH 12/30] mautrix-whatsapp: 0.2.4 -> 0.3.0 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 92f6d1f15ac7..e26743b9edf8 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "lBAnMrU292URrZIxPvPIAO50GAFvvZHfUjKMYxZwGb8="; + sha256 = "M44APMnpQU+9TTJu4NF528o0JvGvWja4H7XUcAHtxrA="; }; buildInputs = [ olm ]; - vendorSha256 = "KiNABUZ92gYprTdNAKKMjygr0BzQGVYVPRPMxvYi1VQ="; + vendorSha256 = "o3KTcnMd6Tqt9QIfW29wvN8POIFThNg8AdeGDF5wbVc="; doCheck = false; From adcafc52a7714c84ab0a8aaa4162ce9953da5ccd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 22:59:34 +0100 Subject: [PATCH 13/30] python3Packages.hahomematic: 0.36.3 -> 0.37.1 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 515d6ed8d950..046fc856f017 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.36.3"; + version = "0.37.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-S5KWyW7aeR2qdBzXQ4ka2nuxGPt69LHyq2CUdRPG9ig="; + sha256 = "sha256-ZENCcNppXOl0OHQDdybJV+SxOgtVzF2PPN0gAPIMjXM="; }; propagatedBuildInputs = [ From 27fba3b3ca246ff52d6bef4dd05b0b0319d194d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 23:16:55 +0100 Subject: [PATCH 14/30] python3Packages.yalexs: 1.1.22 -> 1.1.23 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 22440766fd03..2eb38dd0784e 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.22"; + version = "1.1.23"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qtJSGvvYcdGYUUHnRnKe+z+twFqLGAn1Zl47F4CGnvc="; + sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0="; }; propagatedBuildInputs = [ From 91b39c9ae562234e7e838ff1628818516e3eabbc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 23:36:01 +0100 Subject: [PATCH 15/30] zdns: 20210327-8c53210 -> 2022-03-14-unstable --- pkgs/tools/security/zdns/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/zdns/default.nix b/pkgs/tools/security/zdns/default.nix index 913735d4cb9f..354dd5b64475 100644 --- a/pkgs/tools/security/zdns/default.nix +++ b/pkgs/tools/security/zdns/default.nix @@ -5,19 +5,16 @@ buildGoModule rec { pname = "zdns"; - version = "20210327-${lib.strings.substring 0 7 rev}"; - rev = "8c53210f0b9a4fe16c70a5d854e9413c3d0c1ba2"; + version = "2022-03-14-unstable"; src = fetchFromGitHub { owner = "zmap"; repo = pname; - inherit rev; - sha256 = "0pdfz1489ynpw72flalnlkwybp683v826icjx7ljys45xvagdvck"; + rev = "d659a361f6d5165462c10e1c1243f420175e066b"; + hash = "sha256-856O6H03me3IM39/+6n56KJIetL+v4on6+lJx5D2Pcw="; }; - vendorSha256 = "0b8h5n01xmhar1a09svb35ah48k9zdy1mn5balq0h2l0jxr05z78"; - - subPackages = [ "zdns" ]; + vendorSha256 = "sha256-5kZ0voyicnqK/0yrMYW+gR1vVDyptW6I1HgyG4zleX8="; meta = with lib; { description = "CLI DNS lookup tool"; From 19afa75096d6a152a7b4347a2d49d709c678ea91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 23:17:36 +0000 Subject: [PATCH 16/30] python310Packages.pex: 2.1.71 -> 2.1.72 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 4a03d60f1eea..ee356f86500a 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.71"; + version = "2.1.72"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jJ7J4upDL1X1Eut1kUWdJu3Ih2mheNFt0wI+QTZMKow="; + sha256 = "sha256-0hhnBkbgt4bSlqjvYKX2Mhty/T1vBGm91HhKmyvVzmA="; }; nativeBuildInputs = [ From 6ea480daa5f8813a160d1c05257cf1e9cdfedc90 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 17 Mar 2022 09:29:59 +0800 Subject: [PATCH 17/30] monitor: 0.12.0 -> 0.13.0 --- pkgs/applications/system/monitor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 653d727525e8..5de6e1165dc4 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7"; + sha256 = "sha256-qwx60cp3Q6PL1iwRP+M9Rtmxcis0EByi8fk13H4cXfc="; fetchSubmodules = true; }; @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stsdc/monitor"; maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; mainProgram = "com.github.stsdc.monitor"; }; } From 7eca8aea9b94f5f1ee28768f9c6c642d97360d27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 01:49:07 +0000 Subject: [PATCH 18/30] python310Packages.pymavlink: 2.4.27 -> 2.4.29 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 8bf43a445437..361f8bff615d 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.27"; + version = "2.4.29"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DzW1jB7L7sD9WAhk/3/0UD8PW7Nw/bHTI527NmMV6CY="; + sha256 = "sha256-0k6DKkb/Izk15JKrSOC0u5wL3vT4x2CelZt112vc/p0="; }; propagatedBuildInputs = [ future lxml ]; From b2015415df0f694000a0b5645470fe8133e39bea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 02:26:33 +0000 Subject: [PATCH 19/30] python310Packages.pypandoc: 1.7.2 -> 1.7.3 --- pkgs/development/python-modules/pypandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index cd7a322a2aef..d2ff1aab1a47 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.2"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1wk8jxnysb7sa55zhxx5brylv00ivamqbk1b4lbzi58ziij08p03"; + sha256 = "sha256-Tv0vqKN9AAXdfQRMt/QuqeFB3wNTh1DsWu0XNZukTUc="; }; patches = [ From bcf572638f3899d3a10c4437d84080e8fd9dc7b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 04:12:06 +0000 Subject: [PATCH 20/30] python310Packages.python-box: 6.0.0 -> 6.0.1 --- pkgs/development/python-modules/python-box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 52e17faa5cc9..30666ef47064 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.0.0"; + version = "6.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = version; - hash = "sha256-YOYcI+OAuTumNtTylUc6dSY9shOE6eTr8M3rVbcy5hs="; + hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y="; }; propagatedBuildInputs = [ From 33611e53fff3cd446d797aedd0de06706b998934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 04:33:59 +0000 Subject: [PATCH 21/30] cfripper: 1.5.2 -> 1.5.3 --- pkgs/tools/security/cfripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 822566b8d041..7df85144da52 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-tl0g08nnY1CZ4SNcMFPARIRquiO9SCen9VWeNalLHds="; + hash = "sha256-5TjKn7yE3g8/SyD2dVJeHnaLOTyyKpxeAeGuXbkGCeo="; }; propagatedBuildInputs = with python3.pkgs; [ From 1a29f2f45899969400d6403737d8ceab5f1e4203 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 05:21:40 +0000 Subject: [PATCH 22/30] cfitsio: 4.0.0 -> 4.1.0 --- .../libraries/science/astronomy/cfitsio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 9f9545e52f3b..3be249531bbe 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfitsio"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "sha256-sqjvugufhtPhvWGfZipHbsGBErTyfMRBzGgKTjd3Ql4="; + sha256 = "sha256-s2fGldKDGVjnFmkhw7NW1d+lGx7O5QW5dBa6OdG2wXo="; }; buildInputs = [ bzip2 zlib ]; From d56ccde39ad2a5f439d980a27d43cddcde7f4f4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Mar 2022 21:12:25 +0100 Subject: [PATCH 23/30] python38: 3.8.12 -> 3.8.13 https://www.python.org/downloads/release/python-3813/ --- .../interpreters/python/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a7d5e0854fba..12d27c4233b4 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -120,15 +120,6 @@ with pkgs; }; sources = { - python38 = { - sourceVersion = { - major = "3"; - minor = "8"; - patch = "12"; - suffix = ""; - }; - sha256 = "1si8hw2xpagh4iji89zdx69p3dv5mjqwwbx2x2sl6lrp41jaglxi"; - }; python39 = { sourceVersion = { major = "3"; @@ -177,11 +168,18 @@ in { inherit passthruFun; }; - python38 = callPackage ./cpython ({ + python38 = callPackage ./cpython { self = python38; + sourceVersion = { + major = "3"; + minor = "8"; + patch = "13"; + suffix = ""; + }; + sha256 = "sha256-bzCQdwEgQKo5/o8MYduMD6HEUTZ2MpnTdcnldW8Jz1c="; inherit (darwin) configd; inherit passthruFun; - } // sources.python38); + }; python39 = callPackage ./cpython ({ self = python39; From c91c73a714e34bb141e0ec7285783b9b34323e1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Mar 2022 21:12:50 +0100 Subject: [PATCH 24/30] python37: 3.7.12 -> 3.7.13 https://www.python.org/downloads/release/python-3713/ --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 12d27c4233b4..579e3a05c58a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -160,10 +160,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "12"; + patch = "13"; suffix = ""; }; - sha256 = "041jqjl5wf7gsw84zd3jgvg91skq20l2fy5zbhz237w38zxzfyzp"; + sha256 = "sha256-mfEGJ134iZw+jLnXwBzmhsIC7ydZUzAUJxlGk95b74Q="; inherit (darwin) configd; inherit passthruFun; }; From 773a363bb5d49902a2c18a3b42f42e20abd6ed5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 07:53:24 +0000 Subject: [PATCH 25/30] python310Packages.renault-api: 0.1.9 -> 0.1.10 --- pkgs/development/python-modules/renault-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 2ddd65790fa0..2312078c5fc6 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.9"; + version = "0.1.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CZDxJ5vgk9I1cRDXoqcrUHu+buPWYVrEcHaRXcyts7I="; + sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s="; }; nativeBuildInputs = [ From a3a45d186ab9cc191f529aff4cbfdc3a4ecd1af3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Mar 2022 09:15:01 +0100 Subject: [PATCH 26/30] python3Packages.identify: 2.4.11 -> 2.4.12 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 9f2a066ebdf2..18a12fe9e198 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.11"; + version = "2.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q86n2uAjmA05h+0NE77TBkbPiKoRYqB1b2H3MbOVmMY="; + sha256 = "sha256-kXhUlt+lcqK3ohOA8eziFcrm4U/FAYWpie4rH5xRejI="; }; checkInputs = [ From bbb48bb6338f2fac8f27405436f7efc7478890bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Mar 2022 09:16:03 +0100 Subject: [PATCH 27/30] python3Packages.intellifire4py: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/intellifire4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 39fcec9af12e..b93b9b9c957b 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-hKe9sDn5t2qQ0THqFQypAGgr7cJXaZs8562NpPR/iJU="; + hash = "sha256-t3wJQ7dXX65yqxMYsFggViqqGvLCdASw1QLc5DJBn+4="; }; propagatedBuildInputs = [ From 38d6b542322c3044cd643581cf1cac5dd2db406f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Mar 2022 09:20:44 +0100 Subject: [PATCH 28/30] python3Packages.types-requests: 2.27.12 -> 2.27.13 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index c62190ff5dab..d28f01b128b0 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.12"; + version = "2.27.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/ROC+i4o6shI+u2wMyhAIE8G8MtRcAjjx7goLKU+VtI="; + sha256 = "sha256-zwZGAx3WMHETs3gU90PATwcHozVzeMK7Eyb4SEEvW6k="; }; propagatedBuildInputs = [ From a3caaae54f0dec9e6ba8ba82b09420649d79952e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Mar 2022 09:21:40 +0100 Subject: [PATCH 29/30] python3Packages.types-setuptools: 57.4.10 -> 57.4.11 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 46fe7da5d1c7..c59baea3c6e3 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.10"; + version = "57.4.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ="; + sha256 = "sha256-Ji90BuDH1wWta7RSa1t2H6UAv5nqt03oWsNZIYfWKTU="; }; # Module doesn't have tests From b785f9ea98b421322f12fd4a02bcb86f3f000ce4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Mar 2022 03:20:52 -0700 Subject: [PATCH 30/30] cri-o: 1.23.1 -> 1.23.2 (#164563) --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 87b91196f882..b6d238d599ee 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-A59Bgt0u8jzpTijT5vcO8JREL7Elx1mWnwddAuRHn5c="; + sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U="; }; vendorSha256 = null;