From 72d6393910239639d195cff7cf68e29914d1d88d Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 22 May 2025 17:48:00 -0400 Subject: [PATCH 01/48] wine: fix updateScript It looks like there was a recent change that breaks routing to download directories without a trailing slash. For example: > curl -s https://dl.winehq.org/wine/source/10.x NoSuchKeyThe specified key does not exist.wine/source/10.xAKNHP1J5C1T3RPE7aRh+/1HwSjshv35lm1saNkVC46nJtYFQmc6a2KxO5ZoKAuOVy4qgf6BE5aNz/UCZ/wa8UxIGlKmnRFFF6NSOQpXRoMttaaHhhsiczYeNfRc= > curl -s https://dl.winehq.org/wine/source/10.x/ WineHQ Downloads: /wine/source/10.x/ ... --- pkgs/applications/emulators/wine/update-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/wine/update-lib.sh b/pkgs/applications/emulators/wine/update-lib.sh index 8be264541579..addcb6d8c91e 100644 --- a/pkgs/applications/emulators/wine/update-lib.sh +++ b/pkgs/applications/emulators/wine/update-lib.sh @@ -20,7 +20,7 @@ set_version_and_hash() { } get_latest_wine_version() { - list-directory-versions --pname=wine --url="$wine_url_base/source/$1" | grep -v 'diff\|rc\|tar' | sort --reverse --version-sort -u | head -n 1 + list-directory-versions --pname=wine --url="$wine_url_base/source/$1/" | grep -v 'diff\|rc\|tar' | sort --reverse --version-sort -u | head -n 1 } get_latest_lib_version() { From 1968d347352ca0d7ed9ed6d6dcebc0c2cf4babb6 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Tue, 8 Jul 2025 11:48:27 -0400 Subject: [PATCH 02/48] python3Packages.flask-session2: init at 1.3.1 Signed-off-by: Ethan Carter Edwards --- .../python-modules/flask-session2/default.nix | 82 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/development/python-modules/flask-session2/default.nix diff --git a/pkgs/development/python-modules/flask-session2/default.nix b/pkgs/development/python-modules/flask-session2/default.nix new file mode 100644 index 000000000000..7a3457e97a47 --- /dev/null +++ b/pkgs/development/python-modules/flask-session2/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + cachelib, + flask, + pytz, + + # tests + elasticsearch, + flask-sqlalchemy, + peewee, + pymemcache, + pymongo, + pytestCheckHook, + redis, + redisTestHook, +}: + +buildPythonPackage rec { + pname = "flask-session2"; + version = "1.3.1"; + pyproject = true; + + __darwinAllowLocalNetworking = true; + + src = fetchFromGitHub { + owner = "christopherpickering"; + repo = "flask-session2"; + tag = "v${version}"; + hash = "sha256-kxUuEirUG/jZlygKyQy2Sm7hmB331K2q8vBmcIbp7/s="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + cachelib + flask + pytz + ]; + + pythonRelaxDeps = [ + "cachelib" + "flask" + "pytz" + ]; + + nativeCheckInputs = [ + elasticsearch + flask-sqlalchemy + peewee + pymemcache + pymongo + pytestCheckHook + redis + redisTestHook + ]; + + disabledTests = [ + "test_elasticsearch_session" + "test_flasksqlalchemy_session" + "test_flasksqlalchemy_session_with_signer" + "test_memcached_session" + "test_mongodb_session" + "test_session_use_signer" + ]; + + pythonImportsCheck = [ "flask_session" ]; + + meta = { + description = "Flask extension that adds support for server-side sessions"; + homepage = "https://github.com/christopherpickering/flask-session2"; + changelog = "https://github.com/christopherpickering/flask-session2/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a5fa59e59dc..e572ba0dc0c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5252,6 +5252,8 @@ self: super: with self; { flask-session-captcha = callPackage ../development/python-modules/flask-session-captcha { }; + flask-session2 = callPackage ../development/python-modules/flask-session2 { }; + flask-simpleldap = callPackage ../development/python-modules/flask-simpleldap { }; flask-sock = callPackage ../development/python-modules/flask-sock { }; From f94bff56841351f9eab5c8cb1b4f9d018c108389 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Jul 2025 01:14:41 +0000 Subject: [PATCH 03/48] enzyme: 0.0.184 -> 0.0.185 --- pkgs/by-name/en/enzyme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index a8942bafdb60..c47d88d4987f 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.184"; + version = "0.0.185"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-qLV21DlZpRrGobjqcpwNvm7J+gCi/2yj1eXKPbC/j8A="; + hash = "sha256-RRqjYdPVLPL6jlu491KqT/9P8uGESrsthAIdad4gckk="; }; postPatch = '' From 5b107e91be85b563de0638667452cfe29d1c2553 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Jul 2025 21:17:03 +0000 Subject: [PATCH 04/48] cato-client: 5.4.0.1006 -> 5.5.0.2620 --- pkgs/by-name/ca/cato-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cato-client/package.nix b/pkgs/by-name/ca/cato-client/package.nix index 44aa79563bb4..e8a3398bb8c6 100644 --- a/pkgs/by-name/ca/cato-client/package.nix +++ b/pkgs/by-name/ca/cato-client/package.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation rec { pname = "cato-client"; - version = "5.4.0.1006"; + version = "5.5.0.2620"; src = fetchurl { url = "https://clients.catonetworks.com/linux/${version}/cato-client-install.deb"; - sha256 = "sha256-3RyiDgfWL4vA/pUyOigmuK+SV1Q96Y65HVERPeadWWY="; + sha256 = "sha256-V1BhgLOHP/pGlwvjVFdNslKupjHBVSTDVIRtZ6amwbk="; }; passthru.updateScript = writeScript "update-cato-client" '' From 22665bce7a43d5a57c38b34b495bba74d9d7675c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 15 Jul 2025 20:40:38 +0200 Subject: [PATCH 05/48] nixos/msmtp: add package option --- nixos/modules/programs/msmtp.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/msmtp.nix b/nixos/modules/programs/msmtp.nix index 11faf345388e..258f0ddabe41 100644 --- a/nixos/modules/programs/msmtp.nix +++ b/nixos/modules/programs/msmtp.nix @@ -16,6 +16,8 @@ in programs.msmtp = { enable = lib.mkEnableOption "msmtp - an SMTP client"; + package = lib.mkPackageOption pkgs "msmtp" { }; + setSendmail = lib.mkOption { type = lib.types.bool; default = true; @@ -75,11 +77,11 @@ in }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.msmtp ]; + environment.systemPackages = [ cfg.package ]; services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail { program = "sendmail"; - source = "${pkgs.msmtp}/bin/sendmail"; + source = "${cfg.package}/bin/sendmail"; setuid = false; setgid = false; owner = "root"; From 89229d91d5b7cd4df9a2c422c4a011ad3bb80392 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Jul 2025 19:43:49 +0000 Subject: [PATCH 06/48] python3Packages.databricks-sdk: 0.57.0 -> 0.58.0 --- pkgs/development/python-modules/databricks-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 1b5325ec8400..62a6a174130c 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.57.0"; + version = "0.58.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-QdqbUq2kzrP614BWIMdWAIKsVdXIG89BmLlh+Po98zI="; + hash = "sha256-MWv+gNueH+Docz19YVhTNOW8e5KEPrI91eUE+UGRUwg="; }; build-system = [ From f68224a5d4386c516cfdd540f9a07951958729de Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 17 Jul 2025 23:12:31 +0200 Subject: [PATCH 07/48] invidious: remove pbsds from maintainers I originally added as a maintainer to get updates merged quickly. I don't use this anymore however and I am not even updated on how to set it up properly with the circumventions needed now for youtube not to block it. --- pkgs/by-name/in/invidious/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index 6157e59d01da..d9befb33be44 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -137,7 +137,6 @@ crystal.buildCrystalPackage rec { _999eagle GaetanLepage sbruder - pbsds ]; }; } From 3d9c7c0e5f200579f2d54b0652209af84e49c329 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Fri, 18 Jul 2025 12:28:17 +0200 Subject: [PATCH 08/48] grafanaPlugins.grafana-metricsdrilldown-app: fix maintainer entry --- .../grafana/plugins/grafana-metricsdrilldown-app/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index 91d3f474316d..37653f3e89a7 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -7,7 +7,7 @@ grafanaPlugin { meta = with lib; { description = "The Grafana Metrics Drilldown app provides a queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries."; license = licenses.agpl3Only; - teams = [ lib.maintainers.marcel ]; + maintainers = [ lib.maintainers.marcel ]; platforms = platforms.unix; }; } From ea1d022ab9fddf5c057a0d3ae3a9782e018c1769 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 18 Jul 2025 14:42:12 +0200 Subject: [PATCH 09/48] atuin: add myself as maintainer --- pkgs/by-name/at/atuin/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index bf01919a04d5..5f86322a5837 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -70,6 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: { SuperSandro2000 sciencentistguy _0x4A6F + rvdp ]; mainProgram = "atuin"; }; From 25ad44bc34c7b5ed482d814abf3861ca5343fbaa Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 18 Jul 2025 12:39:11 +0000 Subject: [PATCH 10/48] atuin: 18.6.1 -> 18.7.1 --- pkgs/by-name/at/atuin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index 5f86322a5837..cb883eafad3a 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin"; - version = "18.6.1"; + version = "18.7.1"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; tag = "v${finalAttrs.version}"; - hash = "sha256-aRaUiGH2CTPtmbfrtLlNfoQzQWG817eazWctqwRlOCE="; + hash = "sha256-KHATm505ysJAIGCd2UvkMEIFhp7huPYW5ly+jq1HLdc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-umagQYzOMr3Jh1RewjT0aX5FpYxs9N/70NZXoGaAfi4="; + cargoHash = "sha256-ZzMNU3FqD4bD96gEXaTphuM7MqRBBSYZTxIJSNtw+EI="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. From f61f0e75aec3034603e00e0b3ae16018f812bdd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Jul 2025 17:41:52 +0000 Subject: [PATCH 11/48] python3Packages.spsdk-mcu-link: 0.6.4 -> 0.6.5 --- pkgs/development/python-modules/spsdk-mcu-link/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spsdk-mcu-link/default.nix b/pkgs/development/python-modules/spsdk-mcu-link/default.nix index 7d0547d8203f..7ead54be3dd7 100644 --- a/pkgs/development/python-modules/spsdk-mcu-link/default.nix +++ b/pkgs/development/python-modules/spsdk-mcu-link/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "spsdk-mcu-link"; - version = "0.6.4"; + version = "0.6.5"; pyproject = true; # Latest tag missing on GitHub src = fetchPypi { pname = "spsdk_mcu_link"; inherit version; - hash = "sha256-9PI/h40vUbdvIRIfITo1b6bB+FyT1CS0F8ygx0IgQKI="; + hash = "sha256-rjPmMKmRs3+wtH4aWvGiA1NNVteytbH4bx5ihJ5BkMc="; }; build-system = [ From 4f0bc94fcc9d219d6a237a2b7b8cdd7e48a82f52 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sat, 19 Jul 2025 02:04:31 +0800 Subject: [PATCH 12/48] python3Packages.docling-jobkit: init at 1.1.0 --- .../python-modules/docling-jobkit/default.nix | 108 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 110 insertions(+) create mode 100644 pkgs/development/python-modules/docling-jobkit/default.nix diff --git a/pkgs/development/python-modules/docling-jobkit/default.nix b/pkgs/development/python-modules/docling-jobkit/default.nix new file mode 100644 index 000000000000..53ef19db014a --- /dev/null +++ b/pkgs/development/python-modules/docling-jobkit/default.nix @@ -0,0 +1,108 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + poetry-core, + + # dependencies + docling, + pydantic-settings, + typer, + boto3, + pandas, + fastparquet, + pyarrow, + httpx, + + # optional dependencies + tesserocr, + rapidocr-onnxruntime, + onnxruntime, + ray, + + # tests + pytestCheckHook, + pytest-asyncio, + writableTmpDirAsHomeHook, + + # options + withTesserocr ? false, + withRapidocr ? false, + withRay ? false, +}: + +buildPythonPackage rec { + pname = "docling-jobkit"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "docling-project"; + repo = "docling-jobkit"; + tag = "v${version}"; + hash = "sha256-V+Sc/eEuv0Q3q/wjGpkraD6ZR4Kfhorc3meg7fy0LTA="; + }; + + build-system = [ + hatchling + poetry-core + ]; + + dependencies = + [ + docling + pydantic-settings + typer + boto3 + pandas + fastparquet + pyarrow + httpx + ] + ++ lib.optionals withTesserocr optional-dependencies.tesserocr + ++ lib.optionals withRapidocr optional-dependencies.rapidocr + ++ lib.optionals withRay optional-dependencies.ray; + + optional-dependencies = { + tesserocr = [ tesserocr ]; + rapidocr = [ + rapidocr-onnxruntime + onnxruntime + ]; + ray = [ ray ]; + }; + + pythonRelaxDeps = [ + "boto3" + "pyarrow" + ]; + + pythonImportsCheck = [ + "docling" + "docling_jobkit" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # requires network access + "test_convert_url" + "test_convert_file" + "test_convert_warmup" + ]; + + meta = { + changelog = "https://github.com/docling-project/docling-jobkit/blob/${src.tag}/CHANGELOG.md"; + description = "Running a distributed job processing documents with Docling"; + homepage = "https://github.com/docling-project/docling-jobkit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ codgician ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d231cd21957d..bd6d682fd308 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4192,6 +4192,8 @@ self: super: with self; { docling-ibm-models = callPackage ../development/python-modules/docling-ibm-models { }; + docling-jobkit = callPackage ../development/python-modules/docling-jobkit { }; + docling-parse = callPackage ../development/python-modules/docling-parse { loguru-cpp = pkgs.loguru; }; From 50d128bee65175c95fb8e5175d348f03bd39bc05 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sat, 19 Jul 2025 02:04:44 +0800 Subject: [PATCH 13/48] python3Packages.scalar-fastapi: init at 1.2.2 --- .../python-modules/scalar-fastapi/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/scalar-fastapi/default.nix diff --git a/pkgs/development/python-modules/scalar-fastapi/default.nix b/pkgs/development/python-modules/scalar-fastapi/default.nix new file mode 100644 index 000000000000..b6c4791faab2 --- /dev/null +++ b/pkgs/development/python-modules/scalar-fastapi/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # python dependencies + annotated-types, + anyio, + fastapi, + idna, + pydantic, + sniffio, + starlette, + typing-extensions, + + # tests + pytestCheckHook, + httpx, +}: + +buildPythonPackage rec { + pname = "scalar-fastapi"; + version = "1.2.2"; + pyproject = true; + + src = fetchPypi { + pname = "scalar_fastapi"; + inherit version; + hash = "sha256-r5GoX6f7Ru078WcRvGNyhyYDxL1w4yjbfHvlf+ZF/sc="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + annotated-types + anyio + fastapi + idna + pydantic + sniffio + starlette + typing-extensions + ]; + + pythonImportsCheck = [ + "scalar_fastapi" + ]; + + nativeCheckInputs = [ + pytestCheckHook + httpx + ]; + + meta = { + description = "A plugin for FastAPI to render a reference for your OpenAPI document"; + homepage = "https://github.com/scalar/scalar/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ codgician ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd6d682fd308..1f15efa5402c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15951,6 +15951,8 @@ self: super: with self; { sbom4files = callPackage ../development/python-modules/sbom4files { }; + scalar-fastapi = callPackage ../development/python-modules/scalar-fastapi { }; + scalene = callPackage ../development/python-modules/scalene { }; scales = callPackage ../development/python-modules/scales { }; From b23150849557b034c7f1e5ed15ed1ad9617f3efe Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Tue, 15 Jul 2025 23:50:57 +0200 Subject: [PATCH 14/48] python313Packages.colcon: fixed spellchecking test --- pkgs/development/python-modules/colcon/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colcon/default.nix b/pkgs/development/python-modules/colcon/default.nix index 1c6c0cc37be0..8c53dc78bfed 100644 --- a/pkgs/development/python-modules/colcon/default.nix +++ b/pkgs/development/python-modules/colcon/default.nix @@ -15,7 +15,10 @@ pytest-cov-stub, pytest-repeat, pytest-rerunfailures, + scspell, + writableTmpDirAsHomeHook, }: + buildPythonPackage rec { pname = "colcon-core"; version = "0.19.0"; @@ -43,12 +46,15 @@ buildPythonPackage rec { pytest-cov-stub pytest-repeat pytest-rerunfailures + scspell + writableTmpDirAsHomeHook ]; disabledTestPaths = [ - # Skip the linter and spell check tests that require additional dependencies + # Skip the linter tests that require additional dependencies "test/test_flake8.py" - "test/test_spell_check.py" + # Skip failing Python build tests + "test/test_build_python.py" ]; pythonImportsCheck = [ "colcon_core" ]; From 35eee85f37a9131efa5f2e6ae034514462235d81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Jul 2025 23:57:07 +0000 Subject: [PATCH 15/48] hoppscotch: 25.6.0-0 -> 25.6.1-0 --- pkgs/by-name/ho/hoppscotch/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index 58261780e4ef..a2131630f979 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,22 +8,22 @@ let pname = "hoppscotch"; - version = "25.6.0-0"; + version = "25.6.1-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-QeI8BmEJOdzi7eonsLtF4SQaah8LJS+cee5pBbWuHBI="; + hash = "sha256-pQAG8jRObTaYOBKgHRydq1ilO7O5nweZSoT70wdcUfA="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-4CIU+aFo50E1uMWIR1dA6tNCY1qKiMHnBRkGK5x3Ljg="; + hash = "sha256-pRaBphPcWfCgYE03kth4EeFI4mroSHg4r1mmwQDKhLg="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-+jtDamZaRzBcfrRdlWBqqJlTYfOF0KpunuruBVuSS3Y="; + hash = "sha256-dwjHUBZs9XQMmTfxUrbqgb/7lm+xPTeVO+VCX9wBFK8="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 74b3c0e35013fda4063f6c134b3076e61283c18b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 00:28:56 +0000 Subject: [PATCH 16/48] gitolite: 3.6.13 -> 3.6.14 --- pkgs/by-name/gi/gitolite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitolite/package.nix b/pkgs/by-name/gi/gitolite/package.nix index 79b5169df336..1b6f70024d9a 100644 --- a/pkgs/by-name/gi/gitolite/package.nix +++ b/pkgs/by-name/gi/gitolite/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gitolite"; - version = "3.6.13"; + version = "3.6.14"; src = fetchFromGitHub { owner = "sitaramc"; repo = "gitolite"; rev = "v${version}"; - hash = "sha256-/VBu+aepIrxWc2padPa/WoXbIdKfIwqmA/M8d1GE5FI="; + hash = "sha256-BwpqvjpHzoypV91W/QReAgiNrmpxZ0IE3W/bpCVO1GE="; }; buildInputs = [ From 7d75c0bd0958322e1349bca09ea9bebbc9ba207c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 02:31:06 +0000 Subject: [PATCH 17/48] tofu-ls: 0.0.8 -> 0.0.9 --- pkgs/by-name/to/tofu-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tofu-ls/package.nix b/pkgs/by-name/to/tofu-ls/package.nix index 95fc6d91ce06..83a66505191d 100644 --- a/pkgs/by-name/to/tofu-ls/package.nix +++ b/pkgs/by-name/to/tofu-ls/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "tofu-ls"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "opentofu"; repo = "tofu-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-zOdZjbzTfVM8Nu3cn2qJokC1gwvRVFEabOa2t9SI1AU="; + hash = "sha256-Cfkxc6+Pq+sthHvptQ9MS+jYxr+LK42KV8k14vweTX0="; }; - vendorHash = "sha256-CD3x52rHmxOfYZ++/C4xGi8aNzl4lS3Ev24sTcJe1FQ="; + vendorHash = "sha256-smEjFVqY4AXSzGs8FQRnoFzWrJIu96z0tLajMMusmCA="; ldflags = [ "-s" From 08c5b11d444d8b144edd440d272138e72157f4f2 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 18 Jul 2025 20:24:26 -0700 Subject: [PATCH 18/48] python313Packages.pyw215: init at 0.8.0 --- .../python-modules/pyw215/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyw215/default.nix diff --git a/pkgs/development/python-modules/pyw215/default.nix b/pkgs/development/python-modules/pyw215/default.nix new file mode 100644 index 000000000000..44c3bfbe873f --- /dev/null +++ b/pkgs/development/python-modules/pyw215/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyw215"; + version = "0.8.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AQRGXpuduHRMozEZQMNLX5f5GtJa3T/5rHIGqGvWUP4="; + }; + + build-system = [ setuptools ]; + + doCheck = false; + + pythonImportsCheck = [ "pyW215" ]; + + meta = { + description = "Python library for interfacing with D-Link W215 Smart Plugs"; + homepage = "https://github.com/linuxchristian/pyW215"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d231cd21957d..96cffb81e2ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14995,6 +14995,8 @@ self: super: with self; { pyvows = callPackage ../development/python-modules/pyvows { }; + pyw215 = callPackage ../development/python-modules/pyw215 { }; + pywal = callPackage ../development/python-modules/pywal { }; pywatchman = callPackage ../development/python-modules/pywatchman { }; From 04f9dec8cbd1f0450ce3759c03e4a4ea3146b146 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 18 Jul 2025 20:24:32 -0700 Subject: [PATCH 19/48] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b3fe8ceb38c1..34f5eb942d17 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1221,7 +1221,8 @@ ]; "dlink" = ps: with ps; [ - ]; # missing inputs: pyW215 + pyw215 + ]; "dlna_dmr" = ps: with ps; [ async-upnp-client @@ -6962,6 +6963,7 @@ "discovergy" "dlib_face_detect" "dlib_face_identify" + "dlink" "dlna_dmr" "dlna_dms" "dnsip" From b4fd6df395c13f86f0050632f6e118431ed399e9 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 18 Jul 2025 20:07:50 -0700 Subject: [PATCH 20/48] python313Packages.lacrosse-view: init at 1.1.1 --- .../python-modules/lacrosse-view/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/lacrosse-view/default.nix diff --git a/pkgs/development/python-modules/lacrosse-view/default.nix b/pkgs/development/python-modules/lacrosse-view/default.nix new file mode 100644 index 000000000000..a85ec9be666e --- /dev/null +++ b/pkgs/development/python-modules/lacrosse-view/default.nix @@ -0,0 +1,46 @@ +{ + lib, + aiohttp, + aiozoneinfo, + buildPythonPackage, + fetchFromGitHub, + pydantic, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "lacrosse-view"; + version = "1.1.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "IceBotYT"; + repo = "lacrosse_view"; + tag = "v${version}"; + hash = "sha256-fIeVRqGEL79pOl/zAk3nrrgOgfvlujjK3sFfPVWfUxM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + aiozoneinfo + pydantic + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "lacrosse_view" ]; + + meta = { + description = "Client for retrieving data from the La Crosse View cloud"; + homepage = "https://github.com/IceBotYT/lacrosse_view"; + changelog = "https://github.com/IceBotYT/lacrosse_view/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d231cd21957d..8a30902e46a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7781,6 +7781,8 @@ self: super: with self; { laces = callPackage ../development/python-modules/laces { }; + lacrosse-view = callPackage ../development/python-modules/lacrosse-view { }; + lacuscore = callPackage ../development/python-modules/lacuscore { }; lakeside = callPackage ../development/python-modules/lakeside { }; From 862e6b7c205d053182db475f53031b14a2e33461 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 18 Jul 2025 20:10:08 -0700 Subject: [PATCH 21/48] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b3fe8ceb38c1..3d92aead216f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3037,7 +3037,8 @@ ]; "lacrosse_view" = ps: with ps; [ - ]; # missing inputs: lacrosse-view + lacrosse-view + ]; "lamarzocco" = ps: with ps; [ aioesphomeapi @@ -7219,6 +7220,7 @@ "kostal_plenticore" "kraken" "kulersky" + "lacrosse_view" "lamarzocco" "lametric" "landisgyr_heat_meter" From 727688de015a0b7638e5087a3e85f6e154f857cf Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 18 Jul 2025 20:59:27 -0700 Subject: [PATCH 22/48] python313Packages.freesms: init at 0.3.0 --- .../python-modules/freesms/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/freesms/default.nix diff --git a/pkgs/development/python-modules/freesms/default.nix b/pkgs/development/python-modules/freesms/default.nix new file mode 100644 index 000000000000..665c90ab6b3c --- /dev/null +++ b/pkgs/development/python-modules/freesms/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, + requests, + httmock, +}: + +buildPythonPackage rec { + pname = "freesms"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bfontaine"; + repo = "freesms"; + tag = "v${version}"; + hash = "sha256-5f5amXH6VVppX9/9DhILdBU8w/6n67EUgBy/zgTEUCM="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ requests ]; + + nativeCheckInputs = [ + pytestCheckHook + httmock + ]; + + pythonImportsCheck = [ "freesms" ]; + + meta = { + description = "Python interface for Free Mobile SMS API"; + homepage = "https://github.com/bfontaine/freesms"; + changelog = "https://github.com/bfontaine/freesms/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d231cd21957d..224a6ecbbc38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5457,6 +5457,8 @@ self: super: with self; { freesasa = callPackage ../development/python-modules/freesasa { inherit (pkgs) freesasa; }; + freesms = callPackage ../development/python-modules/freesms { }; + freetype-py = callPackage ../development/python-modules/freetype-py { }; freezegun = callPackage ../development/python-modules/freezegun { }; From da7f5f7a82d84cdaa15e73f6dda69649cf8c269c Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 18 Jul 2025 20:59:57 -0700 Subject: [PATCH 23/48] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b3fe8ceb38c1..a41018ec3d36 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1847,7 +1847,8 @@ ]; "free_mobile" = ps: with ps; [ - ]; # missing inputs: freesms + freesms + ]; "freebox" = ps: with ps; [ freebox-api From 02a66e0dec1726a448f11524ae96c05563bef3e4 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 19 Jul 2025 13:19:55 +0900 Subject: [PATCH 24/48] ty: 0.0.1-alpha.14 -> 0.0.1-alpha.15 https://github.com/astral-sh/ty/blob/0.0.1-alpha.15/CHANGELOG.md Signed-off-by: misilelab --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 50e2414f4f8e..9724ac895b7f 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.14"; + version = "0.0.1-alpha.15"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-q99wzor6inHggInT3R1mX7vLVZwoz68h41+mRg1oayk="; + hash = "sha256-7aOFRrnj4WFTuQWcOgdSU3w9KWwRbpPj3K6g4y0JPo0="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-+MlTidF5g15ojRksfVpJIife+Dd3YTge5aBfrjz6qv8="; + cargoHash = "sha256-vhsXYqU3Y5xGDLE/AVkVIY4eweHbyR/E3RvGoHG+1ZE="; nativeBuildInputs = [ installShellFiles ]; From ab3c1690d0b519a24ac54b309b4319f9931a5a11 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 18 Jul 2025 21:11:31 -0700 Subject: [PATCH 25/48] python313Packages.iperf3: init at 0.1.11 --- .../python-modules/iperf3/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/iperf3/default.nix diff --git a/pkgs/development/python-modules/iperf3/default.nix b/pkgs/development/python-modules/iperf3/default.nix new file mode 100644 index 000000000000..d472ab98399f --- /dev/null +++ b/pkgs/development/python-modules/iperf3/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + iperf3, + setuptools, +}: + +buildPythonPackage rec { + pname = "iperf3"; + version = "0.1.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "thiezn"; + repo = "iperf3-python"; + tag = "v${version}"; + hash = "sha256-kcEgG9lkYUqFtTgrGZdEQ0AHsx3yQIMFOG4A7d4mAnE="; + }; + + build-system = [ setuptools ]; + + # Tests require iperf3 client and server setup + doCheck = false; + + pythonImportsCheck = [ "iperf3" ]; + + meta = { + description = "Python wrapper around iperf3"; + homepage = "https://github.com/thiezn/iperf3-python"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d231cd21957d..41de2f17a70e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7074,6 +7074,8 @@ self: super: with self; { ipdb = callPackage ../development/python-modules/ipdb { }; + iperf3 = callPackage ../development/python-modules/iperf3 { }; + ipfshttpclient = callPackage ../development/python-modules/ipfshttpclient { }; iplotx = callPackage ../development/python-modules/iplotx { }; From 389e30e4fd9af3a51eeb4b3c4a84d074b0885b01 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 18 Jul 2025 21:11:35 -0700 Subject: [PATCH 26/48] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b3fe8ceb38c1..07af3d767ed0 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2743,7 +2743,8 @@ ]; "iperf3" = ps: with ps; [ - ]; # missing inputs: iperf3 + iperf3 + ]; "ipma" = ps: with ps; [ pyipma From 3bdd515c4ed20b2f345926971c85e2f90a9db7a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 04:35:07 +0000 Subject: [PATCH 27/48] kopia-ui: 0.20.1 -> 0.21.0 --- pkgs/by-name/ko/kopia-ui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix index 989146e16853..7957563a8c65 100644 --- a/pkgs/by-name/ko/kopia-ui/package.nix +++ b/pkgs/by-name/ko/kopia-ui/package.nix @@ -10,12 +10,12 @@ kopia, }: let - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${version}"; - hash = "sha256-hKtrHv7MQjA/AQ/frjP2tPT6zqVPPGnBxYuhWtUgIl0="; + hash = "sha256-M4qI8CzIIeoUqCvi8wc7s2CItPFN+1scHdwACy9vw/4="; }; in buildNpmPackage { @@ -24,7 +24,7 @@ buildNpmPackage { sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-5gXM5aLsUsJhxbt6IKY4Sg4SBI9ATe248K1TyZThg/0="; + npmDepsHash = "sha256-IoPR3es5rHVOxITYCG5I3ETB/KKh5Ku8ftyR9uQH//8="; makeCacheWritable = true; nativeBuildInputs = [ From 7189c1969baec665146299def1fccdd61ccaf19b Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sat, 19 Jul 2025 12:41:12 +0800 Subject: [PATCH 28/48] python3Packages.docling-serve: 0.14.0 -> 1.0.0 --- .../python-modules/docling-serve/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix index 07c5e977dcf3..a5923a766140 100644 --- a/pkgs/development/python-modules/docling-serve/default.nix +++ b/pkgs/development/python-modules/docling-serve/default.nix @@ -6,10 +6,12 @@ setuptools-scm, # python dependencies docling, + docling-jobkit, fastapi, httpx, pydantic-settings, python-multipart, + scalar-fastapi, uvicorn, websockets, tesserocr, @@ -29,21 +31,16 @@ buildPythonPackage rec { pname = "docling-serve"; - version = "0.14.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-serve"; tag = "v${version}"; - hash = "sha256-R8W/FXKj2wLJOcjwIsna/2wFOLGM80Qr3WlYPJTTSNU="; + hash = "sha256-kvtsutdQXk9mxx90fHXlzxFXrA7v+TdlgjrKCSFuuVU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"kfp[kubernetes]>=2.10.0",' "" - ''; - build-system = [ hatchling setuptools-scm @@ -60,10 +57,12 @@ buildPythonPackage rec { dependencies = [ docling + (docling-jobkit.override { inherit withTesserocr withRapidocr; }) fastapi httpx pydantic-settings python-multipart + scalar-fastapi typer uvicorn websockets From b1e1ba7b45250d9d4525bc6e0d7658357e6f5c43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 05:04:44 +0000 Subject: [PATCH 29/48] ruffle: 0-nightly-2025-07-10 -> 0-nightly-2025-07-19 --- pkgs/by-name/ru/ruffle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 68bb7075a9c6..1320914a2e46 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -21,17 +21,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0-nightly-2025-07-10"; + version = "0-nightly-2025-07-19"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0-" finalAttrs.version; - hash = "sha256-uN+UqoTSj98ARkwgQT+npY75HDQBDyBO82USXKaq9bI="; + hash = "sha256-2EDKnuWE1VHsw7UkMCbmREVRsB1CgwrxnC1x2lvCi+0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2/Fbd6O233/464UXvK5HOk30Z8xbqeURjZNFWITVsW4="; + cargoHash = "sha256-BRfljhOQ9X4LBQ14tLmd6M3N19nOMwk3AC02iclATm4="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = From a4eba7d754fec19c16f3a32443c0547a7826ad8e Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sat, 19 Jul 2025 13:45:53 +0800 Subject: [PATCH 30/48] docling: downgrade to 2.38.1 to unblock docling-parse test failure --- pkgs/development/python-modules/docling-core/default.nix | 4 ++-- pkgs/development/python-modules/docling/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 8690c2289623..82d3e9916700 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.43.0"; + version = "2.38.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-c9TaX4INfTfR3ZpmXbOteHr2R2jAbVzvMk8tO1XV4Nc="; + hash = "sha256-zfpinXjZrGp5SF5IXLSP/A9Kb1WzqXXtIhhk/G3nY4k="; }; build-system = [ diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix index 42e4900744da..b341fd681149 100644 --- a/pkgs/development/python-modules/docling/default.nix +++ b/pkgs/development/python-modules/docling/default.nix @@ -52,14 +52,14 @@ buildPythonPackage rec { pname = "docling"; - version = "2.41.0"; + version = "2.38.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling"; tag = "v${version}"; - hash = "sha256-GD052HCqBLs+KUkOUOVdlXxS6+PD2pthGtz+zdQ6QnM="; + hash = "sha256-ITRpWO7PEtfg5kM9LF3koZgzuPtLxoGFhorMlXlwSdI="; }; build-system = [ From f1bc9b03bf604ed55dfeb869b0aceb48c996f555 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 06:06:31 +0000 Subject: [PATCH 31/48] postgresqlPackages.pg-gvm: 22.6.9 -> 22.6.10 --- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index e08982715966..a6a16d8e43e0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -14,13 +14,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg-gvm"; - version = "22.6.9"; + version = "22.6.10"; src = fetchFromGitHub { owner = "greenbone"; repo = "pg-gvm"; tag = "v${finalAttrs.version}"; - hash = "sha256-T1U7t6ORHtmWeg77PR4gUH4nn3ywVC3MnvqoEIpJ4aw="; + hash = "sha256-NyArAvGkKaMKUuZs76+bmQwUBu3AXCXNCYZ9UB1V7rA="; }; nativeBuildInputs = [ From 1910563bb3c0a76aae035d578a8c094c5646baa7 Mon Sep 17 00:00:00 2001 From: Julius Michaelis Date: Sat, 19 Jul 2025 19:36:58 +0900 Subject: [PATCH 32/48] python313Packages.pybind11-protobuf: downgrade abseil-cpp to fix build --- pkgs/development/python-modules/pybind11-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybind11-protobuf/default.nix b/pkgs/development/python-modules/pybind11-protobuf/default.nix index 99dcb8e5bc45..c38601de9b72 100644 --- a/pkgs/development/python-modules/pybind11-protobuf/default.nix +++ b/pkgs/development/python-modules/pybind11-protobuf/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, cmake, - abseil-cpp, + abseil-cpp_202407, # downgrade, same reason as toplevel protobuf_29 protobuf_29, pybind11, zlib, @@ -31,7 +31,7 @@ buildPythonPackage { nativeBuildInputs = [ cmake ]; buildInputs = [ - abseil-cpp + abseil-cpp_202407 protobuf_29 pybind11 zlib From b21791994debd066e520ca58a6e77cc4c9c61a48 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 19 Jul 2025 12:33:07 +0200 Subject: [PATCH 33/48] flood: fix build failure --- pkgs/by-name/fl/flood/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix index fd2cab7635d1..62da2fd3c343 100644 --- a/pkgs/by-name/fl/flood/package.nix +++ b/pkgs/by-name/fl/flood/package.nix @@ -20,6 +20,7 @@ buildNpmPackage rec { npmConfigHook = pnpm_9.configHook; npmDeps = pnpmDeps; + dontNpmPrune = true; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; fetcherVersion = 1; From 242e80f393307d6d79f3e24ff378448bf6271c37 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Thu, 17 Jul 2025 11:29:32 +0200 Subject: [PATCH 34/48] opencode: 0.2.33 -> 0.3.22 --- pkgs/by-name/op/opencode/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 369e524cbbd0..308413c71bba 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -12,10 +12,10 @@ let opencode-node-modules-hash = { - "aarch64-darwin" = "sha256-uk8HQfHCKTAW54rNHZ1Rr0piZzeJdx6i4o0+xKjfFZs="; - "aarch64-linux" = "sha256-gDQh8gfFKl0rAujtos1XsCUnxC2Vjyq9xH5FLZoNW5s="; - "x86_64-darwin" = "sha256-H5+qa7vxhwNYRXUo4v8IFUToVXtyXzU3veIqu4idAbU="; - "x86_64-linux" = "sha256-1ZxetDrrRdNNOfDOW2uMwMwpEs5S3BLF+SejWcRdtik="; + "aarch64-darwin" = "sha256-W/kIKKRt2rBbnb+42NaZ1PsHZPGJbtjB8kV/aP1iZKc="; + "aarch64-linux" = "sha256-xDUT61afD8wk3z35NXtQGvZQpxQkN/CPWctVObYQECE="; + "x86_64-darwin" = "sha256-Kumy9PeeCO3TQGDdS0Zw9/HlIIQT5O4wrBPGGyl73Og="; + "x86_64-linux" = "sha256-VB7bikVFy8w82M6AkYXjsHx34CNHAGMgY69KISOokE4="; }; bun-target = { "aarch64-darwin" = "bun-darwin-arm64"; @@ -26,12 +26,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.2.33"; + version = "0.3.22"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-l/V9YHwuIPN73ieMT++enL1O5vecA9L0qBDGr8eRVxY="; + hash = "sha256-yT6uaTEKYb/+A1WhP6AQW0hWMnmS9vlfLn1E57cnzn0="; }; tui = buildGoModule { @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) version; src = "${finalAttrs.src}/packages/tui"; - vendorHash = "sha256-0vf4fOk32BLF9/904W8g+5m0vpe6i6tUFRXqDHVcMIQ="; + vendorHash = "sha256-G1vM8wxTTPpB1Oaxz2YI8AkirwG54A9i6Uq5e92ucyY="; subPackages = [ "cmd/opencode" ]; From 266eab0547186335b92fca0a97fb80f9751de5d9 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 19 Jul 2025 12:58:27 +0200 Subject: [PATCH 35/48] opencode: remove "models-dev-data" from updateScript subpackages - Deleted the "--subpackage models-dev-data" entries from the updateScript extraArgs list --- pkgs/by-name/op/opencode/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 308413c71bba..4776696291c7 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -164,8 +164,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { "tui" "--subpackage" "node_modules" - "--subpackage" - "models-dev-data" ]; }; }; From 46a4c640f05eb5f26e7951e11e5e7d9d425dfde1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 18 Jul 2025 21:49:30 +0200 Subject: [PATCH 36/48] ocamlformat_0_26_2: build with OCaml 5.2 Fixes eval, which previously failed with: ``` ocamlformat 0.26.2 is not available for OCaml 5.3.0 ``` --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ada05947688f..dae4bb1f1067 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5894,9 +5894,12 @@ with pkgs; ocamlformat_0_26_1 ; + inherit (ocaml-ng.ocamlPackages_5_2) + ocamlformat_0_26_2 + ; + inherit (ocamlPackages) ocamlformat # latest version - ocamlformat_0_26_2 ocamlformat_0_27_0 ; From c75ae07474065cb55bbbc61eb8d0d8b1d1e3fb54 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 18 Jul 2025 22:28:25 +0200 Subject: [PATCH 37/48] elixir_1_{14,15,16}: fix build with erlang 26 Those throw an error right now and break CI. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dae4bb1f1067..d21303e5387f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6284,10 +6284,13 @@ with pkgs; elixir_1_19 elixir_1_18 elixir_1_17 + elixir-ls + ; + + inherit (beam.packages.erlang_26.beamPackages) elixir_1_16 elixir_1_15 elixir_1_14 - elixir-ls ; inherit (beam.packages.erlang) From 5bd538caf1063829431df122b4053d817a758348 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Jul 2025 15:03:15 +0300 Subject: [PATCH 38/48] comma: 2.1.0 -> 2.2.0 Diff: https://www.github.com/nix-community/comma/compare/v2.1.0...v2.2.0 --- pkgs/by-name/co/comma/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix index 8111f49b7816..f21a8d33e72f 100644 --- a/pkgs/by-name/co/comma/package.nix +++ b/pkgs/by-name/co/comma/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-Q9s3z/FqkEqCQyvYhH07qlITGGlA8quZcYsK3lO8M8g="; + hash = "sha256-mhSX2yx+/xDwCtLVb+aSFFxP2TOJek/ZX/28khvetwE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yNx0Sc2JnEfndBBPxaeNMWsdWpB9fAUqXUPVNR+NOrM="; + cargoHash = "sha256-6BsRgxcUtVuN1gp3VVXkNQzqb9hD5rWWctieJvFdyrQ="; nativeBuildInputs = [ makeBinaryWrapper ]; From 68f8de6113802135de59e20afd4c96526faa9824 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 19 Jul 2025 14:58:34 +0200 Subject: [PATCH 39/48] cargo-pgrx: prevent update of pinned versions Hopefully it works this time. --- .../tools/rust/cargo-pgrx/default.nix | 19 +----------------- .../tools/rust/cargo-pgrx/pinned.nix | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/tools/rust/cargo-pgrx/pinned.nix diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 2dec7263f7a5..7992893bbdd3 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -56,24 +56,6 @@ let }; in { - cargo-pgrx_0_12_0_alpha_1 = generic { - version = "0.12.0-alpha.1"; - hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; - cargoHash = "sha256-zYjqE7LZLnTaVxWAPWC1ncEjCMlrhy4THtgecB7wBYY="; - }; - - cargo-pgrx_0_12_6 = generic { - version = "0.12.6"; - hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA="; - cargoHash = "sha256-pnMxWWfvr1/AEp8DvG4awig8zjdHizJHoZ5RJA8CL08="; - }; - - cargo-pgrx_0_14_1 = generic { - version = "0.14.1"; - hash = "sha256-oMToAhKkRiCyC8JYS0gmo/XX3QVcVtF5mUV0aQjd+p8="; - cargoHash = "sha256-RawGAQGtG2QVDCMbwjmUEaH6rDeRiBvvJsGCY8wySw0="; - }; - # Default version for direct usage. # Not to be used with buildPgrxExtension, where it should be pinned. # When you make an extension use the latest version, *copy* this to a separate pinned attribute. @@ -83,3 +65,4 @@ in cargoHash = "sha256-c+n1bJMO9254kT4e6exVNhlIouzkkzrRIOVzR9lZeg4="; }; } +// lib.mapAttrs (_: generic) (import ./pinned.nix) diff --git a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix new file mode 100644 index 000000000000..6a73795ad2f2 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix @@ -0,0 +1,20 @@ +# nixpkgs-update: no auto update +{ + cargo-pgrx_0_12_0_alpha_1 = { + version = "0.12.0-alpha.1"; + hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; + cargoHash = "sha256-zYjqE7LZLnTaVxWAPWC1ncEjCMlrhy4THtgecB7wBYY="; + }; + + cargo-pgrx_0_12_6 = { + version = "0.12.6"; + hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA="; + cargoHash = "sha256-pnMxWWfvr1/AEp8DvG4awig8zjdHizJHoZ5RJA8CL08="; + }; + + cargo-pgrx_0_14_1 = { + version = "0.14.1"; + hash = "sha256-oMToAhKkRiCyC8JYS0gmo/XX3QVcVtF5mUV0aQjd+p8="; + cargoHash = "sha256-RawGAQGtG2QVDCMbwjmUEaH6rDeRiBvvJsGCY8wySw0="; + }; +} From a0b153c14854fb58ca22d9f287930344ffcd49f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Jul 2025 19:53:27 +0000 Subject: [PATCH 40/48] ft2-clone: 1.96 -> 1.97 --- pkgs/by-name/ft/ft2-clone/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ft/ft2-clone/package.nix b/pkgs/by-name/ft/ft2-clone/package.nix index 22d39af404ca..64ae56dfd956 100644 --- a/pkgs/by-name/ft/ft2-clone/package.nix +++ b/pkgs/by-name/ft/ft2-clone/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.96"; + version = "1.97"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-Kw2EjFiKRVriiauwL/o/yNQkFwnKA23qTs4fhZtEEuA="; + hash = "sha256-DaI5mlnl63i8+8JrSQkZ9NTIdB2W4WnFJ60wnglIpWg="; }; nativeBuildInputs = [ cmake ]; From 13dc8d57c307a22a152282438935f5a6ef0b619a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Jul 2025 12:13:36 +0000 Subject: [PATCH 41/48] rat-king-adventure: 2.2.0 -> 2.2.2 --- .../shattered-pixel-dungeon/rat-king-adventure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix index 3945aebb2aff..3d080a6d9d90 100644 --- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix @@ -5,13 +5,13 @@ callPackage ../generic.nix rec { pname = "rat-king-adventure"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Rat-King-Adventure"; rev = version; - hash = "sha256-IdaUnCpE8xZzPTjrUYdTPzJmL4Z0FFIc2zxrIXKSWkE="; + hash = "sha256-9vK5wD/pA/xa4lpRrpHdiwbiRdaBkIB6TKAOIfHrjz0="; }; desktopName = "Rat King Adventure"; From 839f8681812ba4b905ca12959779bc85fe2d3b43 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 19 Jul 2025 15:57:19 +0200 Subject: [PATCH 42/48] helix: 25.07 -> 25.07.1 Diff: https://github.com/helix-editor/helix/compare/25.07...25.07.1 Changelog: https://github.com/helix-editor/helix/blob/25.07.1/CHANGELOG.md --- pkgs/by-name/he/helix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index 09f89cd3a8f0..b26a4d913e47 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "25.07"; + version = "25.07.1"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - hash = "sha256-UbvIbrDNUmcAvqVM98CPlBhjAc5BAyIUpp9+BXGmdfA="; + hash = "sha256-Pj/lfcQXRWqBOTTWt6+Gk61F9F1UmeCYr+26hGdG974="; stripRoot = false; }; useFetchCargoVendor = true; - cargoHash = "sha256-++zslB4s5/TOjxqeOFZAsYUu7acPxQw/xMnlYgTf5GU="; + cargoHash = "sha256-Mf0nrgMk1MlZkSyUN6mlM5lmTcrOHn3xBNzmVGtApEU="; nativeBuildInputs = [ git From 2e2ff832914937e3ecc783245b552a6e6e12a2e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 14:18:52 +0000 Subject: [PATCH 43/48] tscli: 0.0.12 -> 0.0.13 --- pkgs/by-name/ts/tscli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ts/tscli/package.nix b/pkgs/by-name/ts/tscli/package.nix index 265431077c94..1236438d282a 100644 --- a/pkgs/by-name/ts/tscli/package.nix +++ b/pkgs/by-name/ts/tscli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "tscli"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "jaxxstorm"; repo = "tscli"; tag = "v${version}"; - hash = "sha256-+1meGROQvprReWSJMKutFcTjhw0YcIekDHml/A+RbN4="; + hash = "sha256-KncOCrpu0/72Nf9dOErKT45PxPECS50+wokO10sGUXc="; }; vendorHash = "sha256-FmJoKADhcHk5mWjcXxXb7VszZhFfGWmBKUGxUjvA64U="; From 1d348e88e024c8f4d1af6904cee37a727dec9d69 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 7 Jul 2025 10:17:34 -0400 Subject: [PATCH 44/48] jellyfin-ffmpeg: add to release-cuda This package overrides ffmpeg and thus can't rely on the ffmpeg build --- pkgs/top-level/release-cuda.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index e0bc3c1ee127..2574550342f3 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -90,6 +90,7 @@ let gimp3 = linux; gpu-screen-recorder = linux; gst_all_1.gst-plugins-bad = linux; + jellyfin-ffmpeg = linux; kdePackages.kdenlive = linux; lightgbm = linux; llama-cpp = linux; From 652ce1f95b1142108814536dfee721b949cec4f9 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Fri, 18 Jul 2025 16:28:49 +0200 Subject: [PATCH 45/48] strawberry: remove libgpod depedency/feature Motivated by the gettext breakage ... but a library this old, abandoned, and only relevant for hardware many years out of sale/warranty is unlikely to be needed by many (any?). --- pkgs/applications/audio/strawberry/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 9fd22a49e86a..e1c70ed591ff 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -13,7 +13,6 @@ libXdmcp, libcdio, libebur128, - libgpod, libidn2, libmtp, libpthreadstubs, @@ -36,10 +35,6 @@ rapidjson, }: -let - inherit (lib) optionals; - -in stdenv.mkDerivation rec { pname = "strawberry"; version = "1.2.11"; @@ -78,8 +73,7 @@ stdenv.mkDerivation rec { sparsehash rapidjson ] - ++ optionals stdenv.hostPlatform.isLinux [ - libgpod + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libselinux libsepol @@ -103,10 +97,12 @@ stdenv.mkDerivation rec { qttools wrapQtAppsHook ] - ++ optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]; + cmakeFlags = [ (lib.cmakeBool "ENABLE_GPOD" false) ]; + postInstall = '' qtWrapperArgs+=( --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" From 12c49aca94d40c6008d1c78592d8f2c04331fd97 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 19 Jul 2025 14:38:09 +0200 Subject: [PATCH 46/48] postgresqlPackages: remove top-level aliases This removes some historic top-level attributes for older postgresql extensions. These are available via the versioned postgresqlPackages attributes instead. --- pkgs/top-level/aliases.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5d6eae648868..e9c8a8be2d86 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1590,22 +1590,22 @@ mapAliases { presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24 projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10 - cstore_fdw = postgresqlPackages.cstore_fdw; - pg_cron = postgresqlPackages.pg_cron; - pg_hll = postgresqlPackages.pg_hll; - pg_repack = postgresqlPackages.pg_repack; - pg_similarity = postgresqlPackages.pg_similarity; - pg_topn = postgresqlPackages.pg_topn; + cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19 + pg_cron = throw "'pg_cron' has been removed. Use 'postgresqlPackages.pg_cron' instead."; # Added 2025-07-19 + pg_hll = throw "'pg_hll' has been removed. Use 'postgresqlPackages.pg_hll' instead."; # Added 2025-07-19 + pg_repack = throw "'pg_repack' has been removed. Use 'postgresqlPackages.pg_repack' instead."; # Added 2025-07-19 + pg_similarity = throw "'pg_similarity' has been removed. Use 'postgresqlPackages.pg_similarity' instead."; # Added 2025-07-19 + pg_topn = throw "'pg_topn' has been removed. Use 'postgresqlPackages.pg_topn' instead."; # Added 2025-07-19 pgf1 = throw "'pgf1' has been removed since it is unmaintained. Consider using 'pgf' instead"; # Added 2025-05-10 - pgjwt = postgresqlPackages.pgjwt; - pgroonga = postgresqlPackages.pgroonga; - pgtap = postgresqlPackages.pgtap; - plv8 = postgresqlPackages.plv8; + pgjwt = throw "'pgjwt' has been removed. Use 'postgresqlPackages.pgjwt' instead."; # Added 2025-07-19 + pgroonga = throw "'pgroonga' has been removed. Use 'postgresqlPackages.pgroonga' instead."; # Added 2025-07-19 + pgtap = throw "'pgtap' has been removed. Use 'postgresqlPackages.pgtap' instead."; # Added 2025-07-19 + plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19 postcss-cli = throw "postcss-cli has been removed because it was broken"; # added 2025-03-24 - postgis = postgresqlPackages.postgis; + postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19 tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24 texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10 - timescaledb = postgresqlPackages.timescaledb; + timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19 tsearch_extras = throw "'tsearch_extras' has been removed from nixpkgs"; # Added 2024-12-15 postgresql_12 = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14 From 162f2a883a1288bdcb926af68859f94f0773a915 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 15:18:50 +0000 Subject: [PATCH 47/48] lux-cli: 0.8.2 -> 0.9.1 --- pkgs/by-name/lu/lux-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index bfe0f48f0b27..5beb3fa11c6f 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -17,18 +17,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-O4n/xTGd1WDiZ/LhBBifsUq7dTvBD4uLoOxX1ByJ82s="; + hash = "sha256-RbJ/jR/LrOIn4R4In21Rj5QNr3GrPwPp+6Wy/GPlAM4="; }; buildAndTestSubdir = "lux-cli"; useFetchCargoVendor = true; - cargoHash = "sha256-I8dAcPWug/7l3gAyAlHjwqNVzZVEfcvWWBnXuqOEbd4="; + cargoHash = "sha256-rQ4zJQSlIUC63a4UdkA6+Y63vvkZ7TyXV0EWXzXmjPM="; nativeInstallCheckInputs = [ versionCheckHook From 33e9d4f3c0d9839248e057967df248794a901191 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 19 Jul 2025 10:39:04 -0500 Subject: [PATCH 48/48] libunwind: fix dangling symlink errors Windows ucrt for aarch64 crossPkgs fail building because of the dangling symlinks this code introduces --- pkgs/development/compilers/llvm/common/libunwind/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix index 25520428bacb..20c0287a08e2 100644 --- a/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -107,9 +107,12 @@ stdenv.mkDerivation ( + lib.optionalString (enableShared && stdenv.hostPlatform.isWindows) '' ln -s $out/lib/libunwind.dll.a $out/lib/libunwind_shared.dll.a '' - + lib.optionalString (doFakeLibgcc) '' + + lib.optionalString (doFakeLibgcc && !stdenv.hostPlatform.isWindows) '' ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so.1 + '' + + lib.optionalString (doFakeLibgcc && stdenv.hostPlatform.isWindows) '' + ln -s $out/lib/libunwind.dll.a $out/lib/libgcc_s.dll.a ''; meta = llvm_meta // {