From 2d8ae5164a006e1fbd654d879dcebbc4ff0d18b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 21:09:53 +0000 Subject: [PATCH 01/44] kubeseal: 0.19.4 -> 0.19.5 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index a97054a9071f..0fefba4f5d3d 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-okQJBZLIFujHg5Tn/AbCox8mRrump/GjYjyQzkJAtFg="; + sha256 = "sha256-giCFea4uZNztWxQhsYSdh2KtFE0uU0hf/lhGnY9OsIE="; }; - vendorHash = "sha256-Nzef+cfC4Fosm1e1Whpz/BrGqRlcbD0NpyST8V1iwiU="; + vendorHash = "sha256-i8MpQsqD1SBf+qPwYTFDTYDE4mvLdpKUoKML+u1027U="; subPackages = [ "cmd/kubeseal" ]; From 62d62dfdb9bf3ae65135e7ed48fd0a419b2cc5c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 02:50:18 +0000 Subject: [PATCH 02/44] mapcidr: 1.0.3 -> 1.1.0 --- pkgs/tools/misc/mapcidr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix index 911cde27cc64..9bed612bd598 100644 --- a/pkgs/tools/misc/mapcidr/default.nix +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mapcidr"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dsHTnaK1Bna6Gbr/J+PYjeZ0WqJh696sliTd5JF1C+o="; + sha256 = "sha256-cpNNStPgGnEtiiHgpiLUvEFu78NtyJIVgjrkh6N+dLU="; }; - vendorSha256 = "sha256-RblYkQSOMOKaI4ODkNae3rxJEaxkzwA2SuoMr+Z2/ew="; + vendorHash = "sha256-t6bTbgOTWNz3nz/Tgwkd+TCBhN++0UaV0LqaEsO9YCI="; modRoot = "."; subPackages = [ From f9113b5406697b9287016c4f5cafbf7225c19457 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Feb 2023 04:20:00 +0000 Subject: [PATCH 03/44] python310Packages.chat-downloader: 0.2.3 -> 0.2.4 https://github.com/xenova/chat-downloader/releases/tag/v0.2.4 --- pkgs/development/python-modules/chat-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix index 930303005780..550da20b626f 100644 --- a/pkgs/development/python-modules/chat-downloader/default.nix +++ b/pkgs/development/python-modules/chat-downloader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "chat-downloader"; - version = "0.2.3"; + version = "0.2.4"; format = "setuptools"; src = fetchPypi { inherit version pname; - sha256 = "e19f961480b14b55d03d4d4aaa766d46131bdf2ea8a79b47d20037dfd980201a"; + sha256 = "beeaedbe7d28e22f8a2c635fc6432f9e9af84e3c2a6ecff101f4453de1abb385"; }; propagatedBuildInputs = [ From bd9a6ca623abb01a23ef6b56d353d4a90a07fa10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 08:25:23 +0000 Subject: [PATCH 04/44] xmrig-mo: 6.18.1-mo1 -> 6.19.0-mo1 --- pkgs/applications/misc/xmrig/moneroocean.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 538bf3507a7b..dbe6e427f526 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.18.1-mo1"; + version = "6.19.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-ZHSDJLZ+5WTqJwSWT05VuN7VAK/aD0dimVFiZ39IWvg="; + sha256 = "sha256-+J6gl/R9Yi8V2nYNuIH/oyplWi8vzfdamELHjp6iS7c="; }; meta = with lib; { From a0c476cbeb800f498ffca7e7414417c18fa8f247 Mon Sep 17 00:00:00 2001 From: harvidsen Date: Mon, 20 Feb 2023 14:19:50 +0100 Subject: [PATCH 05/44] python3Packages.oracledb: init at 1.2.2 This is the renamed, new major release of cx_Oracle. --- .../python-modules/oracledb/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/oracledb/default.nix diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix new file mode 100644 index 000000000000..adf39ad10a0a --- /dev/null +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cryptography +, cython +}: + +buildPythonPackage rec { + pname = "oracledb"; + version = "1.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3Z9jCE5EZCtISkay/PtPySHzn6z0lKG6sAYo+mQJ9Pw="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + cryptography + ]; + + doCheck = false; # Checks need an Oracle database + + pythonImportsCheck = [ + "oracledb" + ]; + + meta = with lib; { + description = "Python driver for Oracle Database"; + homepage = "https://oracle.github.io/python-oracledb"; + changelog = "https://github.com/oracle/python-oracledb/blob/v${version}/doc/src/release_notes.rst"; + license = with licenses; [ asl20 /* and or */ upl ]; + maintainers = with maintainers; [ harvidsen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28812e165401..630c10e4044e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6754,6 +6754,8 @@ self: super: with self; { opytimark = callPackage ../development/python-modules/opytimark { }; + oracledb = callPackage ../development/python-modules/oracledb { }; + oralb-ble = callPackage ../development/python-modules/oralb-ble { }; orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; From 3756d4b8ccf7282fc3756669da179d0a1eeb7382 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 12:25:59 +0100 Subject: [PATCH 06/44] python310Packages.aiormq: add changelog to meta --- pkgs/development/python-modules/aiormq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index 747f38026686..24f3c15b5d78 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "AMQP 0.9.1 asynchronous client library"; homepage = "https://github.com/mosquito/aiormq"; + changelog = "https://github.com/mosquito/aiormq/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ emilytrau ]; }; From f233ece1b7021a32051b9ddae8116c2299c8d7d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 12:28:18 +0100 Subject: [PATCH 07/44] python310Packages.aiormq: 6.6.4 -> 6.7.2 Diff: https://github.com/mosquito/aiormq/compare/refs/tags/6.6.4...6.7.2 Changelog: https://github.com/mosquito/aiormq/releases/tag/6.7.2 --- pkgs/development/python-modules/aiormq/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index 24f3c15b5d78..b8ec9619b139 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiormq"; - version = "6.6.4"; + version = "6.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mosquito"; repo = pname; - rev = version; - sha256 = "+zTSaQzBoIHDUQgOpD6xvoruFFHZBb0z5D6uAUo0W5A="; + rev = "refs/tags/${version}"; + hash = "sha256-ujRw+trXOZaCRsZdkE3WoomOSdYoQkHmtlyFg1mp3Sg="; }; nativeBuildInputs = [ @@ -37,15 +37,20 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ aiomisc ]; + # Tests attempt to connect to a RabbitMQ server disabledTestPaths = [ "tests/test_channel.py" "tests/test_connection.py" ]; - pythonImportsCheck = [ "aiormq" ]; + + pythonImportsCheck = [ + "aiormq" + ]; meta = with lib; { description = "AMQP 0.9.1 asynchronous client library"; From 19f12c7d3ad82ac2d79c4b1fd11516754642f097 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 22 Feb 2023 08:54:53 -0300 Subject: [PATCH 08/44] fluxcd: 0.39.0 -> 0.40.0 Release: https://github.com/fluxcd/flux2/releases/tag/v0.40.0 * update script: add release note --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- pkgs/applications/networking/cluster/fluxcd/update.sh | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 01f229ca24fc..ff4db0e9d197 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.39.0"; - sha256 = "1mxzafv4p6n2r62nsr4py74z8jw42hm6ypm9kkfw3bfz5db7xhav"; - manifestsSha256 = "0wri6xzd603ll7ncn4af4xv5px1yg91m133m0dlrrzrb3izgiky0"; + version = "0.40.0"; + sha256 = "0wgl3l0zbznsycm5xxnc30w6zf44aj1p6i7ab83ppyz8xnjca24f"; + manifestsSha256 = "0r1sba1lxws7rqj6kz9nd7g4d7bvigj0cmbivddipgc2l4l1wwzw"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-IyWXCunOCVDV/OHf3py/g0UbIByYhnIHDlEDxIkBLZI="; + vendorSha256 = "sha256-AmAGeJyc7ajDicQEHP9268+H3YpKU8ej6g8zwh+zvTo="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 2d25eee6f347..8c80ef9fda34 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -38,7 +38,9 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then if [ $# -eq 1 ] && [ "$1" = "git" ]; then git switch -c "package-fluxcd-${LATEST_VERSION}" git add "$FLUXCD_PATH"/default.nix - git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}" + git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION} + +Release: https://github.com/fluxcd/flux2/releases/tag/v${LATEST_VERSION}" fi else echo "fluxcd is already up-to-date at $OLD_VERSION" From 3f766151313239d5150ca4c66ec475fe170288e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 13:01:22 +0100 Subject: [PATCH 09/44] python310Packages.aio-pika: add changelog to meta --- pkgs/development/python-modules/aio-pika/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index fddabeccd6a1..aaa67744dc31 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "AMQP 0.9 client designed for asyncio and humans"; homepage = "https://github.com/mosquito/aio-pika"; + changelog = "https://github.com/mosquito/aio-pika/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ emilytrau ]; }; From 3361a24364612c7286d2b78ae5bfd376883267d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 13:08:20 +0100 Subject: [PATCH 10/44] python310Packages.aio-pika: 8.3.0 -> 9.0.4 Diff: https://github.com/mosquito/aio-pika/compare/refs/tags/8.3.0...9.0.4 Changelog: https://github.com/mosquito/aio-pika/blob/9.0.4/CHANGELOG.md --- .../python-modules/aio-pika/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index aaa67744dc31..ff0a25d26594 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -1,41 +1,54 @@ { lib +, aiomisc +, aiormq , buildPythonPackage , fetchFromGitHub -, pythonOlder +, poetry-core , pytestCheckHook -, aiormq -, yarl -, aiomisc +, pythonOlder +, setuptools , shortuuid +, typing-extensions +, yarl }: buildPythonPackage rec { pname = "aio-pika"; - version = "8.3.0"; + version = "9.0.4"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mosquito"; repo = pname; - rev = version; - sha256 = "CYfj6V/91J7JA8YSctG/FkSHRkwyLKxr27eREbA+MtQ="; + rev = "refs/tags/${version}"; + hash = "sha256-dY4uSkiAZz8kjeqt0QwehogljBrxqhVI9LmRE/I8HKA="; }; + nativeBuildInputs = [ + setuptools + poetry-core + ]; + propagatedBuildInputs = [ aiormq yarl + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ aiomisc shortuuid ]; - # Tests attempt to connect to a RabbitMQ server + disabledTestPaths = [ + # Tests attempt to connect to a RabbitMQ server "tests/test_amqp.py" "tests/test_amqp_robust.py" "tests/test_amqp_robust_proxy.py" @@ -45,7 +58,10 @@ buildPythonPackage rec { "tests/test_rpc.py" "tests/test_types.py" ]; - pythonImportsCheck = [ "aio_pika" ]; + + pythonImportsCheck = [ + "aio_pika" + ]; meta = with lib; { description = "AMQP 0.9 client designed for asyncio and humans"; From 00ebc3860cf43842f0b7fe420c058a76b8fad5c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 16:01:16 +0000 Subject: [PATCH 11/44] python310Packages.azure-mgmt-search: 8.0.0 -> 9.0.0 --- pkgs/development/python-modules/azure-mgmt-search/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index e4cb5b234742..1bf416416d08 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-search"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; + sha256 = "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; }; propagatedBuildInputs = [ From 2f71339deeda1bb99b579da49ca319ea90d47d20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 16:13:07 +0000 Subject: [PATCH 12/44] python310Packages.pyvisa-py: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/pyvisa-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index d4b3d70b72a9..46c99543a342 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-2jNf/jmqpAE4GoX7xGvQTr0MF/UalIWDMAQHUq+B4v4="; + hash = "sha256-bRO2xO3Q9ruu5KY9SHwdhDU3DoZfW98uYiEFv5P0Fqc="; }; nativeBuildInputs = [ From 202bc10b3fedd91c4f6806580a0b12322bee1ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Feb 2023 13:35:44 -0300 Subject: [PATCH 13/44] linuxKernel.kernels.linux_zen: 6.1.12-zen1 -> 6.2-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 2745cd780fce..6acd78385da9 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1.12"; #zen + version = "6.2"; #zen suffix = "zen1"; #zen - sha256 = "16g0rkgmxbj4425mbnadam7vbd8621ar13ddx26j298bc9m8yqic"; #zen + sha256 = "090xywfydzhcz2nqqms3n84n0vvsnhn2w7bb34xldnslbmzapgip"; #zen isLqx = false; }; # ./update-zen.py lqx From 849cb51e7252c7df96b84905c633b3de4a23cdbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 18:43:40 +0100 Subject: [PATCH 14/44] python310Packages.denonavr: 0.11.0 -> 0.11.1 Changelog: https://github.com/ol-iver/denonavr/releases/tag/0.11.1 --- .../development/python-modules/denonavr/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 14fe85c6af51..23a86a184c36 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , asyncstdlib , attrs , buildPythonPackage @@ -15,16 +16,16 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "scarface-4711"; + owner = "ol-iver"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0zclIoEGKjA8Ro8k+HYX/d77U+ntQZv0vq6gC4Sa7zE="; + hash = "sha256-iYekqqhrcN1rbclFVSbJSF5ky19WsBLKlTxAa2HULqY="; }; propagatedBuildInputs = [ @@ -33,6 +34,8 @@ buildPythonPackage rec { defusedxml httpx netifaces + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ @@ -48,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automation Library for Denon AVR receivers"; - homepage = "https://github.com/scarface-4711/denonavr"; + homepage = "https://github.com/ol-iver/denonavr"; changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ colemickens ]; From 1e61e68e6c618a2b56b9e8cba849c7c0dbf367d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Feb 2023 13:37:26 -0300 Subject: [PATCH 15/44] linuxKernel.kernels.linux_lqx: 6.1.12-lqx1 -> 6.1.13-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 6acd78385da9..70ec82d11d33 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.12"; #lqx + version = "6.1.13"; #lqx suffix = "lqx1"; #lqx - sha256 = "0a6slrydf47hk4b3xlxycjw9y2xgjgvzjic2psbcb1c5y75zq720"; #lqx + sha256 = "07slp9ylrhh5xpsha2sa2qqzj8f46jc37avh20jbb3v1n27gc5zx"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 3a690ebe7789c650389ee4cdb2ccbaaa4213ed0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 19:53:47 +0000 Subject: [PATCH 16/44] opkg: 0.6.0 -> 0.6.1 --- pkgs/tools/package-management/opkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 2fbdebebb10d..656f7e16acd1 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "sha256-VoRHIu/yN9rxSqbmgUNvMkUhPFWQ7QzaN6ed9jf/Okw="; + sha256 = "sha256-6H/MtXXGTTrAVZREAWonlfEhJZhqDaiWurl8ShovGyo="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From be95c393404ae17637ed83949b4538f5a6dda659 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 21:14:32 +0000 Subject: [PATCH 17/44] evtx: 0.8.0 -> 0.8.1 --- pkgs/tools/security/evtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/tools/security/evtx/default.nix index ebee997d8048..f236a5d30935 100644 --- a/pkgs/tools/security/evtx/default.nix +++ b/pkgs/tools/security/evtx/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "evtx"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "omerbenamram"; repo = pname; rev = "v${version}"; - hash = "sha256-iexSMcD4XHEYeVWWQXQ7VLZwtUQeEkvrLxMXuxYuxts="; + hash = "sha256-aa04Ia11+Ae1amc3JAtYdSWf+f/fenTt0Bny/AauaHo="; }; - cargoSha256 = "sha256-6dDv4+yEKxFjbguMfQxPm18PgZ2DC9IVbmpw2N94mEo="; + cargoHash = "sha256-4pQP+cvKfOvRgWRFa4+/dEpBq+gfcOuEENC5aP4Cp7U="; postPatch = '' # CLI tests will fail in the sandbox From 1b49d3108bd7c868b08eba155a5eaded98487261 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 00:45:43 +0100 Subject: [PATCH 18/44] evtx: add changelog to meta --- pkgs/tools/security/evtx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/tools/security/evtx/default.nix index f236a5d30935..86cd382576df 100644 --- a/pkgs/tools/security/evtx/default.nix +++ b/pkgs/tools/security/evtx/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "omerbenamram"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-aa04Ia11+Ae1amc3JAtYdSWf+f/fenTt0Bny/AauaHo="; }; @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Parser for the Windows XML Event Log (EVTX) format"; homepage = "https://github.com/omerbenamram/evtx"; + changelog = "https://github.com/omerbenamram/evtx/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fab ]; }; From 56ca30ef4c1c11766243b857046964e4e9193151 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 00:59:19 +0100 Subject: [PATCH 19/44] python310Packages.goodwe: 0.2.25 -> 0.2.26 Diff: https://github.com/marcelblijleven/goodwe/compare/refs/tags/v0.2.25...v0.2.26 Changelog: https://github.com/marcelblijleven/goodwe/releases/tag/v0.2.26 --- pkgs/development/python-modules/goodwe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 3676c1a4e137..32ca2a222a0f 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.25"; + version = "0.2.26"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RT8fkFHiqUaahowk6EDpaf8s4JUuHSHPNT0iEr/pDVg="; + sha256 = "sha256-OHY8Cd2SF55tQZ85bUU564sHzjbTJcPwcJwVGucvzyM="; }; postPatch = '' From 20ddf3b8104bc918b8f5c747c9b08985ddc7f305 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 01:00:53 +0100 Subject: [PATCH 20/44] python310Packages.meilisearch: 0.24.0 -> 0.25.0 Diff: https://github.com/meilisearch/meilisearch-python/compare/refs/tags/v0.24.0...v0.25.0 Changelog: https://github.com/meilisearch/meilisearch-python/releases/tag/v0.25.0 --- pkgs/development/python-modules/meilisearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 60f2d7329d18..c9abb3770151 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.24.0"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-u7LQjc1N4JS9bAFaa9SnljgnldkcgK1bsjKakG0zQ2E="; + hash = "sha256-tN6rjUozN+VqUAm4vHN3RDQoNmkPE49pSUl+zuei9lc="; }; propagatedBuildInputs = [ From c27ce8fe4fee4be98c7ea8cb506e581a0209c01a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 01:02:55 +0100 Subject: [PATCH 21/44] python310Packages.freebox-api: 1.0.1 -> 1.1.0 Diff: https://github.com/hacf-fr/freebox-api/compare/refs/tags/v1.0.1...v1.1.0 --- pkgs/development/python-modules/freebox-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index a896a6c72ed9..e711c8334f61 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "freebox-api"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-60hIv35nNxXPFZy/JvG1O/ZkSMk65XDojUYP1QyfwXY="; + hash = "sha256-3i9I2RRRxLgyfzegnqjO4g+ad1v4phx6xa8HpWP1cck="; }; nativeBuildInputs = [ From 0cc2f14b8230a6087fd94ee80dac70a79c69fbc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 01:04:56 +0100 Subject: [PATCH 22/44] python310Packages.freebox-api: add changelog to meta --- pkgs/development/python-modules/freebox-api/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index e711c8334f61..950b2d4caee4 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with the Freebox OS API"; homepage = "https://github.com/hacf-fr/freebox-api"; + changelog = "https://github.com/hacf-fr/freebox-api/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; From 55d85d5018c432a1f1bd8d85566888a6b0e87aaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 01:13:45 +0100 Subject: [PATCH 23/44] memray: 1.6.0 -> 1.7.0 Diff: https://github.com/bloomberg/memray/compare/refs/tags/v1.6.0...v1.7.0 Changelog: https://github.com/bloomberg/memray/releases/tag/v1.7.0 --- pkgs/development/tools/memray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index e5510aa5f80b..4f8b509702fb 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.6.0"; + version = "1.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iIbx8vK4xAFfTVO4oJ5ELNKn19Tw6LPgwEi6eFOA5yo="; + hash = "sha256-FM6DVBnYgvciTeF9bf2NDvHGsnccxKqcR5ATj6daQ4w="; }; nativeBuildInputs = [ From fd2edf9cc4205a856221b7e8015190164104faa9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 01:20:57 +0100 Subject: [PATCH 24/44] trufflehog: 3.27.1 -> 3.28.0 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.27.1...v3.28.0 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.28.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 00dd9c00be20..530b9ac2ec45 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.27.1"; + version = "3.28.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-oZfqRNKj/cQw7b933qzQWz1N25zXG5bmCjah4sA5wRY="; + hash = "sha256-qag8e7m4mfHmaeMg//sAZpiHTIoXt1vQMKv5PdtvvKc="; }; - vendorHash = "sha256-IiMFSYZ7kdb5HHPFuRJKi+WXLdERSwyph1vSEQ/7RRk="; + vendorHash = "sha256-CVCAP2JMfLN23Sgf2d+CSK4uetomWzPUX0BRmutW7pI="; # Test cases run git clone and require network access doCheck = false; From 3c5402a81a57d0994a94158dd2a989c49f52d5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Feb 2023 17:18:23 -0800 Subject: [PATCH 25/44] python310Packages.caldav: 1.1.1 -> 1.1.3 Diff: https://github.com/python-caldav/caldav/compare/refs/tags/v1.1.1...v1.1.3 --- pkgs/development/python-modules/caldav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index dd1b7d51cfff..9da7e50185a5 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "caldav"; - version = "1.1.1"; + version = "1.1.3"; format = "setuptools"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "python-caldav"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nAvkzZcMl/h1rysF6YNjEbbLrQ4PYGrXCoKgZEyE6WI="; + hash = "sha256-ZilsCYr1M2WKSz/g5JV41JVsuHopPerxOevoG7FrEjQ="; }; propagatedBuildInputs = [ From c346267257e01f500e792950506b94c12fbabf66 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 23 Feb 2023 07:07:33 +0530 Subject: [PATCH 26/44] tailscale: 1.36.1 -> 1.36.2 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 75adec85e541..d0ce2ee87d6f 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.36.1"; + version = "1.36.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-xTfMq8n9Io99qg/cc7SAWelcxXaWr21IQhsICeDCDNU="; + hash = "sha256-5rGRe4ENIQVz8KDy1OuSKtD7UMVYmU2DaJAn7wrhXVQ="; }; - vendorSha256 = "sha256-xdZlwv/2knOE7xaGeNHYNdztflhLLmirGzPOJpDvk3s="; + vendorHash = "sha256-xdZlwv/2knOE7xaGeNHYNdztflhLLmirGzPOJpDvk3s="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From 1f16363672ad79d3e8d348d8fac51239a8ca73ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 02:53:46 +0000 Subject: [PATCH 27/44] python310Packages.pytorch-metric-learning: 2.0.0 -> 2.0.1 --- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index d019e2b62917..cc6b56d4cf97 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.0.0"; + version = "2.0.1"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-xarZvCRT/PhhB+ySv94XGz7uF/WiKbil6ohg7XbzOUs="; + sha256 = "sha256-zB0g6GJcqWRhjJZgUWmTdG4fhBBfFR6yEM2FEOVLWIs="; }; propagatedBuildInputs = [ From ee8aa8fbb5b422533cb8c8558b77f2ffa8265f53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 03:47:36 +0000 Subject: [PATCH 28/44] pineapple-pictures: 0.6.5 -> 0.6.6 --- pkgs/applications/graphics/pineapple-pictures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 1cbbaf8ffe3b..ddbeb4caa42e 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "pineapple-pictures"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-s4mJNPzrcg5UT8JC3D5ipaM8IvNFAK7e3V0TjVGeRdM="; + sha256 = "sha256-p51FlCeViDRNGUDN//IT4bLJpP2kU0CC67BCAlm0rYk="; }; nativeBuildInputs = [ From bcd127d19f5b31a0dbf3b83126f08308223695b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 04:08:52 +0000 Subject: [PATCH 29/44] argocd: 2.6.1 -> 2.6.2 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 719c0f634fb7..86af4aef1065 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-O3JJ75qfs02qxzyW4TwPfYckhxuULRK7n67QVZRyB3I="; + sha256 = "sha256-H/jrjU3iIlO75eN2Av/zuGe2G5KbJw9Xj6MCbWgTFEs="; }; proxyVendor = true; # darwin/linux hash mismatch From c210cc7f9ea3248da3531b4cf9e7affef207d3a0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 22 Feb 2023 23:09:00 -0500 Subject: [PATCH 30/44] vimPlugins.nvim-treesitter: 2023-02-19 -> 2023-02-22 --- .../editors/vim/plugins/generated.nix | 6 +- .../vim/plugins/nvim-treesitter/generated.nix | 78 +++++++++---------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 01645465979f..92813ed4637e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6479,12 +6479,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-02-19"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ce0dba96f47cd8bbd46b4c3ac8fd1b9502f1002a"; - sha256 = "0hgd2flldhjh38j69mgg5gg7iy8wcg258rhdx46ag8jgxvx31imc"; + rev = "ba35d094c1dfffa652e9c20971c51bd5271c1d25"; + sha256 = "0kvp7wd14q4z7a4y7yscbl3ksbjqzwm10f79jfwigfxgd7f0h5r3"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 7c9630754e60..3ed61e541d90 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -282,12 +282,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "09e316d"; + version = "8ee3a0f"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "09e316dba307b869831e9399b11a83bbf0f2a24b"; - hash = "sha256-FffwAt9FJurxFJajLTsQe5tLeZty3nSbXBRkgdjNOJ4="; + rev = "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62"; + hash = "sha256-I73T3NuN/K9+R3itIJrNVjlyVr/432UT3HEf6LND+0c="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -349,12 +349,12 @@ }; elsa = buildGrammar { language = "elsa"; - version = "c83c21c"; + version = "0a66b2b"; src = fetchFromGitHub { owner = "glapa-grossklag"; repo = "tree-sitter-elsa"; - rev = "c83c21c1f8f6b38dfc5bd1392de03a7b05bb78f4"; - hash = "sha256-6PnI58jxuRuluK11/6hjTI24AVq2IQcuIplhvCv10nA="; + rev = "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"; + hash = "sha256-zahi5hOXzad6R1+mqmYBFfn2X+SejQUIQzbabgCIJ8w="; }; meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa"; }; @@ -426,12 +426,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "dd35c67"; + version = "67cf1c9"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "dd35c67b1653963d3b4cca7bfbceb6ec2e6f006f"; - hash = "sha256-AVImNPg2d/vavpg+IBholzKiH8Hod4m7V3aJxWTnMKk="; + rev = "67cf1c96fd0dd92edd7812a95626c86c9be0781a"; + hash = "sha256-OImEGuPlks3XfWSWXLekz5nSPJUHNS9uDm6ugrFPfdQ="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -593,12 +593,12 @@ }; gosum = buildGrammar { language = "gosum"; - version = "bd0ec1f"; + version = "14da5c2"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-go-sum"; - rev = "bd0ec1fe9d68a5d4713d907417a43d489fa1b62a"; - hash = "sha256-BFwYKVbCBCC2ZvockKqiVFHOlTc3/YFIaZ2OqkO52yY="; + rev = "14da5c2a34861eb2d97ed89f39324156031e8878"; + hash = "sha256-PP8uj8tFMIBZtFuOQbEi25Yz/UEy5cRiEklbrlS5J+Q="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; }; @@ -857,12 +857,12 @@ }; kdl = buildGrammar { language = "kdl"; - version = "b50d6c8"; + version = "c3c4856"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kdl"; - rev = "b50d6c8b77d311639ecbf2b803ffb720c2b4cee2"; - hash = "sha256-dE2SqRSjy05Un3DPkrVDN0+na1ahddY57RYPMtaWynA="; + rev = "c3c4856464842e05366b1f3ebc4434c9194cad43"; + hash = "sha256-vYvyX9NWIFsWkxZvA5k32gFBh5Ykwgy0YrCBPAH6bcg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; }; @@ -1313,12 +1313,12 @@ }; ron = buildGrammar { language = "ron"; - version = "049a3ef"; + version = "ce6086b"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-ron"; - rev = "049a3ef4e271089107dd08e4aeb195abd1f77103"; - hash = "sha256-ITWls8kp/UvwWOBE19v1UWQ1/BEiDhsK5VIFHicJM84="; + rev = "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"; + hash = "sha256-4ZKhJ3qvKWwINQIWJLqgPwfnDvQBWzeZb2dZY7imYfc="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; }; @@ -1357,12 +1357,12 @@ }; scala = buildGrammar { language = "scala"; - version = "628e0aa"; + version = "2275b75"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "628e0aab6c2f7d31cf3b7d730f964d4fd9b340ee"; - hash = "sha256-LbVebyhVPKobPxosLDl21NGGtNlZ5gUhJN6fGX87iak="; + rev = "2275b754360de8539e02e84106fa38f7cb6de275"; + hash = "sha256-xc8/N2h9i7gZ+zPUzNpuwPg9++vZo8KvdOnjFF5YIo4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1401,14 +1401,14 @@ }; smali = buildGrammar { language = "smali"; - version = "d7f535e"; - src = fetchFromGitHub { - owner = "amaanq"; + version = "5a742af"; + src = fetchFromSourcehut { + owner = "~yotam"; repo = "tree-sitter-smali"; - rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff"; - hash = "sha256-wSUHzQdpWtIXuqfFvqMNJPQjvdRZ29PBcwtMnyKwRR4="; + rev = "5a742af7388864a3ff2ce8421328a33e7246a2d5"; + hash = "sha256-8FpmeyGzaQDUWXs/XanNi1u0jHsKP9wq7y7XNaQIlXM="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-smali"; + meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali"; }; smithy = buildGrammar { language = "smithy"; @@ -1445,12 +1445,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0d7a121"; + version = "3a3f92b"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "0d7a121b2a08fb37109f7be1cc6654443cad661f"; - hash = "sha256-b3HtiAoknPgmivnN/GVHcFHbAgl1an41iSS13wTFyGA="; + rev = "3a3f92b29c880488a08bc2baaf1aca6432ec3380"; + hash = "sha256-UdvsZOpnZsfWomKHBmtpHYDsgYZgIZvw2d+JNUphycs="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1490,12 +1490,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0fe0de5"; + version = "0c32d29"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "0fe0de56b528cbf24a654c734ca181b48be3831d"; - hash = "sha256-tU6UTyTR5biS6qBG0z6NbjJQUtZItzzscAKftUAzLq0="; + rev = "0c32d2948b79939b6464d9ced40fca43912cd486"; + hash = "sha256-LyeK/fOQBO10blHCXYyGvmzk/U3uIj4tfjdH+p6aVs4="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1549,12 +1549,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "c5a9454"; + version = "e0c3e50"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "c5a94547f01eb51b26446f9b94ee8644fa791223"; - hash = "sha256-2RNS0raJ0sEbBECwtI8hMG4Dir8KAx9PENwlRb7lY8o="; + rev = "e0c3e50e17846230e88becdce28fbb1b41dcabba"; + hash = "sha256-yqdGQabEE1unk7Rel+E3/MRXTEOz9XxrBVH9nj+mm/Q="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -1684,12 +1684,12 @@ }; vhs = buildGrammar { language = "vhs"; - version = "8a0df32"; + version = "54fe7c0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "8a0df32b72a8cf8d3e3e84f16c19e9ba46d3dba5"; - hash = "sha256-bWI/MW7U5ht7jmL3BSm5HwD1BMDNGwkBShJIpRlhonI="; + rev = "54fe7c05dfa2b9e100572496531e15c9bec86343"; + hash = "sha256-xP0pHuK0Gc8huTWaZY/DMfWzm6Jw/oVCx1huYL8Vwx4="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; From 3a6f78e67cce325cfdbc6f32aff1aecd68b06f02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 04:19:17 +0000 Subject: [PATCH 31/44] srvc: 0.14.0 -> 0.14.1 --- pkgs/applications/version-management/srvc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 4c6f27b561f8..258f03eb7831 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-gid3zPN9fdUqqNnRKvhEfzO4rJqZ3lWwmlP6SWEUyAY="; + sha256 = "sha256-6wA2dnUUgS6HNQo2vMFqoT+seZHqcNLoTN+f5+Ok1AQ="; }; - cargoHash = "sha256-UWKD2qXyxGepFK90QkyhyR7PJrK1wUiwQZjApoz9tqU="; + cargoHash = "sha256-XkRnbfTaCo0J1+yOOvIxhDTjtaZURkjFOPWsFRk8iNU="; buildInputs = lib.optionals stdenv.isDarwin [ Security From d117f8ff63e464a720c1bccae2250f41dabb5b89 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 21 Feb 2023 11:38:29 +0100 Subject: [PATCH 32/44] azure-static-sites-client: latest: 1.0.022152 -> 1.0.022431 --- .../azure-static-sites-client/versions.json | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index bd08b32de197..82df086db3bd 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,6 +1,44 @@ [ { "version": "latest", + "buildId": "1.0.022431", + "publishDate": "2023-02-21T18:46:09.9616432Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/linux/StaticSitesClient", + "sha": "a0424f02b72b0e292e23fa1774a579f3a83cc2280af46a19682c11423e55a134" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/windows/StaticSitesClient.exe", + "sha": "78476f93e8357ebd5b6676c66747c6f0432084615a5cecaa43e4afbda2533176" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/macOS/StaticSitesClient", + "sha": "0f2dc106903167d5900d9875321fd99a11349d21177b4794495b45e3df175755" + } + } + }, + { + "version": "stable", + "buildId": "1.0.022291", + "publishDate": "2023-02-07T21:07:28.1304112Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/linux/StaticSitesClient", + "sha": "65ca5599a37cd41ab6d88557b0e33179ffc0f86cb81fe1c72db30b021d8e63c0" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/windows/StaticSitesClient.exe", + "sha": "b94f11e62441339882bfd9f0e8fc496d7c77f9b6d9c2fe305b64d53e87e9814c" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/macOS/StaticSitesClient", + "sha": "3f5808e91fe24a3afee25297fce42cff4b1ab4fbbfaaf0c510662b14277485c6" + } + } + }, + { + "version": "backup", "buildId": "1.0.022152", "publishDate": "2023-01-24T18:38:40.5584174Z", "files": { @@ -17,43 +55,5 @@ "sha": "396f5fefe087399c78521b2f5456c79e58c771ca64785e4be055a149738a2e6a" } } - }, - { - "version": "stable", - "buildId": "1.0.021731", - "publishDate": "2022-12-14T02:22:20.0230853Z", - "files": { - "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/linux/StaticSitesClient", - "sha": "d2f88cf8b855169534c7e330dd95385b993b1c0f83331306e685faa8468a82b5" - }, - "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/windows/StaticSitesClient.exe", - "sha": "525d13ebffd79ea9663a15a4bd2e6d49bca72d20aa44838aa4b83133943d450c" - }, - "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/macOS/StaticSitesClient", - "sha": "5de3ac4b205d3871e7a8ff3b5869f2a57002277ac7fa6317032239d114e25ab8" - } - } - }, - { - "version": "backup", - "buildId": "1.0.021671", - "publishDate": "2022-12-08T00:34:47.6310685Z", - "files": { - "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/linux/StaticSitesClient", - "sha": "306c2d24cbc6461cdf1fe29e9206ccb9d452ba3514ee9d67a1d7e0f8edbc036f" - }, - "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/windows/StaticSitesClient.exe", - "sha": "ee868ca5e73a6ad8758698c168bb01d07b66288d353813fefe41d441f82b9f1f" - }, - "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/macOS/StaticSitesClient", - "sha": "5ef513530a45d4b8e135e272f7e7112e900fbb8c8137c19e645a694e71b98c74" - } - } } ] From 05e94bc57bdf4229b38c5ae069d1d6f18045b4ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 09:24:09 +0100 Subject: [PATCH 33/44] opkg: add changelog to meta --- pkgs/tools/package-management/opkg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 656f7e16acd1..6452aecdb259 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight package management system based upon ipkg"; homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; + changelog = "https://git.yoctoproject.org/opkg/tree/NEWS?h=v${version}"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; From e99fae5e667485a2f74b997adf267f0e51625757 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 09:25:05 +0100 Subject: [PATCH 34/44] opkg: specify license --- pkgs/tools/package-management/opkg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 6452aecdb259..34d0a25d3077 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "A lightweight package management system based upon ipkg"; homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; changelog = "https://git.yoctoproject.org/opkg/tree/NEWS?h=v${version}"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; From 3b2329c422fbed1f02fe9fad02880b6cd5cac422 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 09:27:33 +0100 Subject: [PATCH 35/44] opkg: equalize content --- .../tools/package-management/opkg/default.nix | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 34d0a25d3077..f62e6e246f69 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,16 +1,42 @@ -{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, xz, attr, acl, libxml2 -, autoreconfHook }: +{ lib +, stdenv +, fetchurl +, pkg-config +, curl +, gpgme +, libarchive +, bzip2 +, xz +, attr +, acl +, libxml2 +, autoreconfHook +}: stdenv.mkDerivation rec { - version = "0.6.1"; pname = "opkg"; + version = "0.6.1"; + src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "sha256-6H/MtXXGTTrAVZREAWonlfEhJZhqDaiWurl8ShovGyo="; + hash = "sha256-6H/MtXXGTTrAVZREAWonlfEhJZhqDaiWurl8ShovGyo="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ curl gpgme libarchive bzip2 xz attr acl libxml2 ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + curl + gpgme + libarchive + bzip2 + xz + attr + acl + libxml2 + ]; meta = with lib; { description = "A lightweight package management system based upon ipkg"; From 0d44a37f7ee6a6996b76d7ffa77a70a959b10ed2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 09:35:27 +0100 Subject: [PATCH 36/44] python310Packages.azure-mgmt-search: disable on unsupported Python releases --- .../python-modules/azure-mgmt-search/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index 1bf416416d08..bb062f0ed6ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -6,16 +6,20 @@ , azure-common , azure-mgmt-core , azure-mgmt-nspkg +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-search"; version = "9.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; + hash = "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; }; propagatedBuildInputs = [ @@ -28,7 +32,10 @@ buildPythonPackage rec { # has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.search" ]; + + pythonImportsCheck = [ + "azure.mgmt.search" + ]; meta = with lib; { description = "This is the Microsoft Azure Search Management Client Library"; From 29c0e789ec27837d5c95fb2d8d525c788533f43b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 09:37:05 +0100 Subject: [PATCH 37/44] python310Packages.azure-mgmt-search: adjust inputs --- .../python-modules/azure-mgmt-search/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index bb062f0ed6ea..4683d1e29412 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -2,11 +2,10 @@ , buildPythonPackage , fetchPypi , msrest -, msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg , pythonOlder +, typing-extensions }: buildPythonPackage rec { @@ -25,12 +24,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-common azure-mgmt-core - azure-mgmt-nspkg msrest - msrestazure + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ From 3ee028c185fd46bcdc42ec8d62e977de4bf574ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 08:46:16 +0000 Subject: [PATCH 38/44] lefthook: 1.2.8 -> 1.2.9 --- pkgs/applications/version-management/lefthook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index 7973b8ff1c04..06c7c6c4d941 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-hW3zKco0c90eIwWefHLABAZGUc2fGHsGnyPaSa/zGuQ="; + sha256 = "sha256-MYeQMgac1bqqN2QPz2KO55w7++3MnsRFm/ziSm6e2Rw="; }; - vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI="; + vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg="; nativeBuildInputs = [ installShellFiles ]; From b53bd4a5f05e3d0cbba4a63b28239084c080c94d Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 22 Feb 2023 07:55:55 -0500 Subject: [PATCH 39/44] qdrant: 0.11.2 -> 1.0.2 --- pkgs/servers/search/qdrant/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index abde1176ceda..0a3c0f00f913 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -3,20 +3,23 @@ , fetchFromGitHub , protobuf , stdenv +, pkg-config +, openssl +, Security }: rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "0.11.2"; + version = "1.0.2"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-MT2k4k/g97iXVUCz1dYJdL+JBCLKTWqE2u2Yiuvd/nw="; + sha256 = "sha256-AVglZr3J9fEWgE2g5UHt1j6YQud/viGp0IvuR9XRntE="; }; - cargoSha256 = "sha256-86F7B+SKaAxu7c3kyYurI5jPnnbvtdD0jouNCzT0A50="; + cargoSha256 = "sha256-4hzixh1/nVIMRsBSoldmbtpcpBMmvxik3lV/h4FPOrk="; prePatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace .cargo/config.toml \ @@ -24,7 +27,12 @@ rustPlatform.buildRustPackage rec { --replace "linker = \"aarch64-linux-gnu-gcc\"" "" ''; - nativeBuildInputs = [ protobuf rustPlatform.bindgenHook ]; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + nativeBuildInputs = [ protobuf rustPlatform.bindgenHook pkg-config ]; NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-faligned-allocation"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 146c17083c7b..e93b06df2183 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11311,7 +11311,9 @@ with pkgs; qarte = libsForQt5.callPackage ../applications/video/qarte { }; - qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { }; + qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { + inherit (darwin.apple_sdk_11_0.frameworks) Security; + }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; From c420236aaaea0ca37bbb61ff6166292f202b25f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 05:31:41 +0000 Subject: [PATCH 40/44] meilisearch: 1.0.0 -> 1.0.1 --- pkgs/servers/search/meilisearch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 3b568df12b53..51085070c8a0 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nixosTests }: -let version = "1.0.0"; +let version = "1.0.1"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "v${version}"; - hash = "sha256-XWPJldWxe8iply7XtmDem1gfbNuuaWuFdMfuCbcU6tc="; + hash = "sha256-PARvz1LEEgmelku69ywKditAx0G4xJnEL6dYIh1IYTM="; }; - cargoHash = "sha256-v8P4pbTJ/t9TgB07tyhn3y8q65xILFTbBgziw5kuxUQ="; + cargoHash = "sha256-p9X2l5nUR02Emo6dt6LsrO2Vef4dbCvCljaXL9imnFs="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; From cf8436e4cbc7e4cea6d4948140818e864c5899ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 09:12:09 +0100 Subject: [PATCH 41/44] meilisearch: update description --- pkgs/servers/search/meilisearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 51085070c8a0..b60dded03273 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "meilisearch"; repo = "MeiliSearch"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-PARvz1LEEgmelku69ywKditAx0G4xJnEL6dYIh1IYTM="; }; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage { doCheck = false; meta = with lib; { - description = "Powerful, fast, and an easy to use search engine "; + description = "Powerful, fast, and an easy to use search engine"; homepage = "https://docs.meilisearch.com/"; changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; license = licenses.mit; From 70c36dcfb8bcd293171c0faae2d4056334d1e744 Mon Sep 17 00:00:00 2001 From: hsjobeki Date: Thu, 23 Feb 2023 10:21:58 +0100 Subject: [PATCH 42/44] add better documentation comments to lib.runTests --- lib/debug.nix | 65 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index e3ca3352397e..9ec0169e66e2 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -109,6 +109,8 @@ rec { traceSeqN 2 { a.b.c = 3; } null trace: { a = { b = {…}; }; } => null + + Type: traceSeqN :: Int -> a -> b -> b */ traceSeqN = depth: x: y: let snip = v: if isList v then noQuotes "[…]" v @@ -173,17 +175,68 @@ rec { # -- TESTING -- - /* Evaluate a set of tests. A test is an attribute set `{expr, - expected}`, denoting an expression and its expected result. The - result is a list of failed tests, each represented as `{name, - expected, actual}`, denoting the attribute name of the failing + /* Evaluates a set of tests. + + A test is an attribute set `{expr, expected}`, + denoting an expression and its expected result. + + The result is a `list` of __failed tests__, each represented as + `{name, expected, result}`, + + - expected + - What was passed as `expected` + - result + - The actual `result` of the test + + Denoting the attribute name of the failing test and its expected and actual results. Used for regression testing of the functions in lib; see - tests.nix for an example. Only tests having names starting with + tests.nix for an example. + + > Important: In general only `tests` having names starting with "test" are run. - Add attr { tests = ["testName"]; } to run these tests only. + - Add attr { tests = ["testName"]; } to run tests from list only. + - If `tests` in not specififed all tests will be evaluated. + + Example: + + runTests { + testAndOk = { + expr = lib.and true false; + expected = false; + }; + testAndFail = { + expr = lib.and true false; + expected = true; + }; + } + -> + [ + { + name = "testAndFail"; + expected = true; + result = false; + } + ] + + Type: + runTests :: { + tests = [ String ]; + ${testName} :: { + expr :: a; + expected :: a; + }; + } + -> + [ + { + name :: String; + expected :: a; + result :: a; + } + ] */ runTests = # Tests to run From 09ee6241b55545d44011ae97fd48c9f46567db03 Mon Sep 17 00:00:00 2001 From: hsjobeki Date: Thu, 23 Feb 2023 11:24:47 +0100 Subject: [PATCH 43/44] improves: comprehensiveness --- lib/debug.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 9ec0169e66e2..35ca4c7dfb20 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -188,17 +188,12 @@ rec { - result - The actual `result` of the test - Denoting the attribute name of the failing - test and its expected and actual results. - Used for regression testing of the functions in lib; see - tests.nix for an example. + tests.nix for more examples. - > Important: In general only `tests` having names starting with - "test" are run. + Important: Only attributes that start with `test` are executed. - - Add attr { tests = ["testName"]; } to run tests from list only. - - If `tests` in not specififed all tests will be evaluated. + - If you want to run only a subset of the tests add the attribute `tests = ["testName"];` Example: From d316c28a302955e236de98f007d2120d5c092afb Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 23 Feb 2023 12:02:12 +0100 Subject: [PATCH 44/44] modules/github-runner: Improve `tokenFile` docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’ve been having trouble figuring out which kind of token to use and why our setup would break every few system updates. This should clarify which options there are, and which ones lead to better results. Ideally there would be a manual section that has a step-by-step guide on how to set up the github runner, with screenshots and everything. --- .../github-runner/options.nix | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix index 6ce08aaaece8..ce8809213724 100644 --- a/nixos/modules/services/continuous-integration/github-runner/options.nix +++ b/nixos/modules/services/continuous-integration/github-runner/options.nix @@ -41,17 +41,42 @@ with lib; tokenFile = mkOption { type = types.path; description = lib.mdDoc '' - The full path to a file which contains either a runner registration token or a - (fine-grained) personal access token (PAT). - The file should contain exactly one line with the token without any newline. - If a registration token is given, it can be used to re-register a runner of the same - name but is time-limited. If the file contains a PAT, the service creates a new - registration token on startup as needed. Make sure the PAT has a scope of - `admin:org` for organization-wide registrations or a scope of - `repo` for a single repository. Fine-grained PATs need read and write permission - to the "Administration" resources. + The full path to a file which contains either - Changing this option or the file's content triggers a new runner registration. + * a fine-grained personal access token (PAT), + * a classic PAT + * or a runner registration token + + Changing this option or the `tokenFile`’s content triggers a new runner registration. + + We suggest using the fine-grained PATs. A runner registration token is valid + only for 1 hour after creation, so the next time the runner configuration changes + this will give you hard-to-debug HTTP 404 errors in the configure step. + + The file should contain exactly one line with the token without any newline. + (Use `echo -n '…token…' > …token file…` to make sure no newlines sneak in.) + + If the file contains a PAT, the service creates a new registration token + on startup as needed. + If a registration token is given, it can be used to re-register a runner of the same + name but is time-limited as noted above. + + For fine-grained PATs: + + Give it "Read and Write access to organization/repository self hosted runners", + depending on whether it is organization wide or per-repository. You might have to + experiment a little, fine-grained PATs are a `beta` Github feature and still subject + to change; nonetheless they are the best option at the moment. + + For classic PATs: + + Make sure the PAT has a scope of `admin:org` for organization-wide registrations + or a scope of `repo` for a single repository. + + For runner registration tokens: + + Nothing special needs to be done, but updating will break after one hour, + so these are not recommended. ''; example = "/run/secrets/github-runner/nixos.token"; };