From f4ef149e9c529e929c1b039dea0f26ab0c79a823 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Fri, 9 Dec 2022 10:09:06 +0000 Subject: [PATCH 01/51] clash-geoip: 20220912 -> 20221112 --- pkgs/data/misc/clash-geoip/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 31d7384976d6..6ebded41f09f 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20220912"; + version = "20221112"; - src = ./.; - - data = fetchurl { + src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; sha256 = "sha256-YIQjuWbizheEE9kgL+hBS1GAGf2PbpaW5mu/lim9Q9A"; }; + dontUnpack = true; + installPhase = '' runHook preInstall mkdir -p $out/etc/clash - install -Dm 0644 $data -D $out/etc/clash/Country.mmdb + install -Dm 0644 $src -D $out/etc/clash/Country.mmdb runHook postInstall ''; From b32d7053fa6155897b4b6aa113c2f96f066114f2 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Fri, 9 Dec 2022 10:18:18 +0000 Subject: [PATCH 02/51] clash-geoip: add update script --- pkgs/data/misc/clash-geoip/default.nix | 2 ++ pkgs/data/misc/clash-geoip/update.sh | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100755 pkgs/data/misc/clash-geoip/update.sh diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 6ebded41f09f..3c1fad47b06c 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -18,6 +18,8 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A GeoLite2 data created by MaxMind"; homepage = "https://github.com/Dreamacro/maxmind-geoip"; diff --git a/pkgs/data/misc/clash-geoip/update.sh b/pkgs/data/misc/clash-geoip/update.sh new file mode 100755 index 000000000000..f4d5edcd5ca8 --- /dev/null +++ b/pkgs/data/misc/clash-geoip/update.sh @@ -0,0 +1,6 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts curl jq +set -euo pipefail + +RELEASE=$(curl "https://api.github.com/repos/Dreamacro/maxmind-geoip/releases/latest") +update-source-version clash-geoip "$(echo $RELEASE | jq -r .tag_name)" From 231da669c35e6e22f21a95e0a9ae60378e274050 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Fri, 16 Dec 2022 09:17:01 +0000 Subject: [PATCH 03/51] clash-geoip: 20221112 -> 20221212 --- pkgs/data/misc/clash-geoip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 3c1fad47b06c..f98e286bb2e0 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20221112"; + version = "20221212"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-YIQjuWbizheEE9kgL+hBS1GAGf2PbpaW5mu/lim9Q9A"; + sha256 = "sha256-pApPPRIvG8qak5chupTN2u1IUKANXtkcEMlSAPedjH4="; }; dontUnpack = true; From 62fa8fe959b53d021fe549e0b6665aab5d40a48d Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Sat, 17 Dec 2022 17:23:52 +0800 Subject: [PATCH 04/51] clash-geoip: use new update script --- pkgs/data/misc/clash-geoip/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index f98e286bb2e0..8c9a288b6c6a 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ lib, stdenvNoCC, fetchurl, nix-update-script }: stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; @@ -18,7 +18,11 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; meta = with lib; { description = "A GeoLite2 data created by MaxMind"; From c8c93b4d62064668f05291f129d8f09e020d578a Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Sat, 17 Dec 2022 17:24:35 +0800 Subject: [PATCH 05/51] clash-geoip: remove old update script --- pkgs/data/misc/clash-geoip/update.sh | 6 ------ 1 file changed, 6 deletions(-) delete mode 100755 pkgs/data/misc/clash-geoip/update.sh diff --git a/pkgs/data/misc/clash-geoip/update.sh b/pkgs/data/misc/clash-geoip/update.sh deleted file mode 100755 index f4d5edcd5ca8..000000000000 --- a/pkgs/data/misc/clash-geoip/update.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p common-updater-scripts curl jq -set -euo pipefail - -RELEASE=$(curl "https://api.github.com/repos/Dreamacro/maxmind-geoip/releases/latest") -update-source-version clash-geoip "$(echo $RELEASE | jq -r .tag_name)" From 93016af260909ac4dfb88aae6228bb0a45ad1e6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:34:26 +0100 Subject: [PATCH 06/51] python310Packages.yalexs-ble: 1.11.4 -> 0.12.0 Changelog: https://github.com/bdraco/yalexs-ble/blob/v0.12.0/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 8fd6aaed63a3..0b2a82b3cd70 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.11.4"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EiT1Bnez1en8NTcNrGn9GmD//VcaBMfk4iwXaYTm8cU="; + hash = "sha256-T3XkaLxAwGhIAat0HrBou9mu17iQrZLWGldr1ybfr3E="; }; nativeBuildInputs = [ From b2bcafc4b753ffccc3d91c857f386f465b46a136 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:34:49 +0100 Subject: [PATCH 07/51] python310Packages.yalexs-ble: 0.12.0 -> 0.12.1 Changelog: https://github.com/bdraco/yalexs-ble/blob/v0.12.1/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 0b2a82b3cd70..5910150a04ac 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "0.12.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T3XkaLxAwGhIAat0HrBou9mu17iQrZLWGldr1ybfr3E="; + hash = "sha256-0+R22ip2D3pauB1IStExzwDg4P26CCCI5nFkFB7Vfj8="; }; nativeBuildInputs = [ From 706cadc68b1713a94712ce8a37476e931e95c784 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:35:08 +0100 Subject: [PATCH 08/51] python310Packages.yalexs-ble: 0.12.1 -> 1.12.2 Changelog: https://github.com/bdraco/yalexs-ble/blob/v1.12.2/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 5910150a04ac..a84ba321ab21 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "0.12.1"; + version = "1.12.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0+R22ip2D3pauB1IStExzwDg4P26CCCI5nFkFB7Vfj8="; + hash = "sha256-QVZlf7t925RFVNBxOj39Ln7sezTkwQ065sbVFcoQG4Y="; }; nativeBuildInputs = [ From ce95518d6441bcfe3b7bdd114cdf394ac4aca579 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:36:12 +0100 Subject: [PATCH 09/51] python310Packages.ical: 4.2.2 -> 4.2.3 Changelog: https://github.com/allenporter/ical/releases/tag/4.2.3 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 9c12520e9718..b75499fe2b5f 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ical"; - version = "4.2.2"; + version = "4.2.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YvBcfrZiHTornCEAFhNLN/siNvl119pD+o+0yNsRBA8="; + hash = "sha256-Af08Xnf5PNWTzRfRENSixVlfcqrvhSuutGxoDzHG4dk="; }; propagatedBuildInputs = [ From 30cdcf22d32650920aa390275657479f2582c526 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:43:30 +0100 Subject: [PATCH 10/51] python310Packages.pyswitchbot: 0.23.2 -> 0.24.0 Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.24.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 872999bf565e..bc0f8cb5a99f 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.23.2"; + version = "0.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-bpa83uT3Gebwryb7Fc7kBv0m9aYgoL84Q625AavLw40="; + hash = "sha256-rkFSq6b5agtEwqlRLI4gFHjDVNpWvU9sdVNa/D1O1r4="; }; propagatedBuildInputs = [ From cc3502e37def71881cb4a334e5cc1741251b7af9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:43:51 +0100 Subject: [PATCH 11/51] python310Packages.pyswitchbot: 0.24.0 -> 0.25.0 Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.25.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index bc0f8cb5a99f..493b0c20578e 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.24.0"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-rkFSq6b5agtEwqlRLI4gFHjDVNpWvU9sdVNa/D1O1r4="; + hash = "sha256-L9/Vx+oxfqPWLptE3jjiAcNkoFFWvbeUX3T23ids/KM="; }; propagatedBuildInputs = [ From 522206c4680d72eae745924e7771ee6930a67691 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:44:18 +0100 Subject: [PATCH 12/51] python310Packages.pyswitchbot: 0.25.0 -> 0.26.0 Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.26.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 493b0c20578e..b4cad9893659 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.25.0"; + version = "0.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-L9/Vx+oxfqPWLptE3jjiAcNkoFFWvbeUX3T23ids/KM="; + hash = "sha256-fY9P9fEgVUOmHD3WYELM0aB2ulutYOzd/9MBl0Mpj04="; }; propagatedBuildInputs = [ From 1d36015126d2a4d5ed9fad10af255017d0498d86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:48:47 +0100 Subject: [PATCH 13/51] python310Packages.pyswitchbot: 0.26.0 -> 0.27.0 Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.27.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index b4cad9893659..3de6f8b2411d 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.26.0"; + version = "0.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-fY9P9fEgVUOmHD3WYELM0aB2ulutYOzd/9MBl0Mpj04="; + hash = "sha256-wvwBhTEgIBc/un5vV2LxKRjamotLjs6P+ITp1aNviXg="; }; propagatedBuildInputs = [ From 3155c2fb0e126896eedc40c33d892cf9d268cba6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 10:49:15 +0100 Subject: [PATCH 14/51] python310Packages.pyswitchbot: 0.27.0 -> 0.27.1 Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.27.1 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 3de6f8b2411d..45ade7808584 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.27.0"; + version = "0.27.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-wvwBhTEgIBc/un5vV2LxKRjamotLjs6P+ITp1aNviXg="; + hash = "sha256-2ef2a8Ru3fl0mdVBy4CDObd22z0u4AF2V9FvhSfR9B4="; }; propagatedBuildInputs = [ From 26a94f31631beb38d7f371c8a195d118ecdc3791 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 11:14:33 +0100 Subject: [PATCH 15/51] python310Packages.bluetooth-auto-recovery: 1.0.0 -> 1.0.3 Changelog: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v1.0.3/CHANGELOG.md --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index ab158f4d72e9..38a577cf123a 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.0.0"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TkTWF8Ljt2cLIuz2FnktrZFAlpvTVkFh6evE8TSzJhk="; + hash = "sha256-gDypj2Vud6JtbGREPotvawgcsu5hbf92gJxxutWHcII="; }; nativeBuildInputs = [ From 9aff4216e7ab1c596990565b807ce726a123357c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 11:15:40 +0100 Subject: [PATCH 16/51] python310Packages.pytibber: 0.26.4 -> 0.26.5 Changelog: https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.5 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index a4047483eb63..0e25985cf337 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.4"; + version = "0.26.5"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-R++vsJ2CJwPxG/32qam/LRj7GUj3obh9z20xXNMAnQ4="; + hash = "sha256-YW+Oi/ORXjeFLQfeVxCKgyRGBVx4TZKGeKMCgYkEIzo="; }; propagatedBuildInputs = [ From 2928c77a5d1ebc491fee79d4bdca3aee2de5bc1f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 11:17:07 +0100 Subject: [PATCH 17/51] python310Packages.govee-ble: 0.19.1 -> 0.19.3 --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 4034dc57cfec..7cee9b5713e7 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.19.1"; + version = "0.19.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3uYAyItZ1X18pw3h3rTJpcv2H7O+e4sFCv1R7vb8QPI="; + hash = "sha256-HoEWFwpEzlTVlCD1sPOSKhvZleErxJdaqxKPv+1PcGo="; }; nativeBuildInputs = [ From 410da1fec495a68b0935b28338b4931c6e07013f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 18:17:30 +0100 Subject: [PATCH 18/51] python310Packages.logging-journald: 0.6.2 -> 0.6.3 --- .../logging-journald/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix index 6abd9efeda27..8e59d46aea51 100644 --- a/pkgs/development/python-modules/logging-journald/default.nix +++ b/pkgs/development/python-modules/logging-journald/default.nix @@ -1,21 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, poetry-core , pythonOlder }: buildPythonPackage rec { pname = "logging-journald"; - version = "0.6.2"; - format = "setuptools"; + version = "0.6.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-U6kqAvMSyLDbThc6wAN/ri0vmt/vAxgFFZT65Csbpss="; + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-jqwtmypugfiQW1loLUwUIjWjcRKyCaqJss2Z54wg67U="; }; + nativeBuildInputs = [ + poetry-core + ]; + # Circular dependency with aiomisc doCheck = false; From b79567b831169c32200dd991f120b224188adf30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 18:17:42 +0100 Subject: [PATCH 19/51] python310Packages.logging-journald: 0.6.3 -> 0.6.4 Diff: https://github.com/mosquito/logging-journald/compare/refs/tags/0.6.3...0.6.4 --- pkgs/development/python-modules/logging-journald/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix index 8e59d46aea51..7dc0d67e7a71 100644 --- a/pkgs/development/python-modules/logging-journald/default.nix +++ b/pkgs/development/python-modules/logging-journald/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "logging-journald"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jqwtmypugfiQW1loLUwUIjWjcRKyCaqJss2Z54wg67U="; + hash = "sha256-g8oDFuqTBVutS7Uq7JCN+SXYL7UEQ+7G2nxzndjKAh8="; }; nativeBuildInputs = [ From 4e10c04b858c405b6302977559becedfb01c03a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 19:07:15 +0100 Subject: [PATCH 20/51] python310Packages.pyezviz: 0.2.0.10 -> 0.2.0.11 Diff: https://github.com/baqs/pyEzviz/compare/refs/tags/0.2.0.10...0.2.0.11 Changelog: https://github.com/BaQs/pyEzviz/releases/tag/0.2.0.11 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 4ae751b92dd8..a647f53150ad 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.10"; + version = "0.2.0.11"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-oi2F+OYxiQXq8JlIqbQyjpUuRciMwIaBCh27lvM7TuM="; + hash = "sha256-XG4+UQL8M5G8Y19PNTBAL51XJRE48qorE8FapaiddYI="; }; propagatedBuildInputs = [ From 2b748ef061b2960c5ebfe74754e96b597ff3030a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 18:30:50 +0000 Subject: [PATCH 21/51] mcfly: 0.7.0 -> 0.7.1 --- pkgs/tools/misc/mcfly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index e5f079a5c316..3727ef2fd95d 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-4vhDtKVo5DI/A9Cg/2I7vn1bJL/8VvUtsqMn8NdVqco="; + sha256 = "sha256-F3kjJvv94yxiDZx3BkvCQyWDTAQfw5s5yhDfaAxwvLQ="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoSha256 = "sha256-Q8J75kI3Oob2cMweW5d1nD2mSX0WUhIacUx6XQnk95c="; + cargoSha256 = "sha256-9h4a2P5R571vdeRM1cgt67+Zx8VEIBrh2/Aad66ZQqc="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From a519dea33528bbc7676e70545ccb49fc43a1d85f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 19:31:39 +0100 Subject: [PATCH 22/51] python310Packages.sentry-sdk: 1.11.1 -> 1.12.0 Diff: https://github.com/getsentry/sentry-python/compare/refs/tags/1.11.1...1.12.0 Changelog: https://github.com/getsentry/sentry-python/blob/1.12.0/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index ff52a049c7ff..fbb573fa98f8 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-2AAi9BrF15TDiv9v2d/UF9JPgJheet33k+7iHqPlw5g="; + hash = "sha256-22GQO3y24xlbZgxNsD8eEWj/pVWcOlYiRV52jKTf7sc="; }; propagatedBuildInputs = [ From b821711e33db15fbdaa8f480179ad6f39a9c24e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 19:35:22 +0100 Subject: [PATCH 23/51] python310Packages.zamg: 0.2.0 -> 0.2.1 Diff: https://github.com/killer0071234/python-zamg/compare/refs/tags/v0.2.0...v0.2.1 Changelog: https://github.com/killer0071234/python-zamg/releases/tag/v0.2.1 --- pkgs/development/python-modules/zamg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index e24e712e7c07..66532c75b7d8 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-mql3r1TdVHwpJi54TMj6kfP3uZO2maa5dynUL4fOiNY="; + hash = "sha256-P9BvrINsF6OZdNw8L8RXjpDgVWvW5s3qgCFXtEeUChM="; }; postPatch = '' From deac3ab9e71b9617eed58f5879a9ded76ae585d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 19:36:56 +0100 Subject: [PATCH 24/51] pyupgrade: 3.1.0 -> 3.3.1 Diff: https://github.com/asottile/pyupgrade/compare/v3.1.0...v3.3.1 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 2e17db7d29bd..b14fb46e98b1 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "3.1.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-OzU3Qv6qdEw0hJdbQ7Q3T6zOGpUt2uZyfy1Fxm3GT0Q="; + hash = "sha256-vg1eNxIkdHM1MMTkCof/ED6nqFhwSgEiKjYmqAyHMp0="; }; propagatedBuildInputs = [ From 2130acfabdf5a7149ef624c2113f2249b387c5f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 19:40:45 +0100 Subject: [PATCH 25/51] python310Packages.nettigo-air-monitor: 1.5.0 -> 1.6.0 Diff: https://github.com/bieniu/nettigo-air-monitor/compare/1.5.0...1.6.0 Changelog: https://github.com/bieniu/nettigo-air-monitor/releases/tag/1.6.0 --- .../python-modules/nettigo-air-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 1f23192eaaf1..35a6b1a613da 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - hash = "sha256-84cd869k+JZZpjBBoHH2AyIo8ixJzVgpLLRBV4cMNKA="; + hash = "sha256-86YEpn3rI6Y4v0pcNk+/4tHCUzXpXZN5xwV9M/1gZ8U="; }; propagatedBuildInputs = [ From e9c1876e9449e742e93584e68afdda63a01b2008 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 19:47:05 +0100 Subject: [PATCH 26/51] python310Packages.aiomisc: 16.2 -> 16.2.10 --- .../python-modules/aiomisc/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index d1fd33eb618e..d3c386eef7bf 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -8,7 +8,7 @@ , colorlog , croniter , fastapi -, fetchFromGitHub +, fetchPypi , logging-journald , pytestCheckHook , pythonOlder @@ -20,16 +20,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "16.2"; + version = "16.2.10"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "aiokitchen"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-wxm7MrFHZ7TrUGw5w7iLWs1olU8ZmJmJ7M/BZ6Nf0fU="; + src = fetchPypi { + inherit pname version; + hash = "sha256-iQlbd1DoPgxq+Am0BTDYXIBZoC21/54+bywDtcCXlls="; }; propagatedBuildInputs = [ @@ -73,11 +71,14 @@ buildPythonPackage rec { "aiomisc" ]; - disabledTestPaths = [ - # Dependencies are not available at the moment - "tests/test_entrypoint.py" - "tests/test_raven_service.py" - ]; + # Upstream stopped tagging with 16.2 + doCheck = false; + + # disabledTestPaths = [ + # # Dependencies are not available at the moment + # "tests/test_entrypoint.py" + # "tests/test_raven_service.py" + # ]; meta = with lib; { description = "Miscellaneous utils for asyncio"; From 83bffb14af94e21031a9251dea9e8a90a01bcb74 Mon Sep 17 00:00:00 2001 From: wackbyte Date: Fri, 16 Dec 2022 17:58:49 -0500 Subject: [PATCH 27/51] imgbrd-grabber: 7.9.1 -> 7.10.0 --- pkgs/applications/graphics/imgbrd-grabber/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index 5988627d401c..e37539ceeec5 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "imgbrd-grabber"; - version = "7.9.1"; + version = "7.10.0"; src = fetchFromGitHub { owner = "Bionus"; repo = "imgbrd-grabber"; rev = "v${version}"; - sha256 = "sha256-0CceSXH1GJbWKOnxZkjmbuyj7NBOQ6tpCYrCl7z4Vrw="; + sha256 = "sha256-AT6pN2do0LlH6xAXKcFQv+oderD88/EiG1JnCw6kOOg="; fetchSubmodules = true; }; @@ -67,8 +67,10 @@ stdenv.mkDerivation rec { # link the catch2 sources from nixpkgs ln -sf ${catch2.src} tests/src/vendor/catch + ''; - sed "s|strict\": true|strict\": false|g" -i ./sites/tsconfig.json + preBuild = '' + export HOME=$TMPDIR ''; postInstall = '' From d20852787475c0e4b7078010039029247d659d2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 19:55:57 +0100 Subject: [PATCH 28/51] python310Packages.fakeredis: 2.2.0 -> 2.3.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.2.0...v2.3.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.3.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index d86e6b016568..dfde6be5c4ca 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-W24DMVp3E6SYaVTUYCRDm/tLaGcjDqecO3rN1RO/J84="; + hash = "sha256-3CHBSjuvpH614Hag+8EWzpvVcdx140/NvsQHf3DyzZM="; }; nativeBuildInputs = [ From 82c749f22403d0a39e3083b1ccecebeb307eda6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 22:09:24 +0100 Subject: [PATCH 29/51] python310Packages.aliyun-python-sdk-dbfs: 2.0.2 -> 2.0.3 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-dbfs/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-dbfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix index c0a2bed20c3c..73e997b9cd4a 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-dbfs"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+zypKosn+lKEjxJhjLHD43i8jK40WvapD8pjXQehU7E="; + hash = "sha256-vMF0bAsICikvDtxn+wXujo8bY4DQ/xxXJmUePMQ+7Ak="; }; propagatedBuildInputs = [ From 4fd61e853684ef66d119f03c60ecb089c5bdb980 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 22:19:50 +0100 Subject: [PATCH 30/51] python310Packages.aiolifx-themes: 0.2.1 -> 0.3.0 Diff: https://github.com/Djelibeybi/aiolifx-themes/compare/refs/tags/v0.2.1...v0.3.0 Changelog: https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v0.3.0 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index ebcf0d913841..98d86b25c67f 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.2.1"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-sWEWfsew758jl6vLB7AQQ3nA83BFHF7YPy1ZaoPt45Y="; + hash = "sha256-2ZruUkSpLclsz3ZSyTM+UshfGG4bHwfQMM8UFjlkvBg="; }; prePatch = '' From d96d425f7b74cec5898bf194a539265d569eca7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 22:26:50 +0100 Subject: [PATCH 31/51] python310Packages.asn1tools: 0.164.0 -> 0.165.0 Diff: https://github.com/eerimoq/asn1tools/compare/0.164.0...0.165.0 --- pkgs/development/python-modules/asn1tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 9168d9dcb43f..d9747450a336 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asn1tools"; - version = "0.164.0"; + version = "0.165.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "eerimoq"; repo = "asn1tools"; rev = version; - hash= "sha256-sbwwbwkhlZvCb2emuw1FTBj5pnv9SOtHpAcYPSQqIvM="; + hash = "sha256-E9ns4xBDHkmIET2rXsMP9/9knXZ9H0D24w5QISQrYlc="; }; propagatedBuildInputs = [ From 7c3a27dba627facfc8f8f27d6e3259db8829a1e6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 17 Dec 2022 22:53:27 +0100 Subject: [PATCH 32/51] pdns-recursor: 4.7.3 -> 4.8.0 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 4e9e2f014f9b..566f2ab015ff 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.7.3"; + version = "4.8.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-IG12bMjwGJ951pr2TY2TfsxhpNE+jqZZTXj+MOYUBfI="; + sha256 = "zLkBehp4jpXpSOeyQO+NtTropQe5FfJgGI7zQ/f2i9w="; }; nativeBuildInputs = [ pkg-config ]; From 5b198bd79c83ce62e0de82a11766ac2e6709dfa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 22:13:39 +0000 Subject: [PATCH 33/51] python310Packages.dnachisel: 3.2.9 -> 3.2.10 --- pkgs/development/python-modules/dnachisel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 1c86e3bccf6b..777b12b79cc8 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dnachisel"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "DnaChisel"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Fg0gkI+01xIt8LQmNmRzkzd4AObg/99x34y5NclMtDQ="; + sha256 = "sha256-YlNOvK7ZXUHYdRX1NFEdZ646NGLtGXU1YgAjN6RY2QE="; }; propagatedBuildInputs = [ From 3166d3d7852c076edcc0a0207c171dafa3154880 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 23:56:33 +0000 Subject: [PATCH 34/51] picom: 10.1 -> 10.2 --- pkgs/applications/window-managers/picom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 384b806ce2f7..ddcab1095719 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "10.1"; + version = "10.2"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - hash = "sha256-EYNLLAz7CkbVGv2XMT+73RR58HzxG+Gy7b5x1qahAgo="; + hash = "sha256-C+icJXTkE+XMaU7N6JupsP8xhmRVggX9hY1P7za0pO0="; fetchSubmodules = true; }; From 16d80744cc6d275e73e5dc710d91a8e1a9d58f08 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 Dec 2022 15:02:54 +0800 Subject: [PATCH 35/51] ndppd: fix cross compilation --- pkgs/applications/networking/ndppd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index ccaf3e0bbbb8..df3bc9f9f236 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0"; }; + nativeBuildInputs = [ gzip ]; + makeFlags = [ "PREFIX=$(out)" ]; preConfigure = '' - substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip + substituteInPlace Makefile --replace /bin/gzip gzip ''; postInstall = '' From 8735b044f9da2a65ffc40e78e4d4cd6e40d4f231 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 Dec 2022 14:58:54 +0800 Subject: [PATCH 36/51] libva1: fix cross compilation --- pkgs/development/libraries/libva/1.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix index 5197420783a1..b3ad61d4b283 100644 --- a/pkgs/development/libraries/libva/1.nix +++ b/pkgs/development/libraries/libva/1.nix @@ -8,6 +8,7 @@ , libdrm , libXfixes , wayland +, wayland-scanner , libffi , libGL , mesa @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config wayland-scanner ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; From ee9715db0d0f56e0dc05caf0e2be288ff98c475d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 02:26:58 +0000 Subject: [PATCH 37/51] python310Packages.sqlmap: 1.6.11 -> 1.6.12 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 791da716c56b..f6378cfce9ed 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.11"; + version = "1.6.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zucBRLf5qnRURS0YS3Zv4jxRZYOIGtzPBepQ7a2nvs="; + sha256 = "sha256-RHDW2A9mC0zIpjNqUUhXvWDBWj7r4O+9FTFRYUqoAXw="; }; postPatch = '' From a87ddf11992edd7f1ebe7ebf0fabfb5a5d84daad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 04:58:25 +0000 Subject: [PATCH 38/51] flexget: 3.5.11 -> 3.5.12 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index ac8e3129bb0b..9bd2c90d24f8 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.11"; + version = "3.5.12"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-KGeTzERLlsrBHQxskrMhFHw9XyYyl33bJJK+SN++EU4="; + hash = "sha256-nrW6+BhcDvFt7bw0XdiDk2eNnM+ut24xTdPulNDw9X4="; }; postPatch = '' From 242fa43f1042720c94fb45ec96e03cb7ecfbcfc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 08:36:27 +0000 Subject: [PATCH 39/51] python310Packages.transformers: 4.24.0 -> 4.25.1 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index e445dd7e8db3..15eee616aea3 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.24.0"; + version = "4.25.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aGtTey+QK12URZcGNaRAlcaOphON4ViZOGdigtXU1g0="; + hash = "sha256-b0xEHM72HcaTRgGisB6fnPrMaXZ8EcJfowwK92W4aYg="; }; propagatedBuildInputs = [ From e41571123aa2b11cce1ca152d296d351c7b36613 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 11 Dec 2022 15:18:42 +0100 Subject: [PATCH 40/51] =?UTF-8?q?ocamlPackages.ansiterminal:=200.8.2=20?= =?UTF-8?q?=E2=86=92=200.8.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ansiterminal/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index edd40fb4df29..f421e59ce7da 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,16 +1,12 @@ -{ lib, buildDunePackage, fetchFromGitHub }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { pname = "ANSITerminal"; - version = "0.8.2"; + version = "0.8.5"; - useDune2 = true; - - src = fetchFromGitHub { - owner = "Chris00"; - repo = pname; - rev = version; - sha256 = "0dyjischrgwlxqz1p5zbqq76jvk6pl1qj75i7ydhijssr9pj278d"; + src = fetchurl { + url = "https://github.com/Chris00/ANSITerminal/releases/download/${version}/ANSITerminal-${version}.tbz"; + hash = "sha256-q3OyGLajAmfSu8QzEtzzE5gbiwvsVV2SsGuHZkst0w4="; }; doCheck = true; @@ -22,7 +18,7 @@ buildDunePackage rec { movements on ANSI terminals. It also works on the windows shell (but this part is currently work in progress). ''; - inherit (src.meta) homepage; + homepage = "https://github.com/Chris00/ANSITerminal"; license = licenses.lgpl3; maintainers = [ maintainers.jirkamarsik ]; }; From 32c0b869636f562dcc024c410a2a3e29d01519ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 10:33:28 +0100 Subject: [PATCH 41/51] python310Packages.bluetooth-adapters: 0.12.0 -> 0.13.0 Diff: https://github.com/Bluetooth-Devices/bluetooth-adapters/compare/refs/tags/v0.12.0...0.13.0 Changelog: https://github.com/bluetooth-devices/bluetooth-adapters/blob/v0.13.0/CHANGELOG.md --- .../development/python-modules/bluetooth-adapters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 6e750422120f..eff0823ef2aa 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.12.0"; + version = "0.13.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-meBCjWKAIN6sNrBp/Riptu9igvVwIPf0G2x+Z3Kqkts="; + hash = "sha256-NNbX7fKs1Lr/DAU5DpOa3yoIQ6Ki+niAB2CFK7+o47Y="; }; postPatch = '' From b561e9531bbc96ab7eb2e1fd8b7ff784fa95d62c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 10:33:42 +0100 Subject: [PATCH 42/51] python310Packages.bluetooth-adapters: 0.13.0 -> 0.14.0 Diff: https://github.com/Bluetooth-Devices/bluetooth-adapters/compare/refs/tags/v0.13.0...0.14.0 Changelog: https://github.com/bluetooth-devices/bluetooth-adapters/blob/v0.14.0/CHANGELOG.md --- .../development/python-modules/bluetooth-adapters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index eff0823ef2aa..18faa55de1f8 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.13.0"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NNbX7fKs1Lr/DAU5DpOa3yoIQ6Ki+niAB2CFK7+o47Y="; + hash = "sha256-iFJQexjL7iDO78katCPafRC6F+TSQmwlUh6J9Zx0hCs="; }; postPatch = '' From 98254834e1c28b4e42c2dffa075c2c221565f0fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 10:33:57 +0100 Subject: [PATCH 43/51] python310Packages.bluetooth-adapters: 0.14.0 -> 0.14.1 Diff: https://github.com/Bluetooth-Devices/bluetooth-adapters/compare/refs/tags/v0.14.0...v0.14.1 Changelog: https://github.com/bluetooth-devices/bluetooth-adapters/blob/v0.14.1/CHANGELOG.md --- .../development/python-modules/bluetooth-adapters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 18faa55de1f8..d467e6924d6c 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.14.0"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iFJQexjL7iDO78katCPafRC6F+TSQmwlUh6J9Zx0hCs="; + hash = "sha256-QqwEnz3b5+r7bUSrZkzTwFn8fYczNuUi49hpa1LRsrw="; }; postPatch = '' From 16da0dbd89eb8be949993483b64b95e28dbdaec6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 10:35:42 +0100 Subject: [PATCH 44/51] python310Packages.hahomematic: 2022.12.3 -> 2022.12.4 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2022.12.3...2022.12.4 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2022.12.4 --- 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 26b050ae998b..0ca4e6acc4b6 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.12.3"; + version = "2022.12.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-6xCPkB2QydoJrvwgGGJqmGaw38HCAUs2jPBuXoIBC2Q="; + sha256 = "sha256-/JX9YlH642MbCs2ChMKFiD0+e5eWUTeY5o9EsUGgbl8="; }; nativeBuildInputs = [ From afba69bcb5ce9842df43860ef26ac7ca1d638562 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 21:59:51 +0000 Subject: [PATCH 45/51] devspace: 6.2.1 -> 6.2.2 --- pkgs/development/tools/misc/devspace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index fe831c2eb93d..183175ecb34a 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.2.1"; + version = "6.2.2"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-V/LaK4pzML5tYaT5YBMsYgzGzsoJ6tkAOo2mGlEkJWQ="; + sha256 = "sha256-eET7Q0UvpvmPPgnrc6tX69dYhrsO2bsyzFkAJyp9FLg="; }; vendorSha256 = null; From 6b24d97551481782cdbcf3ddb1918ca48d76ec4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 14:53:48 +0000 Subject: [PATCH 46/51] level-zero: 1.8.8 -> 1.8.12 --- pkgs/development/libraries/level-zero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 592260c0a467..85a803c010b1 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.8.8"; + version = "1.8.12"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "v${version}"; - sha256 = "sha256-hfbTgEbvrhWkZEi8Km7KaxJBAc9X1kA/T2DLooKa7KQ="; + sha256 = "sha256-87fnucPg8JygYo3QSuA6ll0acbHQvmWzNLEp4dqkAH8="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; From 95407e7c09787d8905a12f7072666d579877bd94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 12:46:27 +0000 Subject: [PATCH 47/51] jc: 1.22.2 -> 1.22.3 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index a77d36eca069..f87984dc022f 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.22.2"; + version = "1.22.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GUzBZ9NCh+70yv40WDGWxQWq0F00oMpZOPQ3Y2AiQTQ="; + sha256 = "sha256-JOhsV4NyY5OW4smDEup1i9MTSQzK4Ldut/VybPB9ulc="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; From 6c3fbca325f6d24504c2c1d5511a3e874617c59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 18 Dec 2022 09:37:26 +0000 Subject: [PATCH 48/51] cachix: 1.0.1 -> 1.1 --- .../haskell-modules/configuration-common.nix | 3 +-- .../haskell-modules/configuration-nix.nix | 27 ++++++++++++++++++- .../haskell-modules/patches/cachix.patch | 10 ------- 3 files changed, 27 insertions(+), 13 deletions(-) delete mode 100755 pkgs/development/haskell-modules/patches/cachix.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 55bf787c2f41..8267a47ff7e9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -132,8 +132,7 @@ self: super: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; }) super.shell-conduit; - # https://github.com/cachix/cachix/pull/451 - cachix = appendPatch ./patches/cachix.patch super.cachix; + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix; # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d37fd3f7e6a5..3815c91edf2c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -907,7 +907,32 @@ self: super: builtins.intersectAttrs super { (overrideCabal { doCheck = pkgs.postgresql.doCheck; }) ]; - cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); + cachix = overrideCabal (drv: { + version = "1.1"; + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "v1.1"; + sha256 = "sha256-lML+E5RR5Pk2Do85+8Qs7mMVqp7ImlCIqEYjUAS08W4="; + }; + buildDepends = [ self.conduit-zstd ]; + postUnpack = "sourceRoot=$sourceRoot/cachix"; + postPatch = '' + sed -i 's/1.0.1/1.1/' cachix.cabal + ''; + }) (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); + cachix-api = overrideCabal (drv: { + version = "1.1"; + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "v1.1"; + sha256 = "sha256-lML+E5RR5Pk2Do85+8Qs7mMVqp7ImlCIqEYjUAS08W4="; + }; + buildDepends = [ self.stm-chans ]; + postUnpack = "sourceRoot=$sourceRoot/cachix-api"; + }) super.cachix-api; + hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; }; hercules-ci-cnix-expr = diff --git a/pkgs/development/haskell-modules/patches/cachix.patch b/pkgs/development/haskell-modules/patches/cachix.patch deleted file mode 100755 index 21f1496933a7..000000000000 --- a/pkgs/development/haskell-modules/patches/cachix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Cachix/Client/OptionsParser.hs -+++ b/src/Cachix/Client/OptionsParser.hs -@@ -15,7 +15,7 @@ - import qualified Cachix.Client.URI as URI - import qualified Cachix.Deploy.OptionsParser as DeployOptions - import Options.Applicative --import Protolude hiding (toS) -+import Protolude hiding (option, toS) - import Protolude.Conv - import qualified URI.ByteString as URI From ecca235a5bdf580ec15cde533f5a95266bbc7fb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 19:41:22 +0000 Subject: [PATCH 49/51] mongodb-compass: 1.34.1 -> 1.34.2 --- pkgs/tools/misc/mongodb-compass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 15345a28fb90..4fd81d1fd9fc 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.34.1"; + version = "1.34.2"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-TkwSfzTIUMCyNFVA3K+Y2ZKA3gTGXHi1mgySXef1KE4="; + sha256 = "sha256-qXteinKphHi2dwHQ4WMIegG+Yb9YGU/WuCbhwcoIV3Y="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From b65120b662a663f997ddc795c3e42fe9218864c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 14:24:26 +0000 Subject: [PATCH 50/51] kubemq-community: 2.3.5 -> 2.3.7 --- pkgs/servers/kubemq-community/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix index a3428a8db8a3..b631ce233ad6 100644 --- a/pkgs/servers/kubemq-community/default.nix +++ b/pkgs/servers/kubemq-community/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "kubemq-community"; - version = "2.3.5"; + version = "2.3.7"; src = fetchFromGitHub { owner = "kubemq-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kR2/Is1fQqpRyQ8yKSEvXV5xzXcHldCqgnCRNRZ+Ekg="; + sha256 = "sha256-oAo/O3T3wtfCumT2kjoyXKfCFHijVzSmxhslaKaeF3Y="; }; CGO_ENABLED=0; @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; # grpc tests are flaky - vendorSha256 = "sha256-mie+Akfsn+vjoxYnI23Zxk0OTFbMf51BDbJk2c0U7iU="; + vendorSha256 = "sha256-L1BxxSI2t0qWXizge+X3BrpGPaSy5Dk81vKuI0N5Ywg="; meta = { homepage = "https://github.com/kubemq-io/kubemq-community"; From 04f574a1c0fde90b51bf68198e2297ca4e7cccf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Dec 2022 11:10:51 +0000 Subject: [PATCH 51/51] kapp: 0.54.0 -> 0.54.1 --- pkgs/tools/networking/kapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index 19596e4cf13e..a7d2bda6428c 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-68JIsL+qrXB3yLU+euznAVPv57cQd5qzvHn547nwHVI="; + sha256 = "sha256-q9Am9ryrvmvuUCmHNCsf1iZz0wdaO87C1Gbvi40cKIA="; }; vendorSha256 = null;