From ae348a66f11f909ce74e6f390de6f6726a033cc2 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 4 Feb 2025 19:50:13 +0100 Subject: [PATCH 001/115] cassandra: 4.1.7 -> 4.1.8 Fixes CVE-2025-24860, CVE-2025-23015 and CVE-2024-27137. Changes: https://github.com/apache/cassandra/blob/cassandra-4.1.8/CHANGES.txt --- pkgs/servers/nosql/cassandra/4.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json index 00321c9df8e1..adff55e01ad1 100644 --- a/pkgs/servers/nosql/cassandra/4.json +++ b/pkgs/servers/nosql/cassandra/4.json @@ -1,4 +1,4 @@ { - "version": "4.1.7", - "sha256": "0qnsz1zvjs1ax9p58g5b8bf3xyjg47sskkcb9nfafp6nzfdy0a2w" + "version": "4.1.8", + "sha256": "sha256-jsMCNuHxTzPki3lYQ5QiRw+Y8JtVJ+8FyAfeQpf4lyE=" } From 70af6304883a2baf8b9cae0679e7f6c5bb06ea2a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 4 Feb 2025 19:52:59 +0100 Subject: [PATCH 002/115] cassandra_3_11: 3.11.12 -> 3.11.18 Fixes CVE-2025-23015. Changes: https://github.com/apache/cassandra/blob/cassandra-3.11.18/CHANGES.txt --- pkgs/servers/nosql/cassandra/3.11.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.11.json b/pkgs/servers/nosql/cassandra/3.11.json index e47f78b7baf8..33fc2c310c43 100644 --- a/pkgs/servers/nosql/cassandra/3.11.json +++ b/pkgs/servers/nosql/cassandra/3.11.json @@ -1,4 +1,4 @@ { - "version": "3.11.12", - "sha256": "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw" + "version": "3.11.18", + "sha256": "sha256-eb9+d1nVQ1mMKY9+O0f1gIIlpxQ8FYQeAU4/Msad5Ro=" } From 6b6ddc3c270153330ed38577ba258e83546c6f92 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 4 Feb 2025 19:55:49 +0100 Subject: [PATCH 003/115] cassandra_3_0: 3.0.28 -> 3.0.31 Fixes CVE-2025-23015. Changes: https://github.com/apache/cassandra/blob/cassandra-3.0.31/CHANGES.txt --- pkgs/servers/nosql/cassandra/3.0.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.0.json b/pkgs/servers/nosql/cassandra/3.0.json index 968edce704b3..298270273093 100644 --- a/pkgs/servers/nosql/cassandra/3.0.json +++ b/pkgs/servers/nosql/cassandra/3.0.json @@ -1,4 +1,4 @@ { - "version": "3.0.28", - "sha256": "1x06sxzppipi0jg0qvk26iicqwf28y0aik7c732r0yd1vz4vdwq6" + "version": "3.0.31", + "sha256": "sha256-NKElcojNVjAXusDXGlPeFYOzSrS01hZnk0U+1va4EuQ=" } From 2ae4878af75c7d3c70e04af2908edfa87ffc28bc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 1 Feb 2025 12:06:33 +0100 Subject: [PATCH 004/115] elasticsearch: 7.17.16 -> 7.17.27 Fixes CVE-2024-43709, CVE-2024-23450 and CVE-2024-43709 https://discuss.elastic.co/t/elasticsearch-7-17-21-and-8-13-3-security-update-esa-2024-25/373442 https://discuss.elastic.co/t/elasticsearch-8-13-0-7-17-19-security-update-esa-2024-06/356314 https://discuss.elastic.co/t/elasticsearch-7-17-21-and-8-13-3-security-update-esa-2024-25/373442 Changes: https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.27.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.26.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.25.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.24.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.23.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.22.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.21.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.20.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.19.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.18.html https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.17.html --- pkgs/misc/logging/beats/7.x.nix | 4 ++-- pkgs/servers/search/elasticsearch/7.x.nix | 8 +++---- pkgs/servers/search/elasticsearch/plugins.nix | 24 +++++++++---------- pkgs/tools/misc/logstash/7.x.nix | 12 +++++----- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 58641f46a11f..d509cb443db6 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -21,10 +21,10 @@ let owner = "elastic"; repo = "beats"; rev = "v${version}"; - hash = "sha256-0qwWHRIDLlnaPOCRmiiFGg+/jdanWuQtggM2QSaMR1o="; + hash = "sha256-TzcKB1hIHe1LNZ59GcvR527yvYqPKNXPIhpWH2vyMTY="; }; - vendorHash = "sha256-rwCCpptppkpvwQWUtqTjBUumP8GSpPHBTCaj0nYVQv8="; + vendorHash = "sha256-JOCcceYYutC5MI+/lXBqcqiET+mcrG1e3kWySo3+NIk="; subPackages = [ package ]; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 1dd885e7d07c..a06b8e29af45 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,10 +17,10 @@ let arch = lib.elemAt info 0; plat = lib.elemAt info 1; hashes = { - x86_64-linux = "sha512-OiWGRxaCdRxXuxE/W04v87ytzOeUEcHRjF5nyRkdqSbZSnLXUyKOYQ4fKmk4til0VBOaKZYId20XyPiu/XTXNw=="; - x86_64-darwin = "sha512-V/vKYL96+M1lp7ZJlvuneRBePWZmucUANfUrFPMuq+fnUP4nN69RStLWcgwgt65EspFMBwKVyQbak4swV8rWxw=="; - aarch64-linux = "sha512-fNgVRaIIGx01reNHOnGKhMOG1aYU7gC8HLpIESSbM3+9xO1q9IHIaL/ObI/w2RYj/lD22d7PAdX5N6Hd1pVSAA=="; - aarch64-darwin = "sha512-DgexeyoxZ1YTPw9HjSUAM6eC8XtzIw7MY1WUVsIa8zl5j3RpCp25s3oI12BWefjYYCTjdtFDMsnoFSqZBabLig=="; + x86_64-linux = "sha512-xlbdx/fFQxilECdDiN80U+s+huBowo9Qf5tDIYwZ1z9gUCriNL0rMNDkvzUDL73BEI3WMFMqHdbi3cn7b5l9gA=="; + x86_64-darwin = "sha512-hiTSp7lO/x6tBYiUgKglce39k/oxT4hUlTAoC50pYFiqANALAN+2E0HtZdvsMmrOn4aGLxh+SKVglMHfrGxr+g=="; + aarch64-linux = "sha512-MPrDfBMcwNCgWW8dpOeAtlz9Odfk/0z8i+Rn08hTp35kU849KdPQLTmexlvnf/jVwqfwzN2xWJtNF0sQO26pUA=="; + aarch64-darwin = "sha512-uq5VVwvbOX4Rv32iLFw+RalFPBxQqA+1hBjFw3svzOaD1caOOrGHD4lJVHFxsFw0xl//AZuSG7S3r7Eh9AmWvQ=="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index aedb10f9e210..7fba9a2fc89e 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -38,7 +38,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-wgm6N5fofs5wTM25ZT3dJkg7iDesXsc3Up419IAY9gk=" + if version == "7.17.27" then "sha256-HGHhcWj+6IWZ9kQCGJD7HmmvwqYV1zjN0tCsEpN4IAA=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -54,7 +54,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-SShdBcWfm21XoVhghSSiWIhsoXzG7wz6162iOmuf5EU=" + if version == "7.17.27" then "sha256-j0WXuGmE3bRNBnDx/uWxfWrIUrdatDt52ASj8m3mrVg=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -87,7 +87,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-S/Cp9opeLitFh2/3Qw7/MFt6GcYKufxXKD6cJSi3SaQ=" + if version == "7.17.27" then "sha256-X8b8z9LznJQ24aF9GugRuDz1c9buqT7QGS3jhuDbYBM=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -103,8 +103,8 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then - "sha256-Ym2h7Qe+L4PFhcFjsSBSfXbYoG3PgfaVKXfkaPwvuFM=" + if version == "7.17.27" then + "sha256-0hHHkywdpjKqzZ9vFqQ9B2aLCky17AYzFcSiaz/zGSw=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -121,7 +121,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-hMErTLd5fXg420Olz+j6Zv7WByA1aNq9FlEgCtkYIxY=" + if version == "7.17.27" then "sha256-44p0Pn0mYKR5hWtC8jdaUbh9mbUGiHN9PK98ZT1jQFY=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -137,7 +137,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-z0gfdx98urCzdQNlVn99CmteG6jweOmUDmGJW89twtU=" + if version == "7.17.27" then "sha256-i+fGO7Ic2Wm/COfPGeRhiJ99Os+rLRYgs/pSepQr68g=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -153,7 +153,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; hash = - if version == "7.17.16" then "sha256-TWMN8jzFjzBVTUB+zn4tJr47VMXHC8U+014BvnArK8M=" + if version == "7.17.27" then "sha256-o2T0Dd2RqVh99wDPJMEvpnEpFFjz0lQrN9yAVJfiSGY=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -169,7 +169,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; hash = - if version == "7.17.16" then "sha256-hG5wy1Xw4T1NzI7pja3CejwJg002/n6YqM1/QaVSWbg=" + if version == "7.17.27" then "sha256-CWyQuzf2fP9BSIUWL/jxkxrXwdvHyujEINDNhY3FKNI=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -185,13 +185,13 @@ in pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.17.16" then "${esVersion}-53.8.0" + if esVersion == "7.17.27" then "${esVersion}-53.10.0" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = - if esVersion == "7.17.16" then + if esVersion == "7.17.27" then fetchurl { url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"; - hash = "sha256-j8dz7rUKWqMvT6EksoFIuGJzYcgdMipKeg2d8UtzlDI="; + hash = "sha256-M1yJ8OD+mDq2uEiK6pvsMxUQMrg6o5A4xEPX8nDt1Rs="; } else throw "unsupported version ${version} for plugin ${pluginName}"; meta = { diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 3a09752bf638..df84399d2b16 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -17,15 +17,15 @@ let hashes = if enableUnfree then { - x86_64-linux = "sha512-ze0hJxUHCN52bOxUs5upDj64tIE58P2BTow2kaCo6HreRiF9rfTTzNkNr/hCmEgE+/oFbgSEuOQLz+6G373RDQ=="; - x86_64-darwin = "sha512-FOFd8d+4UddSGorjuUWW/JbQ5fQH4LU1f1HJLmdbfnb8Q5L4GEveb2LmWNILU8/a85V4HGmD6lL8mCJqH9CULQ=="; - aarch64-linux = "sha512-giYqW88/6iT3haXzJVn/+b7uxjYhHq4GERmiq3tMIvjxDyu7B6g+X7JneaTYxhpNdn6gOD/hfXgNv+hFRq6lgg=="; + x86_64-linux = "sha512-9JzopnY43Osoy4/0G9gxJYlbCl1a9Qy2pL4GL1uyjJ3uSNoOskEBhhsqLp9BhtJXOaquuRDgbJnXhbBrlE0rKg=="; + x86_64-darwin = "sha512-ZcdKWFrIQUmGtxoWbLc2F7g85quXfRqy62DyVPR/9zBtMTgFH0eG4Cj40ELpW7nYXZqglmAUTF/0mZZYUg2Ciw=="; + aarch64-linux = "sha512-V2Nt/lup4ofgoMqpAH3OHF8Fp0PvC1M8nl6sCKmTf+ZXQYHNjAJkJwGJwHeQQ0L/348JHyCkeWL43dS7Jr6ZJQ=="; } else { - x86_64-linux = "sha512-OC9gx76k+RMdjqcDkrJCNbPYSQameyddaYMxUIB0foVxCmo6UvbdcwZGXRLPPn95in8rYOCjvPoBkmupiQw9xQ=="; - x86_64-darwin = "sha512-1OEfEED/jjlT3Fd095Y5VYiWKnovytI3UYCCy1Rs3tEvkZPHYwqIQHfMQYeAvGgUci37ADwEDu8xrSQULHToLw=="; - aarch64-linux = "sha512-QWW0AXOMNIXThxpUiRomvINm+917MvGrSDndrEw11IYYuvi0d0dckJiRytfnBbBNoOKpVhB68uOmfjIcZBNpWQ=="; + x86_64-linux = "sha512-L11ZUdXC8VDiSEVDBMous2OaMlAFgvkQ+eDbmbA9r/sDIXY8W7dx3jgPNXoorDtatTemwy8aXw1XJGaVmj4T3Q=="; + x86_64-darwin = "sha512-az5ujFtwcuNNGuITDeGRu1FB2bb8/hIUmGMvm0Xcfvs0GZPnCZVY6ScsiHZYjT8X+qBYkn/httT3MYozrPOy4Q=="; + aarch64-linux = "sha512-iVft0kZYhvFJ1NKCfdePhRxDljPTwV+3G7wV94iykYISgLTVoehzDTMdxUyfK/mmQhu3hmmHbVpw1jXjTrS7ng=="; }; this = stdenv.mkDerivation rec { version = elk7Version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c16d3533f94e..4331ec52ccec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3181,7 +3181,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! - elk7Version = "7.17.16"; + elk7Version = "7.17.27"; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { util-linux = util-linuxMinimal; From 0fa5aa827f076361ed659aa23b953c21af4c978b Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 6 Mar 2025 00:41:58 +0100 Subject: [PATCH 005/115] tera-cli: enable for darwin, add nix-update-script --- pkgs/by-name/te/tera-cli/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/tera-cli/package.nix b/pkgs/by-name/te/tera-cli/package.nix index 66429fa08504..f488bf279f8b 100644 --- a/pkgs/by-name/te/tera-cli/package.nix +++ b/pkgs/by-name/te/tera-cli/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + nix-update-script, rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -10,19 +11,21 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "chevdor"; repo = "tera-cli"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-TN3zkxZC0Y9lev2wmvzwyLU+t4rNwut/dQILIA7+qbw="; }; useFetchCargoVendor = true; cargoHash = "sha256-+qf/MlifpVXzDpADJoTqxU40wDntcPu+bW7eq6/iubk="; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Command line utility to render templates from json|toml|yaml and ENV, using the tera templating engine"; homepage = "https://github.com/chevdor/tera-cli"; - license = licenses.mit; - maintainers = with maintainers; [ _365tuwe ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._365tuwe ]; mainProgram = "tera"; - platforms = platforms.linux; + platforms = lib.platforms.unix; }; } From 550b7205534015391c39f067441b537e57db8b73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Mar 2025 08:27:05 +0000 Subject: [PATCH 006/115] kubernetes: 1.32.2 -> 1.32.3 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index a2fc303698fd..541bf4d25e01 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.32.2"; + version = "1.32.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-pie36Y3zKGKvnCDHtjNHYox1b2xhy6w7MShkAfkDVrs="; + hash = "sha256-kF3Oo+YETnsrFPWBO5b7nH2A2eONIOkE84+u6vOSrpE="; }; vendorHash = null; From a5de042ebba162c3aca7269812b3efd95c6649dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Mar 2025 20:22:21 +0100 Subject: [PATCH 007/115] python313Packages.garth: 0.5.2 -> 0.5.3 Changelog: https://github.com/matin/garth/releases/tag/0.5.3 --- pkgs/development/python-modules/garth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 63a00ab0a1e0..92fdef89b655 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-WUrK/ieYnao/+8hGDK8GOAI1nGsfQMmP/Tsh9prcbgk="; + hash = "sha256-cyqXCkfkpd71VqguZFOA4bO/dOkKBZkEzJ6BVLCBWFA="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; From a7ae50056954a989003d708821a933000427d660 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 14 Mar 2025 16:05:49 -0400 Subject: [PATCH 008/115] turbo: fix updateScript --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 6c2d6f4c7549..22f54687aa73 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "'v(\\d+\\.\\d+\\.\\d+)'" + "v(\\d+\\.\\d+\\.\\d+)$" ]; }; }; From 0f5afb7bb7fade044aa3633b17c5adc32b10721b Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 14 Mar 2025 16:08:19 -0400 Subject: [PATCH 009/115] turbo: `rec` -> `finalAttrs` --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 22f54687aa73..114ca6383239 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -15,14 +15,14 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "turbo-unwrapped"; version = "2.4.2"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wXQY9W15J7+Plv3IvB8XaZd+Hn0TP2qDOB36bPJwfpY="; }; @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "High-performance build system for JavaScript and TypeScript codebases"; homepage = "https://turbo.build/"; - changelog = "https://github.com/vercel/turbo/releases/tag/v${version}"; + changelog = "https://github.com/vercel/turbo/releases/tag/${toString finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dlip @@ -79,4 +79,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "turbo"; }; -} +}) From 45a17797406d7fe86b56cb4f76058fd1193283a5 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 14 Mar 2025 16:45:00 -0400 Subject: [PATCH 010/115] turbo: 2.4.2 -> 2.4.5-canary.4 Fixes building against Rust 1.85 Diff: https://github.com/vercel/turborepo/compare/v2.4.2...v2.4.5-canary.4 Changelog: https://github.com/vercel/turborepo/releases/tag/v2.4.5-canary.4 --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 114ca6383239..9ed3a326b0bd 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "turbo-unwrapped"; - version = "2.4.2"; + version = "2.4.5-canary.4"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; tag = "v${finalAttrs.version}"; - hash = "sha256-wXQY9W15J7+Plv3IvB8XaZd+Hn0TP2qDOB36bPJwfpY="; + hash = "sha256-tQ/Xocpk48eRhCyfRZx2rkAVqNn115rO3MRYF5fC2nI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-L56ubw2tQ3y2KBbbnUdnS9xZzQNMDKdCzKC0n12yl6o="; + cargoHash = "sha256-pngzlmkntTCv5/aw1UNbDGNQOVtMgFZHc2woj6R0vys="; nativeBuildInputs = [ From e4ffd9c09c6944acfdc4ce006a551a5d20e9fb33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 16:40:22 +0000 Subject: [PATCH 011/115] python312Packages.rtslib: 2.2.0 -> 2.2.2 --- .../python-modules/rtslib/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index 814e7515b543..3ee775443e85 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -2,23 +2,31 @@ lib, fetchFromGitHub, buildPythonPackage, + + # build-system hatchling, hatch-vcs, - six, + + # dependencies pyudev, - pygobject3, }: buildPythonPackage rec { pname = "rtslib"; - version = "2.2.0"; + version = "2.2.2"; pyproject = true; + # TypeError: 'method' object does not support the context manager protocol + postPatch = '' + substituteInPlace rtslib/root.py \ + --replace-fail "Path(restore_file).open" "Path(restore_file).open('r')" + ''; + src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; tag = "v${version}"; - hash = "sha256-lBYckQlnvIQ6lSENctYsMhzULi1MJAVUyF06Ul56LzA="; + hash = "sha256-FuXO/yGZBR+QRvB5s1tE77hjnisSfjjHSCPLvGJOYdM="; }; build-system = [ @@ -27,16 +35,23 @@ buildPythonPackage rec { ]; dependencies = [ - six pyudev - pygobject3 ]; - meta = with lib; { + postInstall = '' + install -Dm555 scripts/targetctl -t $out/bin + ''; + + # No tests + doCheck = false; + + meta = { description = "Python object API for managing the Linux LIO kernel target"; mainProgram = "targetctl"; homepage = "https://github.com/open-iscsi/rtslib-fb"; - license = licenses.asl20; - platforms = platforms.linux; + changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/v${version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + mainProgram = "targetctl"; }; } From 68c06a055ac83cace7e733dc4815d08ddabd9696 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 22:08:23 +0100 Subject: [PATCH 012/115] python312Packages.rtslib: rename to rtslib-fb --- nixos/modules/services/networking/iscsi/target.nix | 4 ++-- pkgs/by-name/ta/targetcli/package.nix | 2 +- .../python-modules/{rtslib => rtslib-fb}/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{rtslib => rtslib-fb}/default.nix (96%) diff --git a/nixos/modules/services/networking/iscsi/target.nix b/nixos/modules/services/networking/iscsi/target.nix index bfc229376895..f6c0739d0622 100644 --- a/nixos/modules/services/networking/iscsi/target.nix +++ b/nixos/modules/services/networking/iscsi/target.nix @@ -52,8 +52,8 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.python3.pkgs.rtslib}/bin/targetctl restore"; - ExecStop = "${pkgs.python3.pkgs.rtslib}/bin/targetctl clear"; + ExecStart = "${lib.getExe pkgs.python3Packages.rtslib-fb} restore"; + ExecStop = "${lib.getExe pkgs.python3Packages.rtslib-fb} clear"; RemainAfterExit = "yes"; }; }; diff --git a/pkgs/by-name/ta/targetcli/package.nix b/pkgs/by-name/ta/targetcli/package.nix index 9498717b22d6..de02714be0ac 100644 --- a/pkgs/by-name/ta/targetcli/package.nix +++ b/pkgs/by-name/ta/targetcli/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ configshell - rtslib + rtslib-fb pygobject3 ]; diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib-fb/default.nix similarity index 96% rename from pkgs/development/python-modules/rtslib/default.nix rename to pkgs/development/python-modules/rtslib-fb/default.nix index 3ee775443e85..e9eba892e89d 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib-fb/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - pname = "rtslib"; + pname = "rtslib-fb"; version = "2.2.2"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "open-iscsi"; - repo = "${pname}-fb"; + repo = "rtslib-fb"; tag = "v${version}"; hash = "sha256-FuXO/yGZBR+QRvB5s1tE77hjnisSfjjHSCPLvGJOYdM="; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ae5fdce752b2..1bb761ce2f3d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -647,6 +647,7 @@ mapAliases ({ ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21 ROPGadget = ropgadget; # added 2021-07-06 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + rtslib = rtslib-fb; # added 2025-03-14 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22227021a161..01cbe3947a26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14696,7 +14696,7 @@ self: super: with self; { inherit (pkgs) libspatialindex; }; - rtslib = callPackage ../development/python-modules/rtslib { }; + rtslib-fb = callPackage ../development/python-modules/rtslib-fb { }; rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { }; From 32c6c9048edd80d8fa30b6d8cf55bd2a0bbb9e11 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 22:17:25 +0100 Subject: [PATCH 013/115] targetcli: 2.1.58 -> 3.0.1 Diff: https://github.com/open-iscsi/targetcli-fb/compare/v2.1.58...v3.0.1 --- pkgs/by-name/ta/targetcli/package.nix | 28 +++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ta/targetcli/package.nix b/pkgs/by-name/ta/targetcli/package.nix index de02714be0ac..d34ab31b9d3a 100644 --- a/pkgs/by-name/ta/targetcli/package.nix +++ b/pkgs/by-name/ta/targetcli/package.nix @@ -1,6 +1,6 @@ { lib, - python3, + python3Packages, fetchFromGitHub, nixosTests, wrapGAppsNoGuiHook, @@ -8,24 +8,30 @@ glib, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "targetcli"; - version = "2.1.58"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "open-iscsi"; - repo = "${pname}-fb"; - rev = "v${version}"; - hash = "sha256-9QYo7jGk9iWr26j0qPQCqYsJ+vLXAsO4Xs7+7VT9/yc="; + repo = "targetcli-fb"; + tag = "v${version}"; + hash = "sha256-jRujBgUdeJY8ekVBDscitajDhYohlx/BS4wn+jFkZSg="; }; + build-system = with python3Packages; [ + hatch-vcs + hatchling + ]; + nativeBuildInputs = [ wrapGAppsNoGuiHook gobject-introspection ]; buildInputs = [ glib ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ configshell rtslib-fb pygobject3 @@ -40,11 +46,13 @@ python3.pkgs.buildPythonApplication rec { inherit (nixosTests) iscsi-root; }; - meta = with lib; { + meta = { description = "Command shell for managing the Linux LIO kernel target"; homepage = "https://github.com/open-iscsi/targetcli-fb"; - license = licenses.asl20; + changelog = "https://github.com/open-iscsi/targetcli-fb/releases/tag/v${version}"; + license = lib.licenses.asl20; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; + mainProgram = "targetcli"; }; } From b6ec380f6656bfee6f02c4862364fcfe5746508a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 22:30:48 +0100 Subject: [PATCH 014/115] python312Packages.rtslib-fb: remove meta.mainProgram as it does not exist --- pkgs/development/python-modules/rtslib-fb/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/rtslib-fb/default.nix b/pkgs/development/python-modules/rtslib-fb/default.nix index e9eba892e89d..ab2f3b9d5553 100644 --- a/pkgs/development/python-modules/rtslib-fb/default.nix +++ b/pkgs/development/python-modules/rtslib-fb/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { meta = { description = "Python object API for managing the Linux LIO kernel target"; - mainProgram = "targetctl"; homepage = "https://github.com/open-iscsi/rtslib-fb"; changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/v${version}"; license = lib.licenses.asl20; From 6e79d0d383c2dd3770d12495fea84a0f35a298fa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 22:21:25 +0100 Subject: [PATCH 015/115] targetcli: rename to targetcli-fb --- nixos/modules/services/networking/iscsi/target.nix | 2 +- pkgs/by-name/ta/{targetcli => targetcli-fb}/package.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/by-name/ta/{targetcli => targetcli-fb}/package.nix (97%) diff --git a/nixos/modules/services/networking/iscsi/target.nix b/nixos/modules/services/networking/iscsi/target.nix index f6c0739d0622..3154271b4dd6 100644 --- a/nixos/modules/services/networking/iscsi/target.nix +++ b/nixos/modules/services/networking/iscsi/target.nix @@ -34,7 +34,7 @@ in mode = "0600"; }; - environment.systemPackages = with pkgs; [ targetcli ]; + environment.systemPackages = with pkgs; [ targetcli-fb ]; boot.kernelModules = [ "configfs" diff --git a/pkgs/by-name/ta/targetcli/package.nix b/pkgs/by-name/ta/targetcli-fb/package.nix similarity index 97% rename from pkgs/by-name/ta/targetcli/package.nix rename to pkgs/by-name/ta/targetcli-fb/package.nix index d34ab31b9d3a..dd169518ef0e 100644 --- a/pkgs/by-name/ta/targetcli/package.nix +++ b/pkgs/by-name/ta/targetcli-fb/package.nix @@ -9,7 +9,7 @@ }: python3Packages.buildPythonApplication rec { - pname = "targetcli"; + pname = "targetcli-fb"; version = "3.0.1"; pyproject = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e9aab7b7b809..601b40ab9992 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1473,6 +1473,7 @@ mapAliases { taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 + targetcli = targetcli-fb; # Added 2025-03-14 taro = taproot-assets; # Added 2023-07-04 tbb_2021_5 = throw "tbb_2021_5 has been removed from nixpkgs, as it broke with GCC 14"; tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02 From 988fef7fbf622984ae22d0ff62c97d14d48f9f05 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Mar 2025 00:41:30 +0100 Subject: [PATCH 016/115] python312Packages.configshell: rename to configshell-fb --- pkgs/by-name/nv/nvmet-cli/package.nix | 2 +- pkgs/by-name/sp/spdk/package.nix | 2 +- pkgs/by-name/ta/targetcli-fb/package.nix | 2 +- .../{configshell => configshell-fb}/default.nix | 11 +++++------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/development/python-modules/{configshell => configshell-fb}/default.nix (77%) diff --git a/pkgs/by-name/nv/nvmet-cli/package.nix b/pkgs/by-name/nv/nvmet-cli/package.nix index beaeea887c39..00bfcef2829e 100644 --- a/pkgs/by-name/nv/nvmet-cli/package.nix +++ b/pkgs/by-name/nv/nvmet-cli/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { buildInputs = with python3Packages; [ nose2 ]; - propagatedBuildInputs = with python3Packages; [ configshell ]; + propagatedBuildInputs = with python3Packages; [ configshell-fb ]; # This package requires the `nvmet` kernel module to be loaded for tests. doCheck = false; diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix index 738779b2325b..7a3e57071253 100644 --- a/pkgs/by-name/sp/spdk/package.nix +++ b/pkgs/by-name/sp/spdk/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - python3.pkgs.configshell + python3.pkgs.configshell-fb ]; postPatch = '' diff --git a/pkgs/by-name/ta/targetcli-fb/package.nix b/pkgs/by-name/ta/targetcli-fb/package.nix index dd169518ef0e..a8db141a5e64 100644 --- a/pkgs/by-name/ta/targetcli-fb/package.nix +++ b/pkgs/by-name/ta/targetcli-fb/package.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib ]; dependencies = with python3Packages; [ - configshell + configshell-fb rtslib-fb pygobject3 ]; diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell-fb/default.nix similarity index 77% rename from pkgs/development/python-modules/configshell/default.nix rename to pkgs/development/python-modules/configshell-fb/default.nix index df0a5aa19170..6fb61a2831db 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell-fb/default.nix @@ -9,15 +9,13 @@ }: buildPythonPackage rec { - pname = "configshell"; + pname = "configshell-fb"; version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "open-iscsi"; - repo = "${pname}-fb"; + repo = "configshell-fb"; tag = "v${version}"; hash = "sha256-lP3WT9ASEj6WiCrurSU/e9FhIaeoQW/n9hi1XZMnV4Q="; }; @@ -36,10 +34,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "configshell" ]; - meta = with lib; { + meta = { description = "Python library for building configuration shells"; homepage = "https://github.com/open-iscsi/configshell-fb"; - license = licenses.asl20; + changelog = "https://github.com/open-iscsi/configshell-fb/releases/tag/v${version}"; + license = lib.licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1bb761ce2f3d..c7f689980f04 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -135,6 +135,7 @@ mapAliases ({ command_runner = command-runner; # added 2024-03-06 CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 + configshell = configshell-fb; # added 2025-03-14 coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20 cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01cbe3947a26..4f1e323d1deb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2650,7 +2650,7 @@ self: super: with self; { configparser = callPackage ../development/python-modules/configparser { }; - configshell = callPackage ../development/python-modules/configshell { }; + configshell-fb = callPackage ../development/python-modules/configshell-fb { }; configupdater = callPackage ../development/python-modules/configupdater { }; From e0ba6aaf11b30a973d45d6d49e633e03bffa189d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Mar 2025 08:18:22 +0000 Subject: [PATCH 017/115] fortran-fpm: modernize --- pkgs/by-name/fo/fortran-fpm/package.nix | 40 ++++++++++++++++--------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/fo/fortran-fpm/package.nix b/pkgs/by-name/fo/fortran-fpm/package.nix index 7e80dd9a62a6..225684d8cd45 100644 --- a/pkgs/by-name/fo/fortran-fpm/package.nix +++ b/pkgs/by-name/fo/fortran-fpm/package.nix @@ -1,31 +1,33 @@ { lib, - fetchurl, - pkgs, stdenv, + fetchurl, + gfortran, + versionCheckHook, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fortran-fpm"; version = "0.11.0"; src = fetchurl { - url = "https://github.com/fortran-lang/fpm/releases/download/v${version}/fpm-${version}.F90"; - sha256 = "sha256-mIozF+4kSO5yB9CilBDwinnIa92sMxSyoXWAGpz1jSc="; + url = "https://github.com/fortran-lang/fpm/releases/download/v${finalAttrs.version}/fpm-${finalAttrs.version}.F90"; + hash = "sha256-mIozF+4kSO5yB9CilBDwinnIa92sMxSyoXWAGpz1jSc="; }; dontUnpack = true; - nativeBuildInputs = with pkgs; [ gfortran ]; + nativeBuildInputs = [ gfortran ]; buildPath = "build/bootstrap"; buildPhase = '' runHook preBuild - mkdir -p ${buildPath} - gfortran -J ${buildPath} -o ${buildPath}/${pname} $src + mkdir -p ${finalAttrs.buildPath} + gfortran -J ${finalAttrs.buildPath} -o ${finalAttrs.buildPath}/fortran-fpm $src runHook postBuild ''; @@ -34,17 +36,27 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - cp ${buildPath}/${pname} $out/bin + cp ${finalAttrs.buildPath}/fortran-fpm $out/bin runHook postInstall ''; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Fortran Package Manager (fpm)"; homepage = "https://fpm.fortran-lang.org"; - maintainers = [ maintainers.proofconstruction ]; - license = licenses.mit; - platforms = platforms.all; + maintainers = [ lib.maintainers.proofconstruction ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; mainProgram = "fortran-fpm"; }; -} +}) From 2f8d40b10c6a894b8c085c2b7eed3c0d194462fa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 16 Mar 2025 10:23:47 +0100 Subject: [PATCH 018/115] python312Packages.cvxpy: 1.6.3 -> 1.6.4 Diff: https://github.com/cvxpy/cvxpy/compare/refs/tags/v1.6.3...v1.6.4 Changelog: https://github.com/cvxpy/cvxpy/releases/tag/v1.6.4 --- pkgs/development/python-modules/cvxpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index a232230b39e4..608efa1b9d5e 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.6.3"; + version = "1.6.4"; pyproject = true; src = fetchFromGitHub { owner = "cvxpy"; repo = "cvxpy"; tag = "v${version}"; - hash = "sha256-fQz9tPxSNKRSJdtyeEAE1qwK//x1U3kKozclav1G+nc="; + hash = "sha256-PV6fROIt8NsCTm2MbKr+ejgE3QC3IIU607q9MYRGnxc="; }; # we need to patch out numpy version caps from upstream From bccfeae00cf6e8b2564b8b417ca0886411690497 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Mar 2025 15:38:20 +0000 Subject: [PATCH 019/115] isisdl: 1.3.20 -> 1.3.21 --- pkgs/by-name/is/isisdl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/is/isisdl/package.nix b/pkgs/by-name/is/isisdl/package.nix index fc5286e99cad..be97db57636b 100644 --- a/pkgs/by-name/is/isisdl/package.nix +++ b/pkgs/by-name/is/isisdl/package.nix @@ -6,11 +6,11 @@ }: python3Packages.buildPythonApplication rec { pname = "isisdl"; - version = "1.3.20"; + version = "1.3.21"; src = fetchPypi { inherit pname version; - hash = "sha256-s0vGCJVSa6hf6/sIhzmaxpziP4izoRwcZfxvm//5inY="; + hash = "sha256-YyR0A7NqmUcR+hQnQlIgBdU6CxfHtDOjR3q5I21ROCI="; }; pyproject = true; From e0943517f6a059f2db48dd47e432055c7b80a572 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Mar 2025 17:58:21 +0000 Subject: [PATCH 020/115] mud: 1.0.11 -> 1.0.12 --- pkgs/by-name/mu/mud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix index a8109b0208df..b67867c11517 100644 --- a/pkgs/by-name/mu/mud/package.nix +++ b/pkgs/by-name/mu/mud/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "mud"; - version = "1.0.11"; + version = "1.0.12"; pyproject = true; src = fetchFromGitHub { owner = "jasursadikov"; repo = "mud"; tag = "v${version}"; - hash = "sha256-HnYBHfburJuA/yRV4Nb8HApi7kfkONh5N9t221GOxMw="; + hash = "sha256-fFSnkodYhV1dokCJq43PwXxjIeAkObYZA3VxhjGZlhM="; }; build-system = with python3Packages; [ @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { description = "multi-directory git runner which allows you to run git commands in a multiple repositories"; homepage = "https://github.com/jasursadikov/mud"; license = lib.licenses.mit; - changelog = "https://github.com/jasursadikov/mud/releases/tag/v${version}"; + changelog = "https://github.com/jasursadikov/mud/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ genga898 ]; mainProgram = "mud"; }; From 2096eeca7b4e9fa3c0681d2d143e57040ed9a4dd Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Wed, 12 Mar 2025 16:11:41 +0100 Subject: [PATCH 021/115] streamcontroller: 1.5.0-beta.7 -> 1.5.0-beta.8 --- pkgs/by-name/st/streamcontroller/package.nix | 65 ++++++++++++-------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/st/streamcontroller/package.nix b/pkgs/by-name/st/streamcontroller/package.nix index e1f95c5ebf61..2054f05560b0 100644 --- a/pkgs/by-name/st/streamcontroller/package.nix +++ b/pkgs/by-name/st/streamcontroller/package.nix @@ -1,6 +1,7 @@ { stdenv, lib, + isKde ? false, python3Packages, fetchFromGitHub, copyDesktopItems, @@ -12,20 +13,23 @@ libportal-gtk4, xdg-desktop-portal, xdg-desktop-portal-gtk, + kdotool, }: -stdenv.mkDerivation rec { +let + # We have to hardcode revision because upstream often create multiple releases for the same version number. + # This is the commit hash that maps to 1.5.0-beta.8 released on 2025-03-12 + rev = "de11d84afac7873044568606a8468c78d57aceda"; +in +stdenv.mkDerivation { pname = "streamcontroller"; - version = "1.5.0-beta.7"; - # We have to hardcode revision because upstream often create multiple releases for the same version number. - # This is the commit hash that maps to 1.5.0-beta.7 released on 2024-11-20 - rev = "45b5bc72f617c5aea306450d6592da66ade53568"; + version = "1.5.0-beta.8"; src = fetchFromGitHub { repo = "StreamController"; owner = "StreamController"; inherit rev; - hash = "sha256-tgbqURtqp1KbzOfXo4b4Dp3N8Sg8xcUSTwdEFXq+f6w="; + hash = "sha256-pE92/oX9iZYCIhwDkPkjPq/cDUQLUGs+Ou5rjFEIBpo="; }; # The installation method documented upstream @@ -34,37 +38,48 @@ stdenv.mkDerivation rec { # Due to how the code is structured upstream, it's infeasible to use `buildPythonApplication`. dontBuild = true; - installPhase = '' - runHook preInstall + installPhase = + # Some plugins needs to load things dynamically and in that case we won't find python3 without this + let + binPath = + [ + python3Packages.python.interpreter + ] + # Allows automatic detection of windows to switch pages on KDE + ++ lib.optional isKde kdotool; + in + '' + runHook preInstall - mkdir -p $out/usr/lib/streamcontroller - cp -r ./* $out/usr/lib/streamcontroller/ + mkdir -p $out/usr/lib/streamcontroller + cp -r ./* $out/usr/lib/streamcontroller/ - mkdir -p $out/bin/ + mkdir -p $out/bin/ - # Note that the implementation of main.py assumes - # working directory to be at the root of the project's source code - makeWrapper \ - ${python3Packages.python.interpreter} \ - $out/bin/streamcontroller \ - --add-flags main.py \ - --chdir $out/usr/lib/streamcontroller \ - --prefix PYTHONPATH : "$PYTHONPATH" + # Note that the implementation of main.py assumes + # working directory to be at the root of the project's source code + makeWrapper \ + ${python3Packages.python.interpreter} \ + $out/bin/streamcontroller \ + --add-flags main.py \ + --chdir $out/usr/lib/streamcontroller \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "$PATH:${lib.makeBinPath binPath}" - mkdir -p "$out/etc/udev/rules.d" - cp ./udev.rules $out/etc/udev/rules.d/70-streamcontroller.rules + mkdir -p "$out/etc/udev/rules.d" + cp ./udev.rules $out/etc/udev/rules.d/70-streamcontroller.rules - install -D ./flatpak/icon_256.png $out/share/icons/hicolor/256x256/apps/streamcontroller.png + install -D ./flatpak/icon_256.png $out/share/icons/hicolor/256x256/apps/com.core447.StreamController.png - runHook postInstall - ''; + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { name = "StreamController"; desktopName = "StreamController"; exec = "streamcontroller"; - icon = "streamcontroller"; + icon = "com.core447.StreamController"; comment = "Control your Elgato Stream Decks"; categories = [ "Utility" ]; }) From 2b75cbbf4174d15808d27ec362ba01ccd814e144 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 02:30:37 +0000 Subject: [PATCH 022/115] python312Packages.ckzg: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/ckzg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ckzg/default.nix b/pkgs/development/python-modules/ckzg/default.nix index 135c354d1224..d9d1993eef1b 100644 --- a/pkgs/development/python-modules/ckzg/default.nix +++ b/pkgs/development/python-modules/ckzg/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ckzg"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "c-kzg-4844"; tag = "v${version}"; - hash = "sha256-kOoodri80p5tz8RlMz6mqsZRAuXBxZm4vr+VWJEtfA0="; + hash = "sha256-gmH3JR05LkZvjYXf25Ar3rfh9DqabqJr7Vpe1QuRqNA="; }; build-system = [ setuptools ]; @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Minimal implementation of the Polynomial Commitments API for EIP-4844 and EIP-7594"; homepage = "https://github.com/ethereum/c-kzg-4844"; - changelog = "https://github.com/ethereum/c-kzg-4844/releases/tag/v${version}"; + changelog = "https://github.com/ethereum/c-kzg-4844/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hellwolf ]; }; From f286888520ef0b3e0349e9a72acfe49bea2eb0f4 Mon Sep 17 00:00:00 2001 From: Suwon Park Date: Tue, 18 Mar 2025 15:01:31 +0900 Subject: [PATCH 023/115] maintainers: add sepiabrown --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 86c46e67bb40..07df6fa455c6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21514,6 +21514,12 @@ githubId = 529649; name = "Raffael Mancini"; }; + sepiabrown = { + email = "bboxone@gmail.com"; + github = "sepiabrown"; + githubId = 35622998; + name = "Suwon Park"; + }; seppeljordan = { email = "sebastian.jordan.mail@googlemail.com"; github = "seppeljordan"; From 4d308324196fa395a8032e31c179e3bfb1c8b1fe Mon Sep 17 00:00:00 2001 From: Suwon Park Date: Tue, 18 Mar 2025 15:02:11 +0900 Subject: [PATCH 024/115] cusparselt: init at 0.7.1 (#270446) --- .../cuda-modules/cusparselt/extension.nix | 144 ++++++++++++++++++ .../cusparselt/manifests/feature_0.7.1.json | 44 ++++++ .../cusparselt/manifests/redistrib_0.7.1.json | 35 +++++ .../modules/cusparselt/default.nix | 4 + .../cuda-modules/modules/default.nix | 1 + pkgs/top-level/cuda-packages.nix | 3 + pkgs/top-level/release-cuda.nix | 1 + 7 files changed, 232 insertions(+) create mode 100644 pkgs/development/cuda-modules/cusparselt/extension.nix create mode 100644 pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json create mode 100644 pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json create mode 100644 pkgs/development/cuda-modules/modules/cusparselt/default.nix diff --git a/pkgs/development/cuda-modules/cusparselt/extension.nix b/pkgs/development/cuda-modules/cusparselt/extension.nix new file mode 100644 index 000000000000..f7ecfb0f12b6 --- /dev/null +++ b/pkgs/development/cuda-modules/cusparselt/extension.nix @@ -0,0 +1,144 @@ +# Support matrix can be found at +# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html +{ + lib, + stdenv, + cudaVersion, + flags, + mkVersionedPackageName, +}: +let + inherit (lib) + attrsets + lists + modules + versions + strings + trivial + ; + + inherit (stdenv) hostPlatform; + + redistName = "cusparselt"; + pname = "libcusparse_lt"; + + cusparseltVersions = [ + "0.7.1" + ]; + + # Manifests :: { redistrib, feature } + + # Each release of cusparselt gets mapped to an evaluated module for that release. + # From there, we can get the min/max CUDA versions supported by that release. + # listOfManifests :: List Manifests + listOfManifests = + let + configEvaluator = + fullCusparseltVersion: + modules.evalModules { + modules = [ + ../modules + # We need to nest the manifests in a config.cusparselt.manifests attribute so the + # module system can evaluate them. + { + cusparselt.manifests = { + redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCusparseltVersion}.json"); + feature = trivial.importJSON (./manifests + "/feature_${fullCusparseltVersion}.json"); + }; + } + ]; + }; + # Un-nest the manifests attribute set. + releaseGrabber = evaluatedModules: evaluatedModules.config.cusparselt.manifests; + in + lists.map (trivial.flip trivial.pipe [ + configEvaluator + releaseGrabber + ]) cusparseltVersions; + + # Our cudaVersion tells us which version of CUDA we're building against. + # The subdirectories in lib/ tell us which versions of CUDA are supported. + # Typically the names will look like this: + # + # - 10.2 + # - 11 + # - 11.0 + # - 12 + + # libPath :: String + libPath = + let + cudaMajorMinor = versions.majorMinor cudaVersion; + cudaMajor = versions.major cudaVersion; + in + if cudaMajorMinor == "10.2" then cudaMajorMinor else cudaMajor; + + # A release is supported if it has a libPath that matches our CUDA version for our platform. + # LibPath are not constant across the same release -- one platform may support fewer + # CUDA versions than another. + # redistArch :: String + redistArch = flags.getRedistArch hostPlatform.system; + # platformIsSupported :: Manifests -> Boolean + platformIsSupported = + { feature, redistrib, ... }: + (attrsets.attrByPath [ + pname + redistArch + ] null feature) != null; + + # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports, + # we could filter out releases that don't support our CUDA version. + # However, we don't have that currently, so we make a best-effort to try to build TensorRT with whatever + # libPath corresponds to our CUDA version. + # supportedManifests :: List Manifests + supportedManifests = builtins.filter platformIsSupported listOfManifests; + + # Compute versioned attribute name to be used in this package set + # Patch version changes should not break the build, so we only use major and minor + # computeName :: RedistribRelease -> String + computeName = { version, ... }: mkVersionedPackageName redistName version; +in +final: _: +let + # buildCusparseltPackage :: Manifests -> AttrSet Derivation + buildCusparseltPackage = + { redistrib, feature }: + let + drv = final.callPackage ../generic-builders/manifest.nix { + inherit pname redistName; + redistribRelease = redistrib.${pname}; + featureRelease = feature.${pname}; + }; + fixedDrv = drv.overrideAttrs (prevAttrs: { + buildInputs = + prevAttrs.buildInputs + ++ lists.optionals (strings.versionOlder cudaVersion "11.4") [ final.cudatoolkit ] + ++ lists.optionals (strings.versionAtLeast cudaVersion "11.4") ( + [ final.libcublas.lib ] + # For some reason, the 1.4.x release of cusparselt requires the cudart library. + ++ lists.optionals (strings.hasPrefix "1.4" redistrib.${pname}.version) [ final.cuda_cudart.lib ] + ); + meta = prevAttrs.meta // { + description = "cuSPARSELt: A High-Performance CUDA Library for Sparse Matrix-Matrix Multiplication"; + homepage = "https://developer.nvidia.com/cusparselt-downloads"; + + maintainers = prevAttrs.meta.maintainers ++ [ lib.maintainers.sepiabrown ]; + license = lib.licenses.unfreeRedistributable // { + shortName = "cuSPARSELt EULA"; + fullName = "cuSPARSELt SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS"; + url = "https://docs.nvidia.com/cuda/cusparselt/license.html"; + }; + }; + }); + in + attrsets.nameValuePair (computeName redistrib.${pname}) fixedDrv; + + extension = + let + nameOfNewest = computeName (lists.last supportedManifests).redistrib.${pname}; + drvs = builtins.listToAttrs (lists.map buildCusparseltPackage supportedManifests); + containsDefault = attrsets.optionalAttrs (drvs != { }) { cusparselt = drvs.${nameOfNewest}; }; + in + drvs // containsDefault; +in +extension diff --git a/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json b/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json new file mode 100644 index 000000000000..0b368e22bb24 --- /dev/null +++ b/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json @@ -0,0 +1,44 @@ +{ + "libcusparse_lt": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json b/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json new file mode 100644 index 000000000000..b9609bd4532a --- /dev/null +++ b/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json @@ -0,0 +1,35 @@ +{ + "release_date": "2025-02-25", + "release_label": "0.7.1", + "release_product": "cusparselt", + "libcusparse_lt": { + "name": "NVIDIA cuSPARSELt", + "license": "cuSPARSELt", + "license_path": "libcusparse_lt/LICENSE.txt", + "version": "0.7.1.0", + "linux-x86_64": { + "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.7.1.0-archive.tar.xz", + "sha256": "a0d885837887c73e466a31b4e86aaae2b7d0cc9c5de0d40921dbe2a15dbd6a88", + "md5": "b2e5f3c9b9d69e1e0b55b16de33fdc6e", + "size": "353151840" + }, + "linux-sbsa": { + "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.7.1.0-archive.tar.xz", + "sha256": "4a131d0a54728e53ba536b50bb65380603456f1656e7df8ee52e285618a0b57c", + "md5": "612a712c7da6e801ee773687e99af87e", + "size": "352406784" + }, + "windows-x86_64": { + "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.7.1.0-archive.zip", + "sha256": "004bcb1b700c24ca8d60a8ddd2124640f61138a6c29914d2afaa0bfa0d0e3cf2", + "md5": "a1d8df8dc8ff4b3bd0e859f992f8f392", + "size": "268594665" + }, + "linux-aarch64": { + "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.7.1.0-archive.tar.xz", + "sha256": "d3b0a660fd552e0bd9a4491b15299d968674833483d5f164cfea35e70646136c", + "md5": "54e3f3b28c94118991ce54ec38f531fb", + "size": "5494380" + } + } +} diff --git a/pkgs/development/cuda-modules/modules/cusparselt/default.nix b/pkgs/development/cuda-modules/modules/cusparselt/default.nix new file mode 100644 index 000000000000..745bad811c05 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/cusparselt/default.nix @@ -0,0 +1,4 @@ +{ options, ... }: +{ + options.cusparselt.manifests = options.generic.manifests; +} diff --git a/pkgs/development/cuda-modules/modules/default.nix b/pkgs/development/cuda-modules/modules/default.nix index ccccd871479e..a173d1cae360 100644 --- a/pkgs/development/cuda-modules/modules/default.nix +++ b/pkgs/development/cuda-modules/modules/default.nix @@ -4,6 +4,7 @@ # Always after generic ./cuda ./cudnn + ./cusparselt ./cutensor ./tensorrt ]; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 4da43f0bd117..3770aee3bae7 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -148,6 +148,9 @@ let (callPackage ../development/cuda-modules/cutensor/extension.nix { inherit cudaVersion flags mkVersionedPackageName; }) + (callPackage ../development/cuda-modules/cusparselt/extension.nix { + inherit cudaVersion flags mkVersionedPackageName; + }) (callPackage ../development/cuda-modules/generic-builders/multiplex.nix { inherit cudaVersion flags mkVersionedPackageName; pname = "tensorrt"; diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 55796a21291d..4ebabe05e1f3 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -23,6 +23,7 @@ let || builtins.elem license.shortName [ "CUDA EULA" "cuDNN EULA" + "cuSPARSELt EULA" "cuTENSOR EULA" "NVidia OptiX EULA" ] From 3016de24d1bc9d8d623317aa8160898d5d425031 Mon Sep 17 00:00:00 2001 From: Suwon Park Date: Tue, 18 Mar 2025 15:19:52 +0900 Subject: [PATCH 025/115] cuda-library-samples.cusparselt: fix build --- .../cuda-library-samples/generic.nix | 63 ++++++++++++++++++- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix index 43d2bece88c9..4302830ac200 100644 --- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix @@ -4,17 +4,30 @@ fetchFromGitHub, cmake, addDriverRunpath, + autoAddDriverRunpath, cudatoolkit, cutensor, + cusparselt, + cudaPackages, + setupCudaHook, + autoPatchelfHook, }: let - rev = "5aab680905d853bce0dbad4c488e4f7e9f7b2302"; + inherit (cudaPackages) + cuda_cccl + cuda_cudart + cuda_nvcc + libcusparse + cudaAtLeast + cudaOlder + ; + rev = "e57b9c483c5384b7b97b7d129457e5a9bdcdb5e1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "CUDALibrarySamples"; inherit rev; - sha256 = "0gwgbkq05ygrfgg5hk07lmap7n7ampxv0ha1axrv8qb748ph81xs"; + sha256 = "0g17afsmb8am0darxchqgjz1lmkaihmnn7k1x4ahg5gllcmw8k3l"; }; commonAttrs = { version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; @@ -83,4 +96,50 @@ in CUTENSOR_ROOT = cutensor; } ); + + cusparselt = backendStdenv.mkDerivation ( + commonAttrs + // { + pname = "cuda-library-samples-cusparselt"; + + src = "${src}/cuSPARSELt"; + + sourceRoot = "cuSPARSELt/matmul"; + + buildInputs = lib.optionals (cudaOlder "11.4") [ cudatoolkit ]; + + nativeBuildInputs = + [ + cmake + addDriverRunpath + (lib.getDev cusparselt) + (lib.getDev libcusparse) + ] + ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ] + ++ lib.optionals (cudaAtLeast "11.4") [ + cuda_nvcc + (lib.getDev cuda_cudart) # + ] + ++ lib.optionals (cudaAtLeast "12.0") [ + cuda_cccl # + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib cusparselt}/lib/libcusparseLt.so" \ + --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic cusparselt}/lib/libcusparseLt_static.a" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp matmul_example $out/bin/ + cp matmul_example_static $out/bin/ + runHook postInstall + ''; + + CUDA_TOOLKIT_PATH = lib.getLib cudatoolkit; + CUSPARSELT_PATH = lib.getLib cusparselt; + } + ); } From c7fc4ae81b368098af3f25b1176a06bf14a6e8c7 Mon Sep 17 00:00:00 2001 From: oluceps Date: Sun, 16 Mar 2025 22:51:57 +0800 Subject: [PATCH 026/115] maple-font: 6.4 -> 7.0 --- pkgs/data/fonts/maple-font/default.nix | 147 ++++++++++++++++++------- pkgs/data/fonts/maple-font/hashes.json | 46 ++++++++ pkgs/data/fonts/maple-font/update.py | 60 ++++++++++ pkgs/top-level/all-packages.nix | 9 +- 4 files changed, 215 insertions(+), 47 deletions(-) create mode 100644 pkgs/data/fonts/maple-font/hashes.json create mode 100644 pkgs/data/fonts/maple-font/update.py diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index fbaeaa59a1a8..542e337ef0d2 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -6,18 +6,21 @@ }: let + + hashes = lib.importJSON ./hashes.json; + maple-font = { pname, - sha256, + hash, desc, }: stdenv.mkDerivation rec { inherit pname; - version = "6.4"; + version = "7.0"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; - inherit sha256; + inherit hash; }; # Work around the "unpacker appears to have produced no directories" @@ -41,41 +44,105 @@ let }; }; + typeVariants = { + truetype = { + suffix = "TTF"; + desc = "monospace TrueType"; + }; + + truetype-autohint = { + suffix = "TTF-AutoHint"; + desc = "monospace ttf autohint"; + }; + + variable = { + suffix = "Variable"; + desc = "monospace variable"; + }; + + woff2 = { + suffix = "Woff2"; + desc = "WOFF2.0"; + }; + + opentype = { + suffix = "OTF"; + desc = "OpenType"; + }; + + NF = { + suffix = "NF"; + desc = "Nerd Font"; + }; + + NF-unhinted = { + suffix = "NF-unhinted"; + desc = "Nerd Font unhinted"; + }; + + CN = { + suffix = "CN"; + desc = "monospace CN"; + }; + + CN-unhinted = { + suffix = "CN-unhinted"; + desc = "monospace CN unhinted"; + }; + + NF-CN = { + suffix = "NF-CN"; + desc = "Nerd Font CN"; + }; + + NF-CN-unhinted = { + suffix = "NF-CN-unhinted"; + desc = "Nerd Font CN unhinted"; + }; + }; + + ligatureVariants = { + No-Ligature = { + suffix = "NL"; + desc = "No Ligature"; + }; + Normal-Ligature = { + suffix = "Normal"; + desc = "Normal Ligature"; + }; + Normal-No-Ligature = { + suffix = "NormalNL"; + desc = "Normal No Ligature"; + }; + }; + + combinedFonts = + lib.concatMapAttrs ( + ligName: ligVariant: + lib.concatMapAttrs ( + typeName: typeVariant: + let + pname = "MapleMono${ligVariant.suffix}-${typeVariant.suffix}"; + in + { + "${ligVariant.suffix}-${typeVariant.suffix}" = maple-font { + inherit pname; + desc = "${ligVariant.desc} ${typeVariant.desc}"; + hash = hashes.${pname}; + }; + } + ) typeVariants + ) ligatureVariants + // lib.mapAttrs ( + _: value: + let + pname = "MapleMono-${value.suffix}"; + in + maple-font { + inherit pname; + inherit (value) desc; + hash = hashes.${pname}; + } + ) typeVariants; in -{ - Mono = maple-font { - pname = "MapleMono-ttf"; - sha256 = "sha256-a06JLIP5aVb9SeEz6kw+LqKy0ydCgaUlPDFWA2Y0G8Q="; - desc = "monospace TrueType"; - }; - - NF = maple-font { - pname = "MapleMono-NF"; - sha256 = "sha256-fy+hdUYZDW5nkMVirhkmys3tIkWezPDrlpNxnRMl4WU="; - desc = "Nerd Font"; - }; - - SC-NF = maple-font { - pname = "MapleMono-SC-NF"; - sha256 = "sha256-SbXWkrpLJUrq+Jt1h3GBP9md5TbYpPchdiR0oEDMAgY="; - desc = "Nerd Font SC"; - }; - - opentype = maple-font { - pname = "MapleMono-otf"; - sha256 = "sha256-fwfFlNbaWXFCjcno7NK3dZqAzsHLh9rdGkSq26xc9qw="; - desc = "OpenType"; - }; - - woff2 = maple-font { - pname = "MapleMono-woff2"; - sha256 = "sha256-4akpZGGth4yZjI5wjO3ZXrXcWNxb7/6YChU7T5fNVKs="; - desc = "WOFF2.0"; - }; - - autohint = maple-font { - pname = "MapleMono-ttf-autohint"; - sha256 = "sha256-rSYIC42Bt+KFgxhwRhXS4sbh4etKYkCOo5nP2J2BHt4="; - desc = "ttf autohint"; - }; -} +combinedFonts diff --git a/pkgs/data/fonts/maple-font/hashes.json b/pkgs/data/fonts/maple-font/hashes.json new file mode 100644 index 000000000000..3a4453136ec6 --- /dev/null +++ b/pkgs/data/fonts/maple-font/hashes.json @@ -0,0 +1,46 @@ +{ + "MapleMono-CN-unhinted": "sha256-L2EasFES9EYmNtOs/CKwqqQNzkxAZgoBT8qN1dWipBc=", + "MapleMono-CN": "sha256-vQkZD1wa/pzAZR8b9krfApGCUS+ARkZNvhqJ/ZGpnLs=", + "MapleMono-NF-CN-unhinted": "sha256-x7ZnObDkGMR4nPpMbBfRfE6M4o19rZgApQeG69P6TZg=", + "MapleMono-NF-CN": "sha256-IUBHSBIW//vWwlumefFW48eSULJmY9e8F9Ymhbt/KU0=", + "MapleMono-NF-unhinted": "sha256-5P42BHDnIv4ZN4rDtEWFCWEc+NfPd0qHT2VOW2Jhn+Q=", + "MapleMono-NF": "sha256-HgZkIrEV5zmRhBvAI4/uT+nfUhDaD0H81upTXfJNhaA=", + "MapleMono-OTF": "sha256-4zPKejWZS52bhw0FLJX69kMr8kbv6P5l5cQ8orYcT5o=", + "MapleMono-TTF-AutoHint": "sha256-Xa7cSDXKby0UILmxj96xbD6ZhDDwBee9lymOx7FPmoE=", + "MapleMono-TTF": "sha256-FglonkbnphiwmxGj7Z0ozfHMwpJj7+96g6WMtMe3rIo=", + "MapleMono-Variable": "sha256-EILfODQ8DJiyTwgmTogwcNlz+YBIdmlk/mnfFZ4Eme8=", + "MapleMono-Woff2": "sha256-S7lWI+Xr7LxdFvjnngktx5uaixEVlxdLUDKMmFlARCk=", + "MapleMonoNL-CN-unhinted": "sha256-0wKF/0hUj45aApnHbp0jQqPtw8YcIsvE88HFob0U8n0=", + "MapleMonoNL-CN": "sha256-JUCHV2TkDTFxpZXibLq8/ENyn7KER5AqT5Yx4tK6eW8=", + "MapleMonoNL-NF-CN-unhinted": "sha256-t7pOo8YsewYR31AB2J4BIZU+JW3Qp770Esbpy38Y2Ts=", + "MapleMonoNL-NF-CN": "sha256-S9a8qXpebYMmJmSr+JG945GYuucQC5bbURf3h0jwH40=", + "MapleMonoNL-NF-unhinted": "sha256-j2M6kLSALRzdOl8vyMsX+4wvGVcVDYvlYRLuX1XYhic=", + "MapleMonoNL-NF": "sha256-k+FsBxlZheaAzJFdpdKtr4NUTnSue6GNgNa/U5B6dPI=", + "MapleMonoNL-OTF": "sha256-TV+6rZ3MNabt+1n33UeElP2zcGktYIYOos3dF4XlQaM=", + "MapleMonoNL-TTF-AutoHint": "sha256-VD4d0BdUzRiAUao9sGJKIeLkD3AAuhfJoIdrvdJPP0s=", + "MapleMonoNL-TTF": "sha256-bbJxcIYarftrinBO9rLAqUz3jLoWzkcZ+qZCmLeko8U=", + "MapleMonoNL-Variable": "sha256-+6WgaUddD2LSYsaVajpYNw+ypuQI27stjc6hPnQtHrw=", + "MapleMonoNL-Woff2": "sha256-bbMqjLHRI0aMTa7pxMvRU2RsiE97e3pavkJuMfVXctA=", + "MapleMonoNormal-CN-unhinted": "sha256-Ew/7KwKPWluFtYRDD/0hg26tQCVKYCIUTNqClYndVfI=", + "MapleMonoNormal-CN": "sha256-ODTWB+9nTMmgEaqlv1/Fq4GABh45CLTA0HKWHM9G9Aw=", + "MapleMonoNormal-NF-CN-unhinted": "sha256-vOlFwb0a97ydJPR7YeEJqnmTjK9pKE2O6szGGQJHShQ=", + "MapleMonoNormal-NF-CN": "sha256-5Jk/Fqd7pMuDghhaFvIegPJqK21iMJuN/nJt9y5hebc=", + "MapleMonoNormal-NF-unhinted": "sha256-9FhbDhBnGEFwX2YE2GEeyteIWA5z3b4VJwURTWsWf3k=", + "MapleMonoNormal-NF": "sha256-SMntZ0XVRsdLocSd9BsN3/ORmkUi8XgTSicULqEG0po=", + "MapleMonoNormal-OTF": "sha256-flHGOMuURNehlLw0JzbIPNLXNb7B7g8YXl8PoN/Wqt0=", + "MapleMonoNormal-TTF-AutoHint": "sha256-/giwB5H0FQ8NTYViqz81Bed+uWuOL9ipH+CKS1p34vU=", + "MapleMonoNormal-TTF": "sha256-vL6fRwEP2GSORBrOGvEgSA+fxjrZyYmpbNeuIMpVvYM=", + "MapleMonoNormal-Variable": "sha256-S/76i2fj1e+KAxQlAjngGDmOMx8t6Y7Zn8487zJJJXw=", + "MapleMonoNormal-Woff2": "sha256-gsyUKyibV5q0llNi0Inwqk/ZOEEF+pH1ZCf9sMadkc8=", + "MapleMonoNormalNL-CN-unhinted": "sha256-ht/MwZcc2RvEzZ1mpqCMkfU6J6OD8F4V4lMlrsuo1/E=", + "MapleMonoNormalNL-CN": "sha256-pGxsKUFSO5hzOPWW0rgYG8fpgunmPkswnZ8a+C5A+TM=", + "MapleMonoNormalNL-NF-CN-unhinted": "sha256-N+JSUc8reu2Sile2ivHu325zzg7MFKJBzbggUg4orZA=", + "MapleMonoNormalNL-NF-CN": "sha256-li/xPAHJIFtWDEK1TttQuOjZ7OJqXk+dncHFpwsh3FY=", + "MapleMonoNormalNL-NF-unhinted": "sha256-xBRiZaXswGy+DcT3h2m8nCxZBjLgq/5eX6ST4496hw0=", + "MapleMonoNormalNL-NF": "sha256-j8Li+I/NgdNSwTAY31YbBJFTc2IXffyqQnv/KVfBeMU=", + "MapleMonoNormalNL-OTF": "sha256-+exfPalJXhHScVArcdwLVde5JhxPAyxyebQAE2yBkos=", + "MapleMonoNormalNL-TTF-AutoHint": "sha256-Cdo0FhIIp7c+OIlz7D66G8xsBk0JaNq9vn6GugUJiZM=", + "MapleMonoNormalNL-TTF": "sha256-xbp1ZhbYysHHOKkoUyu0Tv76/jDqCbo2U6fzHiFPt50=", + "MapleMonoNormalNL-Variable": "sha256-mQdYcLT/30kJjPGm4j2pZXrJ8EuiY7M/gsQuI+i1Y3A=", + "MapleMonoNormalNL-Woff2": "sha256-WQp+/sKQg/QHYeeFP5k9IPPcQJKGULlmCyrAOUOvfmk=" +} diff --git a/pkgs/data/fonts/maple-font/update.py b/pkgs/data/fonts/maple-font/update.py new file mode 100644 index 000000000000..bc0335dcdbe9 --- /dev/null +++ b/pkgs/data/fonts/maple-font/update.py @@ -0,0 +1,60 @@ +import re +import json +import base64 +import argparse +import requests +from urllib.parse import urlparse + +def process_github_release(url, token=None): + parsed = urlparse(url) + path_parts = parsed.path.strip('/').split('/') + if len(path_parts) < 5 or parsed.netloc != 'github.com': + raise ValueError("Invalid GitHub release URL format") + owner, repo, _, _, tag = path_parts[:5] + headers = {"Accept": "application/vnd.github.v3+json"} + if token: + headers["Authorization"] = f"Bearer {token}" + response = requests.get( + f"https://api.github.com/repos/{owner}/{repo}/releases/tags/{tag}", + headers=headers + ) + if response.status_code != 200: + raise RuntimeError(f"Failed to fetch release info: {response.status_code} ({response.json().get('message')})") + release_data = response.json() + assets = release_data.get('assets', []) + result = {} + sha256_pattern = re.compile(r"^[a-fA-F0-9]{64}$") + for asset in assets: + if not asset['name'].endswith('.sha256'): + continue + download_url = asset['browser_download_url'] + content_response = requests.get(download_url, headers=headers) + if content_response.status_code != 200: + raise RuntimeError( + f"Failed to download {asset['name']}: " + f"{content_response.status_code} {content_response.text}" + ) + hex_hash = content_response.text.strip() + if not sha256_pattern.match(hex_hash): + raise ValueError(f"Invalid SHA256 format in {asset['name']}") + try: + byte_data = bytes.fromhex(hex_hash) + base64_hash = base64.b64encode(byte_data).decode('utf-8') + except Exception as e: + raise RuntimeError(f"Error processing {asset['name']}: {str(e)}") + filename = asset['name'][:-7] + result[filename] = f"sha256-{base64_hash}" + output_file = f"{repo}_{tag}_hashes.json" + with open(output_file, 'w', encoding='utf-8') as f: + json.dump(result, f, indent=2, ensure_ascii=False) + print(f"Successfully generated {output_file}") +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Process GitHub release hashes') + parser.add_argument('url', help='GitHub release URL') + parser.add_argument('-t', '--token', help='GitHub API token (optional)') + args = parser.parse_args() + try: + process_github_release(args.url, args.token) + except Exception as e: + print(f"Error: {str(e)}") + sys.exit(1) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db392a2b84ea..89a4688d04d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2429,13 +2429,6 @@ with pkgs; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; - maple-mono = (callPackage ../data/fonts/maple-font { }).Mono; - maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF; - maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF; - maple-mono-otf = (callPackage ../data/fonts/maple-font { }).opentype; - maple-mono-woff2 = (callPackage ../data/fonts/maple-font { }).woff2; - maple-mono-autohint = (callPackage ../data/fonts/maple-font { }).autohint; - mat2 = with python3.pkgs; toPythonApplication mat2; materialx = with python3Packages; toPythonApplication materialx; @@ -4235,6 +4228,8 @@ with pkgs; nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { }); + maple-mono = recurseIntoAttrs (callPackage ../data/fonts/maple-font { }); + netcdf-mpi = netcdf.override { hdf5 = hdf5-mpi.override { usev110Api = true; }; }; From 24b628091c533c883fd05282de09bec73e3d70c0 Mon Sep 17 00:00:00 2001 From: oluceps Date: Mon, 17 Mar 2025 03:02:46 +0800 Subject: [PATCH 027/115] maple-font: add alias --- pkgs/top-level/aliases.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 741dca6e8c2b..b3bfa80e499f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -940,6 +940,33 @@ mapAliases { maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24 manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10 manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17 + + maple-mono-NF = throw '' + maple-mono-NF had been moved to maple-mono.NF. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + maple-mono-otf = throw '' + maple-mono-otf had been moved to maple-mono.opentype. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + maple-mono-woff2 = throw '' + maple-mono-woff2 had been moved to maple-mono.woff2. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + maple-mono-SC-NF = throw '' + mono-SC-NF had been superseded by maple-mono.NF-CN. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + maple-mono-autohint = throw '' + maple-mono-autohint had been moved to maple-mono.truetype-autohint. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08 marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08 From 65ae653d236535c7400193f8fe9fd164acc8f3f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 23:53:58 +0000 Subject: [PATCH 028/115] remote-touchpad: 1.4.8 -> 1.5.0 --- pkgs/by-name/re/remote-touchpad/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/remote-touchpad/package.nix b/pkgs/by-name/re/remote-touchpad/package.nix index 8f7db0223206..72c81bd39393 100644 --- a/pkgs/by-name/re/remote-touchpad/package.nix +++ b/pkgs/by-name/re/remote-touchpad/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.4.8"; + version = "1.5.0"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C/qaLEYvIbl0XINsumAFLnsQgy+EDjoX446BJnuE6eQ="; + sha256 = "sha256-UZjbU9Ti5+IjcxIf+LDWlcqxb4kMIwa8zHmZDdZbnw8="; }; buildInputs = [ @@ -27,7 +27,7 @@ buildGoModule rec { ]; tags = [ "portal,x11" ]; - vendorHash = "sha256-bt5KUgNDgWX7CVHvX5c0uYqoxGRDbGbae52+mpnBEZU="; + vendorHash = "sha256-4TJ9Nok1P3qze69KvrwFo5sMJ4nDYhDNuApsNlZLWCI="; meta = with lib; { description = "Control mouse and keyboard from the web browser of a smartphone"; From d90c9dc67e273791fd181f29871c1aec930c5c81 Mon Sep 17 00:00:00 2001 From: Haylin Moore Date: Tue, 18 Mar 2025 23:09:48 -0700 Subject: [PATCH 029/115] intel-gpu-tools: 1.30 -> 2.0 --- pkgs/by-name/in/intel-gpu-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix index cd85c9f18f21..73e521dcfeba 100644 --- a/pkgs/by-name/in/intel-gpu-tools/package.nix +++ b/pkgs/by-name/in/intel-gpu-tools/package.nix @@ -43,14 +43,14 @@ stdenv.mkDerivation rec { pname = "intel-gpu-tools"; - version = "1.30"; + version = "2.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "drm"; repo = "igt-gpu-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-lZNDDWfySz7etxzN/28bo9qDE8SxK2vPAAOR3hxSoWY="; + hash = "sha256-568sgmP7HhrNv3nwhuokiPk/2qQtzPOC9aCsScKCI8A="; }; nativeBuildInputs = [ From 583101b94c261e0618514ddf534869d4eab25503 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 14:00:09 +0000 Subject: [PATCH 030/115] containerd: 2.0.3 -> 2.0.4 --- pkgs/by-name/co/containerd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index d277ce30b3ff..52c9167111fb 100644 --- a/pkgs/by-name/co/containerd/package.nix +++ b/pkgs/by-name/co/containerd/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { pname = "containerd"; - version = "2.0.3"; + version = "2.0.4"; outputs = [ "out" @@ -27,7 +27,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; tag = "v${version}"; - hash = "sha256-MPzC7X4r3zrDM6Ej8lICDIB29X+s6jQ1sHQmnk9Zc10="; + hash = "sha256-KW2fKdsJ590UPGcu2O3IGyJ+/iY0c8GQLirL8zK3F14="; }; postPatch = "patchShebangs ."; From 861063a9f3d77f5130f87abdb9beab2c21db7d5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 01:47:05 +0000 Subject: [PATCH 031/115] nats-server: 2.10.26 -> 2.11.0 --- pkgs/by-name/na/nats-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index 7008db74155f..0531e6a0a795 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.26"; + version = "2.11.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-jOfS1uHI8sTL7xTyIiK/M7bFFNLTZZ6+Xy5QErBe9VY="; + hash = "sha256-9t5DOLZU2VcEBggirf+aLzwzsDBB+uGGXlBkIKP3HkE="; }; - vendorHash = "sha256-9BkcN4XLQPc9Df6m/CssKYxUk1nKJHB5SRPMrsXd+lQ="; + vendorHash = "sha256-CvxAP35/hinewnNhrW9urI0J3DI5QfZybbyRbz9Ol4s="; doCheck = false; From 57bc235f74cad67bbea5e6fff5d7bdffcd95b5c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 03:25:22 +0000 Subject: [PATCH 032/115] openrefine: 3.9.0 -> 3.9.1 --- pkgs/applications/science/misc/openrefine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index f9d4cd0fde4f..b15fdcf87311 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -10,12 +10,12 @@ }: let - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-793qKSo9/FVzchlHqQKSBF4MT3rJUv9xvf7YJBiQnZo="; + hash = "sha256-ClRjU9xGZLtLhjnvWrEVEojniVMpVNGyBu9bmEGqSDI="; }; npmPkg = buildNpmPackage { From e1e5def9946e80d7cda132dd0a3f136843958042 Mon Sep 17 00:00:00 2001 From: Charles Gardner <1515419+opsroller@users.noreply.github.com> Date: Wed, 19 Mar 2025 23:07:02 -0600 Subject: [PATCH 033/115] Revert "emacs: set `FD_SETSIZE` and `DARWIN_UNLIMITED_SELECT` on darwin" --- pkgs/applications/editors/emacs/make-emacs.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index e203a5fd3506..ef8a5d923822 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -460,13 +460,10 @@ mkDerivation (finalAttrs: { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths; } - // { - NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - # Fixes intermittent segfaults when compiled with LLVM >= 7.0. - # See https://github.com/NixOS/nixpkgs/issues/127902 - (lib.optionalString (variant == "macport") "-include ${./macport_noescape_noop.h}") - (lib.optionalString stdenv.hostPlatform.isDarwin "-DFD_SETSIZE=10000 -DDARWIN_UNLIMITED_SELECT") - ]; + // lib.optionalAttrs (variant == "macport") { + # Fixes intermittent segfaults when compiled with LLVM >= 7.0. + # See https://github.com/NixOS/nixpkgs/issues/127902 + NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}"; }; enableParallelBuilding = true; From 15fd26619edfa264c029344b005ccbe03ed1cf88 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 16 Jul 2024 01:22:03 +0200 Subject: [PATCH 034/115] python312Packages.pybind11-abseil: init at 202402.0 --- .../pybind11-abseil/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/pybind11-abseil/default.nix diff --git a/pkgs/development/python-modules/pybind11-abseil/default.nix b/pkgs/development/python-modules/pybind11-abseil/default.nix new file mode 100644 index 000000000000..de497d6eec18 --- /dev/null +++ b/pkgs/development/python-modules/pybind11-abseil/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + cmake, + abseil-cpp, + pybind11, + python, +}: + +buildPythonPackage rec { + pname = "pybind11-abseil"; + version = "202402.0"; + pyproject = false; + + src = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11_abseil"; + rev = "v${version}"; + hash = "sha256-hFVuGzEFqAEm2p2RmfhFtLB6qOqNuVNcwcLh8dIWi0k="; + }; + + patches = [ + (fetchpatch { + name = "pybind11_abseil.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11-abseil/pybind11_abseil.patch?rev=2"; + hash = "sha256-zwxCIhYMvexdSUmKM22OMBMEo0NRDgMtSVMDySFCn6U="; + }) + (fetchpatch { + name = "use-system-packages-if-possible.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11-abseil/use-system-packages-if-possible.patch?rev=2"; + hash = "sha256-CLHOSni2ej6ICtvMtBoCIpR9CNPPibwIS+hYbOCAwBE="; + }) + (fetchpatch { + name = "0001-Install-headers-and-CMake-development-files.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11-abseil/0001-Install-headers-and-CMake-development-files.patch?rev=2"; + hash = "sha256-TU9AzvF83aROY4gwys2ITOcdtjEm4x2IbhX4cHNWp0M="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + abseil-cpp + pybind11 + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_PYDIR" "${placeholder "out"}/${python.sitePackages}") + (lib.cmakeFeature "Python_EXECUTABLE" python.interpreter) + ]; + + meta = { + description = "Pybind11 bindings for the Abseil C++ Common Libraries"; + homepage = "https://github.com/pybind/pybind11_abseil"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91c1643f8a60..2e21198bb84d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11750,6 +11750,8 @@ self: super: with self; { pybind11 = callPackage ../development/python-modules/pybind11 { }; + pybind11-abseil = callPackage ../development/python-modules/pybind11-abseil { }; + pybind11-stubgen = callPackage ../development/python-modules/pybind11-stubgen { }; pybindgen = callPackage ../development/python-modules/pybindgen { }; From d3b2ce22eb05070557f8703d3dde4b08234e5360 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 16 Jul 2024 01:22:15 +0200 Subject: [PATCH 035/115] python312Packages.pybind11-protobuf: init at 0-unstable-2024-01-04 --- .../pybind11-protobuf/default.nix | 76 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/development/python-modules/pybind11-protobuf/default.nix diff --git a/pkgs/development/python-modules/pybind11-protobuf/default.nix b/pkgs/development/python-modules/pybind11-protobuf/default.nix new file mode 100644 index 000000000000..c8acae9e45b4 --- /dev/null +++ b/pkgs/development/python-modules/pybind11-protobuf/default.nix @@ -0,0 +1,76 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + cmake, + abseil-cpp_202301, + protobuf_23, + pybind11, +}: + +buildPythonPackage { + pname = "pybind11-protobuf"; + version = "0-unstable-2024-01-04"; + pyproject = false; + + src = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11_protobuf"; + rev = "3b11990a99dea5101799e61d98a82c4737d240cc"; + hash = "sha256-saeBxffAbDoHI/YvLatSubpdch9vb5DAfp/Bz3MC8ps="; + }; + + patches = [ + (fetchpatch { + name = "0001-Make-protobuf-python_api-fully-optional.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0001-Make-protobuf-python_api-fully-optional.patch?rev=1"; + hash = "sha256-gUeM/7R2kC5DaGKtot9AyG9CyCUHZt5s88dfEtj4b5E="; + }) + (fetchpatch { + name = "0002-Add-ENABLE_PYPROTO_API-option-to-CMake-build-clean-u.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0002-Add-ENABLE_PYPROTO_API-option-to-CMake-build-clean-u.patch?rev=1"; + hash = "sha256-2Wh8XxVXD/RBmkVP4XTJt8gCWrn/zII9h2Cjo6n6dI0="; + }) + (fetchpatch { + name = "0003-Make-the-pybind11_-_proto_caster-libraries-STATIC.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0003-Make-the-pybind11_-_proto_caster-libraries-STATIC.patch?rev=1"; + hash = "sha256-4sa3TD9qjEjHFhxZa/87fiWLJhehNYY2xc3i0jeSHeA="; + }) + (fetchpatch { + name = "0004-Fix-handling-of-external-dependencies-allow-forcing-.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0004-Fix-handling-of-external-dependencies-allow-forcing-.patch?rev=1"; + hash = "sha256-ifqOVU/Lzed+B+8rL6u12TjopA3iYPYDW05QV6W9SAQ="; + }) + (fetchpatch { + name = "0005-Build-and-run-the-test-cases.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0005-Build-and-run-the-test-cases.patch?rev=1"; + hash = "sha256-xTiTGS6AsXCJBcyno7IfQd7P7wH51XoeMCEiT6OcUUY="; + }) + (fetchpatch { + name = "0006-Add-install-target-for-CMake-builds.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0006-Add-install-target-for-CMake-builds.patch?rev=1"; + hash = "sha256-2gJgQGFMB7ihftv4vKEe+ES0wofwaCSzsQm3cAAzXrg="; + }) + (fetchpatch { + name = "0007-CMake-Use-Python-Module.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0007-CMake-Use-Python-Module.patch?rev=1"; + hash = "sha256-A1dhfh31FMBHBdCfoYmQrInZvO/DeuVMUL57PpUHYfA="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + abseil-cpp_202301 + protobuf_23 + pybind11 + ]; + + meta = { + description = "Pybind11 bindings for Google's Protocol Buffers"; + homepage = "https://github.com/pybind/pybind11_protobuf"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e21198bb84d..fbf0110b67ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11752,6 +11752,8 @@ self: super: with self; { pybind11-abseil = callPackage ../development/python-modules/pybind11-abseil { }; + pybind11-protobuf = callPackage ../development/python-modules/pybind11-protobuf { }; + pybind11-stubgen = callPackage ../development/python-modules/pybind11-stubgen { }; pybindgen = callPackage ../development/python-modules/pybindgen { }; From f44c8cc972f38af93edea6000059dfc6b5d4d1d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 18:55:38 +0000 Subject: [PATCH 036/115] rospo: 0.13.0 -> 0.14.0 --- pkgs/by-name/ro/rospo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/rospo/package.nix b/pkgs/by-name/ro/rospo/package.nix index 19300832cef1..5658c5854d74 100644 --- a/pkgs/by-name/ro/rospo/package.nix +++ b/pkgs/by-name/ro/rospo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "rospo"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ferama"; repo = "rospo"; rev = "v${version}"; - hash = "sha256-+1xrke8dfMkuZZ/imY+1KkeJnZCDtKJpxwAg5ksErnM="; + hash = "sha256-H6hZbOnX+1P1Ob5fCROQtV+64NiFD9mO3kiaQY63OBM="; }; - vendorHash = "sha256-MTPFBrLFMQ2hEwtSDb7t3ls/Wagw7s9/w6bwWjZ62vE="; + vendorHash = "sha256-KyTDyV27YQDqbEyKSYfbJuTKw2EsZAqWsHhmMncUHUs="; ldflags = [ "-s" From 6c1e5628daa157468cd2a97403f43a5da58e2525 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 19:00:08 +0000 Subject: [PATCH 037/115] qir-runner: 0.7.5 -> 0.7.6 --- pkgs/by-name/qi/qir-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qi/qir-runner/package.nix b/pkgs/by-name/qi/qir-runner/package.nix index 2d1270274f63..cfa1167666a4 100644 --- a/pkgs/by-name/qi/qir-runner/package.nix +++ b/pkgs/by-name/qi/qir-runner/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "qir-runner"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "qir-alliance"; repo = "qir-runner"; tag = "v${version}"; - hash = "sha256-65ioZ+7Xo4ocpFFVvwtY6Hn1FKuI48hcAfbAjPnSYEs="; + hash = "sha256-dvzvLm8omt4Uh/yTisaUcwuom0ZJnV6SwwFfbDNjHvM="; }; nativeBuildInputs = [ llvmPackages_19.llvm ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-ciQ6TFl+LNBVrIwhCdpzbaQz72W7EC5wj85PW29UV0M="; + cargoHash = "sha256-11+TV+7JLLvoWQIwgc4owUV4jNZcjD6S1uUwD8xWAEI="; meta = { description = "QIR bytecode runner to assist with QIR development and validation"; From c44a4b77c72f13b248dfe10ec02612efffd8eed2 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Thu, 20 Mar 2025 22:03:30 +0100 Subject: [PATCH 038/115] zeekstd: 0.2.2 -> 0.2.3 Changelog: https://github.com/rorosen/zeekstd/releases/tag/v0.2.3 --- pkgs/by-name/ze/zeekstd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zeekstd/package.nix b/pkgs/by-name/ze/zeekstd/package.nix index 40b283922f5d..424954b4823c 100644 --- a/pkgs/by-name/ze/zeekstd/package.nix +++ b/pkgs/by-name/ze/zeekstd/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "zeekstd"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "rorosen"; repo = "zeekstd"; tag = "v${finalAttrs.version}"; - hash = "sha256-Blyp5GpnytB3S4k6lp2fAwXueaUtXqPW+WLEmFNPZc0="; + hash = "sha256-URQ8UiCy8qnm0VM55BqPgIthR4AIyRk+fgowAFxvXwM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bbl0zHxd2HYkctX029mtxDciC2tnPVTlHxYyetmtuw0="; + cargoHash = "sha256-lS4RQuwvY6bRpsev7RI3XWBPbrdek5im/rkzP+Cmgpc="; meta = { description = "CLI tool that works with the zstd seekable format"; From 9916693ebcd5a78a6433e2b832c7599ef151dc19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 21:22:54 +0000 Subject: [PATCH 039/115] python312Packages.langchain-groq: 0.2.5 -> 0.3.1 --- pkgs/development/python-modules/langchain-groq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix index 838956215d24..212791cd9fed 100644 --- a/pkgs/development/python-modules/langchain-groq/default.nix +++ b/pkgs/development/python-modules/langchain-groq/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langchain-groq"; - version = "0.2.5"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-groq==${version}"; - hash = "sha256-TXmAaEOK2qNglNAa02M027NXmocsxFaQi3tUFdmFQUQ="; + hash = "sha256-kdqgX2fnagVL+W6dRJwnpngcJK2q4E4nk8r4+zIwPt4="; }; sourceRoot = "${src.name}/libs/partners/groq"; From f6d38c109d02ee81b176094fb03e4105a7673d79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 21:25:05 +0000 Subject: [PATCH 040/115] bpftune: 0-unstable-2025-03-07 -> 0-unstable-2025-03-20 --- pkgs/by-name/bp/bpftune/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bp/bpftune/package.nix b/pkgs/by-name/bp/bpftune/package.nix index c2ccdd2d2825..8f3ca13e6329 100644 --- a/pkgs/by-name/bp/bpftune/package.nix +++ b/pkgs/by-name/bp/bpftune/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-03-20"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "744bd48eccb536d6e9c782f635130dbf322e8a32"; - hash = "sha256-pjFqq5KeG1ptTEo8ENiqC/QkDPqQG4VPR2GDvcBPwH8="; + rev = "8c6a3ffc09265bd44ed89b75c400ef97959d1aff"; + hash = "sha256-TQ8WaGvMcvyeZC4B9gSjJ2k5NOxpTaV4n7Qi36aA78Q="; }; postPatch = '' From 63d43aae06082ab72beb9aff2198be76a3b080b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 22:04:40 +0000 Subject: [PATCH 041/115] awsbck: 0.3.10 -> 0.3.12 --- pkgs/tools/backup/awsbck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index f49f590a6e73..b43f46683510 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "awsbck"; - version = "0.3.10"; + version = "0.3.12"; src = fetchFromGitHub { owner = "beeb"; repo = "awsbck"; rev = "v${version}"; - hash = "sha256-6AJTNJ/vuRAMnkuOoBVmEAlJy18OZDWVr4OzFv9/oag="; + hash = "sha256-C5QaOxZ9DQuda+slf8uqPQYVgDtS5Lhm3AFn8K2G/T4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sr9E6AbgGibOhlg+LOuYL5ysd6gHDyKOAYJTwjrzl2E="; + cargoHash = "sha256-Pb4tnP8BiVTfUR1qM1dUXj9aCmdK23YYxQ4KQQc4z54="; # tests run in CI on the source repo doCheck = false; From 2039a03cc4b7e4e4f8268a41c32024ebd5f70df8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 22:15:05 +0000 Subject: [PATCH 042/115] protoc-gen-twirp_php: 0.12.0 -> 0.13.0 --- pkgs/by-name/pr/protoc-gen-twirp_php/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix b/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix index 7fb1401a37aa..db77baa2df36 100644 --- a/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix +++ b/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.12.0"; + version = "0.13.0"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - hash = "sha256-GDDycFWGrNXWdWNjGhb+W6kImF1nqVVH+dJ8VjYQ2MQ="; + hash = "sha256-Yn1oR69cHu/Q2HDRGzDNZ7RrTkNcwu4eFIrJFbmdhG0="; }; - vendorHash = "sha256-ErTXIbPKAFm8jBYRPuWSaCFbTS+5MPyto9edixbTR7E="; + vendorHash = "sha256-OjOHHXGWFX1K7berkc8vPXegdlr1QFFMPhRd0D5bK00="; subPackages = [ "protoc-gen-twirp_php" ]; From 5da404a5bdf6dcc61010dd7ff86ae967ff9ae7c5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 20 Mar 2025 02:24:27 +0100 Subject: [PATCH 043/115] webdav: 5.7.3 -> 5.7.4 changelog: https://github.com/hacdias/webdav/releases/tag/v5.7.4 --- pkgs/by-name/we/webdav/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 1e30d40a9776..ab060dce9ad7 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGo123Module }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGo123Module rec { +buildGoModule rec { pname = "webdav"; - version = "5.7.3"; + version = "5.7.4"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${version}"; - hash = "sha256-f/EYuaLuF9HuoC2S4JHjtgau2ZmOocRIAtxXqnUpUE8="; + hash = "sha256-f4Z5DiwrcF18ZSfDeSf1kwQIRmVNK4K5WrkQJYfquIs="; }; - vendorHash = "sha256-x5CUy46c4SunzMw/v2DWpdahuXFZnJdGInQ0lSho/es="; + vendorHash = "sha256-8M25/Pfu175CYsO+bvLN5wxT7OciUUt7iQV0BkezTVw="; __darwinAllowLocalNetworking = true; From a9af0ea660177f8a66a2d5d382257378fbf10c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 00:37:12 +0000 Subject: [PATCH 044/115] soft-serve: 0.8.2 -> 0.8.4 --- pkgs/by-name/so/soft-serve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index ce5b3a7d7597..9fded07e6228 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-eYe+F/1oiAshQeUQhpf8aUtmy1OWUL00F5SH6tV1NO0="; + hash = "sha256-pxwSgnT2AV/PFCxwnOPGKXmzBgX6CDOQA6GGdw8xv1Q="; }; - vendorHash = "sha256-DGlenK4CsxhoxtD87KeJYuKG/cpP3MuCCS+7Zlc4WUM="; + vendorHash = "sha256-9SbgujUUFVf092F/Gp/F3+Mcpd/SxMQBehw/nxHNWIY="; doCheck = false; From e3f1e70eaf55b86f18027810fac288f90f0b323d Mon Sep 17 00:00:00 2001 From: stove Date: Tue, 11 Mar 2025 21:54:12 -0700 Subject: [PATCH 045/115] mlir: emit libMLIR.so for not-static host platforms mlir piggybacks onto LLVM_BUILD_LLVM_DYLIB for determining if a shared libMLIR.so is emitted. This also fixes build failures in MLIR 20+ where tablegen'd files aren't generated. In file included from /build/mlir-src-21.0.0-unstable-2025-03-09/mlir/include/mlir/IR/UseDefLists.h:16, from /build/mlir-src-21.0.0-unstable-2025-03-09/mlir/include/mlir/IR/Value.h:17, from /build/mlir-src-21.0.0-unstable-2025-03-09/mlir/include/mlir/IR/BlockSupport.h:16, from /build/mlir-src-21.0.0-unstable-2025-03-09/mlir/include/mlir/IR/OperationSupport.h:18, from /build/mlir-src-21.0.0-unstable-2025-03-09/mlir/include/mlir/IR/Dialect.h:17, from /build/mlir-src-21.0.0-unstable-2025-03-09/mlir/tools/mlir-lsp-server/mlir-lsp-server.cpp:9: /build/mlir-src-21.0.0-unstable-2025-03-09/mlir/include/mlir/IR/Location.h:145:10: fatal error: mlir/IR/BuiltinLocationAttributes.h.inc: No such file or directory 145 | #include "mlir/IR/BuiltinLocationAttributes.h.inc" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. --- pkgs/development/compilers/llvm/common/mlir/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 8f2f28c72c65..04a0408d29b9 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { "-DLLVM_ENABLE_DUMP=ON" "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/llvm-tblgen" "-DMLIR_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/mlir-tblgen" + (lib.cmakeBool "LLVM_BUILD_LLVM_DYLIB" (!stdenv.hostPlatform.isStatic)) ] ++ lib.optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" From b663493de2f62eddce77c5a928f119ea3966cf14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 01:22:32 +0000 Subject: [PATCH 046/115] dpp: 10.1.1 -> 10.1.2 --- pkgs/by-name/dp/dpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dp/dpp/package.nix b/pkgs/by-name/dp/dpp/package.nix index 544c34beb13d..f23586466f76 100644 --- a/pkgs/by-name/dp/dpp/package.nix +++ b/pkgs/by-name/dp/dpp/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dpp"; - version = "10.1.1"; + version = "10.1.2"; src = fetchFromGitHub { owner = "brainboxdotcc"; repo = "DPP"; rev = "v${finalAttrs.version}"; - hash = "sha256-DHsHmAvL22aC4g5MzY2x793IKB9XHCDrNabQwIbfZn8="; + hash = "sha256-Xdd/ULMddwe0C9KHi0NxxRPotF66ljGH7WItJeexzkk="; }; nativeBuildInputs = [ From 0c2b974357e14a66558e5b9138ed831638cccb88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 01:51:32 +0000 Subject: [PATCH 047/115] python312Packages.pymodes: 2.19 -> 2.20 --- pkgs/development/python-modules/pymodes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymodes/default.nix b/pkgs/development/python-modules/pymodes/default.nix index 6576479e12eb..ce88dc8ba6cf 100644 --- a/pkgs/development/python-modules/pymodes/default.nix +++ b/pkgs/development/python-modules/pymodes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pymodes"; - version = "2.19"; + version = "2.20"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "junzis"; repo = "pyModeS"; tag = "v${version}"; - hash = "sha256-rVxqtT/sBFQM2Y+GPR2Tc5J2skavvjxwPB7paDBqYRQ="; + hash = "sha256-BC1GLQW0/UBVwx3346mZsXSREGeVS+GhqH2Rl2faUoY="; }; build-system = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Mode-S and ADS-B Decoder"; homepage = "https://github.com/junzis/pyModeS"; - changelog = "https://github.com/junzis/pyModeS/releases/tag/v${version}"; + changelog = "https://github.com/junzis/pyModeS/releases/tag/${src.tag}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ snicket2100 ]; }; From 35a1c6427c9cf4c06850596e7d487c5e983866ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 01:56:13 +0000 Subject: [PATCH 048/115] operator-sdk: 1.39.1 -> 1.39.2 --- pkgs/by-name/op/operator-sdk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index 713d10af36c4..aa409ccb1ea5 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.39.1"; + version = "1.39.2"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; tag = "v${version}"; - hash = "sha256-+lgpwpLkqpAZ0aScM62gk4l/h44auB7ixhW3ZoT7m64="; + hash = "sha256-2Kv6mDC1MndUgttRYODnI8DZ84RVz8jn3+RpXmOemq0="; }; - vendorHash = "sha256-3CtVl3HWUcbXp/U/pTqoCol4kmJqtLsTlcAijGHENtI="; + vendorHash = "sha256-W+q9K2003dJfcjyoN4YMoY98cwBy+nfZCi3tHNLbm1w="; nativeBuildInputs = [ makeWrapper From 42e6973f0243c2caba31590e9bd60c7c3c97a6a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 02:04:47 +0000 Subject: [PATCH 049/115] sexpp: 0.9.0 -> 0.9.1 --- pkgs/by-name/se/sexpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sexpp/package.nix b/pkgs/by-name/se/sexpp/package.nix index 608f044ceb5f..ddad2a21fe8f 100644 --- a/pkgs/by-name/se/sexpp/package.nix +++ b/pkgs/by-name/se/sexpp/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sexpp"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "rnpgp"; repo = "sexpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-mNt6J8nhzT5sF28ktl3jOkQMKn6x9iE04MMrwwVxyZs="; + hash = "sha256-T0DZPWGDg8lz9TrouD/T6i7W+Qj1UJzjnMchfTEQdEM="; }; buildInputs = [ From d57df9d4baee0e72edeeb5ffd5c25c80bd9227bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Mar 2025 03:12:32 +0100 Subject: [PATCH 050/115] spirv-llvm-translator: 14.0.0+unstable-2024-07-15 -> 14.0.0+unstable-2025-01-28 --- pkgs/by-name/sp/spirv-llvm-translator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix index 47b9544ee475..ab8f2b250df9 100644 --- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix +++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix @@ -49,9 +49,9 @@ let } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-07-15"; - rev = "2823e7052b7999c10fff63bc8089e5aa205716f4"; - hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4="; + version = "14.0.0+unstable-2025-01-28"; + rev = "9df26b6af308cb834a4013deb8094f386f29accd"; + hash = "sha256-8VRQwXFbLcYgHtWKs73yuTsy2kkCgYgPqD+W/GPy1BM="; } else if llvmMajor == "11" then { From d355071566ce1ff564f1fa3db919136ca2f5782f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Mar 2025 03:12:10 +0100 Subject: [PATCH 051/115] intel-graphics-compiler: 1.0.17384.11 ->2.8.3, minor cleanup --- .../in/intel-graphics-compiler/package.nix | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index 851e5bac3bb5..b8e63635ac24 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -22,24 +22,33 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.19.0"; - hash = "sha256-vOK7xfOR+aDpdGd8oOFLJc1Ct1S5BCJmLN6Ubn5wlkQ="; + rev = "v0.22.1"; + hash = "sha256-dSK+kNEZoF4bBx24S0No9aZLZiHK0U9TR1jRyEBL+2U="; }; inherit (llvmPackages_14) lld llvm; inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang; spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; -in + # Handholding the braindead build script + # cmake requires an absolute path + prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' + mkdir $out + ln -s ${clang}/bin/clang $out/ + ln -s ${opencl-clang}/lib/* $out/ + ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ + ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ + ''; +in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.17384.11"; + version = "2.8.3"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; - rev = "igc-${version}"; - hash = "sha256-O4uMaPauRv2aMgM2B7XdzCcjI5JghsjX5XbkeloLyck="; + tag = "v${version}"; + hash = "sha256-1YzvzVmMW5s4keQfa7r6xfyVg7RWSdKNgBtdTN6SADg="; }; postPatch = '' @@ -77,16 +86,6 @@ stdenv.mkDerivation rec { # testing is done via intel-compute-runtime doCheck = false; - # Handholding the braindead build script - # cmake requires an absolute path - prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' - mkdir $out - ln -s ${clang}/bin/clang $out/ - ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ - ''; - cmakeFlags = [ "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" "-DCCLANG_BUILD_PREBUILDS=ON" From 7615b18b2fdad13a35603258dcb9f6dc44661d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Mar 2025 03:10:06 +0100 Subject: [PATCH 052/115] intel-compute-runtime: 24.52.32224.5 -> 25.09.32961.5, minor cleanup --- .../by-name/in/intel-compute-runtime/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index bcccc4f6d899..ea453d6058f6 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.52.32224.5"; + version = "25.09.32961.5"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; - rev = version; - hash = "sha256-Unoh33bZFsMCqJ2hWEYVEdMF2V/aSIDynThz1pUyM7Q="; + tag = version; + hash = "sha256-oOafnYq4p0MubgsjV2kdW/pd7s0N5xmUnWVLg2JAIS8="; }; nativeBuildInputs = [ @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DSKIP_UNIT_TESTS=1" - "-DIGC_DIR=${intel-graphics-compiler}" - "-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors" + (lib.cmakeBool "SKIP_UNIT_TESTS" true) + (lib.cmakeFeature "IGC_DIR" (builtins.toString intel-graphics-compiler)) + (lib.cmakeFeature "OCL_ICD_VENDORDIR" "${placeholder "out"}/etc/OpenCL/vendors") # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX - "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ]; outputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer"; + description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer"; mainProgram = "ocloc"; homepage = "https://github.com/intel/compute-runtime"; changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}"; From 78f6e9b76638328f92dd91c5583ae4ce00995d7a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 20 Mar 2025 21:17:07 -0500 Subject: [PATCH 053/115] fastfetch: 2.39.0 -> 2.39.1 Changelog: https://github.com/fastfetch-cli/fastfetch/releases/tag/2.39.1 --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index d12fa778eb2a..f769b0a9966f 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.39.0"; + version = "2.39.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-2XuODYi3kC9d1rO1LFAdixS7SrrjTOgj+Tm3waMGa+M="; + hash = "sha256-7ukbYmfhfdjzooHA9J/AixfkZrzJZvnoHGg4z2jCZPI="; }; outputs = [ From 175dce9db81185d3cf3d3084b79fdf1b233da878 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 02:46:49 +0000 Subject: [PATCH 054/115] tflint-plugins.tflint-ruleset-google: 0.30.0 -> 0.31.0 --- .../tools/analysis/tflint-plugins/tflint-ruleset-google.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix index 07792ae475cb..71f0cc211e0c 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tflint-ruleset-google"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-eE1KSfbMbNuHlzEi7+zTRdxq548+pB8p01iIWoE2NAQ="; + hash = "sha256-DMFIJ0ywR2goHad3SvUSbj5w2057HJ4k0pNbiR/Y0pI="; }; - vendorHash = "sha256-nuucBbqS+D12JEPoS/QHHTcPKaTjsD4oxnVLDMmLwNA="; + vendorHash = "sha256-plXiB1MTesjg54s0JZGdyf1hR159LlaewJhhyK7raZY="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' From 772d506d9cafe125b80e541bf8c8a954810b65c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 04:18:43 +0000 Subject: [PATCH 055/115] python312Packages.amaranth-boards: 0-unstable-2025-02-07 -> 0-unstable-2025-03-18 --- pkgs/development/python-modules/amaranth-boards/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 82c530f3cd73..b312fa217331 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-boards"; - version = "0-unstable-2025-02-07"; + version = "0-unstable-2025-03-18"; pyproject = true; # from `pdm show` realVersion = @@ -22,10 +22,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "6e01882eefd62cf19f5740406144632fe2d21947"; + rev = "ba3b403a3391b5e306ba1ced61c3368839af61a6"; # these files change depending on git branch status postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; - hash = "sha256-U/+5v4wN+HfpWHnT9E9hf4XYpzqQQ7Tgq6Z09nEIBeE="; + hash = "sha256-mS3RHTWxGJIVvIVIMVDHeMxVqJyzwhlkO153+/H3WvA="; }; build-system = [ pdm-backend ]; From 6b711f432ec343d24922502912a2215c552bcbd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 07:22:43 +0000 Subject: [PATCH 056/115] kapp: 0.64.0 -> 0.64.1 --- pkgs/by-name/ka/kapp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kapp/package.nix b/pkgs/by-name/ka/kapp/package.nix index 55c7e578c6ab..dddd3d2958a8 100644 --- a/pkgs/by-name/ka/kapp/package.nix +++ b/pkgs/by-name/ka/kapp/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.64.0"; + version = "0.64.1"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kapp"; rev = "v${version}"; - hash = "sha256-+kSZERC14IimUa6rwG6u6gHWheCPnk840Sowlv3tm8Q="; + hash = "sha256-vgb4VtMKYncO4TPlMj2HrgZvjoOsOc2cYy+EBDKnGcM="; }; vendorHash = null; From aef59d4ff54f5da3697d6f74be89a02adb9d02be Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 16 Jul 2024 13:02:54 +0200 Subject: [PATCH 057/115] or-tools: 9.7 -> 9.9 --- .../science/math/or-tools/default.nix | 43 ++++++++----------- .../science/math/or-tools/offline.patch | 16 ------- pkgs/top-level/all-packages.nix | 11 ++--- 3 files changed, 23 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/or-tools/offline.patch diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 3c3fac71a1e4..496511252247 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -7,7 +7,7 @@ eigen, ensureNewerSourcesForZipFilesHook, fetchFromGitHub, - replaceVars, + fetchpatch, glpk, lib, pkg-config, @@ -20,28 +20,27 @@ zlib, }: -let - pybind11_protobuf = fetchFromGitHub { - owner = "pybind"; - repo = "pybind11_protobuf"; - rev = "b713501f1da56d9b76c42f89efd00b97c26c9eac"; - hash = "sha256-f6pzRWextH+7lm1xzyhx98wCIWH3lbhn59gSCcjsBVw="; - }; -in stdenv.mkDerivation rec { pname = "or-tools"; - version = "9.7"; + version = "9.9"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - hash = "sha256-eHukf6TbY2dx7iEf8WfwfWsjDEubPtRO02ju0kHtASo="; + hash = "sha256-Ip2mKl+MuzOPaF1a2FTubqT0tA4gzDnD8dR7dLaHHo8="; }; patches = [ - (replaceVars ./offline.patch { - pybind11_protobuf = "../../pybind11_protobuf"; + (fetchpatch { + name = "0001-Allow-to-use-pybind11-system-packages.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Allow-to-use-pybind11-system-packages.patch?rev=18"; + hash = "sha256-+hFgZt9G0EMpMMXA/qnHjOdk6+eIlgV6T0qu36s4Z/Y="; + }) + (fetchpatch { + name = "0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch?rev=18"; + hash = "sha256-vAjxUW1SjHRG2mpyjHjrAkyoix1BnGCxzvFDMzRp3Bk="; }) ]; @@ -49,16 +48,12 @@ stdenv.mkDerivation rec { # cross-compiling. Instead, just tell it where to find protoc. postPatch = '' echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake - - cp -R ${pybind11_protobuf} pybind11_protobuf - chmod -R u+w pybind11_protobuf ''; cmakeFlags = [ "-DBUILD_DEPS=OFF" "-DBUILD_PYTHON=ON" "-DBUILD_pybind11=OFF" - "-DBUILD_pybind11_protobuf=ON" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" @@ -95,6 +90,8 @@ stdenv.mkDerivation rec { glpk python.pkgs.absl-py python.pkgs.pybind11 + python.pkgs.pybind11-abseil + python.pkgs.pybind11-protobuf python.pkgs.pytest python.pkgs.scipy python.pkgs.setuptools @@ -107,20 +104,14 @@ stdenv.mkDerivation rec { protobuf (python.pkgs.protobuf4.override { protobuf = protobuf; }) python.pkgs.numpy + python.pkgs.pandas + python.pkgs.immutabledict ]; nativeCheckInputs = [ python.pkgs.matplotlib - python.pkgs.pandas python.pkgs.virtualenv ]; - env.NIX_CFLAGS_COMPILE = toString [ - # fatal error: 'python/google/protobuf/proto_api.h' file not found - "-I${protobuf.src}" - # fatal error: 'pybind11_protobuf/native_proto_caster.h' file not found - "-I${pybind11_protobuf}" - ]; - # some tests fail on linux and hang on darwin doCheck = false; @@ -149,7 +140,7 @@ stdenv.mkDerivation rec { description = '' Google's software suite for combinatorial optimization. ''; - mainProgram = "fzn-ortools"; + mainProgram = "fzn-cp-sat"; maintainers = with maintainers; [ andersk ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/development/libraries/science/math/or-tools/offline.patch b/pkgs/development/libraries/science/math/or-tools/offline.patch deleted file mode 100644 index 1a2a4dbe3631..000000000000 --- a/pkgs/development/libraries/science/math/or-tools/offline.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt -index af3a28c113..ba92c3c55e 100644 ---- a/cmake/dependencies/CMakeLists.txt -+++ b/cmake/dependencies/CMakeLists.txt -@@ -177,9 +177,8 @@ if(BUILD_PYTHON AND BUILD_pybind11_protobuf) - list(APPEND CMAKE_MESSAGE_INDENT " ") - FetchContent_Declare( - pybind11_protobuf -- GIT_REPOSITORY "https://github.com/pybind/pybind11_protobuf.git" -- GIT_TAG "main" -- PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch" -+ SOURCE_DIR @pybind11_protobuf@ -+ PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch" - ) - FetchContent_MakeAvailable(pybind11_protobuf) - list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 093dff485087..dffb731ff43f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16814,14 +16814,15 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { inherit (darwin) DarwinTools; - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; - protobuf = protobuf_23; - # or-tools builds with -std=c++20, so abseil-cpp must + protobuf = protobuf_25.override { + abseil-cpp = abseil-cpp_202401; + }; + # or-tools builds with -std=c++17, so abseil-cpp must # also be built that way - abseil-cpp = abseil-cpp_202301.override { + abseil-cpp = abseil-cpp_202401.override { static = true; - cxxStandard = "20"; + cxxStandard = "17"; }; }; From 56561382a60c15ad227ff689c05ebe5c6b4419f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 10:28:49 +0100 Subject: [PATCH 058/115] python312Packages.mcpadapt: init at 0.0.15 MCP servers tool https://github.com/grll/mcpadapt --- .../python-modules/mcpadapt/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/mcpadapt/default.nix diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix new file mode 100644 index 000000000000..26de74d821ca --- /dev/null +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + jsonref, + langchain, + langgraph, + llama-index, + mcp, + pytest-asyncio, + pytestCheckHook, + python-dotenv, + smolagents, +}: + +buildPythonPackage rec { + pname = "mcpadapt"; + version = "0.0.15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "grll"; + repo = "mcpadapt"; + tag = "v${version}"; + hash = "sha256-Cpm6jfdAyhMNc3bnDcF42G24VdStM2OpDTsGHS4IEMM="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + jsonref + mcp + python-dotenv + ]; + + optional-dependencies = { + langchain = [ + langchain + # langchain-anthropic + langgraph + ]; + llamaindex = [ llama-index ]; + }; + + pythonImportsCheck = [ "mcpadapt" ]; + + # Circular dependency smolagents + doCheck = false; + + meta = { + description = "MCP servers tool"; + homepage = "https://github.com/grll/mcpadapt"; + changelog = "https://github.com/grll/mcpadapt/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91c1643f8a60..02c83b6f8cdc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8226,6 +8226,8 @@ self: super: with self; { mcp = callPackage ../development/python-modules/mcp { }; + mcpadapt = callPackage ../development/python-modules/mcpadapt { }; + mcstatus = callPackage ../development/python-modules/mcstatus { }; mcuuid = callPackage ../development/python-modules/mcuuid { }; From a4359d6892b12539c04a9d28e70fbe7be4d43a3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 10:29:43 +0100 Subject: [PATCH 059/115] python313Packages.smolagents: 1.11.0 -> 1.12.0 Diff: https://github.com/huggingface/smolagents/compare/refs/tags/v1.11.0...v1.12.0 Changelog: https://github.com/huggingface/smolagents/releases/tag/vv1.12.0 --- pkgs/development/python-modules/smolagents/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index 678f2e9fb46a..61fa37b7f9c0 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -12,9 +12,11 @@ litellm, markdownify, mcp, + mcpadapt, openai, pandas, pillow, + pytest-datadir, pytestCheckHook, python-dotenv, rank-bm25, @@ -30,14 +32,14 @@ buildPythonPackage rec { pname = "smolagents"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "smolagents"; tag = "v${version}"; - hash = "sha256-6+fI5Zp2UyDgcCUXYT34zumDBqkIeW+TXnRNA+SFoxI="; + hash = "sha256-OgivL7L6IOqIEDHO3JUrxluMZoq768DD3hhUpIh1fac="; }; build-system = [ setuptools ]; @@ -68,7 +70,7 @@ buildPythonPackage rec { litellm = [ litellm ]; mcp = [ mcp - # mcpadapt + mcpadapt ]; # mlx-lm = [ mlx-lm ]; openai = [ openai ]; @@ -98,6 +100,7 @@ buildPythonPackage rec { nativeCheckInputs = [ ipython + pytest-datadir pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); From ad4666a73bba8c636555d21b3ae302c65b47927e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 09:55:57 +0000 Subject: [PATCH 060/115] matrix-alertmanager-receiver: 2025.3.5 -> 2025.3.19 --- pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index b6f0e14b0986..c3763b6fa674 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "matrix-alertmanager-receiver"; - version = "2025.3.5"; + version = "2025.3.19"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = version; - hash = "sha256-psA+tgykqnwB6Y1oQqqEQGNP4wLnEcelHF3dKFqKHtg="; + hash = "sha256-uNQU0E2QItXK5VCwFDC4tZZIIECXhas5SMSOTYj9zlo="; }; - vendorHash = "sha256-KsrDnnsLJV5bLVKeC3ytKdBCsEBWEbs9AciUjItwDwo="; + vendorHash = "sha256-u1oTutEEYZ79Ne27Tu4S5eDuUIlVamsFR2WR6O+giM8="; ldflags = [ "-s" From 92ec82a75c8d6a3bc4062c43edb03e4e3dbc2f81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 10:23:17 +0000 Subject: [PATCH 061/115] terraform-providers.sysdig: 1.47.0 -> 1.50.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 92474969a907..5b915167bcd6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1273,11 +1273,11 @@ "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "sysdig": { - "hash": "sha256-TzwrfI4P3C7jIm7LHk00IOrKXSfZ1MOTw/gq9vVtcHw=", + "hash": "sha256-2glf4p19Ni3gCsOXtRlty7bxGRE4RsEr/B2EuEC9S40=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.47.0", + "rev": "v1.50.0", "spdx": "MPL-2.0", "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s=" }, From 8e7f29cacca338fe3685948c2a15122a9203b592 Mon Sep 17 00:00:00 2001 From: Jan van Esdonk Date: Fri, 21 Mar 2025 11:42:23 +0100 Subject: [PATCH 062/115] bruno: 1.39.1 -> 1.40.0 --- pkgs/by-name/br/bruno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index cec8d5f38c60..2590dbd75854 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -17,20 +17,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "1.39.1"; + version = "1.40.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-WPbiQWfGE4rFxb/Xazxm+nu+RINLTQk7PnrLuY6giX0="; + hash = "sha256-8Uo3eGF555yoBQxpq1cF9JLK9jkYVMHG+6eFFX1NO3U="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-SIx2qIWqR1K9K2eUHo5tADdz4vk5ySdSWDBAjBFIVVc="; + npmDepsHash = "sha256-6L/SFdHykhBQgB7bi4w+y4Lc+uLIdM4WSmGS0H6Dz4U="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = From 648825e6720a9fabd49d0c1662e5db9a30afdf02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 10:56:32 +0000 Subject: [PATCH 063/115] q2pro: 0-unstable-2025-03-08 -> 0-unstable-2025-03-20 --- pkgs/by-name/q2/q2pro/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index 72f5706e52ae..c73d7a6e7d58 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "q2pro"; - version = "0-unstable-2025-03-08"; + version = "0-unstable-2025-03-20"; src = fetchFromGitHub { owner = "skullernet"; repo = "q2pro"; - rev = "700559cd4669c1e2f899a4eae869395c33dd4933"; - hash = "sha256-zJYEeVPyppVISjKC0L8zfjfoG0c8TjmSAML4gPryT0A="; + rev = "ef4001c596344aea179fc673a07de53fc0ab6a9d"; + hash = "sha256-PTNxh7UGKT1GZk8Rbub2l6EBLBy+n46AiS4BAyDALX8="; }; # build date and rev number is displayed in the game's console - revCount = "3697"; # git rev-list --count ${src.rev} - SOURCE_DATE_EPOCH = "1741434552"; # git show -s --format=%ct ${src.rev} + revCount = "3724"; # git rev-list --count ${src.rev} + SOURCE_DATE_EPOCH = "1742479264"; # git show -s --format=%ct ${src.rev} nativeBuildInputs = [ From 94ac2b7371a1b3b74f1df3b309c4a94d231f9284 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 11:11:29 +0000 Subject: [PATCH 064/115] basedmypy: 2.9.1 -> 2.10.0 --- pkgs/development/python-modules/basedmypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/basedmypy/default.nix b/pkgs/development/python-modules/basedmypy/default.nix index 725a2f545618..16bde590a3f7 100644 --- a/pkgs/development/python-modules/basedmypy/default.nix +++ b/pkgs/development/python-modules/basedmypy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "basedmypy"; - version = "2.9.1"; + version = "2.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "KotlinIsland"; repo = "basedmypy"; tag = "v${version}"; - hash = "sha256-0y7+9Bq/n53n2/s0yGG7IJ0UgTI3qbgrPKUOKpKFFf0="; + hash = "sha256-/43wVQoW/BbRD8j8Oypq5yz79ZTyAkLD4T8/aUg/QT8="; }; postPatch = '' From 499be959a3dc18e44421350352c8c7639644e489 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 12:37:56 +0100 Subject: [PATCH 065/115] python313Packages.reolink-aio: 0.12.2 -> 0.12.3 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.12.2...0.12.3 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.12.3 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 0f7f49721228..1f2128181618 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-js7+x5Ft3gBsycaUKTz7qDaPOlgOZmnmxmfHSVGy1cw="; + hash = "sha256-9Jw5utU81u+HTr9bvnYsBRPYdV6OnvfXuc5s9EsNsDU="; }; build-system = [ setuptools ]; From 502d1457d2d49f09e449c1f31544dc6ca4f20f34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 11:43:01 +0000 Subject: [PATCH 066/115] omnictl: 0.46.3 -> 0.47.1 --- pkgs/by-name/om/omnictl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 333d7f0c7875..de52df25d619 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.46.3"; + version = "0.47.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-pVi27A8U3+nDMMmVAV/7HXXXydWFxB8M/PiEJCnqdwo="; + hash = "sha256-/hv6YNaBfECFlf1xJCiSeWg+/PqmIa+Rtip6kFuHPCM="; }; - vendorHash = "sha256-5+15d7QcjajZ6yOSQgN4D0Lzy2Bljk0ih/KKG1SGtX8="; + vendorHash = "sha256-BQn+3TEaHnJrzDZt3j/sB9Gbh4mQXhqfX0ssu+G+mg0="; ldflags = [ "-s" From f2d042928ad2ff775324448e7882ec427f85f8f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 12:43:03 +0100 Subject: [PATCH 067/115] python313Packages.pychromecast: 14.0.5 -> 14.0.6 Diff: https://github.com/home-assistant-libs/pychromecast/compare/refs/tags/14.0.5...14.0.6 Changelog: https://github.com/home-assistant-libs/pychromecast/releases/tag/14.0.6 --- .../python-modules/pychromecast/default.nix | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index dba7ba778363..97b2b32ade17 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,38 +2,28 @@ lib, buildPythonPackage, casttube, - fetchPypi, + fetchFromGitHub, pythonOlder, protobuf, setuptools, - wheel, zeroconf, }: buildPythonPackage rec { pname = "pychromecast"; - version = "14.0.5"; + version = "14.0.6"; pyproject = true; disabled = pythonOlder "3.11"; - src = fetchPypi { - pname = "PyChromecast"; - inherit version; - hash = "sha256-qGce5OpKcJXi4GcOIhUUXsHj4KoHN/901kiuTcJosrE="; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "pychromecast"; + tag = version; + hash = "sha256-fyF/3F/K4bSOEepCArhK+v+W6tet82r1EW22g74mQlw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools~=65.6" "setuptools" \ - --replace-fail "wheel~=0.37.1" "wheel" \ - --replace-fail "protobuf>=4.25.1" "protobuf" - ''; - - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ casttube @@ -49,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Python to communicate with the Google Chromecast"; homepage = "https://github.com/home-assistant-libs/pychromecast"; - changelog = "https://github.com/home-assistant-libs/pychromecast/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/pychromecast/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; From fd257a8d4bed13b82028c3f8d7ee8880d54144f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 12:18:18 +0000 Subject: [PATCH 068/115] saucectl: 0.193.0 -> 0.194.0 --- pkgs/by-name/sa/saucectl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index 83c5640d3c67..2d2b0154802e 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.193.0"; + version = "0.194.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-f4OtXjqtqcMIIssXq5UjPX450Ji2objhOcgm82m52V0="; + hash = "sha256-Fetm/Qh6v+4UNBvhexf+mQMBBWUvlpisHOoExuqRunk="; }; ldflags = [ From 63515c7070e230f369c04c7c5cdd9404f3415fd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 13:30:02 +0100 Subject: [PATCH 069/115] python313Packages.garminconnect: relax garth --- pkgs/development/python-modules/garminconnect/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index cee048cbaa87..988f6427188c 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -23,7 +23,10 @@ buildPythonPackage rec { hash = "sha256-V+i+e1McE9YFVuq2fuQtD3RKTHw9u3u0bZ2zCi9yZCM="; }; - pythonRelaxDeps = [ "withings-sync" ]; + pythonRelaxDeps = [ + "garth" + "withings-sync" + ]; build-system = [ pdm-backend ]; From 5e8b447a3bf9d1059bd5227d58a4bf81531694b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 12:32:15 +0000 Subject: [PATCH 070/115] python312Packages.bidsschematools: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/bidsschematools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index af44375de93c..5ea063ff2359 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bidsschematools"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bidsschematools"; inherit version; - hash = "sha256-uEThihkXkC0SmFfnRmD1idA02jqI3JVZAUhWZjhWvfc="; + hash = "sha256-dEPJircy7RDRa1Q7lgUhgfj2ewVo1rsUu1A1mnSi6vw="; }; build-system = [ From 4f6ee0aef2ca8ebd973ad1b964bd1080c2742476 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 12:46:32 +0000 Subject: [PATCH 071/115] iio-sensor-proxy: 3.6 -> 3.7 --- pkgs/by-name/ii/iio-sensor-proxy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ii/iio-sensor-proxy/package.nix b/pkgs/by-name/ii/iio-sensor-proxy/package.nix index f726526d86a5..e8d95bba9f4e 100644 --- a/pkgs/by-name/ii/iio-sensor-proxy/package.nix +++ b/pkgs/by-name/ii/iio-sensor-proxy/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; - version = "3.6"; + version = "3.7"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "hadess"; repo = "iio-sensor-proxy"; rev = version; - hash = "sha256-X4vJ9zvMyYY9G7cslHMvXoexV/+39c9KctJBc+Ne114="; + hash = "sha256-MAfh6bgh39J5J3rlyPjyCkk5KcfWHMZLytZcBRPHaJE="; }; postPatch = '' From 323aae390e06a6ef93784cb6342ab9c17e523d24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 13:48:15 +0100 Subject: [PATCH 072/115] trufflehog: 3.88.17 -> 3.88.18 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.88.17...v3.88.18 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.88.18 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 5a44c7b401c3..38c5a3ac1d11 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.17"; + version = "3.88.18"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-Fx2p0ClkSd0PJycYQbwg0LjO6MN8fiFmVZGUPiaTtik="; + hash = "sha256-0STZXG7abx5viXhU2Zks1uiabNtL1ckoSH7foSn6WNw="; }; vendorHash = "sha256-mxmPvuOznYN3sjuCzuircQNtot9ntApS9ygKywLIVv4="; From bab5ac1b286c78266877cb1ec442b9d034561f31 Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 21 Mar 2025 21:58:38 +0900 Subject: [PATCH 073/115] python3Packages.pbs-installer: 2025.03.11 -> 2025.03.17 https://github.com/frostming/pbs-installer/compare/2025.03.11...2025.03.17 Signed-off-by: misilelab --- pkgs/development/python-modules/pbs-installer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 9627f6e55c2d..b80888595eac 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2025.03.11"; + version = "2025.03.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "frostming"; repo = "pbs-installer"; tag = version; - hash = "sha256-uf74Ry/VX7PpGiOsLXU6CBj40NX4b2aYfPQ4vU6nS0I="; + hash = "sha256-4SwbxTwl0DQjtYTxFMBg4p9aTyELNIOSRQw9fiweDhg="; }; build-system = [ pdm-backend ]; From c12f426e241c97e8f5eb9ae637368145c1246ddc Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 21 Mar 2025 22:00:37 +0900 Subject: [PATCH 074/115] python3Packages.unearth: 0.17.2 -> 0.17.3 https://github.com/frostming/unearth/releases/tag/0.17.3 Signed-off-by: misilelab --- pkgs/development/python-modules/unearth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 871023795233..6572eebdbb97 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.17.2"; + version = "0.17.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-C4oq/TR28athVfxXlQGsR//+Q1R9iKcOWlt2p/5sqiw="; + hash = "sha256-MulsnfY8VjoRjUEd+0+cZy8YGkEJd/Z2XA7UMLDTJ4Q="; }; build-system = [ pdm-backend ]; From 121235eecc5fdc5735191deefa11b9b34d4de915 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 13:03:59 +0000 Subject: [PATCH 075/115] tgpt: 2.9.1 -> 2.9.2 --- pkgs/by-name/tg/tgpt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix index 62bf5d675e83..68d7d188cfb5 100644 --- a/pkgs/by-name/tg/tgpt/package.nix +++ b/pkgs/by-name/tg/tgpt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tgpt"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; tag = "v${version}"; - hash = "sha256-6kJwJedFnALP4hpoaQ5DR/zN1KijgwFpYSBb1o+XCHw="; + hash = "sha256-LE6wwGEsqI/wfD21FiLpEo5fc7V0uGkN+hUPeAXCOZE="; }; vendorHash = "sha256-hPbvzhYHOxytQs3NkSVaZhFH0TbOlr4U/QiH+vemTrc="; From f67d44076051da8ccb2b5b0123dd9f6346a91197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 13:05:37 +0000 Subject: [PATCH 076/115] clap: 1.2.5 -> 1.2.6 --- pkgs/by-name/cl/clap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix index 57a76a0ad9e5..d7366c96a0a0 100644 --- a/pkgs/by-name/cl/clap/package.nix +++ b/pkgs/by-name/cl/clap/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-st8K6hmU2qa01qvHCe6NNnjXwx5k0ABZKZBjp5II7B8="; + hash = "sha256-QyIuuiwFg5DP2Ao/LOKYiBXxKHQ0FbFhssIIUnEQz+c="; }; postPatch = '' From 8e6931147ad70ccbf18804ee04958dbee7caad02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 13:05:53 +0000 Subject: [PATCH 077/115] fselect: 0.8.9 -> 0.8.10 --- pkgs/by-name/fs/fselect/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index fdfbea77693e..b01e0f8185cc 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-oZnA033/gKg5qppEvP+miNTTTwDpOlhUz8OOnKt5cx0="; + sha256 = "sha256-9JSyPNXiBMwPxhVWL5M6o/nnzDJv5MmWYqC1veinZuI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4NpyHcTJhLO0xeva/qcKE5WiS15hHvQ9HO8ENgplfvo="; + cargoHash = "sha256-cRF/drfdmUccb9Y/RKB3Bs748Y5dJUCgsFJxklAZB9Q="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; From b9fd1e9e5901d3028f032cfa1c6df0dc28f2e49b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 14:10:14 +0100 Subject: [PATCH 078/115] garmindb: relax garth and add pythonImportsCheck --- pkgs/by-name/ga/garmindb/package.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ga/garmindb/package.nix b/pkgs/by-name/ga/garmindb/package.nix index b7093d52b441..c5f19b89e90c 100644 --- a/pkgs/by-name/ga/garmindb/package.nix +++ b/pkgs/by-name/ga/garmindb/package.nix @@ -17,10 +17,18 @@ python3Packages.buildPythonApplication rec { hash = "sha256-JAUDAYf9CH/BxwV88ziF5Zy+3ibcbieEfHrZpHSU8m0="; }; - build-system = [ - python3Packages.setuptools + pythonRelaxDeps = [ + "sqlalchemy" + "cached-property" + "garth" + "tqdm" + "fitfile" + "tcxfile" + "idbutils" ]; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ sqlalchemy python-dateutil @@ -33,15 +41,6 @@ python3Packages.buildPythonApplication rec { tornado ]; - pythonRelaxDeps = [ - "sqlalchemy" - "cached-property" - "tqdm" - "fitfile" - "tcxfile" - "idbutils" - ]; - # require data files disabledTestPaths = [ "test/test_activities_db.py" @@ -64,9 +63,12 @@ python3Packages.buildPythonApplication rec { writableTmpDirAsHomeHook ]; + pythonImportsCheck = [ "garmindb" ]; + meta = { description = "Download and parse data from Garmin Connect or a Garmin watch"; homepage = "https://github.com/tcgoetz/GarminDB"; + changelog = "https://github.com/tcgoetz/GarminDB/releases/tag/${src.tag}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; From 30f26752ba7722128c35b45ce4dccdb14888759e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 13:28:51 +0000 Subject: [PATCH 079/115] lk-jwt-service: 0.2.0 -> 0.2.1 --- pkgs/by-name/lk/lk-jwt-service/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 2013f1a31d98..17d81b99859b 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lk-jwt-service"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; tag = "v${version}"; - hash = "sha256-dnlcJaGJqhFLrVvyU9hVwrE/r+wxknbnINSIfUDKC7I="; + hash = "sha256-R4YqmHp0i+RpJJkENJPZJDNCVg+O+70JMoCR8ZlesyM="; }; - vendorHash = "sha256-AGkwjzdTjfDA8K6ko24QSSxbTQeFGpu9sv5m8ZCmNJI="; + vendorHash = "sha256-evzltyQZCBQ4/k641sQrmUvw6yIBWFEic/WUa/WX5xE="; meta = with lib; { description = "Minimal service to issue LiveKit JWTs for MatrixRTC"; From a02a9354bdb8867e2d64b5c19361fe9f4775f554 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 13:40:54 +0000 Subject: [PATCH 080/115] ibus-engines.libpinyin: 1.16.0 -> 1.16.1 --- .../inputmethods/ibus-engines/ibus-libpinyin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 381bc7b4a0a4..02be20fad163 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ibus-libpinyin"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; tag = version; - hash = "sha256-aeyoBfl5x9Jo35vESMmLBbl72Qx5F3JwZHZaBr3c0Jk="; + hash = "sha256-lDwQjQepMTmsnGh/wreUfweT1xih/z3tiBPHaY+mBTI="; }; nativeBuildInputs = [ From 9b30ac5bec4fdd12c3cc20de081e9c902fc737e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 13:50:48 +0000 Subject: [PATCH 081/115] gci: 0.13.5 -> 0.13.6 --- pkgs/by-name/gc/gci/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gc/gci/package.nix b/pkgs/by-name/gc/gci/package.nix index 28eeee22e6cf..a4a587971c0e 100644 --- a/pkgs/by-name/gc/gci/package.nix +++ b/pkgs/by-name/gc/gci/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "gci"; - version = "0.13.5"; + version = "0.13.6"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jtDqaUko0So/VwY3NF5NyPFu1jxt4nIbUkJxILc+iTs="; + sha256 = "sha256-BlR7lQnp9WMjSN5IJOK2HIKXIAkn5Pemf8qbMm83+/w="; }; vendorHash = "sha256-/8fggERlHySyimrGOHkDERbCPZJWqojycaifNPF6MjE="; From ce9cfb39a1fa53f770110c3b01c23beb80b8a692 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 14:05:04 +0000 Subject: [PATCH 082/115] gdevelop: 5.5.225 -> 5.5.226 --- pkgs/by-name/gd/gdevelop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index 8109ecb2a89f..08b4444c0ba6 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -5,14 +5,14 @@ appimageTools, }: let - version = "5.5.225"; + version = "5.5.226"; pname = "gdevelop"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - sha256 = "sha256-ACNmO5hYfLEaJV6wntH4PZoHcB2T/+WFe2E5Ir/5c4U="; + sha256 = "sha256-58P/9QZOpk327gPM/gDLSchmuXpOR5kBf7U8xksFWUQ="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; From eea56c4c0845cec5072978adead979186229719b Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Fri, 14 Mar 2025 12:38:49 +0100 Subject: [PATCH 083/115] streamcontroller module: Add kdotools when using plasma Update nixos/modules/programs/streamcontroller.nix Co-authored-by: Sandro --- nixos/modules/programs/streamcontroller.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/streamcontroller.nix b/nixos/modules/programs/streamcontroller.nix index 2f85d37625c8..10298e491ff7 100644 --- a/nixos/modules/programs/streamcontroller.nix +++ b/nixos/modules/programs/streamcontroller.nix @@ -10,7 +10,14 @@ in { options.programs.streamcontroller = { enable = lib.mkEnableOption "StreamController"; - package = lib.mkPackageOption pkgs "streamcontroller" { default = [ "streamcontroller" ]; }; + package = lib.mkOption { + default = pkgs.streamcontroller.override { isKde = config.services.desktopManager.plasma6.enable; }; + defaultText = lib.literalExpression "pkgs.streamcontroller"; + type = lib.types.package; + description = '' + The StreamController package to use + ''; + }; }; config = lib.mkIf cfg.enable { From 4b8202da7bc5ebde462e9b84b293f0c2c6c7856d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 14:48:54 +0000 Subject: [PATCH 084/115] pueue: 3.4.1 -> 4.0.0 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 6e5d4a332d5f..8a3717a8eefc 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.4.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-b4kZ//+rO70uZh1fvI4A2dbCZ7ymci9g/u5keMBWYf8="; + hash = "sha256-TDxTj7VGzJzd6RWyVbe2ubpVS57bqq7OVvi23ZHmYDM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MDUBP1NI50I8sSXHYFiAdyL8C2DloCjnq8pr7PsBBIE="; + cargoHash = "sha256-R94D9/J+Zl86Rb4+5O2Hp9GmcwnRt+0wJ56CHFoy/zg="; nativeBuildInputs = [ From 7d7ab852b3d8c134efb1d639cc878e08a1f38e6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Mar 2025 23:14:31 +0000 Subject: [PATCH 085/115] python312Packages.lox: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/lox/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lox/default.nix b/pkgs/development/python-modules/lox/default.nix index 5cea402143a5..f127251e8ac1 100644 --- a/pkgs/development/python-modules/lox/default.nix +++ b/pkgs/development/python-modules/lox/default.nix @@ -12,22 +12,20 @@ buildPythonPackage rec { pname = "lox"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "BrianPugh"; repo = "lox"; tag = "v${version}"; - hash = "sha256-Iv3ZdfsvFLU6lhlH1n+eQ+KIrXESsnC1S2lVFnKFV08="; + hash = "sha256-I/+/wl+H3OLAN26qJVqyqgW72GoTddm59j2Y6fsz8AM="; }; build-system = [ setuptools ]; dependencies = [ pathos ]; - pythonRemoveDeps = [ "sphinx-rtd-theme" ]; - # setup.py requires pytest-runner for setuptools, which is wrong postPatch = '' substituteInPlace setup.py --replace-fail '"pytest-runner",' "" @@ -53,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Threading and Multiprocessing made easy"; - changelog = "https://github.com/BrianPugh/lox/releases/tag/v${version}"; + changelog = "https://github.com/BrianPugh/lox/releases/tag/${src.tag}"; homepage = "https://github.com/BrianPugh/lox"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.greg ]; From 0de051cd519fb69c66231a82a4fa6b4beeea1f8b Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Fri, 21 Mar 2025 17:37:54 +0100 Subject: [PATCH 086/115] appflowy: 0.8.6 -> 0.8.7 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.8.7 --- pkgs/by-name/ap/appflowy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index cbec3f98d2fd..d7f316ea540f 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-ODhN2Nu53nxzMNLsxlw/hSf6nLS7www6SXAyNeSOHmA="; + hash = "sha256-e0G7J2BRRC+2MMqpvu5BNnimS7RRTjRBgo/j1T9iYWU="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-ZVJjUHkzEjDbFottwGKi9fTfcMdebDqP0r9Wecwro+o="; + hash = "sha256-A9BCdYxeWPjCOZ/L0wYTVuqybLHfc1vsWWxAY7IJohw="; }; aarch64-darwin = x86_64-darwin; } @@ -30,7 +30,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.8.6"; + version = "0.8.7"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From cb9bd5e787c72550cc0a6aac683f9a1c20e07031 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Fri, 21 Mar 2025 09:15:29 -0400 Subject: [PATCH 087/115] forgejo: 10.0.1 -> 10.0.2 Changelog: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/10.0.2.md --- pkgs/by-name/fo/forgejo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index bfc56b506978..23f9dcd54ef8 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "10.0.1"; - hash = "sha256-JLy/edAkbsOqQTQqqoyxc0UX9fPnP8HD54IUzcsyGe4="; + version = "10.0.2"; + hash = "sha256-UxjhJA6o1LS/7/s0BzcaTSkXSsnKfjIMIjL6ASSot6k="; npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw="; - vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0="; + vendorHash = "sha256-ceV73QmxYEthjsA50ylojwC4dcTYAbE2UgxuxFqvi24="; lts = false; nixUpdateExtraArgs = [ "--override-filename" From e4b383b2a6c0b04e77e1c5062b4b96f4cecc19ec Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Fri, 21 Mar 2025 10:49:47 -0400 Subject: [PATCH 088/115] forgejo: remove SSH DSA test skips Tests are no longer valid now that https://codeberg.org/forgejo/forgejo/pulls/4833 is merged into 10.x and backported to 7.x --- pkgs/by-name/fo/forgejo/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 2a851e523d54..4e475c733c22 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -119,12 +119,11 @@ buildGoModule rec { checkFlags = let skippedTests = [ - "Test_SSHParsePublicKey/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time - "Test_calcFingerprint/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time "TestPassword" # requires network: api.pwnedpasswords.com "TestCaptcha" # requires network: hcaptcha.com "TestDNSUpdate" # requires network: release.forgejo.org "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS) + "TestURLAllowedSSH/Pushmirror_URL" # requires network git.gay (DNS) ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; From 923361458be3a9eb0dcb311dd2892bc3d7d2b065 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 20 Mar 2025 10:39:50 -0700 Subject: [PATCH 089/115] python312Packages.openai: 1.66.3 -> 1.68.2 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.66.3...v1.68.2 Changelog: https://github.com/openai/openai-python/blob/v1.68.2/CHANGELOG.md --- .../python-modules/openai/default.nix | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index c1cfc7c22bd6..476638d066ef 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -19,11 +19,17 @@ tqdm, typing-extensions, + # optional-dependencies (datalib) numpy, pandas, pandas-stubs, + + # optional-dependencies (realtime) websockets, + # optional-dependencies (voice-helpers) + sounddevice, + # check deps pytestCheckHook, dirty-equals, @@ -32,11 +38,15 @@ pytest-asyncio, pytest-mock, respx, + + # optional-dependencies toggle + withRealtime ? true, + withVoiceHelpers ? true, }: buildPythonPackage rec { pname = "openai"; - version = "1.66.3"; + version = "1.68.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,24 +55,31 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-T9ZW/93ovzJgLEjLgzp/4bPezONxqlYNFpe6U8a7q/A="; + hash = "sha256-TA+gr6cFGFlbAUqfgSbLFsoKdSZktPwk6DUfeq99PsM="; }; + postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; + build-system = [ hatchling hatch-fancy-pypi-readme ]; - dependencies = [ - anyio - distro - httpx - jiter - pydantic - sniffio - tqdm - typing-extensions - ] ++ optional-dependencies.realtime; + dependencies = + [ + anyio + distro + httpx + jiter + numpy + pydantic + sniffio + sounddevice + tqdm + typing-extensions + ] + ++ lib.optionals withRealtime optional-dependencies.realtime + ++ lib.optionals withVoiceHelpers optional-dependencies.voice-helpers; optional-dependencies = { datalib = [ @@ -73,6 +90,10 @@ buildPythonPackage rec { realtime = [ websockets ]; + voice-helpers = [ + numpy + sounddevice + ]; }; pythonImportsCheck = [ "openai" ]; From b0ad4b88ca534dd51b184bea0beb70fdee11e48b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 18:12:58 +0100 Subject: [PATCH 090/115] python313Packages.tencentcloud-sdk-python: 3.0.1343 -> 3.0.1344 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1343...3.0.1344 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1344/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 8120a74d4166..a7f291843a08 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1343"; + version = "3.0.1344"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-N6gpd1t9cCZkZLRabapzX7h2ui/rA01Gy9Lu138oADE="; + hash = "sha256-AB1ZNM0wMJPNhOdYGNAbk1Vjcx7Ir3kSqGcfkL0pIdw="; }; build-system = [ setuptools ]; From c8f305ccb7db783b5a747d3918aea3aac1c1679a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 21 Mar 2025 11:18:47 +0100 Subject: [PATCH 091/115] or-tools: 9.9 -> 9.11 --- .../science/math/or-tools/default.nix | 42 +++++++++++++------ .../pybind11-protobuf/default.nix | 37 +++------------- pkgs/top-level/all-packages.nix | 6 +-- 3 files changed, 38 insertions(+), 47 deletions(-) diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 496511252247..998ae934a397 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -9,6 +9,7 @@ fetchFromGitHub, fetchpatch, glpk, + highs, lib, pkg-config, protobuf, @@ -22,33 +23,47 @@ stdenv.mkDerivation rec { pname = "or-tools"; - version = "9.9"; + version = "9.11"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; - rev = "v${version}"; - hash = "sha256-Ip2mKl+MuzOPaF1a2FTubqT0tA4gzDnD8dR7dLaHHo8="; + tag = "v${version}"; + hash = "sha256-aRhUAs9Otvra7VPJvrf0fhDCGpYhOw1//BC4dFJ7/xI="; }; patches = [ (fetchpatch { - name = "0001-Allow-to-use-pybind11-system-packages.patch"; - url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Allow-to-use-pybind11-system-packages.patch?rev=18"; - hash = "sha256-+hFgZt9G0EMpMMXA/qnHjOdk6+eIlgV6T0qu36s4Z/Y="; + name = "0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch?rev=19"; + hash = "sha256-QHQ9E3mhTznJVKB+nP/9jct3uz+SPcOZ7w5tjOQ8iuk="; }) (fetchpatch { - name = "0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch"; - url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch?rev=18"; - hash = "sha256-vAjxUW1SjHRG2mpyjHjrAkyoix1BnGCxzvFDMzRp3Bk="; + name = "0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch?rev=19"; + hash = "sha256-BNB3KlgjpWcZtb9e68Jkc/4xC4K0c+Iisw0eS6ltYXE="; + }) + (fetchpatch { + name = "0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch?rev=19"; + hash = "sha256-r38ZbRkEW1ZvJb0Uf56c0+HcnfouZZJeEYlIK7quSjQ="; }) ]; # or-tools normally attempts to build Protobuf for the build platform when # cross-compiling. Instead, just tell it where to find protoc. - postPatch = '' - echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake - ''; + postPatch = + '' + echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake + '' + # Patches from OpenSUSE: + # https://build.opensuse.org/projects/science/packages/google-or-tools/files/google-or-tools.spec?expand=1 + + '' + sed -i -e '/CMAKE_DEPENDENT_OPTION(INSTALL_DOC/ s/BUILD_CXX AND BUILD_DOC/BUILD_CXX/' CMakeLists.txt + find . -iname \*CMakeLists.txt -exec sed -i -e 's/pybind11_native_proto_caster/pybind11_protobuf::pybind11_native_proto_caster/' '{}' \; + sed -i -e 's/TARGET pybind11_native_proto_caster/TARGET pybind11_protobuf::pybind11_native_proto_caster/' cmake/check_deps.cmake + sed -i -e "/protobuf/ { s/.*,/'protobuf >= 5.26',/ }" ortools/python/setup.py.in + ''; cmakeFlags = [ "-DBUILD_DEPS=OFF" @@ -101,8 +116,9 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ abseil-cpp + highs protobuf - (python.pkgs.protobuf4.override { protobuf = protobuf; }) + (python.pkgs.protobuf.override { protobuf = protobuf; }) python.pkgs.numpy python.pkgs.pandas python.pkgs.immutabledict diff --git a/pkgs/development/python-modules/pybind11-protobuf/default.nix b/pkgs/development/python-modules/pybind11-protobuf/default.nix index c8acae9e45b4..eef20b7c3744 100644 --- a/pkgs/development/python-modules/pybind11-protobuf/default.nix +++ b/pkgs/development/python-modules/pybind11-protobuf/default.nix @@ -11,50 +11,25 @@ buildPythonPackage { pname = "pybind11-protobuf"; - version = "0-unstable-2024-01-04"; + version = "0-unstable-2024-11-01"; pyproject = false; src = fetchFromGitHub { owner = "pybind"; repo = "pybind11_protobuf"; - rev = "3b11990a99dea5101799e61d98a82c4737d240cc"; - hash = "sha256-saeBxffAbDoHI/YvLatSubpdch9vb5DAfp/Bz3MC8ps="; + rev = "90b1a5b9de768340069c15b603d467c21cac5e0b"; + hash = "sha256-3OuwRP9MhxmcfeDx+p74Fz6iLqi9FXbR3t3BtafesKk="; }; patches = [ - (fetchpatch { - name = "0001-Make-protobuf-python_api-fully-optional.patch"; - url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0001-Make-protobuf-python_api-fully-optional.patch?rev=1"; - hash = "sha256-gUeM/7R2kC5DaGKtot9AyG9CyCUHZt5s88dfEtj4b5E="; - }) - (fetchpatch { - name = "0002-Add-ENABLE_PYPROTO_API-option-to-CMake-build-clean-u.patch"; - url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0002-Add-ENABLE_PYPROTO_API-option-to-CMake-build-clean-u.patch?rev=1"; - hash = "sha256-2Wh8XxVXD/RBmkVP4XTJt8gCWrn/zII9h2Cjo6n6dI0="; - }) - (fetchpatch { - name = "0003-Make-the-pybind11_-_proto_caster-libraries-STATIC.patch"; - url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0003-Make-the-pybind11_-_proto_caster-libraries-STATIC.patch?rev=1"; - hash = "sha256-4sa3TD9qjEjHFhxZa/87fiWLJhehNYY2xc3i0jeSHeA="; - }) - (fetchpatch { - name = "0004-Fix-handling-of-external-dependencies-allow-forcing-.patch"; - url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0004-Fix-handling-of-external-dependencies-allow-forcing-.patch?rev=1"; - hash = "sha256-ifqOVU/Lzed+B+8rL6u12TjopA3iYPYDW05QV6W9SAQ="; - }) - (fetchpatch { - name = "0005-Build-and-run-the-test-cases.patch"; - url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0005-Build-and-run-the-test-cases.patch?rev=1"; - hash = "sha256-xTiTGS6AsXCJBcyno7IfQd7P7wH51XoeMCEiT6OcUUY="; - }) (fetchpatch { name = "0006-Add-install-target-for-CMake-builds.patch"; - url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0006-Add-install-target-for-CMake-builds.patch?rev=1"; - hash = "sha256-2gJgQGFMB7ihftv4vKEe+ES0wofwaCSzsQm3cAAzXrg="; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0006-Add-install-target-for-CMake-builds.patch?rev=2"; + hash = "sha256-tjaOr6f+JCRft0SWd0Zfte7FEOYOP7RrW0Vjz34rX6I="; }) (fetchpatch { name = "0007-CMake-Use-Python-Module.patch"; - url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0007-CMake-Use-Python-Module.patch?rev=1"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0007-CMake-Use-Python-Module.patch?rev=2"; hash = "sha256-A1dhfh31FMBHBdCfoYmQrInZvO/DeuVMUL57PpUHYfA="; }) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dffb731ff43f..734850509691 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16815,12 +16815,12 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { inherit (darwin) DarwinTools; python = python3; - protobuf = protobuf_25.override { - abseil-cpp = abseil-cpp_202401; + protobuf = protobuf_26.override { + abseil-cpp = abseil-cpp_202407; }; # or-tools builds with -std=c++17, so abseil-cpp must # also be built that way - abseil-cpp = abseil-cpp_202401.override { + abseil-cpp = abseil-cpp_202407.override { static = true; cxxStandard = "17"; }; From cab256c8cd8283f4b1ef568295f675cab0d6ff21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 18:00:53 +0000 Subject: [PATCH 092/115] ckb-next: 0.6.1 -> 0.6.2 --- pkgs/tools/misc/ckb-next/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 4556bfdb2728..921e1094997e 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -21,14 +21,14 @@ }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - hash = "sha256-xOt+yvdrN6wBkvz1OfkdAPSz5F4qWg5kIgCw8JlXd10="; + hash = "sha256-lA1FpUee2SpUQwJotbYhG0QX7LT5l2PP9lJ9F3uNtdU="; }; buildInputs = [ From 782980423843c79eb642ae501988062e84b3a8b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 18:06:44 +0000 Subject: [PATCH 093/115] hydralauncher: 3.3.0 -> 3.3.1 --- pkgs/by-name/hy/hydralauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 439512157995..f4531c2c82e6 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-5F/RcsRKMAMfXaPOmEkqTrJ4Zgp0+sQ36kPj0p5VUa0="; + hash = "sha256-CscQnbMCK+dAWQacKIRwHl1Dqpau5+EyuH1pZhLrJ/Q="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From 6970756fb655948878f574ad55c1be60439a1036 Mon Sep 17 00:00:00 2001 From: Scott Edlund Date: Fri, 21 Mar 2025 22:50:26 +0700 Subject: [PATCH 094/115] nixos/homepage-dashboard: fix shellcheck SC2115 Error if variable is null or unset. --- nixos/modules/services/misc/homepage-dashboard.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index db21a57989ad..3a3bc8f6d60e 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -255,12 +255,14 @@ in Restart = "on-failure"; }; + enableStrictShellChecks = true; + preStart = '' # Related: # * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade") # * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state") # * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir") - rm -rf "$NIXPKGS_HOMEPAGE_CACHE_DIR"/* + rm -rf "''${NIXPKGS_HOMEPAGE_CACHE_DIR:?}"/* ''; }; From e0fcd272a1d3fe95a510040b5560b5ac833e3d2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 12:52:04 +0000 Subject: [PATCH 095/115] basex: 11.7 -> 11.8 --- pkgs/by-name/ba/basex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/basex/package.nix b/pkgs/by-name/ba/basex/package.nix index e73f2271a9fa..b52de9c4c210 100644 --- a/pkgs/by-name/ba/basex/package.nix +++ b/pkgs/by-name/ba/basex/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "11.7"; + version = "11.8"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${ builtins.replaceStrings [ "." ] [ "" ] version }.zip"; - hash = "sha256-4xeMdmfk6JmfetfDGlqKQYTMtf15vRGRKYRdyrC90Cc="; + hash = "sha256-bzRsKKwOWbXfgbJ51VX3ND9tf+CO3lpB10hw032oJyM="; }; nativeBuildInputs = [ From fed48c38522dee09daeb1ad3797224bd12172e3c Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 21 Mar 2025 14:14:10 -0400 Subject: [PATCH 096/115] errands: fix src hash Seems upstream force pushed this tag --- pkgs/by-name/er/errands/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix index efe54775925e..9070e0a778ff 100644 --- a/pkgs/by-name/er/errands/package.nix +++ b/pkgs/by-name/er/errands/package.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { owner = "mrvladus"; repo = "Errands"; tag = version; - hash = "sha256-zFI3+U40zzQL3lPPYwL/ekWA1ugOkORlJui4QT6pgQI="; + hash = "sha256-Gs3/DPMsoPTxH+fR7H3gPJr8ITrQDPlmw236vDnmBaA"; }; nativeBuildInputs = [ From 706797e8360a2eaf0d4f01c5c8b5b2abbecfc0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 21 Mar 2025 19:30:05 +0100 Subject: [PATCH 097/115] python3Packages.jeepney: nixfmt Otherwise CI is complaining that we regressed in this respect: https://github.com/NixOS/nixpkgs/actions/runs/13998071354/job/39198029124?pr=389579 --- .../python-modules/jeepney/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 6e36b3553650..2c03136b3372 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -28,16 +28,18 @@ buildPythonPackage rec { build-system = [ flit-core ]; - nativeCheckInputs = [ - dbus - pytest - pytest-trio - pytest-asyncio - testpath - trio - ] ++ lib.optionals (pythonOlder "3.11") [ - async-timeout - ]; + nativeCheckInputs = + [ + dbus + pytest + pytest-trio + pytest-asyncio + testpath + trio + ] + ++ lib.optionals (pythonOlder "3.11") [ + async-timeout + ]; checkPhase = '' runHook preCheck From 39e1e1c40b788675e52f9d9db756eda971943703 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 17 Mar 2025 18:52:42 -0400 Subject: [PATCH 098/115] turbo: use new repo url --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 9ed3a326b0bd..f01de7e53a1d 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "vercel"; - repo = "turbo"; + repo = "turborepo"; tag = "v${finalAttrs.version}"; hash = "sha256-tQ/Xocpk48eRhCyfRZx2rkAVqNn115rO3MRYF5fC2nI="; }; @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "High-performance build system for JavaScript and TypeScript codebases"; homepage = "https://turbo.build/"; - changelog = "https://github.com/vercel/turbo/releases/tag/${toString finalAttrs.src.tag}"; + changelog = "https://github.com/vercel/turborepo/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dlip From cdd78a3b6b09108b0558cf411f8fe5d7cd13787c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 18:38:34 +0000 Subject: [PATCH 099/115] youki: 0.5.2 -> 0.5.3 --- pkgs/by-name/yo/youki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix index 01d1da69a6f4..66aa0c0940cd 100644 --- a/pkgs/by-name/yo/youki/package.nix +++ b/pkgs/by-name/yo/youki/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "youki"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "containers"; repo = "youki"; rev = "v${version}"; - hash = "sha256-w8NCAjOLkb2vJYgtB5gAqvtNGnD/1TRc3KmoEygJNbQ="; + hash = "sha256-SFU7v5pefQkh751Ato4xkPqiEc/3++9hpwyNJjXwqMA="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-eSAXx/OKwIb1v684TNhVym5CM8tlkJzAFxT+1NCY7Yw="; + cargoHash = "sha256-nRlvvr73glmpFsWb2Pi1icZl7d85/8iX2rHnNXv4ep8="; meta = with lib; { description = "Container runtime written in Rust"; From 8bc16b7fa739b8d31bcdc97984e6cf20378910fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 19:24:48 +0000 Subject: [PATCH 100/115] mim-solvers: 0.0.5 -> 0.1.0 --- pkgs/by-name/mi/mim-solvers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix index 7bc0723a3044..2eeb9e166389 100644 --- a/pkgs/by-name/mi/mim-solvers/package.nix +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mim-solvers"; - version = "0.0.5"; + version = "0.1.0"; src = fetchFromGitHub { owner = "machines-in-motion"; repo = "mim_solvers"; rev = "v${finalAttrs.version}"; - hash = "sha256-XV8EJqCOTYqljZe2PQvnhIaPUOJ+bBjRIoshdeqZycA="; + hash = "sha256-jUL/kyXKODpcCURG7e7/qNarvwm4+EnzZRL2Wix5Jbs="; }; # eigenpy is not used without python support From bc096a77288f2d914b7b23a67aea342c64449ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Fri, 21 Mar 2025 20:25:47 +0100 Subject: [PATCH 101/115] python312Packages.dask-awkward: 2025.2.0 -> 2025.3.0 (#391900) Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2025.2.0...2025.3.0 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2025.3.0 --- .../python-modules/dask-awkward/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 8031a140ffbf..d639f09d883c 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -17,7 +17,6 @@ pyarrow, # tests - dask-histogram, distributed, hist, pandas, @@ -27,14 +26,14 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2025.2.0"; + version = "2025.3.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; tag = version; - hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M="; + hash = "sha256-z4dRGNoqwIEOwaz5U0DqCh/chZtopiLNvvvfl0bJxxI="; }; build-system = [ @@ -75,12 +74,6 @@ buildPythonPackage rec { "test_distance_behavior" ]; - disabledTestPaths = [ - # TypeError: Blockwise.__init__() got an unexpected keyword argument 'dsk' - # https://github.com/dask-contrib/dask-awkward/issues/557 - "tests/test_str.py" - ]; - __darwinAllowLocalNetworking = true; meta = { From 67cfd1ae2be4f467e77113205f28641897ce6e5a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 21 Mar 2025 23:36:43 +0400 Subject: [PATCH 102/115] dpp: enable on unix --- pkgs/by-name/dp/dpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dp/dpp/package.nix b/pkgs/by-name/dp/dpp/package.nix index f23586466f76..888b6e5bbd5e 100644 --- a/pkgs/by-name/dp/dpp/package.nix +++ b/pkgs/by-name/dp/dpp/package.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/brainboxdotcc/DPP/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ xbz ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) From 2e5a222c162e9003a72bc51680558f73cc5a8996 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 19:56:41 +0000 Subject: [PATCH 103/115] traefik-certs-dumper: 2.9.3 -> 2.10.0 --- pkgs/by-name/tr/traefik-certs-dumper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/traefik-certs-dumper/package.nix b/pkgs/by-name/tr/traefik-certs-dumper/package.nix index f86409a9e17c..521e56259ddb 100644 --- a/pkgs/by-name/tr/traefik-certs-dumper/package.nix +++ b/pkgs/by-name/tr/traefik-certs-dumper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "traefik-certs-dumper"; - version = "2.9.3"; + version = "2.10.0"; src = fetchFromGitHub { owner = "ldez"; repo = pname; rev = "v${version}"; - sha256 = "sha256-krJ2oPz72mqlmJxQTZaFbyDtUaprRLJGZMSS7ZuvPfA="; + sha256 = "sha256-zXbtabh5ZziELZHzvYisXETPUmhHAVo6sMuF4O3crBY="; }; - vendorHash = "sha256-CmqeIQk7lAENMDNWAG7XylnXRXvgyRN5GMt0ilwJX0U="; + vendorHash = "sha256-WpYxI+7qBYibojPtYlWmDrmJYlRlVwTaqCMI5Vzh1RI="; excludedPackages = "integrationtest"; meta = with lib; { From 80b31e734751d34eb31898b8fb1d7fdf64a0d992 Mon Sep 17 00:00:00 2001 From: Louis Thevenet Date: Thu, 20 Mar 2025 17:27:20 +0100 Subject: [PATCH 104/115] television: 0.10.9 -> 0.11.2 --- pkgs/by-name/te/television/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 37a0307f7ad2..d3007bb58fb0 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.10.9"; + version = "0.11.2"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = version; - hash = "sha256-R46r3S7zaogyVpdLGFIU1l6UDnRQ1lMZvd4RA6iq+qI="; + hash = "sha256-4iS11aBUxtEaWyfdIppdpGs5n8EzgOPEvpZsN+hXhfo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-teUJyLTUiSIbsMVOTj8/wBIimZOMDPQ/h6OryRsTJQ0="; + cargoHash = "sha256-KOvTCMdj6xtKZjqKHxPjts4dE3/TAUbUqv6ew8CYKPY="; passthru = { tests.version = testers.testVersion { From 59d1a60098be5b00e278b70d36c08205e8001eda Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 21 Mar 2025 13:16:45 -0700 Subject: [PATCH 105/115] python3.pkgs.ec2-metadata: init at 2.14.0 --- .../python-modules/ec2-metadata/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/ec2-metadata/default.nix diff --git a/pkgs/development/python-modules/ec2-metadata/default.nix b/pkgs/development/python-modules/ec2-metadata/default.nix new file mode 100644 index 000000000000..4b4dda87eb4f --- /dev/null +++ b/pkgs/development/python-modules/ec2-metadata/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + requests, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "ec2-metadata"; + version = "2.14.0"; + pyproject = true; + + src = fetchPypi { + pname = "ec2_metadata"; + inherit version; + hash = "sha256-svgzgXIgcu+ij2XcN+cmwKvToFMvIns/pqKtaEYMf+s="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + ]; + + pythonImportsCheck = [ + "ec2_metadata" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An easy interface to query the EC2 metadata API, with caching"; + homepage = "https://pypi.org/project/ec2-metadata/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._9999years ]; + mainProgram = "ec2-metadata"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2fbf6befdc7..85101e2b8574 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4138,6 +4138,8 @@ self: super: with self; { ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { }; + ec2-metadata = callPackage ../development/python-modules/ec2-metadata { }; + eccodes = toPythonModule (pkgs.eccodes.override { enablePython = true; pythonPackages = self; From 63e421982cd938db79f73b9882bc6500190bdad5 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 21 Mar 2025 13:22:17 -0700 Subject: [PATCH 106/115] python3.pkgs.pydantic-argparse-extensible: init at 1.3.6 --- .../pydantic-argparse-extensible/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pydantic-argparse-extensible/default.nix diff --git a/pkgs/development/python-modules/pydantic-argparse-extensible/default.nix b/pkgs/development/python-modules/pydantic-argparse-extensible/default.nix new file mode 100644 index 000000000000..61c89576fc45 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-argparse-extensible/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pydantic, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "pydantic-argparse-extensible"; + version = "1.3.6"; + pyproject = true; + + src = fetchPypi { + pname = "pydantic_argparse_extensible"; + inherit version; + hash = "sha256-DLE2eFrofCDcEPrn5g/mZlxNidVXThUumWV+u+yyvOI="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pydantic + ]; + + pythonImportsCheck = [ + "pydantic_argparse_extensible" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A typed wrapper around argparse using pydantic models"; + homepage = "https://pypi.org/project/pydantic-argparse-extensible"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._9999years ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2fbf6befdc7..8f75aceb5a6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11906,6 +11906,8 @@ self: super: with self; { pydantic_1 = callPackage ../development/python-modules/pydantic/1.nix { }; + pydantic-argparse-extensible = callPackage ../development/python-modules/pydantic-argparse-extensible { }; + pydantic-compat = callPackage ../development/python-modules/pydantic-compat { }; pydantic-core = callPackage ../development/python-modules/pydantic-core { }; From 52bdd0f8d0b65d361851e9c6571a75070a0455f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 09:58:33 +0000 Subject: [PATCH 107/115] python312Packages.pystache: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pystache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 226d172a95e2..12f2d672673b 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pystache"; - version = "0.6.7"; + version = "0.6.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PennyDreadfulMTG"; repo = "pystache"; tag = "v${version}"; - hash = "sha256-kfR3ZXbrCDrIVOh4bcOTXqg9D56YQrIyV0NthStga5U="; + hash = "sha256-UVmDpg7wCPnY+1BZqujIYdgt/AT4gZ+RTYdD+ORQhzE="; }; build-system = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Framework-agnostic, logic-free templating system inspired by ctemplate and et"; - homepage = "https://github.com/defunkt/pystache"; + homepage = "https://github.com/PennyDreadfulMTG/pystache"; license = lib.licenses.mit; maintainers = [ lib.maintainers.nickcao ]; }; From a9004e14aaf0569301ace8e58cdf94c928d2e5a5 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 21 Mar 2025 13:29:51 -0700 Subject: [PATCH 108/115] python3.pkgs.strip-ansi: init at 0.1.1 https://pypi.org/project/strip-ansi/ 77k monthly downloads: https://pypistats.org/packages/strip-ansi --- .../python-modules/strip-ansi/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/strip-ansi/default.nix diff --git a/pkgs/development/python-modules/strip-ansi/default.nix b/pkgs/development/python-modules/strip-ansi/default.nix new file mode 100644 index 000000000000..07c9c547cf5d --- /dev/null +++ b/pkgs/development/python-modules/strip-ansi/default.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchpatch, + buildPythonPackage, + fetchPypi, + poetry-core, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "strip-ansi"; + version = "0.1.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-XWDyOcyKN/3VK0PD5m6JPUW6BCMRXbWeyg0u74Owdyk="; + }; + + patches = [ + # Replace `poetry` with `poetry-core`. Unreleased. + # See: https://github.com/NixOS/nixpkgs/issues/103325 + (fetchpatch { + url = "https://github.com/gwennlbh/python-strip-ansi/commit/0ea9b418d5b21bd3d3b1b3b91fad7e66f25acb97.diff"; + hash = "sha256-Pzlc7fx4kEmM8pezu+8K7z5oV44uq/rzeByqKxHVKx0="; + }) + ]; + + build-system = [ + poetry-core + ]; + + pythonImportsCheck = [ + "strip_ansi" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Strip ANSI escape sequences from a string"; + homepage = "https://pypi.org/project/strip-ansi"; + # License is in the repository but not in PyPI metadata. + # See: https://github.com/gwennlbh/python-strip-ansi/blob/master/LICENSE + license = lib.licenses.mit; + maintainers = [ lib.maintainers._9999years ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2fbf6befdc7..6ab09a223353 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16100,6 +16100,8 @@ self: super: with self; { stringzilla = callPackage ../development/python-modules/stringzilla { }; + strip-ansi = callPackage ../development/python-modules/strip-ansi { }; + stripe = callPackage ../development/python-modules/stripe { }; striprtf = callPackage ../development/python-modules/striprtf { }; From ead39fa32847ba0623b9a32bdc33c4b347ba055d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Mar 2025 22:31:29 +0100 Subject: [PATCH 109/115] esphome: 2025.2.2 -> 2025.3.0 https://github.com/esphome/esphome/releases/tag/2025.3.0 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index dcf905f7b219..5c5420b7a169 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.2.2"; + version = "2025.3.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; tag = version; - hash = "sha256-UD+vpJ2hIWDNba2mEFLfhifujNCpjA33LCo4nyO+qBU="; + hash = "sha256-+KmWQPZok73DEs11C5wm5pQ6osy9SS9QNyaqBWsyulI="; }; build-systems = with python.pkgs; [ From 9b45dcfae4f61b20e0e2c1505373af3fef12f777 Mon Sep 17 00:00:00 2001 From: blenderfreaky Date: Thu, 20 Mar 2025 18:26:52 +0100 Subject: [PATCH 110/115] home-assistant-custom-components.lednetwf_ble: init at 0.0.14.2 --- .../lednetwf_ble/package.nix | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix new file mode 100644 index 000000000000..33b57159f978 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + bluetooth-sensor-state-data, + bleak-retry-connector, + bleak, + nix-update-script, +}: +let + version = "0.0.14.2"; +in +buildHomeAssistantComponent { + owner = "8none1"; + domain = "lednetwf_ble"; + inherit version; + + src = fetchFromGitHub { + owner = "8none1"; + repo = "lednetwf_ble"; + tag = "v.${version}"; + hash = "sha256-FgLUBCIYsmvrU8auraFVJ+hnl/p6KHpEeIWMT4KGJBM="; + }; + + dependencies = [ + bluetooth-sensor-state-data + bleak-retry-connector + bleak + ]; + + # Currently there are no tests run, so we skip + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Home Assistant custom integration for LEDnetWF devices"; + homepage = "https://github.com/8none1/lednetwf_ble"; + changelog = "https://github.com/8none1/lednetwf_ble/releases/tag/v.${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ blenderfreaky ]; + }; +} From be52d9e8c5fbecb4f0bfd4570682067bb8c650b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Mar 2025 22:44:04 +0100 Subject: [PATCH 111/115] evcc: 0.201.0 -> 0.201.1 https://github.com/evcc-io/evcc/releases/tag/0.201.1 --- pkgs/by-name/ev/evcc/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 029308c6633f..ebda1afcdba1 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.201.0"; + version = "0.201.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-Hw2TIMcKkeSUEKtTwJezCRMUvicrZUjT9UmTvDgKy2s="; + hash = "sha256-nsA/tJXRuL1Ql0N1OR5DeFjXI0PUtSa65hXH6C0Uxds="; }; - vendorHash = "sha256-zWHysXjBNAAZfrVGzn39pdDqQrLUc1uYVLO/U7q0g04="; + vendorHash = "sha256-NUDGqBmRL7L7/RDy68YG+nAz9Sj1Ink0tAbx9or/h1Q="; commonMeta = with lib; { license = licenses.mit; @@ -52,7 +52,7 @@ buildGo124Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-IOpT7YH85iHCK9UqKoomdKQBsPFm4MJ0bbEFbIIxVTc="; + hash = "sha256-iaQNLbbNvklSAEGAveOqStruL+LOpHdmGQqtERkagWU="; }; nativeBuildInputs = [ From 184fa3e038e611e3169fed6a43fc454f8b22bb9f Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 21 Mar 2025 15:33:43 -0700 Subject: [PATCH 112/115] hatch: fix build on darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Failing since e4b6440d7ca1649bb95bd59f39b2279db959e498, previously succeeding at 00769b0532199db4e1bda59865f00f3a86232c75. Possibly related to dependency versions: ``` $ nix-diff /nix/store/74dgxcwrwq83xrnk6fa76l293na95qz3-hatch-1.14.0.drv /nix/store/v659sh5rj1aqsl17nhqbmfsffw2f4rdv-hatch-1.14.0.drv - /nix/store/74dgxcwrwq83xrnk6fa76l293na95qz3-hatch-1.14.0.drv:{out} + /nix/store/v659sh5rj1aqsl17nhqbmfsffw2f4rdv-hatch-1.14.0.drv:{out} • The builders do not match - /nix/store/iv1k5wr7hbxm51qmdn6l2inq7rd2vfhk-bash-5.2p37/bin/bash + /nix/store/x7m765hh1m4yikg9spw18lxldddvdnd0-bash-5.2p37/bin/bash • The set of input derivation names do not match: - cargo-1.83.0 - git-2.47.1 - python3.12-binary-1.0.0 - python3.12-httpx-0.27.2 - python3.12-keyring-25.4.1 - python3.12-setuptools-75.3.0 - python3.12-virtualenv-20.26.6 + cargo-1.84.0 + git-2.47.2 + python3.12-binary-1.0.1 + python3.12-httpx-0.28.1 + python3.12-keyring-25.6.0 + python3.12-setuptools-75.8.0 + python3.12-virtualenv-20.29.1 ... ``` See: https://github.com/pypa/hatch/issues/1942 --- pkgs/by-name/ha/hatch/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 215d6a45f1d0..f862f8d4a095 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -140,6 +140,10 @@ python3Packages.buildPythonApplication rec { # '...2-macosx_14_0_arm64.whl' "test_macos_archflags" "test_macos_max_compat" + + # https://github.com/pypa/hatch/issues/1942 + "test_features" + "test_sync_dynamic_dependencies" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_resolve" ]; From ff345e3e058343965b5dfb7b2eba6c94a485d8ec Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 21 Mar 2025 22:42:04 +0100 Subject: [PATCH 113/115] python312Packages.azure-ai-vision-imageanalysis: fix meta attributes --- .../azure-ai-vision-imageanalysis/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix index 0c56ff666530..fe71a257941b 100644 --- a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix +++ b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix @@ -5,7 +5,7 @@ setuptools, azure-core, isodate, - pytestCheckHook, + typing-extensions, }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; - rev = "refs/tags/azure-ai-vision-imageanalysis_${version}"; + tag = "azure-ai-vision-imageanalysis_${version}"; hash = "sha256-Hkj9mrjCc8Li8z6e1BjpzANRVx6+DjN0MhTLANMT78E="; }; @@ -27,6 +27,7 @@ buildPythonPackage rec { dependencies = [ azure-core isodate + typing-extensions ]; pythonImportsCheck = [ "azure.ai.vision.imageanalysis" ]; @@ -34,9 +35,9 @@ buildPythonPackage rec { doCheck = false; # cannot import 'devtools_testutils' meta = { - homepage = "https://github.com/Kalmat/PyMonCtl"; - license = lib.licenses.bsd3; - description = "Cross-Platform toolkit to get info on and control monitors connected"; + description = "Azure Image Analysis client library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/vision/azure-ai-vision-imageanalysis"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; } From 4d17eb3cd3ae3431ca2e5f83c5285fc5eb745c12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 07:26:00 +0000 Subject: [PATCH 114/115] libwacom: 2.14.0 -> 2.15.0 --- pkgs/by-name/li/libwacom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix index ffd0ab1c8e35..79505191bcac 100644 --- a/pkgs/by-name/li/libwacom/package.nix +++ b/pkgs/by-name/li/libwacom/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libwacom"; - version = "2.14.0"; + version = "2.15.0"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${finalAttrs.version}"; - hash = "sha256-tJwLcHXXg4tFk7qKQyt+6dcDo8Qykqjn13MfXMoGvKc="; + hash = "sha256-fc7ymkyIJ5BvrPxJg7Vw1h1mBy+icr+5kVDecODxRLQ="; }; postPatch = '' From ee713e84122c3a84f48cebcbe87b4ab7565e8081 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 18:34:12 +0000 Subject: [PATCH 115/115] xdg-desktop-portal-gtk: 1.15.2 -> 1.15.3 --- pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix index 4db0badbdda0..2cc28e37711d 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gtk"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "flatpak"; repo = "xdg-desktop-portal-gtk"; rev = finalAttrs.version; - sha256 = "sha256-L9kt3HAoEezYARH5JekyXhxf9Xkbzy1U2srXD7Yg/a8="; + sha256 = "sha256-aeSm6Wd0EMaZb7tYpnKT/QBt9l/fVyQLgvn5aBqQOAc="; }; nativeBuildInputs = [