From 6e6a32eb6fff37ec02df1610780aa6d959751acc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 4 Mar 2024 22:05:50 +0000 Subject: [PATCH 01/47] zeroc-ice: 3.7.7 -> 3.7.10 Anong other things added support for `gcc-13` building without the need to inhibit warnings. --- pkgs/development/libraries/zeroc-ice/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index f62dec911d81..3ccb7c17f9c9 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.7.7"; + version = "3.7.10"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "sha256-h455isEmnRyoasXhh1UaA5PICcEEM8/C3IJf5yHRl5g="; + hash = "sha256-l3cKsR8HSdtFGw1S12xueQOu/U9ABlOxQQtbHBj2izs="; }; buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl libxcrypt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae8cfef98c10..038cc88e8629 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36543,7 +36543,7 @@ with pkgs; zerobin = callPackage ../applications/networking/zerobin { }; - zeroc-ice = disable-warnings-if-gcc13 (callPackage ../development/libraries/zeroc-ice { }); + zeroc-ice = callPackage ../development/libraries/zeroc-ice { }; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; From 1295cdf06ba8e7102016d71307f27d716701e054 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 16:23:34 +0000 Subject: [PATCH 02/47] yamlscript: 0.1.39 -> 0.1.40 --- pkgs/by-name/ya/yamlscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index ab541bb496b3..cb77a5861227 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.39"; + version = "0.1.40"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-P64Ekkn8yIuct+dl4dVYDRhMmKFieIa75r0rJbTvfhg="; + hash = "sha256-tPnEfYI3l8PKDeWnb9i0ov/XydjlJXMN7h7DJO7acKA="; }; executable = "ys"; From 6837b28d6e2bc78b1c631bc20bca84dd2e548849 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Mar 2024 04:20:00 +0000 Subject: [PATCH 03/47] nodejs_21: 21.7.0 -> 21.7.1 Changelog: https://github.com/nodejs/node/releases/tag/v21.7.1 --- pkgs/development/web/nodejs/v21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index 51460f6ce786..d71480602d54 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.7.0"; - sha256 = "sha256-5B7v4eWWJO5/MSw4+PffwRWVZBrLIpPSEXbwPSdj6dQ="; + version = "21.7.1"; + sha256 = "sha256-EnK24SnVZNveF1J7hEIQuXHCCnCucpJoGGt8udmQpks="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch From 2a52e1df8cf13b7da13da0e9fdc4e2fa9f57d7dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Feb 2024 11:24:27 +0100 Subject: [PATCH 04/47] python311Packages.axis: refactor --- .../development/python-modules/axis/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index 34c0911f3ee5..f76664cf4797 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -7,23 +7,34 @@ , orjson , packaging , pythonOlder +, setuptools , xmltodict }: buildPythonPackage rec { pname = "axis"; version = "50"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Kane610"; - repo = pname; + repo = "axis"; rev = "refs/tags/v${version}"; hash = "sha256-Zu8hT6t7ZxlgXQKb2o20FpB15n9y/+n1qMctzcRP8F8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==68.0.0" "setuptools" \ + --replace-fail "wheel==0.40.0" "wheel" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout attrs From 7c444ebc5bea0c0dbee8097334c167355a31f5b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 16:54:25 +0000 Subject: [PATCH 05/47] ton: 2024.01 -> 2024.02 --- pkgs/applications/blockchains/ton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 0d4d3826b7e7..0db8d3f16876 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.01"; + version = "2024.02"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-nZ7yel+lTNO5zFzN711tLwAvqpf5qaYOxERwApnMVOs="; + hash = "sha256-ZYW1/7jebgPu0IvBkopUjaXZZLymJ4yYp8Di0vI2WUg="; fetchSubmodules = true; }; From f25962377f3d9259c7da9027b29617c8d867c697 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 17:44:19 +0000 Subject: [PATCH 06/47] storj-uplink: 1.99.1 -> 1.99.3 --- pkgs/applications/networking/sync/storj-uplink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index db26d084e797..855315143332 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.99.1"; + version = "1.99.3"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-UzuKy3pwl+chwYUWtcUEJIrU8wpSg3o2mVryc3qA9EM="; + hash = "sha256-SzldiGwcpR+UEQ3imJfu3FlYqGq4evsYtjVLybdjGqc="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-RaZ+yEkzsu/V3734joWtVA2m2vCOW+CnjF5s0mwDI/0="; + vendorHash = "sha256-mPJVb2/iGbRWDDcfIey3uW/5g2TIIemHR8d/3osMeGA="; ldflags = [ "-s" "-w" ]; From a9109b9c1e1e3fa09096af562bf676cc1dd8a22f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 17:44:26 +0000 Subject: [PATCH 07/47] svdtools: 0.3.10 -> 0.3.11 --- pkgs/development/embedded/svdtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index 5611c3005a1e..829e9019639e 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.10"; + version = "0.3.11"; src = fetchCrate { inherit version pname; - hash = "sha256-VEGLUc8ThhD/R+K2IFGvE800euz8oF0kuekGO627rvU="; + hash = "sha256-LmpYsG/2oEdbAK2ePI+LYbGrVN+wC9gQS6GXNcF8XFg="; }; - cargoHash = "sha256-T0yTGCDgRQUySUHNkoB4kqoKS/0kJWDi04ysPGO79HY="; + cargoHash = "sha256-qsCa+YWE9dghG8T53TSDikWh+JhQt9v7A1Gn+/t5YZs="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; From 2bbfc235467466b195c755e2516305a83d1e2c11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 20:34:45 +0000 Subject: [PATCH 08/47] go-task: 3.35.0 -> 3.35.1 --- pkgs/development/tools/go-task/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 8b3e3eb7c350..67a6ad2c0863 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.35.0"; + version = "3.35.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-jjhWo/rQeGcZvvpYisCujFuExJrFiJqIiDytRo8lH1k="; + hash = "sha256-HFjoLzGF62noA9NQk1Delq6vOcuTZzsyq6kH6QtR7zI="; }; vendorHash = "sha256-HhnherRx5YQn4ArcavVZutze9usYP+PRI07lEXyw8a0="; From 9e53c1e876d8de692d92cb69b8d28f4910327e9b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 8 Mar 2024 15:11:02 -0600 Subject: [PATCH 09/47] wttrbar: 0.8.2 -> 0.9.0 --- pkgs/applications/misc/wttrbar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index c2f67e83f8a7..773c5583da93 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-XgBPZl5msKICIrUJZz2gj/hZjVAv0HpVKa69/KiLwnI="; + hash = "sha256-8ahXRKpVbGFX+SrR8bjUw5POzpCqmlunM5CiRzDE/IM="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - cargoHash = "sha256-JGJJ94rzHTQNR6rzFPWnFHH3t0fL1tvMeEN5NMzRtHM="; + cargoHash = "sha256-SsZRD6FmeB5Hz6Hs+I+5SBGazm8/mntK3Eb2FNw27Bg="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; From 2038c77b0bcd6ebe35617ea05dee86a7ee98f3f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 21:16:29 +0000 Subject: [PATCH 10/47] gpxsee: 13.16 -> 13.17 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 896cf02dc887..79164e932f33 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.16"; + version = "13.17"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-rw+I7Re1hqZ1k1flIAr7kW8Wst7pVdmFcqtQTg6L/9Y="; + hash = "sha256-pk6PMQDPvyfUS5PMRu6pz/QrRrOfbq9oGsMk0ZDawDM="; }; buildInputs = [ From 34093f4fa8b1b0ccb58f1f4f1532823c33c9d970 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 21:19:13 +0000 Subject: [PATCH 11/47] beeper: 3.98.16 -> 3.99.22 --- .../networking/instant-messengers/beeper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 1a014d2aef0a..f5363ee4cb63 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.98.16"; + version = "3.99.22"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.98.16-build-240228llcputn9l-x86_64.AppImage"; - hash = "sha256-CjtlE/owx7emzGDdOAw6pSlAuNbUspm1YP+kxm6Jrt8="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.22-build-240307lufv3wsra-x86_64.AppImage"; + hash = "sha256-T3MABc11rWRjCU+4fvbpYDVq4XjSVfEeBrS03ITw8x8="; }; appimage = appimageTools.wrapType2 { inherit version pname src; From 891ee4927200605b1602ca0d946ef3f8d84fb56a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 21:31:33 +0000 Subject: [PATCH 12/47] python311Packages.google-cloud-container: 2.41.0 -> 2.43.0 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 8dc787ddf0cd..c30f659da4b9 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.41.0"; + version = "2.43.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5DUFaQqzIvN/8Vo7MJNBrsMaB4HANO7Eb2nuzx3nDJc="; + hash = "sha256-RfGhQv1wr5fMMHleMamwSKQ2opv3nppGSvUe4UdFiT0="; }; nativeBuildInputs = [ From af147603cfd2096bb3c9e00e0106200d548d3c3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Mar 2024 22:31:42 +0100 Subject: [PATCH 13/47] metasploit: 6.3.58 -> 6.3.59 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 8 ++++---- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 20860f2e5d79..1f2c8a4100c4 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.58" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.59" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 662512b54dca..32d72fae3760 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 08ebefe2368f73ceeac2c5f9c20a49a82d6a969e - ref: refs/tags/6.3.58 + revision: b6a03cb5f17b5c714fad8741c1812be542dd2087 + ref: refs/tags/6.3.59 specs: - metasploit-framework (6.3.58) + metasploit-framework (6.3.59) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -469,4 +469,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.13 + 2.5.6 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index a0d8a05c0821..195edfcbc635 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.58"; + version = "6.3.59"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-NUm+6vWmSpGpy4KGXQ/pQDqeU3ORhQrQwwicFCMyjhg="; + hash = "sha256-pGYEx5Ac4vEW5rsKI4iAMGXB2zHMS2AD6jIVEWHQn6g="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 5cfb435137d2..a00226e532dd 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -674,12 +674,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "08ebefe2368f73ceeac2c5f9c20a49a82d6a969e"; - sha256 = "064f68ii9708qg80m1cifd9rwfj0x47mv1l2rflr2jm6ypmbwj9m"; + rev = "b6a03cb5f17b5c714fad8741c1812be542dd2087"; + sha256 = "1a4zs1hi259jx81n0jyc67dw2r9hh24262mvwqbg3qhwj33h8rm4"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.58"; + version = "6.3.59"; }; metasploit-model = { groups = ["default"]; From 60145c2f12ffff5d88b3d3a981eefee1b7767c19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 21:40:13 +0000 Subject: [PATCH 14/47] git-releaser: 0.1.3 -> 0.1.6 --- pkgs/by-name/gi/git-releaser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-releaser/package.nix b/pkgs/by-name/gi/git-releaser/package.nix index 8e88862bf02e..d615430bc935 100644 --- a/pkgs/by-name/gi/git-releaser/package.nix +++ b/pkgs/by-name/gi/git-releaser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "git-releaser"; - version = "0.1.3"; + version = "0.1.6"; src = fetchFromGitHub { owner = "git-releaser"; repo = "git-releaser"; rev = "refs/tags/v${version}"; - hash = "sha256-27xUsqFuAu02jYLi3LiTnVjifqZIr39lPwMfJea7a4A="; + hash = "sha256-nKmHTqnpWoWMyXxsD/+pk+uSeqZSG18h2T6sJ/wEr/w="; }; - vendorHash = "sha256-uKS7MwCak/CjnMjzFKqYypBVZFl+3hD1xVaOPvQV9E0="; + vendorHash = "sha256-RROA+nvdZnGfkUuB+ksUWGG16E8tqdyMQss2z/XWGd8="; ldflags = [ "-X main.version=${version}" ]; From eef817b55e176e0dcf00bfad1eefce766331e103 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Mar 2024 23:06:54 +0100 Subject: [PATCH 15/47] python311Packages.bless: 0.2.5 -> 0.2.6 Diff: https://github.com/kevincar/bless/compare/refs/tags/v0.2.5...v0.2.6 Changelog: https://github.com/kevincar/bless/releases/tag/v0.2.6 --- pkgs/development/python-modules/bless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bless/default.nix b/pkgs/development/python-modules/bless/default.nix index dbe92d76c73f..b82cac661087 100644 --- a/pkgs/development/python-modules/bless/default.nix +++ b/pkgs/development/python-modules/bless/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bless"; - version = "0.2.5"; + version = "0.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "kevincar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+rnMLqNfhIJASCKkIfOKpVil3S/d8BcMxnLHmdOcRIY="; + hash = "sha256-dAdA+d75iE6v6t4mfgvwhRsIARLW+IqCGmaMABaDlZg="; }; propagatedBuildInputs = [ From 8f41fb68ff7443836f280323674a6a4a5e7fa0a3 Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Wed, 6 Mar 2024 00:18:24 +0100 Subject: [PATCH 16/47] zsync: fix build with clang I originally found the fix in [this HomeBrew formula](https://github.com/Homebrew/homebrew-core/blob/f800f85efed9312a1abc5fcf7f1269576a3f2d95/Formula/z/zsync.rb#L32). I tested the built binary like this: zsync http://cdimage.ubuntu.com/ubuntu/daily-live/current/noble-desktop-amd64.iso.zsync Aborting the download and starting it again worked, it continued at the same percentage mark. So I'm very certain that the compilation error really is a mistake, and suppressing it is not an issue. --- pkgs/tools/compression/zsync/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 0de21cb9c736..94aa7acce2e0 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; + env = lib.optionalAttrs stdenv.cc.isClang { + # Suppress error "call to undeclared library function 'strcasecmp'" during compilation. + # The function is found by the linker correctly, so this doesn't introduce any issues. + NIX_CFLAGS_COMPILE = " -Wno-implicit-function-declaration"; + }; + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; meta = with lib; { From 2f2224456a3d498e92d9cb49738ed79b3b182f56 Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Wed, 6 Mar 2024 00:23:22 +0100 Subject: [PATCH 17/47] zsync: migrate to by-name --- .../zsync/default.nix => by-name/zs/zsync/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/compression/zsync/default.nix => by-name/zs/zsync/package.nix} (100%) diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/by-name/zs/zsync/package.nix similarity index 100% rename from pkgs/tools/compression/zsync/default.nix rename to pkgs/by-name/zs/zsync/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a57d44e72b5..d6703eeba536 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15219,8 +15219,6 @@ with pkgs; zsv = callPackage ../development/tools/zsv { }; - zsync = callPackage ../tools/compression/zsync { }; - zxing = callPackage ../tools/graphics/zxing { }; zkar = callPackage ../tools/security/zkar { }; From 69412cedd728c81170ddbc6819eecc18a100df1f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Mar 2024 23:54:05 +0100 Subject: [PATCH 18/47] python311Packages.bless: refactor --- pkgs/development/python-modules/bless/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bless/default.nix b/pkgs/development/python-modules/bless/default.nix index b82cac661087..3f24aef8bf53 100644 --- a/pkgs/development/python-modules/bless/default.nix +++ b/pkgs/development/python-modules/bless/default.nix @@ -5,24 +5,34 @@ , dbus-next , fetchFromGitHub , numpy +, pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "bless"; version = "0.2.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kevincar"; - repo = pname; + repo = "bless"; rev = "refs/tags/v${version}"; hash = "sha256-dAdA+d75iE6v6t4mfgvwhRsIARLW+IqCGmaMABaDlZg="; }; + postPatch = '' + sed -i "/pysetupdi/d" setup.py + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bleak dbus-next @@ -31,6 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioconsole numpy + pytest-asyncio pytestCheckHook ]; From 53d9101d8d75dafdb08971a694691a7bd589c6c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 23:12:13 +0000 Subject: [PATCH 19/47] flexget: 3.11.21 -> 3.11.22 --- 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 9dfb49a5d9ca..899b44aae2e1 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.21"; + version = "3.11.22"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-KSOuNH+y7+mCK8XfGxiyn+C1H6g9a/ej96k8KG/EE9k="; + hash = "sha256-csy3v1A8tejdChw6umslOPMCJHk5MBLuJdxbpzJBphQ="; }; postPatch = '' From 20acfe375abeac1d00d2be8862694ddffbf98ed3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 00:26:47 +0000 Subject: [PATCH 20/47] convco: 0.5.0 -> 0.5.1 --- pkgs/by-name/co/convco/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 5a2319139e69..314c5593bcba 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - hash = "sha256-x01fkicoAH8NaJJqIF5jjbZ53TitnXBCdKEbr8xVCyE="; + hash = "sha256-b05RO6x5hnxG6gepRTK4CDlnLqMdp8hl4KL+InzBH70="; }; - cargoHash = "sha256-j2xuaAkycWp5sCAmVJLYfqH1ZGxIGU/a/97WpGyQcvU="; + cargoHash = "sha256-pdnH/9Tda6PXf70W76mg5vVE2rzOI+M61UR+HMtgXC0="; nativeBuildInputs = [ cmake pkg-config ]; From cb103d5f14009770fe4922c70d566a196692e162 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:27:49 +0900 Subject: [PATCH 21/47] python311Packages.opentelemetry-api: 1.22.0 -> 1.23.0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../opentelemetry-api/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 5b59d43e7816..135518ce3f8c 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,30 +14,32 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.22.0"; - disabled = pythonOlder "3.7"; + version = "1.23.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-6BmBmooVaH1FOpgXpFlYth0r9XaNtmb9UezeP8hWEok="; + hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA="; }; sourceRoot = "${src.name}/opentelemetry-api"; - format = "pyproject"; - nativeBuildInputs = [ - hatchling pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ deprecated importlib-metadata - setuptools ]; pythonRelaxDeps = [ From e6570c57c354d8a53ab56fe7260f9cb0245d4d0e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:28:11 +0900 Subject: [PATCH 22/47] python311Packages.opentelemetry-exporter-otlp: 1.22.0 -> 1.23.0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../opentelemetry-exporter-otlp/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 7dcc282e1536..75748e3b70ac 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,33 +1,34 @@ { lib , buildPythonPackage , pythonOlder -, backoff , hatchling , opentelemetry-api , opentelemetry-exporter-otlp-proto-grpc , opentelemetry-exporter-otlp-proto-http +, opentelemetry-test-utils , pytestCheckHook }: buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-exporter-otlp-proto-grpc opentelemetry-exporter-otlp-proto-http ]; nativeCheckInputs = [ + opentelemetry-test-utils pytestCheckHook ]; From 65254c32c608ebda29ad0a516f9e6c52f0bf69e4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:28:32 +0900 Subject: [PATCH 23/47] python311Packages.opentelemetry-exporter-otlp-proto-common: 1.22.0 -> 1.23.0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 8a43e9b4cda4..bc8bbec64e97 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -2,10 +2,8 @@ , buildPythonPackage , pythonOlder , hatchling -, backoff , opentelemetry-api , opentelemetry-proto -, opentelemetry-sdk , opentelemetry-test-utils , pytestCheckHook }: @@ -13,19 +11,17 @@ buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-common"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-common"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - backoff - opentelemetry-sdk + dependencies = [ opentelemetry-proto ]; From 7f821539ac82c8dee431193105f420ac54bdc7f8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:29:10 +0900 Subject: [PATCH 24/47] python311Packages.opentelemetry-exporter-otlp-proto-grpc: 1.22.0 -> 1.23.0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index b727d16b8e65..9f1fe62dfbb4 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage , pythonOlder -, backoff +, deprecated , googleapis-common-protos , grpcio , hatchling , opentelemetry-api -, opentelemetry-test-utils , opentelemetry-exporter-otlp-proto-common -, pytest-grpc +, opentelemetry-proto +, opentelemetry-test-utils , pytestCheckHook }: buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-grpc"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-grpc"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - backoff + dependencies = [ + deprecated googleapis-common-protos grpcio + opentelemetry-api opentelemetry-exporter-otlp-proto-common + opentelemetry-proto ]; nativeCheckInputs = [ @@ -43,6 +45,8 @@ buildPythonPackage { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ]; + __darwinAllowLocalNetworking = true; + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc"; description = "OpenTelemetry Collector Protobuf over gRPC Exporter"; From c9eb088b0e18f3e535668544a77693b6ebae1e8f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:29:44 +0900 Subject: [PATCH 25/47] python311Packages.opentelemetry-exporter-otlp-proto-http: 1.22.0 -> 1.23.0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index 2478826cd67e..8c82d0b8b580 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , pythonOlder -, backoff +, deprecated , googleapis-common-protos , hatchling , opentelemetry-api , opentelemetry-exporter-otlp-proto-common +, opentelemetry-proto +, opentelemetry-sdk , opentelemetry-test-utils , requests , responses @@ -15,20 +17,23 @@ buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-http"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-http"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - backoff + dependencies = [ + deprecated googleapis-common-protos + opentelemetry-api opentelemetry-exporter-otlp-proto-common + opentelemetry-proto + opentelemetry-sdk requests ]; From 21fd95be7d5791c54cdf338d936351a2f65f317e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:30:28 +0900 Subject: [PATCH 26/47] python311Packages.opentelemetry-exporter-prometheus: 1.22.0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../opentelemetry-exporter-prometheus/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index 7708b404a980..1ccd6b472e18 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -10,19 +10,20 @@ }: buildPythonPackage { - inherit (opentelemetry-api) version src; + inherit (opentelemetry-api) src; pname = "opentelemetry-exporter-prometheus"; - disabled = pythonOlder "3.7"; + version = "0.44b0"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-prometheus"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api opentelemetry-sdk prometheus-client From 2065c54ca3ebc65333fcf209b60ca5c99939204f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:31:26 +0900 Subject: [PATCH 27/47] python311Packages.opentelemetry-proto: 1.22.0 -> 1.23.0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../python-modules/opentelemetry-proto/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index 21b84dd5898f..58869327a1ae 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -10,17 +10,17 @@ buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-proto"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ protobuf ]; From b24a7f8b416a3d398efc5f6f7c9910f7697bad33 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:31:53 +0900 Subject: [PATCH 28/47] python311Packages.opentelemetry-sdk: 1.22.0 -> 1.23.0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../python-modules/opentelemetry-sdk/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index ba5e7de5db83..bee9dc01e6b0 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -15,20 +15,19 @@ let self = buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-sdk"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-sdk"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api opentelemetry-semantic-conventions - setuptools typing-extensions ]; From 461f3c17156112e1b9b7a1f0c0da89b1ffdbb88a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:32:14 +0900 Subject: [PATCH 29/47] python311Packages.opentelemetry-semantic-conventions: 1.22.0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../opentelemetry-semantic-conventions/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix index d57a7f13fa53..a2a88906ec07 100644 --- a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix +++ b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix @@ -7,15 +7,16 @@ }: buildPythonPackage { - inherit (opentelemetry-api) version src; + inherit (opentelemetry-api) src; pname = "opentelemetry-semantic-conventions"; - disabled = pythonOlder "3.7"; + version = "0.44b0"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-semantic-conventions"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; From 538411090b8595e63babade0cb4b966f188363e7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:32:44 +0900 Subject: [PATCH 30/47] python311Packages.opentelemetry-test-utils: 1.22.0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python@refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.23.0 --- .../opentelemetry-test-utils/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index 4e2405058b86..d255845658c2 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , buildPythonPackage , pythonOlder , asgiref @@ -9,19 +8,20 @@ }: buildPythonPackage { - inherit (opentelemetry-api) version src; + inherit (opentelemetry-api) src; pname = "opentelemetry-test-utils"; - disabled = pythonOlder "3.7"; + version = "0.44b0"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-api.src.name}/tests/opentelemetry-test-utils"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ asgiref opentelemetry-api opentelemetry-sdk From b1a9c453103efc91b24c62363d427f7829ba5111 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 00:33:00 +0000 Subject: [PATCH 31/47] agkozak-zsh-prompt: 3.11.2 -> 3.11.3 --- pkgs/shells/zsh/agkozak-zsh-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix index fa4d9f4cf477..21f265e84645 100644 --- a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix +++ b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "agkozak-zsh-prompt"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "agkozak"; repo = "agkozak-zsh-prompt"; rev = "v${version}"; - sha256 = "sha256-QDUI9EYflITttkX9Khij62ybBMYJwPfayqj+wr495mM="; + sha256 = "sha256-YBqFA/DK2K1effniwjPSe5VMx9tZGbmxyJp92TiingU="; }; strictDeps = true; From 4d9886114f8ed2af9133ec1f6ee9701541c6f073 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:36:14 +0900 Subject: [PATCH 32/47] python311Packages.opentelemetry-instrumentation: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../opentelemetry-instrumentation/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index f5e76507d3ab..965276da78f1 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , hatchling , opentelemetry-api -, opentelemetry-sdk , opentelemetry-test-utils , setuptools , wrapt @@ -13,28 +12,27 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.43b0"; - disabled = pythonOlder "3.7"; + version = "0.44b0"; + pyproject = true; + + disabled = pythonOlder "3.8"; # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-fUyA3cPXAxO506usEWxOUX9xiapc8Ocnbx73LP6ghRE="; + hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api - opentelemetry-sdk setuptools wrapt ]; From d83e6337d529cbd5f33fe13fd6f0aa150ed0da27 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:36:30 +0900 Subject: [PATCH 33/47] python311Packages.opentelemetry-instrumentation-aiohttp-client: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index cdd40d447050..df5a9b037652 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -15,23 +15,23 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-aiohttp-client"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-aiohttp-client"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ + aiohttp opentelemetry-api opentelemetry-instrumentation opentelemetry-semantic-conventions opentelemetry-util-http wrapt - aiohttp ]; # missing https://github.com/ezequielramos/http-server-mock From f3209f125f3f3aaf77d8f05333a82660d5471b2b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:36:55 +0900 Subject: [PATCH 34/47] python311Packages.opentelemetry-instrumentation-asgi: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../opentelemetry-instrumentation-asgi/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 952824cd1b72..7eb2a6679745 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -14,17 +14,17 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-asgi"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-asgi"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ asgiref opentelemetry-instrumentation opentelemetry-api From 76d6fa55c84f56b007379a53f5ce63cd9191fd40 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:37:17 +0900 Subject: [PATCH 35/47] python311Packages.opentelemetry-instrumentation-django: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 39058d16e259..9e27e60e2dde 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -13,33 +13,36 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-django"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-django"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ django opentelemetry-api opentelemetry-instrumentation - opentelemetry-instrumentation-asgi opentelemetry-instrumentation-wsgi opentelemetry-semantic-conventions opentelemetry-util-http ]; + passthru.optional-dependencies = { + asgi = [ opentelemetry-instrumentation-asgi ]; + }; + nativeCheckInputs = [ opentelemetry-test-utils pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.asgi; pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; From cb4a763b662c1e97f94b0e2c2dfcddf0a557c062 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:37:37 +0900 Subject: [PATCH 36/47] python311Packages.opentelemetry-instrumentation-fastapi: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../opentelemetry-instrumentation-fastapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix index 41de5bb8b60f..a4da7665172e 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix @@ -19,15 +19,15 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-fastapi"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-fastapi"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ fastapi opentelemetry-api opentelemetry-instrumentation From f242db71c9fd8d04e9f937f4fc860dffaf7dd9a3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:37:50 +0900 Subject: [PATCH 37/47] python311Packages.opentelemetry-instrumentation-flask: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../opentelemetry-instrumentation-flask/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix index 71860dd8fd74..0e1daa3f3a91 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix @@ -7,6 +7,7 @@ , opentelemetry-semantic-conventions , opentelemetry-test-utils , opentelemetry-util-http +, packaging , pytestCheckHook , pythonOlder }: @@ -14,21 +15,22 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-flask"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask"; - format = "pyproject"; + build-system = [ hatchling ]; - nativeBuildInputs = [ hatchling ]; - - propagatedBuildInputs = [ + dependencies = [ flask opentelemetry-api opentelemetry-instrumentation opentelemetry-instrumentation-wsgi opentelemetry-semantic-conventions opentelemetry-util-http + packaging ]; nativeCheckInputs = [ From 2dba2d7c21297abb1300a3150426b3527fd2c4f3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:38:07 +0900 Subject: [PATCH 38/47] python311Packages.opentelemetry-instrumentation-grpc: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index ad408c3dfbaa..2a2cae6f6de4 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , hatchling @@ -15,17 +16,17 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-grpc"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-grpc"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api opentelemetry-instrumentation opentelemetry-sdk @@ -43,8 +44,15 @@ buildPythonPackage { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # RuntimeError: Failed to bind to address + "TestOpenTelemetryServerInterceptorUnix" + ]; + pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ]; + __darwinAllowLocalNetworking = true; + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; description = "OpenTelemetry Instrumentation for grpc"; From 32b24345277cdf77c0a060584cc1d7f0981756ed Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:38:19 +0900 Subject: [PATCH 39/47] python311Packages.opentelemetry-instrumentation-wsgi: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../opentelemetry-instrumentation-wsgi/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index 0b1fda0276c9..2e3d60b28442 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -13,17 +13,17 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-wsgi"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-wsgi"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-instrumentation opentelemetry-api opentelemetry-semantic-conventions From cfef06f5c4db47c55ee4818ce02698209ef42609 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Mar 2024 09:38:35 +0900 Subject: [PATCH 40/47] python311Packages.opentelemetry-util-http: 0.43b0 -> 0.44b0 Diff: open-telemetry/opentelemetry-python-contrib@refs/tags/v0.43b0...v0.44b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.44b0 --- .../opentelemetry-util-http/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index e14338ffcbce..128f503d832d 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -3,8 +3,6 @@ , pythonOlder , hatchling , opentelemetry-instrumentation -, opentelemetry-sdk -, opentelemetry-semantic-conventions , opentelemetry-test-utils , pytestCheckHook }: @@ -12,23 +10,18 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-util-http"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; sourceRoot = "${opentelemetry-instrumentation.src.name}/util/opentelemetry-util-http"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - opentelemetry-instrumentation - opentelemetry-sdk - opentelemetry-semantic-conventions - ]; - nativeCheckInputs = [ + opentelemetry-instrumentation opentelemetry-test-utils pytestCheckHook ]; @@ -41,6 +34,8 @@ buildPythonPackage { pythonImportsCheck = [ "opentelemetry.util.http" ]; + __darwinAllowLocalNetworking = true; + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http"; description = "Web util for OpenTelemetry"; From 82898955e2c88cce35022581df78ca223c406251 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 4 Mar 2024 01:14:23 +0900 Subject: [PATCH 41/47] python311Packages.chromedb: allow local networking on darwin --- pkgs/development/python-modules/chromadb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 0cc5484332df..37cc44da3f72 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -150,6 +150,8 @@ buildPythonPackage rec { "chromadb/test/stress/" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "The AI-native open-source embedding database"; homepage = "https://github.com/chroma-core/chroma"; From d616b59f557388d6703d3b345b0cb52ca43172ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 00:52:17 +0000 Subject: [PATCH 42/47] chamber: 2.14.0 -> 2.14.1 --- pkgs/tools/admin/chamber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 2b3975002a16..b2cd363f8f88 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "chamber"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vyVdEMs+vtZkN0UuXGmCPNB4hsfjiiG6LeWYFW3gLiw="; + sha256 = "sha256-Vbz8rpNy6+iIr/WyegALSo4gRoDL2P1x/6lHg6Kvm/w="; }; CGO_ENABLED = 0; - vendorHash = "sha256-pxWsx/DURVOXGC2izKS91BhbHc220+/6t15eT4Jl128="; + vendorHash = "sha256-ZRKs/5JtsTjWL62RuQRwroA6TvTpJqkf6pOecvO3134="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; From 659b05493104c056ef6b9ab5ac0ee9c55cc8adee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 01:07:16 +0000 Subject: [PATCH 43/47] grpc_cli: 1.62.0 -> 1.62.1 --- pkgs/tools/networking/grpc_cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 0e2cc5be00c8..91d66f7bd020 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.62.0"; + version = "1.62.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-iqoxgo/oocO9gBq0o5bmZvre/EwRguMrWnmwvyLGLr8="; + hash = "sha256-L0bn6Bg36UKIRxznH9o4T7WXUqMwFjr8ybeQfbUi8xM="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; From 6ca856220afde1fa658dbcd725340d4e9885abc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 01:18:06 +0000 Subject: [PATCH 44/47] littlefs-fuse: 2.7.5 -> 2.7.6 --- pkgs/by-name/li/littlefs-fuse/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index feb566a822a2..00eba357e04e 100644 --- a/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/pkgs/by-name/li/littlefs-fuse/package.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "littlefs-fuse"; - version = "2.7.5"; + version = "2.7.6"; src = fetchFromGitHub { owner = "littlefs-project"; repo = pname; rev = "v${version}"; - hash = "sha256-sSnk1iQV5aHcOPqVKbigWqojrZKlJK5CcrVlwilT2mE="; + hash = "sha256-iN6Ny1H7CyBzBRJyYKbXuzkap7+u+6tVkXo7Vnp1WV8="; }; buildInputs = [ fuse ]; installPhase = '' From 553e34dfd6d63e576822c64266d2f4ffdacbe51e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 01:25:58 +0000 Subject: [PATCH 45/47] python311Packages.minio: 7.2.4 -> 7.2.5 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 5dec8321d700..e86f1ae1d7bc 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.4"; + version = "7.2.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-26naoSccz/LEf56iQIePrNKllq6XkEQD9Peld7VeGqY="; + hash = "sha256-Xb6XaGI/bwkhp6YKgoqi5Tbs74pSXc6aJpWVUgG5uR4="; }; postPatch = '' From 7a2394e7926a16d9d3c43936734553827273ef8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 02:06:45 +0000 Subject: [PATCH 46/47] python311Packages.anywidget: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/anywidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index d12798092413..fa5a0aa10209 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.2"; + version = "0.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-S6nB3Df17sD1Zrsp+1Di66FNeaVmE1rqt8hogjI/3I4="; + hash = "sha256-Coae8oretZHhb1c9i5x0Sm1nVruN89kRZSEMyeLibbg="; }; # We do not need the jupyterlab build dependency, because we do not need to From 1b7d1bd6e1d6297d785f4c20a906a155be7b6ed3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 4 Mar 2024 10:15:56 +0900 Subject: [PATCH 47/47] python311Packages.guidance: 0.1.6 -> 0.1.11 Diff: https://github.com/guidance-ai/guidance/compare/refs/tags/0.1.6...0.1.11 Changelog: https://github.com/guidance-ai/guidance/releases/tag/refs/tags/0.1.11 --- .../python-modules/guidance/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index a8d382310d60..732a107f2a39 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -8,22 +8,24 @@ , wheel , aiohttp , diskcache +, fastapi , gptcache , msal -, nest-asyncio , numpy , openai , ordered-set , platformdirs +, protobuf , pyformlang , requests , tiktoken , torch +, uvicorn }: buildPythonPackage rec { pname = "guidance"; - version = "0.1.6"; + version = "0.1.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,28 +34,33 @@ buildPythonPackage rec { owner = "guidance-ai"; repo = "guidance"; rev = "refs/tags/${version}"; - hash = "sha256-Z3EuHAQPPXf/i0HnbDhGv5KBUBP0aZDHTwpff7g2E3g="; + hash = "sha256-dvIJeSur3DdNBhrEPNPghxqmDEEig59Iz83LWksim6U="; }; nativeBuildInputs = [ pybind11 + ]; + + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp diskcache + fastapi gptcache msal - nest-asyncio numpy openai ordered-set platformdirs + protobuf pyformlang requests tiktoken + uvicorn ]; nativeCheckInputs = [ @@ -86,6 +93,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "guidance" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A guidance language for controlling large language models"; homepage = "https://github.com/guidance-ai/guidance";