From 79ed1b7bd1bc1bfae8f96f98e78bd4aeae6360f4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 9 Jun 2026 22:32:34 +0200 Subject: [PATCH 01/44] nixos/swap: detect whether swap is a device (cherry picked from commit fe18bb82a1661e768864b377a5ecd9a2bd10dd6b) --- nixos/modules/config/swap.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index fa09b61ddec0..334b0c84f67a 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -106,6 +106,11 @@ let description = "Path of the device or swap file."; }; + isDevice = mkOption { + default = lib.substring 0 5 config.device == "/dev/"; + internal = true; + }; + label = mkOption { example = "swap"; type = types.str; From cea6e19df9c59f0c42d2821244c80e8e62b19378 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 9 Jun 2026 22:33:03 +0200 Subject: [PATCH 02/44] nixos/swap: trigger device readiness Attempts to fix https://github.com/nixos/nixpkgs/issues/524389 (cherry picked from commit a8f871c1483115f0480ebee2f756141952a065d9) --- nixos/modules/config/swap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 334b0c84f67a..c99fd3ddf162 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -334,6 +334,7 @@ in ) } ${sw.device} ${sw.deviceName} mkswap ${sw.realDevice} + ${lib.optionalString sw.isDevice "udevadm trigger ${sw.realDevice}"} ''} ''; enableStrictShellChecks = true; From 4680b35662fe53adf79ba87b6802737925d037f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 May 2026 23:35:20 +0000 Subject: [PATCH 03/44] opencolorio: 2.5.1 -> 2.5.2 (cherry picked from commit 004a5b908d637b6bcd8d949e2c929cfd63648a1d) --- pkgs/by-name/op/opencolorio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opencolorio/package.nix b/pkgs/by-name/op/opencolorio/package.nix index 64c6ef1defee..a18f3a0f3843 100644 --- a/pkgs/by-name/op/opencolorio/package.nix +++ b/pkgs/by-name/op/opencolorio/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - hash = "sha256-iI32dnGZdizLBOs7IQtmLUYMPWxadvWNeqZjy49AWb0="; + hash = "sha256-b4tdQ9VH9M7hAD5Uuxu4QKwwpaVwroj/Bvg+Zsy0M1M="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From f16579bfa51038a4642e85d8b7c1da99614c69bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jul 2026 13:25:47 +0000 Subject: [PATCH 04/44] python3Packages.protego: 0.6.1 -> 0.6.2 (cherry picked from commit 8f527adf983f4268f54bbac553833e0bf54f569c) --- pkgs/development/python-modules/protego/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index 4da1b264cb29..ad27e0b8d3ce 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "protego"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "scrapy"; repo = "protego"; tag = finalAttrs.version; - hash = "sha256-Me+bSJnHHJH0ryPoSS7EN2Px5FNElCWQzvKrmWll4mQ="; + hash = "sha256-vAX7l0Xq2itQwBkNYobOWae1qHVVcD7M/o43GpIwEVo="; }; build-system = [ hatchling ]; From 0f2d4e38342b8fedb23c3654fe76691b481a9b2c Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 22 Jun 2026 20:54:48 +0200 Subject: [PATCH 05/44] victoriametrics: 1.145.0 -> 1.146.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.146.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.145.0...v1.146.0 (cherry picked from commit 57c2e76cd4cf8b5bc78d99bca2ae7489c5e695b1) --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 710d39a63429..484d203349d1 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.145.0"; + version = "1.146.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-nKG2ei1Gn1mU5TtD5YLYUHaJrM4fSxm/uUdY4tIGeVE="; + hash = "sha256-EWRVbUeugyLsExP3NyPVLd7v2kwbRg5OjFg2WAY1FuM="; }; vendorHash = null; From 6c021b640970e33e58cb16d1ef54c6acd3d93be1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 4 Jun 2026 12:40:59 -0500 Subject: [PATCH 06/44] apache-airflow: switch to finalAttrs, inline let binding Assisted-by: Cursor Composer 2.5 (cherry picked from commit 6e358fb2edc6dba0b9763d32d1dafe048d38df48) --- .../ap/apache-airflow/python-package.nix | 592 +++++++++--------- 1 file changed, 295 insertions(+), 297 deletions(-) diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index 5dba14a2e683..e3cc15913a6f 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -88,355 +88,353 @@ enabledProviders, }: -let - version = "3.2.2"; +buildPythonPackage ( + finalAttrs: + let + inherit (finalAttrs) src version; - src = fetchFromGitHub { - owner = "apache"; - repo = "airflow"; - tag = version; - hash = "sha256-nAFSLdcKmP2CNm3rx+/fwIsJnpju7wBl+fYWQV8p+sU="; - }; + airflowUi = stdenv.mkDerivation (uiAttrs: { + pname = "airflow-ui-assets"; + inherit src version; + sourceRoot = "${src.name}/airflow-core/src/airflow/ui"; - pnpm = pnpm_10; + # vite build resolves "localhost" during the build, which the darwin + # sandbox blocks by default (getaddrinfo ENOTFOUND localhost). + __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; - airflowUi = stdenv.mkDerivation rec { - pname = "airflow-ui-assets"; - inherit src version; - sourceRoot = "${src.name}/airflow-core/src/airflow/ui"; + nativeBuildInputs = [ + nodejs + pnpm_10 + pnpmConfigHook + ]; - # vite build resolves "localhost" during the build, which the darwin - # sandbox blocks by default (getaddrinfo ENOTFOUND localhost). - __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; + pnpmDeps = fetchPnpmDeps { + pname = "airflow-ui"; + inherit src version; + pnpm = pnpm_10; + sourceRoot = uiAttrs.sourceRoot; + fetcherVersion = 3; + hash = "sha256-wJ2u+y3umecL4IeVW/29/yDgYZ77ffOBQLHeplD3XlQ="; + }; - nativeBuildInputs = [ - nodejs - pnpm - pnpmConfigHook + buildPhase = '' + pnpm install + pnpm build + ''; + + installPhase = '' + mkdir -p $out/share/airflow/ui + cp -r dist $out/share/airflow/ui/ + ''; + }); + + airflowSimpleAuthUi = stdenv.mkDerivation (simpleUiAttrs: { + pname = "airflow-simple-ui-assets"; + inherit src version; + sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui"; + + __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; + + nativeBuildInputs = [ + nodejs + pnpm_10 + pnpmConfigHook + ]; + + pnpmDeps = fetchPnpmDeps { + pname = "simple-auth-manager-ui"; + inherit src version; + pnpm = pnpm_10; + sourceRoot = simpleUiAttrs.sourceRoot; + fetcherVersion = 3; + hash = "sha256-AKaafmDjIlg4eFJT1JGyelXVjcId8f0iXTR3JK4ZMq0="; + }; + + buildPhase = '' + pnpm install + pnpm build + ''; + + installPhase = '' + mkdir -p $out/share/airflow/simple-ui + cp -r dist $out/share/airflow/simple-ui/ + ''; + }); + + requiredProviders = [ + "common_compat" + "common_io" + "common_sql" + "smtp" + "standard" ]; - pnpmDeps = fetchPnpmDeps { - pname = "airflow-ui"; - inherit - sourceRoot - src - version - pnpm - ; - fetcherVersion = 3; - hash = "sha256-wJ2u+y3umecL4IeVW/29/yDgYZ77ffOBQLHeplD3XlQ="; - }; + providers = import ./providers.nix; - buildPhase = '' - pnpm install - pnpm build - ''; + buildProvider = + provider: + buildPythonPackage { + pname = "apache-airflow-providers-${provider}"; + version = providers.${provider}.version; + pyproject = true; - installPhase = '' - mkdir -p $out/share/airflow/ui - cp -r dist $out/share/airflow/ui/ - ''; - }; + inherit src; + sourceRoot = "${src.name}/providers/${lib.replaceStrings [ "_" ] [ "/" ] provider}"; - airflowSimpleAuthUi = stdenv.mkDerivation rec { - pname = "airflow-simple-ui-assets"; - inherit src version; - sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui"; + buildInputs = [ flit-core ]; - __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; + dependencies = map (dep: python.pkgs.${dep}) providers.${provider}.deps; - nativeBuildInputs = [ - nodejs - pnpm - pnpmConfigHook - ]; + pythonRemoveDeps = [ + "apache-airflow" + ]; - pnpmDeps = fetchPnpmDeps { - pname = "simple-auth-manager-ui"; - inherit - sourceRoot - src - version - pnpm - ; - fetcherVersion = 3; - hash = "sha256-AKaafmDjIlg4eFJT1JGyelXVjcId8f0iXTR3JK4ZMq0="; - }; + pythonRelaxDeps = [ + "flit-core" + ]; + }; - buildPhase = '' - pnpm install - pnpm build - ''; - - installPhase = '' - mkdir -p $out/share/airflow/simple-ui - cp -r dist $out/share/airflow/simple-ui/ - ''; - }; - - requiredProviders = [ - "common_compat" - "common_io" - "common_sql" - "smtp" - "standard" - ]; - - providers = import ./providers.nix; - - buildProvider = - provider: - buildPythonPackage { - pname = "apache-airflow-providers-${provider}"; - version = providers.${provider}.version; + taskSdk = buildPythonPackage { + pname = "task-sdk"; + inherit src version; pyproject = true; - inherit src; - sourceRoot = "${src.name}/providers/${lib.replaceStrings [ "_" ] [ "/" ] provider}"; + sourceRoot = "${src.name}/task-sdk"; - buildInputs = [ flit-core ]; + postPatch = '' + # resolve cyclic dependency + sed -i -E 's/"apache-airflow-core[^"]+",//' pyproject.toml - dependencies = map (dep: python.pkgs.${dep}) providers.${provider}.deps; + # relax dependencies + sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml + sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml + sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml + sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml - pythonRemoveDeps = [ - "apache-airflow" + # task-sdk needs config.yml from core subpackage + mkdir -p src/airflow/config_templates + cp ../airflow-core/src/airflow/config_templates/* src/airflow/config_templates/ + ''; + + build-system = [ + hatchling ]; - pythonRelaxDeps = [ - "flit-core" + dependencies = [ + asgiref + attrs + babel + colorlog + fsspec + greenback + httpx + jinja2 + jsonschema + methodtools + msgspec + pendulum + psutil + pydantic + pygtrie + python-dateutil + requests + retryhttp + structlog + tenacity + types-requests ]; }; - airflowCore = buildPythonPackage { - pname = "apache-airflow-core"; - inherit src version; + airflowCore = buildPythonPackage { + pname = "apache-airflow-core"; + inherit src version; + pyproject = true; + + sourceRoot = "${src.name}/airflow-core"; + + postPatch = '' + # remove cyclic dependency + sed -i -E 's/"apache-airflow-task-sdk[^"]+",//' pyproject.toml + + # relax dependencies + sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml + sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml + sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml + sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml + sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml + sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml + + # Copy built UI assets + cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/ + cp -r ${airflowSimpleAuthUi}/share/airflow/simple-ui/dist src/airflow/api_fastapi/auth/managers/simple/ui/ + ''; + + build-system = [ + gitdb + gitpython + hatchling + packaging + smmap + tomli + trove-classifiers + ]; + + dependencies = [ + a2wsgi + aiosqlite + alembic + argcomplete + asgiref + attrs + cachetools + cadwyn + colorlog + cron-descriptor + croniter + cryptography + deprecated + dill + fastapi + httpx + importlib-metadata + itsdangerous + jinja2 + jsonschema + lazy-object-proxy + libcst + linkify-it-py + lockfile + methodtools + msgspec + natsort + opentelemetry-api + opentelemetry-exporter-otlp + packaging + pathspec + pendulum + pluggy + psutil + pydantic + pygments + pygtrie + pyjwt + python-daemon + python-dateutil + python-slugify + pyyaml + requests + rich + rich-argparse + rich-click + setproctitle + sqlalchemy + sqlalchemy-jsonfield + sqlalchemy-utils + starlette + structlog + svcs + tabulate + taskSdk + tenacity + termcolor + typing-extensions + universal-pathlib + uuid6 + uvicorn + ] + ++ (map buildProvider requiredProviders); + + pythonRelaxDeps = [ "starlette" ]; + }; + in + { + pname = "apache-airflow"; + version = "3.2.2"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "apache"; + repo = "airflow"; + tag = finalAttrs.version; + hash = "sha256-nAFSLdcKmP2CNm3rx+/fwIsJnpju7wBl+fYWQV8p+sU="; + }; + pyproject = true; - sourceRoot = "${src.name}/airflow-core"; - postPatch = '' - # remove cyclic dependency - sed -i -E 's/"apache-airflow-task-sdk[^"]+",//' pyproject.toml - # relax dependencies sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml - sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml - sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml - - # Copy built UI assets - cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/ - cp -r ${airflowSimpleAuthUi}/share/airflow/simple-ui/dist src/airflow/api_fastapi/auth/managers/simple/ui/ ''; + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; + build-system = [ gitdb gitpython hatchling packaging + pathspec + pluggy smmap tomli trove-classifiers ]; dependencies = [ - a2wsgi - aiosqlite - alembic - argcomplete - asgiref - attrs - cachetools - cadwyn - colorlog - cron-descriptor - croniter - cryptography - deprecated - dill - fastapi - httpx - importlib-metadata - itsdangerous - jinja2 - jsonschema - lazy-object-proxy - libcst - linkify-it-py - lockfile - methodtools - msgspec - natsort - opentelemetry-api - opentelemetry-exporter-otlp - packaging - pathspec - pendulum - pluggy - psutil - pydantic - pygments - pygtrie - pyjwt - python-daemon - python-dateutil - python-slugify - pyyaml - requests - rich - rich-argparse - rich-click - setproctitle - sqlalchemy - sqlalchemy-jsonfield - sqlalchemy-utils - starlette - structlog - svcs - tabulate - taskSdk - tenacity - termcolor - typing-extensions - universal-pathlib - uuid6 - uvicorn + airflowCore # subpackage from airflow src + taskSdk # subpackage from airflow src ] - ++ (map buildProvider requiredProviders); + ++ (map buildProvider enabledProviders); - pythonRelaxDeps = [ "starlette" ]; - }; - - taskSdk = buildPythonPackage { - pname = "task-sdk"; - inherit src version; - pyproject = true; - - sourceRoot = "${src.name}/task-sdk"; - - postPatch = '' - # resolve cyclic dependency - sed -i -E 's/"apache-airflow-core[^"]+",//' pyproject.toml - - # relax dependencies - sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml - sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml - sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml - sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml - - # task-sdk needs config.yml from core subpackage - mkdir -p src/airflow/config_templates - cp ../airflow-core/src/airflow/config_templates/* src/airflow/config_templates/ + postInstall = '' + # Create a symlink to the airflow-core package + mkdir -p $out/bin + ln -s ${airflowCore}/bin/airflow $out/bin/airflow ''; - build-system = [ - hatchling - ]; + installCheckPhase = '' + runHook preInstallCheck - dependencies = [ - asgiref - attrs - babel - colorlog - fsspec - greenback - httpx - jinja2 - jsonschema - methodtools - msgspec - pendulum - psutil - pydantic - pygtrie - python-dateutil - requests - retryhttp - structlog - tenacity - types-requests - ]; - }; + $out/bin/airflow version + $out/bin/airflow db reset -y -in -buildPythonPackage rec { - pname = "apache-airflow"; - inherit src version; - pyproject = true; + runHook postInstallCheck + ''; - postPatch = '' - # relax dependencies - sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml - sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml - sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml - sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml - ''; + pythonImportsCheck = [ + "airflow" + ] + ++ lib.concatMap (provider: providers.${provider}.imports) (requiredProviders ++ enabledProviders); - nativeBuildInputs = [ writableTmpDirAsHomeHook ]; + passthru.updateScript = ./update.sh; + passthru.airflowUi = airflowUi; + passthru.airflowSimpleAuthUi = airflowSimpleAuthUi; - build-system = [ - gitdb - gitpython - hatchling - packaging - pathspec - pluggy - smmap - tomli - trove-classifiers - ]; + # Note on testing the web UI: + # You can (manually) test the web UI as follows: + # + # nix shell .#apache-airflow + # airflow version + # airflow db reset # WARNING: this will wipe any existing db state you might have! + # airflow standalone + # + # Then navigate to the localhost URL using the credentials printed, try + # triggering the 'example_bash_operator' DAG and see if it reports success. - dependencies = [ - airflowCore # subpackage from airflow src - taskSdk # subpackage from airflow src - ] - ++ (map buildProvider enabledProviders); - - postInstall = '' - # Create a symlink to the airflow-core package - mkdir -p $out/bin - ln -s ${airflowCore}/bin/airflow $out/bin/airflow - ''; - - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/airflow version - $out/bin/airflow db reset -y - - runHook postInstallCheck - ''; - - pythonImportsCheck = [ - "airflow" - ] - ++ lib.concatMap (provider: providers.${provider}.imports) (requiredProviders ++ enabledProviders); - - passthru.updateScript = ./update.sh; - passthru.airflowUi = airflowUi; - passthru.airflowSimpleAuthUi = airflowSimpleAuthUi; - - # Note on testing the web UI: - # You can (manually) test the web UI as follows: - # - # nix shell .#apache-airflow - # airflow version - # airflow db reset # WARNING: this will wipe any existing db state you might have! - # airflow standalone - # - # Then navigate to the localhost URL using the credentials printed, try - # triggering the 'example_bash_operator' DAG and see if it reports success. - - meta = { - description = "Platform to programmatically author, schedule and monitor workflows"; - homepage = "https://airflow.apache.org/"; - changelog = "https://airflow.apache.org/docs/apache-airflow/${version}/release_notes.html"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - taranarmo - ]; - mainProgram = "airflow"; - }; -} + meta = { + description = "Platform to programmatically author, schedule and monitor workflows"; + homepage = "https://airflow.apache.org/"; + changelog = "https://airflow.apache.org/docs/apache-airflow/${finalAttrs.version}/release_notes.html"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + taranarmo + ]; + mainProgram = "airflow"; + }; + } +) From 92387b86a5fb4dc460ad8486635d5a11b72f4cad Mon Sep 17 00:00:00 2001 From: Sergei Volkov Date: Tue, 7 Jul 2026 14:18:00 +0200 Subject: [PATCH 07/44] apache-airflow: 3.2.2 -> 3.3.0 (cherry picked from commit 6535447733074766e4a1a4d15fe16bf2ac112493) --- pkgs/by-name/ap/apache-airflow/providers.nix | 266 +++++++++++------- .../ap/apache-airflow/python-package.nix | 11 +- .../ap/apache-airflow/update-providers.py | 1 + 3 files changed, 167 insertions(+), 111 deletions(-) diff --git a/pkgs/by-name/ap/apache-airflow/providers.nix b/pkgs/by-name/ap/apache-airflow/providers.nix index db03b3269823..428e1394bb9a 100644 --- a/pkgs/by-name/ap/apache-airflow/providers.nix +++ b/pkgs/by-name/ap/apache-airflow/providers.nix @@ -6,16 +6,25 @@ "airflow.providers.airbyte" "airflow.providers.airbyte.get_provider_info" ]; - version = "5.3.3"; + version = "5.5.1"; + }; + + akeyless = { + deps = [ ]; + imports = [ + "airflow.providers.akeyless" + "airflow.providers.akeyless.get_provider_info" + ]; + version = "0.2.0"; }; alibaba = { - deps = [ "oss2" ]; + deps = [ "alibabacloud-tea-openapi" ]; imports = [ "airflow.providers.alibaba" "airflow.providers.alibaba.get_provider_info" ]; - version = "3.3.5"; + version = "3.3.9"; }; amazon = { @@ -41,7 +50,7 @@ "airflow.providers.amazon" "airflow.providers.amazon.get_provider_info" ]; - version = "9.23.0"; + version = "9.31.0"; }; apache_beam = { @@ -63,7 +72,7 @@ "airflow.providers.apache.cassandra" "airflow.providers.apache.cassandra.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; apache_drill = { @@ -72,7 +81,7 @@ "airflow.providers.apache.drill" "airflow.providers.apache.drill.get_provider_info" ]; - version = "3.3.0"; + version = "3.3.3"; }; apache_druid = { @@ -81,7 +90,7 @@ "airflow.providers.apache.druid" "airflow.providers.apache.druid.get_provider_info" ]; - version = "4.5.0"; + version = "4.5.2"; }; apache_flink = { @@ -90,7 +99,7 @@ "airflow.providers.apache.flink" "airflow.providers.apache.flink.get_provider_info" ]; - version = "1.8.3"; + version = "1.8.5"; }; apache_hdfs = { @@ -103,7 +112,7 @@ "airflow.providers.apache.hdfs" "airflow.providers.apache.hdfs.get_provider_info" ]; - version = "4.11.3"; + version = "4.12.1"; }; apache_hive = { @@ -117,16 +126,16 @@ "airflow.providers.apache.hive" "airflow.providers.apache.hive.get_provider_info" ]; - version = "9.4.0"; + version = "9.5.0"; }; apache_iceberg = { - deps = [ ]; + deps = [ "pyiceberg" ]; imports = [ "airflow.providers.apache.iceberg" "airflow.providers.apache.iceberg.get_provider_info" ]; - version = "2.0.0"; + version = "2.0.3"; }; apache_impala = { @@ -138,7 +147,7 @@ "airflow.providers.apache.impala" "airflow.providers.apache.impala.get_provider_info" ]; - version = "1.9.0"; + version = "1.9.3"; }; apache_kafka = { @@ -150,7 +159,7 @@ "airflow.providers.apache.kafka" "airflow.providers.apache.kafka.get_provider_info" ]; - version = "1.13.0"; + version = "1.14.0"; }; apache_kylin = { @@ -159,7 +168,7 @@ "airflow.providers.apache.kylin" "airflow.providers.apache.kylin.get_provider_info" ]; - version = "3.10.2"; + version = "3.10.5"; }; apache_livy = { @@ -168,7 +177,7 @@ "airflow.providers.apache.livy" "airflow.providers.apache.livy.get_provider_info" ]; - version = "4.5.3"; + version = "4.5.7"; }; apache_pig = { @@ -177,7 +186,7 @@ "airflow.providers.apache.pig" "airflow.providers.apache.pig.get_provider_info" ]; - version = "4.8.2"; + version = "4.8.5"; }; apache_pinot = { @@ -186,19 +195,21 @@ "airflow.providers.apache.pinot" "airflow.providers.apache.pinot.get_provider_info" ]; - version = "4.10.0"; + version = "4.10.3"; }; apache_spark = { deps = [ "grpcio-status" "pyspark" + "requests" + "tenacity" ]; imports = [ "airflow.providers.apache.spark" "airflow.providers.apache.spark.get_provider_info" ]; - version = "5.6.0"; + version = "6.2.0"; }; apache_tinkerpop = { @@ -207,7 +218,7 @@ "airflow.providers.apache.tinkerpop" "airflow.providers.apache.tinkerpop.get_provider_info" ]; - version = "1.1.1"; + version = "1.1.4"; }; apprise = { @@ -216,7 +227,7 @@ "airflow.providers.apprise" "airflow.providers.apprise.get_provider_info" ]; - version = "2.3.1"; + version = "2.3.4"; }; arangodb = { @@ -225,7 +236,7 @@ "airflow.providers.arangodb" "airflow.providers.arangodb.get_provider_info" ]; - version = "2.9.2"; + version = "2.9.5"; }; asana = { @@ -234,7 +245,7 @@ "airflow.providers.asana" "airflow.providers.asana.get_provider_info" ]; - version = "2.11.1"; + version = "2.11.4"; }; atlassian_jira = { @@ -243,7 +254,7 @@ "airflow.providers.atlassian.jira" "airflow.providers.atlassian.jira.get_provider_info" ]; - version = "3.3.1"; + version = "3.3.4"; }; celery = { @@ -255,7 +266,16 @@ "airflow.providers.celery" "airflow.providers.celery.get_provider_info" ]; - version = "3.17.1"; + version = "3.20.0"; + }; + + clickhousedb = { + deps = [ "clickhouse-connect" ]; + imports = [ + "airflow.providers.clickhousedb" + "airflow.providers.clickhousedb.get_provider_info" + ]; + version = "1.0.0"; }; cloudant = { @@ -264,7 +284,7 @@ "airflow.providers.cloudant" "airflow.providers.cloudant.get_provider_info" ]; - version = "4.3.2"; + version = "4.3.5"; }; cncf_kubernetes = { @@ -280,7 +300,7 @@ "airflow.providers.cncf.kubernetes" "airflow.providers.cncf.kubernetes.get_provider_info" ]; - version = "10.14.0"; + version = "10.18.1"; }; cohere = { @@ -292,19 +312,27 @@ "airflow.providers.cohere" "airflow.providers.cohere.get_provider_info" ]; - version = "1.6.3"; + version = "1.6.6"; }; common_ai = { deps = [ + "fastavro" + "langchain" + "llama-index-core" + "llama-index-embeddings-openai" + "llama-index-llms-openai" + "pyarrow" "pydantic-ai-slim" + "pypdf" + "python-docx" "sqlglot" ]; imports = [ "airflow.providers.common.ai" "airflow.providers.common.ai.get_provider_info" ]; - version = "0.0.1"; + version = "0.5.0"; }; common_compat = { @@ -313,7 +341,7 @@ "airflow.providers.common.compat" "airflow.providers.common.compat.get_provider_info" ]; - version = "1.14.1"; + version = "1.15.0"; }; common_io = { @@ -322,7 +350,7 @@ "airflow.providers.common.io" "airflow.providers.common.io.get_provider_info" ]; - version = "1.7.1"; + version = "1.7.3"; }; common_messaging = { @@ -331,7 +359,7 @@ "airflow.providers.common.messaging" "airflow.providers.common.messaging.get_provider_info" ]; - version = "2.0.2"; + version = "2.0.4"; }; common_sql = { @@ -349,7 +377,7 @@ "airflow.providers.common.sql" "airflow.providers.common.sql.get_provider_info" ]; - version = "1.33.0"; + version = "2.0.1"; }; databricks = { @@ -368,7 +396,7 @@ "airflow.providers.databricks" "airflow.providers.databricks.get_provider_info" ]; - version = "7.11.0"; + version = "7.16.1"; }; datadog = { @@ -377,7 +405,7 @@ "airflow.providers.datadog" "airflow.providers.datadog.get_provider_info" ]; - version = "3.10.2"; + version = "3.10.5"; }; dbt_cloud = { @@ -390,7 +418,7 @@ "airflow.providers.dbt.cloud" "airflow.providers.dbt.cloud.get_provider_info" ]; - version = "4.7.0"; + version = "4.9.2"; }; dingding = { @@ -399,7 +427,7 @@ "airflow.providers.dingding" "airflow.providers.dingding.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; discord = { @@ -408,7 +436,7 @@ "airflow.providers.discord" "airflow.providers.discord.get_provider_info" ]; - version = "3.12.0"; + version = "3.12.3"; }; docker = { @@ -420,7 +448,7 @@ "airflow.providers.docker" "airflow.providers.docker.get_provider_info" ]; - version = "4.5.3"; + version = "4.5.7"; }; edge3 = { @@ -434,16 +462,19 @@ "airflow.providers.edge3" "airflow.providers.edge3.get_provider_info" ]; - version = "3.2.0"; + version = "4.0.0"; }; elasticsearch = { - deps = [ "elasticsearch" ]; + deps = [ + "elasticsearch" + "polars" + ]; imports = [ "airflow.providers.elasticsearch" "airflow.providers.elasticsearch.get_provider_info" ]; - version = "6.5.0"; + version = "6.7.0"; }; exasol = { @@ -455,11 +486,12 @@ "airflow.providers.exasol" "airflow.providers.exasol.get_provider_info" ]; - version = "4.10.0"; + version = "4.10.3"; }; fab = { deps = [ + "authlib" "blinker" "cachetools" "flask" @@ -481,7 +513,7 @@ "airflow.providers.fab" "airflow.providers.fab.get_provider_info" ]; - version = "3.5.0"; + version = "3.7.0"; }; facebook = { @@ -490,7 +522,7 @@ "airflow.providers.facebook" "airflow.providers.facebook.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; ftp = { @@ -499,7 +531,7 @@ "airflow.providers.ftp" "airflow.providers.ftp.get_provider_info" ]; - version = "3.14.1"; + version = "3.15.1"; }; git = { @@ -508,7 +540,7 @@ "airflow.providers.git" "airflow.providers.git.get_provider_info" ]; - version = "0.2.4"; + version = "0.4.0"; }; github = { @@ -517,7 +549,7 @@ "airflow.providers.github" "airflow.providers.github.get_provider_info" ]; - version = "2.11.0"; + version = "2.11.3"; }; google = { @@ -563,6 +595,7 @@ "plyvel" "proto-plus" "pyarrow" + "pydantic" "python-slugify" "ray" "tenacity" @@ -572,7 +605,7 @@ "airflow.providers.google" "airflow.providers.google.get_provider_info" ]; - version = "21.0.0"; + version = "22.2.0"; }; grpc = { @@ -585,7 +618,7 @@ "airflow.providers.grpc" "airflow.providers.grpc.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; hashicorp = { @@ -597,13 +630,14 @@ "airflow.providers.hashicorp" "airflow.providers.hashicorp.get_provider_info" ]; - version = "4.5.0"; + version = "4.7.1"; }; http = { deps = [ "aiohttp" "asgiref" + "pydantic" "requests" "requests-toolbelt" ]; @@ -611,7 +645,16 @@ "airflow.providers.http" "airflow.providers.http.get_provider_info" ]; - version = "6.0.0"; + version = "6.0.4"; + }; + + ibm_mq = { + deps = [ "asgiref" ]; + imports = [ + "airflow.providers.ibm.mq" + "airflow.providers.ibm.mq.get_provider_info" + ]; + version = "0.1.0"; }; imap = { @@ -620,28 +663,29 @@ "airflow.providers.imap" "airflow.providers.imap.get_provider_info" ]; - version = "3.11.0"; + version = "3.11.3"; }; influxdb = { deps = [ "influxdb-client" + "influxdb3-python" "requests" ]; imports = [ "airflow.providers.influxdb" "airflow.providers.influxdb.get_provider_info" ]; - version = "2.10.2"; + version = "2.11.0"; }; informatica = { - deps = [ ]; + deps = [ "sqlglot" ]; imports = [ "airflow.providers.informatica" "airflow.providers.informatica.get_provider_info" ]; - version = "0.1.1"; + version = "0.2.0"; }; jdbc = { @@ -653,7 +697,7 @@ "airflow.providers.jdbc" "airflow.providers.jdbc.get_provider_info" ]; - version = "5.4.1"; + version = "5.5.0"; }; jenkins = { @@ -662,7 +706,7 @@ "airflow.providers.jenkins" "airflow.providers.jenkins.get_provider_info" ]; - version = "4.2.3"; + version = "4.2.6"; }; keycloak = { @@ -671,7 +715,7 @@ "airflow.providers.keycloak" "airflow.providers.keycloak.get_provider_info" ]; - version = "0.6.0"; + version = "0.8.0"; }; microsoft_azure = { @@ -709,7 +753,7 @@ "airflow.providers.microsoft.azure" "airflow.providers.microsoft.azure.get_provider_info" ]; - version = "13.0.1"; + version = "13.5.0"; }; microsoft_mssql = { @@ -721,7 +765,7 @@ "airflow.providers.microsoft.mssql" "airflow.providers.microsoft.mssql.get_provider_info" ]; - version = "4.5.0"; + version = "4.7.0"; }; microsoft_psrp = { @@ -730,7 +774,7 @@ "airflow.providers.microsoft.psrp" "airflow.providers.microsoft.psrp.get_provider_info" ]; - version = "3.2.3"; + version = "3.2.6"; }; microsoft_winrm = { @@ -739,7 +783,7 @@ "airflow.providers.microsoft.winrm" "airflow.providers.microsoft.winrm.get_provider_info" ]; - version = "3.14.0"; + version = "3.14.3"; }; mongo = { @@ -751,12 +795,13 @@ "airflow.providers.mongo" "airflow.providers.mongo.get_provider_info" ]; - version = "5.3.3"; + version = "5.4.0"; }; mysql = { deps = [ "aiomysql" + "mysql-connector-python" "mysqlclient" "pymysql" ]; @@ -764,7 +809,7 @@ "airflow.providers.mysql" "airflow.providers.mysql.get_provider_info" ]; - version = "6.5.0"; + version = "6.6.1"; }; neo4j = { @@ -773,7 +818,7 @@ "airflow.providers.neo4j" "airflow.providers.neo4j.get_provider_info" ]; - version = "3.11.3"; + version = "3.11.6"; }; odbc = { @@ -782,7 +827,7 @@ "airflow.providers.odbc" "airflow.providers.odbc.get_provider_info" ]; - version = "4.12.0"; + version = "4.12.3"; }; openai = { @@ -791,7 +836,7 @@ "airflow.providers.openai" "airflow.providers.openai.get_provider_info" ]; - version = "1.7.2"; + version = "1.7.5"; }; openfaas = { @@ -800,7 +845,7 @@ "airflow.providers.openfaas" "airflow.providers.openfaas.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; openlineage = { @@ -812,7 +857,7 @@ "airflow.providers.openlineage" "airflow.providers.openlineage.get_provider_info" ]; - version = "2.12.0"; + version = "2.18.1"; }; opensearch = { @@ -821,7 +866,7 @@ "airflow.providers.opensearch" "airflow.providers.opensearch.get_provider_info" ]; - version = "1.8.4"; + version = "1.10.0"; }; opsgenie = { @@ -830,7 +875,7 @@ "airflow.providers.opsgenie" "airflow.providers.opsgenie.get_provider_info" ]; - version = "5.10.1"; + version = "5.10.4"; }; oracle = { @@ -842,7 +887,7 @@ "airflow.providers.oracle" "airflow.providers.oracle.get_provider_info" ]; - version = "4.5.1"; + version = "4.6.1"; }; pagerduty = { @@ -851,7 +896,7 @@ "airflow.providers.pagerduty" "airflow.providers.pagerduty.get_provider_info" ]; - version = "5.2.3"; + version = "5.2.6"; }; papermill = { @@ -865,7 +910,7 @@ "airflow.providers.papermill" "airflow.providers.papermill.get_provider_info" ]; - version = "3.12.1"; + version = "3.13.1"; }; pgvector = { @@ -874,7 +919,7 @@ "airflow.providers.pgvector" "airflow.providers.pgvector.get_provider_info" ]; - version = "1.7.0"; + version = "1.7.2"; }; pinecone = { @@ -883,7 +928,7 @@ "airflow.providers.pinecone" "airflow.providers.pinecone.get_provider_info" ]; - version = "2.4.2"; + version = "2.4.5"; }; postgres = { @@ -899,7 +944,7 @@ "airflow.providers.postgres" "airflow.providers.postgres.get_provider_info" ]; - version = "6.6.1"; + version = "6.8.0"; }; presto = { @@ -913,7 +958,7 @@ "airflow.providers.presto" "airflow.providers.presto.get_provider_info" ]; - version = "5.11.0"; + version = "5.12.0"; }; qdrant = { @@ -922,7 +967,7 @@ "airflow.providers.qdrant" "airflow.providers.qdrant.get_provider_info" ]; - version = "1.5.3"; + version = "1.5.6"; }; redis = { @@ -931,7 +976,7 @@ "airflow.providers.redis" "airflow.providers.redis.get_provider_info" ]; - version = "4.4.2"; + version = "4.5.0"; }; salesforce = { @@ -943,7 +988,7 @@ "airflow.providers.salesforce" "airflow.providers.salesforce.get_provider_info" ]; - version = "5.12.3"; + version = "5.14.1"; }; samba = { @@ -952,7 +997,7 @@ "airflow.providers.samba" "airflow.providers.samba.get_provider_info" ]; - version = "4.12.3"; + version = "4.12.6"; }; segment = { @@ -961,23 +1006,21 @@ "airflow.providers.segment" "airflow.providers.segment.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; sendgrid = { - deps = [ - "sendgrid" - "werkzeug" - ]; + deps = [ "sendgrid" ]; imports = [ "airflow.providers.sendgrid" "airflow.providers.sendgrid.get_provider_info" ]; - version = "4.2.1"; + version = "4.2.4"; }; sftp = { deps = [ + "aiofiles" "asyncssh" "paramiko" "pysftp" @@ -987,7 +1030,7 @@ "airflow.providers.sftp" "airflow.providers.sftp.get_provider_info" ]; - version = "5.7.1"; + version = "5.8.2"; }; singularity = { @@ -996,11 +1039,12 @@ "airflow.providers.singularity" "airflow.providers.singularity.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.4"; }; slack = { deps = [ + "aiohttp" "asgiref" "slack-sdk" ]; @@ -1008,7 +1052,7 @@ "airflow.providers.slack" "airflow.providers.slack.get_provider_info" ]; - version = "9.8.0"; + version = "9.10.2"; }; smtp = { @@ -1017,7 +1061,7 @@ "airflow.providers.smtp" "airflow.providers.smtp.get_provider_info" ]; - version = "2.4.3"; + version = "3.0.1"; }; snowflake = { @@ -1032,7 +1076,7 @@ "airflow.providers.snowflake" "airflow.providers.snowflake.get_provider_info" ]; - version = "6.11.0"; + version = "6.14.0"; }; sqlite = { @@ -1041,20 +1085,19 @@ "airflow.providers.sqlite" "airflow.providers.sqlite.get_provider_info" ]; - version = "4.3.0"; + version = "4.3.3"; }; ssh = { deps = [ "asyncssh" "paramiko" - "sshtunnel" ]; imports = [ "airflow.providers.ssh" "airflow.providers.ssh.get_provider_info" ]; - version = "4.3.2"; + version = "5.0.3"; }; standard = { @@ -1063,7 +1106,7 @@ "airflow.providers.standard" "airflow.providers.standard.get_provider_info" ]; - version = "1.12.1"; + version = "1.15.0"; }; tableau = { @@ -1072,7 +1115,7 @@ "airflow.providers.tableau" "airflow.providers.tableau.get_provider_info" ]; - version = "5.3.3"; + version = "5.5.0"; }; telegram = { @@ -1081,7 +1124,7 @@ "airflow.providers.telegram" "airflow.providers.telegram.get_provider_info" ]; - version = "4.9.2"; + version = "4.9.5"; }; teradata = { @@ -1090,7 +1133,7 @@ "airflow.providers.teradata" "airflow.providers.teradata.get_provider_info" ]; - version = "3.5.0"; + version = "3.6.0"; }; trino = { @@ -1099,7 +1142,7 @@ "airflow.providers.trino" "airflow.providers.trino.get_provider_info" ]; - version = "6.5.0"; + version = "6.6.0"; }; vertica = { @@ -1111,7 +1154,16 @@ "airflow.providers.vertica" "airflow.providers.vertica.get_provider_info" ]; - version = "4.3.0"; + version = "4.4.0"; + }; + + vespa = { + deps = [ ]; + imports = [ + "airflow.providers.vespa" + "airflow.providers.vespa.get_provider_info" + ]; + version = "0.1.1"; }; weaviate = { @@ -1124,7 +1176,7 @@ "airflow.providers.weaviate" "airflow.providers.weaviate.get_provider_info" ]; - version = "3.3.1"; + version = "3.3.5"; }; yandex = { @@ -1133,7 +1185,7 @@ "airflow.providers.yandex" "airflow.providers.yandex.get_provider_info" ]; - version = "4.4.0"; + version = "4.5.0"; }; ydb = { @@ -1142,7 +1194,7 @@ "airflow.providers.ydb" "airflow.providers.ydb.get_provider_info" ]; - version = "2.5.0"; + version = "2.5.3"; }; zendesk = { @@ -1151,7 +1203,7 @@ "airflow.providers.zendesk" "airflow.providers.zendesk.get_provider_info" ]; - version = "4.11.1"; + version = "4.12.0"; }; } diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index e3cc15913a6f..0a00fe496460 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -36,6 +36,7 @@ hatchling, httpx, importlib-metadata, + isoduration, itsdangerous, jinja2, jsonschema, @@ -114,7 +115,7 @@ buildPythonPackage ( pnpm = pnpm_10; sourceRoot = uiAttrs.sourceRoot; fetcherVersion = 3; - hash = "sha256-wJ2u+y3umecL4IeVW/29/yDgYZ77ffOBQLHeplD3XlQ="; + hash = "sha256-bKdZ4Y+enrXYuSpJ85eFHl2EM+QfZsMTGqQZ9yLfGEc="; }; buildPhase = '' @@ -147,7 +148,7 @@ buildPythonPackage ( pnpm = pnpm_10; sourceRoot = simpleUiAttrs.sourceRoot; fetcherVersion = 3; - hash = "sha256-AKaafmDjIlg4eFJT1JGyelXVjcId8f0iXTR3JK4ZMq0="; + hash = "sha256-Ye8jRs9jgsf3YUd3JPldEcTzQFmgS4cvkOVP6tuZw+8="; }; buildPhase = '' @@ -228,10 +229,12 @@ buildPythonPackage ( fsspec greenback httpx + isoduration jinja2 jsonschema methodtools msgspec + opentelemetry-api pendulum psutil pydantic @@ -349,7 +352,7 @@ buildPythonPackage ( in { pname = "apache-airflow"; - version = "3.2.2"; + version = "3.3.0"; strictDeps = true; __structuredAttrs = true; @@ -358,7 +361,7 @@ buildPythonPackage ( owner = "apache"; repo = "airflow"; tag = finalAttrs.version; - hash = "sha256-nAFSLdcKmP2CNm3rx+/fwIsJnpju7wBl+fYWQV8p+sU="; + hash = "sha256-1DRaJCJ488BKUOEFaFMGnZjS2yxBx4pwHvIP67juu54="; }; pyproject = true; diff --git a/pkgs/by-name/ap/apache-airflow/update-providers.py b/pkgs/by-name/ap/apache-airflow/update-providers.py index 53293d9e60fa..e956992b566b 100755 --- a/pkgs/by-name/ap/apache-airflow/update-providers.py +++ b/pkgs/by-name/ap/apache-airflow/update-providers.py @@ -27,6 +27,7 @@ PKG_PREFERENCES = { "protobuf": "protobuf", "pydantic": "pydantic", "requests_toolbelt": "requests-toolbelt", + "setuptools": "setuptools", "sqlalchemy": "sqlalchemy", } From 78dba10b76e99b1ecd1e4c02a430114a05ac1b57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jul 2026 08:51:01 +0000 Subject: [PATCH 08/44] plover_5: 5.3.0 -> 5.4.0 (cherry picked from commit f350348488197c7d3319983afca4ce2043918725) --- pkgs/development/python-modules/plover/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix index 7676abeb0ee2..fe58e8120c8e 100644 --- a/pkgs/development/python-modules/plover/5.nix +++ b/pkgs/development/python-modules/plover/5.nix @@ -40,14 +40,14 @@ buildPythonPackage (finalAttrs: { __structuredAttrs = true; pname = "plover"; - version = "5.3.0"; + version = "5.4.0"; pyproject = true; src = fetchFromGitHub { owner = "openstenoproject"; repo = "plover"; tag = "v${finalAttrs.version}"; - hash = "sha256-1NpZmUDq806geKANqswPYglHwInxum/c/Hxq7JhTpbc="; + hash = "sha256-qaEuzPVqh+e3qq778VdUaRufGzOx9HyUnygIbA0+6kw="; }; # pythonRelaxDeps seemingly doesn't work here From 56d953ab53fc90500a347695eb6f801745abf93f Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sun, 5 Jul 2026 19:32:31 +0200 Subject: [PATCH 09/44] discord: expose stageModules to allow overriding (cherry picked from commit 52ecd13b26de7e707b3056b8452ee0743fedf624) --- .../networking/instant-messengers/discord/linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index e6f62c4c729f..52a3214577e4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: { dontUnpack = true; - inherit libPath; + inherit libPath stageModules; autoPatchelfIgnoreMissingDeps = [ "libssl.so.1.1" @@ -260,7 +260,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName} \ ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \ - --run "${stageModules} $out/opt/${binaryName}/modules" \ + --run "${finalAttrs.stageModules} $out/opt/${binaryName}/modules" \ --add-flags ${lib.escapeShellArg commandLineArgs} ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ From b731fff6a15375093cc42cfcb2423f562b9d1ef6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jul 2026 04:12:44 +0000 Subject: [PATCH 10/44] openlist: 4.2.2 -> 4.2.3 (cherry picked from commit 27b1de41d9ee558552a5ee5b187381b44336a146) --- pkgs/by-name/op/openlist/frontend.nix | 8 ++++---- pkgs/by-name/op/openlist/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix index 3a58dd89834a..1589b83333ee 100644 --- a/pkgs/by-name/op/openlist/frontend.nix +++ b/pkgs/by-name/op/openlist/frontend.nix @@ -12,18 +12,18 @@ }: buildNpmPackage (finalAttrs: { pname = "openlist-frontend"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList-Frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-RLuAGjiYELy+roip2TtvUXGOw6Vk+GkczT1LSI0Vx+8="; + hash = "sha256-33W0JCAmt3pjhAAOxoaZS7zBbJJbl4i85fqyKzoibz8="; }; i18n = fetchzip { url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz"; - hash = "sha256-ZO/ozyRNqh2W4/acQmGHoEMpjpf2jph7Gn/kOlwVSFs="; + hash = "sha256-nnsnYXbH4Uq+sux11txanUs11MB2dHIT0vCLMIzYQdg="; stripRoot = false; }; @@ -41,7 +41,7 @@ buildNpmPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = openlistPnpm; fetcherVersion = 4; - hash = "sha256-ujsCuQexnKPNwoJzaWmhu3+4xMkZ0jR04m2exG674dI="; + hash = "sha256-V+YhQsfUvd8WHxIYEjuihEjTZE75eFfziq2GwW1rPbg="; }; npmConfigHook = pnpmConfigHook; diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix index 022bb7240bee..e98ef06ca68c 100644 --- a/pkgs/by-name/op/openlist/package.nix +++ b/pkgs/by-name/op/openlist/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "openlist"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList"; tag = "v${finalAttrs.version}"; - hash = "sha256-MxoF+hpzn/44knjVeaINo4/1T4ia7HG8mm+tbvJEsfQ="; + hash = "sha256-q7s6u/pQ+bvSbz19029uO9CzVc1KVoISpcStngVUffs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { frontend = callPackage ./frontend.nix { }; proxyVendor = true; - vendorHash = "sha256-ScPfry0PtSlABdyG+7egMAndG7D3iz1+ceAAhLQPtkM="; + vendorHash = "sha256-a4v2JP/+feit3uTqnACWgl77fWZU8yVE/0Hm7qxoI8E="; nativeBuildInputs = [ installShellFiles From de367be335941dec29ac2dc2d1a4bded9cf385b3 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 9 Jul 2026 22:55:22 -0400 Subject: [PATCH 11/44] brave: 1.92.134 -> 1.92.139 https://community.brave.app/t/release-channel-1-92-139/655404 (cherry picked from commit 074dcdfaa7dd784411a61acc1d3ae4708e8d7a2b) --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index a4781eeb6744..f42a60bd89b2 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.92.134"; + version = "1.92.139"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-qo40t+PGl1RO2ajJ2Hev4G1FWvzTx7Ak5CVxjdxabLI="; + hash = "sha256-CkCpXgP4InjfjuhKqG66OjuZcqq7VLLK3/n+7fXpMj0="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-T3A/ejmLkIRYGWc8GXQmvIAZvQFwYEyhQJxssNDalhQ="; + hash = "sha256-UFQV8iBsa6HdUhGGngpi341o41yRoenkxbG2M90O62A="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-K1p5mAYfEDJNZFSmoOQV7kHNsA5RQuyUl3T2KVsNcbw="; + hash = "sha256-65qGzjXZfY5eTWbxTA9R3jN2F0CdkXnHXGVfw3spujo="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-IrhvRVFZGLoGSVNy10ppFL9rEy7MRTb/HIhzspDsrs8="; + hash = "sha256-XPKKB/X8w5Neuxeluc5OFZVN1thqZ0Cf/pFTP4GY2/o="; }; }; From 384a342a1565ab8300ad2a298db46861c59330a5 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 10 Jul 2026 19:01:02 +0200 Subject: [PATCH 12/44] pnpm: 11.10.0 -> 11.11.0 https://github.com/pnpm/pnpm/releases/tag/v11.11.0 Signed-off-by: Sefa Eyeoglu (cherry picked from commit dd85f021f5042e5e19c229b8503fa93cd983bb61) --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 4a6fee8d59fc..e80d473aa1a9 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -53,8 +53,8 @@ let hash = "sha256-WOFDJYhx31FYm2UcBiBdq+xIdmpdu6PCWZm2m1C+WY4="; }; "11" = { - version = "11.10.0"; - hash = "sha256-YgtmBepPYvxWptCphzP0eQcdAyHgPkhrUix+mnRhdDE="; + version = "11.11.0"; + hash = "sha256-he8u/yFqGukIBMAMjfv6ZoU1NkRlDRCQaok8Ba7c2IQ="; }; }; From 0e9beea9ac97f7126096158a1aebeb3d7916f9d2 Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Sat, 11 Jul 2026 15:14:56 +0200 Subject: [PATCH 13/44] cliamp: fix darwin build Darwin wasn't building due to the length of the socket paths being allowed (104 bytes). This makes a new TMPDIR which is shorter and the build succeeds now. Also, I added the platforms tag which reflects the two platforms I have tested cliamp for. Maybe changing it to unix would also be okay, but I haven't tested it. (cherry picked from commit 64387acfe4e6742d9ae6f559b6e83ce324ccb547) --- pkgs/by-name/cl/cliamp/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix index 384f87b16223..bb7fda0ab5d2 100644 --- a/pkgs/by-name/cl/cliamp/package.nix +++ b/pkgs/by-name/cl/cliamp/package.nix @@ -41,6 +41,11 @@ buildGoModule (finalAttrs: { alsa-lib ]; + # macOS limits Unix socket paths to 104 bytes; use a shorter TMPDIR. + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + export TMPDIR="$(mktemp -d /tmp/cliamp-XXXXXX)" + ''; + postInstall = '' wrapProgram $out/bin/cliamp \ --prefix PATH : ${ @@ -60,6 +65,7 @@ buildGoModule (finalAttrs: { description = "Terminal Winamp - a retro terminal music player inspired by Winamp 2.x"; homepage = "https://github.com/bjarneo/cliamp"; license = lib.licenses.mit; + platforms = with lib.platforms; darwin ++ linux; maintainers = with lib.maintainers; [ supermarin ]; mainProgram = "cliamp"; }; From 85f167237ed455d7fbeb8e2533750f8bcc2a5b06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jul 2026 01:09:08 +0000 Subject: [PATCH 14/44] vivaldi: 8.0.4033.54 -> 8.1.4087.48 (cherry picked from commit fd79cfd13ce0898ef732916a46780f0087b43cc3) --- pkgs/by-name/vi/vivaldi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index f1f08fc50e47..66f5ac76805c 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "8.0.4033.54"; + version = "8.1.4087.48"; suffix = { @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-i2FAMp3MFsnXTjQoF4Y/BuB6j+x3ugfsu0ePGI/h5Po="; - x86_64-linux = "sha256-a4ZLX/DpygZgPPjt4BQxTuRbFoPmNuRgdZFiI6UclQI="; + aarch64-linux = "sha256-T6mBi4FpHz2iGXeF91giTbuVp4KjFG1DUnPNpKEV06c="; + x86_64-linux = "sha256-/Bgh+Y6DHWe7al9vLsWWH1HM5JQGwv91KUxQ9TNkqjs="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 80b76e2f294441cbd13124429dfb54a151c06449 Mon Sep 17 00:00:00 2001 From: 3L0C <141392286+3L0C@users.noreply.github.com> Date: Wed, 3 Jun 2026 12:27:29 -0700 Subject: [PATCH 15/44] deadlock-mod-manager: 0.18.0 -> 1.0.0 (cherry picked from commit 62d06da64d5d8ee7945eea973f7225db056891c9) --- .../de/deadlock-mod-manager/package.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/de/deadlock-mod-manager/package.nix b/pkgs/by-name/de/deadlock-mod-manager/package.nix index ef4317966003..f7484213e01b 100644 --- a/pkgs/by-name/de/deadlock-mod-manager/package.nix +++ b/pkgs/by-name/de/deadlock-mod-manager/package.nix @@ -4,7 +4,7 @@ rustPlatform, cargo-tauri, nodejs, - pnpm_9, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, pkg-config, @@ -27,26 +27,26 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "deadlock-mod-manager"; - version = "0.18.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "deadlock-mod-manager"; repo = "deadlock-mod-manager"; tag = "v${finalAttrs.version}"; - hash = "sha256-+64Y6BFwgQIQhmFzZXOeJ/IGFn+OXV58I/ZdARVFt4w="; + hash = "sha256-tSOSjapAlAd63Xkc+MNFVKn1k4+AtW3w3GhicRTV9Pg="; }; cargoRoot = "apps/desktop"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-6ljyPdobcoBaYyarc7Iin5N24y1YXPafrYAk2xvBtvY="; + cargoHash = "sha256-x0lhn8nAV9xTgWbRAabJscATSCNpkKpzWvdnuZ4BEvw="; nativeBuildInputs = [ rustPlatform.cargoSetupHook cargo-tauri.hook nodejs pnpmConfigHook - pnpm_9 + pnpm_11 pkg-config wrapGAppsHook3 ]; @@ -76,10 +76,10 @@ rustPlatform.buildRustPackage (finalAttrs: { version src ; - pnpm = pnpm_9; + pnpm = pnpm_11; fetcherVersion = 3; sourceRoot = "source"; - hash = "sha256-6lMTvlkIeM9kkbFhHzS9jJsHk2bVZWZs6GPgn+X3Rss="; + hash = "sha256-zl+ZrI21EnMBeMInKvEkUObiZ0OA5SJLJjnHwu/Dagc="; }; patches = [ @@ -88,9 +88,13 @@ rustPlatform.buildRustPackage (finalAttrs: { env.VITE_API_URL = "https://api.deadlockmods.app"; - # Skip tests that require network access checkFlags = [ + # Requires network access "--skip=download_manager::downloader::tests::test_download_file" + # Asserts that set_steam_dir rejects a non-Steam directory, but steamlocate + # 2.1.0's SteamDir::from_dir only checks that the path is a directory + # (further validation is an upstream TODO), so this fails in any environment. + "--skip=mod_manager::steam_manager::tests::set_steam_dir_rejects_invalid_directory" ]; preFixup = '' From 5714ed3403a9a7d676edcf2fd096e71a57575669 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 23 May 2026 06:32:23 -0700 Subject: [PATCH 16/44] siyuan: support darwin (cherry picked from commit 19094e7d7baa724d5d3db19e69558ae389c89633) --- pkgs/by-name/si/siyuan/package.nix | 43 +++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 6f3da143226b..2647e2cf6dd4 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -15,12 +15,15 @@ copyDesktopItems, nix-update-script, xdg-utils, + darwin, }: let platformIds = { "x86_64-linux" = "linux"; "aarch64-linux" = "linux-arm64"; + "x86_64-darwin" = "darwin"; + "aarch64-darwin" = "darwin-arm64"; }; platformId = platformIds.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}"); @@ -86,8 +89,13 @@ stdenv.mkDerivation (finalAttrs: { nodejs pnpmConfigHook pnpm_9 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.autoSignDarwinBinariesHook ]; pnpmDeps = fetchPnpmDeps { @@ -114,6 +122,9 @@ stdenv.mkDerivation (finalAttrs: { # link kernel into the correct starting place so that electron-builder can copy it to it's final location mkdir kernel-${platformId} ln -s ${finalAttrs.kernel}/bin/kernel kernel-${platformId}/SiYuan-Kernel + + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist ''; buildPhase = '' @@ -121,19 +132,36 @@ stdenv.mkDerivation (finalAttrs: { pnpm build - npm exec electron-builder -- \ - --dir \ - --config electron-builder-${platformId}.yml \ - -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} + electronBuilderArgs=( + --dir + --config electron-builder-${platformId}.yml + -c.electronDist=electron-dist + -c.electronVersion=${electron.version} + -c.mac.identity=null + ) + + npm exec electron-builder -- "''${electronBuilderArgs[@]}" runHook postBuild ''; installPhase = '' runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications $out/bin + cp -R build/mac*/*.app $out/Applications/SiYuan.app + + cat > $out/bin/siyuan << EOF + #!${stdenv.shell} + exec open -na "$out/Applications/SiYuan.app" --args "\$@" + EOF + chmod +x $out/bin/siyuan + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/siyuan + cp -r build/*-unpacked/{locales,resources{,.pak}} $out/share/siyuan makeWrapper ${lib.getExe electron} $out/bin/siyuan \ @@ -145,11 +173,12 @@ stdenv.mkDerivation (finalAttrs: { --inherit-argv0 install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg - + '' + + '' runHook postInstall ''; - desktopItems = [ desktopEntry ]; + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ desktopEntry ]; passthru = { inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD From 69e8611e5daf48a2ac64eff1a1106df7e07dd62a Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 23 May 2026 06:34:22 -0700 Subject: [PATCH 17/44] siyuan: refactor (cherry picked from commit 982047257db8ec474f5c6175bc75126251e6f699) --- pkgs/by-name/si/siyuan/package.nix | 54 ++++++++++++++---------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 2647e2cf6dd4..d1f89fc0c348 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -19,6 +19,10 @@ }: let + inherit (stdenv.hostPlatform) isLinux isDarwin system; + + pnpm = pnpm_9; + platformIds = { "x86_64-linux" = "linux"; "aarch64-linux" = "linux-arm64"; @@ -26,16 +30,7 @@ let "aarch64-darwin" = "darwin-arm64"; }; - platformId = platformIds.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}"); - - desktopEntry = makeDesktopItem { - name = "siyuan"; - desktopName = "SiYuan"; - comment = "Refactor your thinking"; - icon = "siyuan"; - exec = "siyuan %U"; - categories = [ "Utility" ]; - }; + platformId = platformIds.${system} or (throw "Unsupported platform: ${system}"); in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; @@ -72,9 +67,7 @@ stdenv.mkDerivation (finalAttrs: { # Set flags and tags as per upstream's Dockerfile ldflags = [ "-s" - "-w" - "-X" - "github.com/siyuan-note/siyuan/kernel/util.Mode=prod" + "-X 'github.com/siyuan-note/siyuan/kernel/util.Mode=prod'" ]; tags = [ "fts5" ]; }; @@ -88,13 +81,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_9 + pnpm ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals isLinux [ makeWrapper copyDesktopItems ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals isDarwin [ darwin.autoSignDarwinBinariesHook ]; @@ -106,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot postPatch ; - pnpm = pnpm_9; + inherit pnpm; fetcherVersion = 3; hash = "sha256-GAbP9H+c+JXymH0/vpeYOJrkkFJGVyKcpJYFeyRLSKc="; }; @@ -148,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString isDarwin '' mkdir -p $out/Applications $out/bin cp -R build/mac*/*.app $out/Applications/SiYuan.app @@ -159,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { EOF chmod +x $out/bin/siyuan '' - + lib.optionalString stdenv.hostPlatform.isLinux '' + + lib.optionalString isLinux '' mkdir -p $out/share/siyuan cp -r build/*-unpacked/{locales,resources{,.pak}} $out/share/siyuan @@ -178,16 +171,21 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ desktopEntry ]; + desktopItems = lib.optional isLinux (makeDesktopItem { + name = "siyuan"; + desktopName = "SiYuan"; + comment = "Refactor your thinking"; + icon = "siyuan"; + exec = "siyuan %U"; + categories = [ "Utility" ]; + }); - passthru = { - inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "^v(\\d+\\.\\d+\\.\\d+)$" - ]; - }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v(\\d+\\.\\d+\\.\\d+)$" + "--subpackage=kernel" + ]; }; meta = { From e0675ea65a80e2da0da95b03ed06566d18a78326 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 23 May 2026 06:35:35 -0700 Subject: [PATCH 18/44] siyuan: switch to pnpm_10 (cherry picked from commit 062581ebdc8c71d5e1065aeb2005f9b19770fd32) --- pkgs/by-name/si/siyuan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index d1f89fc0c348..88c6090f1809 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -6,7 +6,7 @@ replaceVars, pandoc, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, electron, @@ -21,7 +21,7 @@ let inherit (stdenv.hostPlatform) isLinux isDarwin system; - pnpm = pnpm_9; + pnpm = pnpm_10; platformIds = { "x86_64-linux" = "linux"; @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 3; - hash = "sha256-GAbP9H+c+JXymH0/vpeYOJrkkFJGVyKcpJYFeyRLSKc="; + hash = "sha256-M2Fdie0XK2Pck/fP7Djxb7XNAQXpJO2i2kSJrDj1G0E="; }; sourceRoot = "${finalAttrs.src.name}/app"; From 4f8d225a6620ece114452ce5652c5999095b7f4e Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 8 Jun 2026 20:02:34 +0700 Subject: [PATCH 19/44] syncyomi: migrate to pnpm 10 and fetcherVersion 4 (cherry picked from commit 69cfab08242ad712333d829403c0d86822a93498) --- pkgs/by-name/sy/syncyomi/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix index 656edd499d13..d496a193a4fc 100644 --- a/pkgs/by-name/sy/syncyomi/package.nix +++ b/pkgs/by-name/sy/syncyomi/package.nix @@ -6,7 +6,7 @@ libredirect, buildGoModule, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, esbuild, @@ -51,15 +51,15 @@ buildGoModule (finalAttrs: { src sourceRoot ; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-paCYfh7tjDuPm8JCpzhCNjL1ZsyQTNxofW8UNIKjqmE="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-i4ji/NjK6/hpqrma+DJ2x5kKq/YEN3Cy8mKQLy1M+dU="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_9 + pnpm_10 ]; env.ESBUILD_BINARY_PATH = lib.getExe lockedEsbuild; From 2259c901d7961c9adcb0007351866ba209219ab8 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Fri, 3 Jul 2026 23:55:21 -0400 Subject: [PATCH 20/44] typstPackages: Do not build in Hydra Downloading from the cache is basically the same building anyways, no reason to build on Hydra TBH. (cherry picked from commit a75da8d0dcc8a960c1d352290bdda9962e2c8fea) --- pkgs/by-name/ty/typst/build-universe-package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ty/typst/build-universe-package.nix b/pkgs/by-name/ty/typst/build-universe-package.nix index a7628f6412dd..af1e0cf4dbe3 100644 --- a/pkgs/by-name/ty/typst/build-universe-package.nix +++ b/pkgs/by-name/ty/typst/build-universe-package.nix @@ -45,6 +45,8 @@ lib.extendMkDerivation { RossSmyth ]; license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) license; + # Sending a bunch of trivial jobs to Hydra is not that great. + hydraPlatforms = [ ]; } // lib.optionalAttrs (homepage != null) { inherit homepage; }; }; From 13589be17f214b9e1a7b07618c437d8839fafce1 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Sat, 11 Jul 2026 08:12:41 +0000 Subject: [PATCH 21/44] olivetin-3k: 3000.15.0 -> 3000.17.0 (cherry picked from commit 688d2cc58097b13ac24e8b66e076c8c031574718) --- pkgs/by-name/ol/olivetin/3k.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ol/olivetin/3k.nix b/pkgs/by-name/ol/olivetin/3k.nix index 8979c680a5c7..6178db460409 100644 --- a/pkgs/by-name/ol/olivetin/3k.nix +++ b/pkgs/by-name/ol/olivetin/3k.nix @@ -16,13 +16,13 @@ buildGoModule (finalAttrs: { pname = "olivetin"; - version = "3000.15.0"; + version = "3000.17.0"; src = fetchFromGitHub { owner = "OliveTin"; repo = "OliveTin"; tag = finalAttrs.version; - hash = "sha256-AztJqhSJV9hIsnhaYZoIMC8ZE17pUT37nRUdCZ6ZiCA="; + hash = "sha256-oLBXDd1grSFEbCvB4bK2XeVOZONSYro/6rvMJkG8eU0="; }; modRoot = "service"; @@ -75,7 +75,7 @@ buildGoModule (finalAttrs: { ''; outputHashMode = "recursive"; - outputHash = "sha256-v7aSikl1VSFZdNKnIucs7RdqFWoaVNIH9u27YG9Ei90="; + outputHash = "sha256-X602MebKdmdxZ9OEtQ150u+/Z1O9FEvcxRtOhMorqyw="; }; webui = buildNpmPackage { From 8e9b075a57159ee58a0a16c5f18663128d27d3a9 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 2 Jul 2026 15:33:30 +0100 Subject: [PATCH 22/44] fastmail: 1.2.1 -> 1.3.0, add aarch64-linux support (cherry picked from commit c9df35f5a17790b31abbe96ff71a10c13c48b186) --- pkgs/by-name/fa/fastmail-desktop/linux.nix | 15 +++++++++++--- pkgs/by-name/fa/fastmail-desktop/package.nix | 1 + pkgs/by-name/fa/fastmail-desktop/sources.nix | 21 +++++++++++++------- pkgs/by-name/fa/fastmail-desktop/update.sh | 11 ++++++++++ 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix index 98f354809842..b973981b57f1 100644 --- a/pkgs/by-name/fa/fastmail-desktop/linux.nix +++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix @@ -66,9 +66,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; # remove musl-libc dependencies before the autoPatchelfHook - preFixup = '' - rm -r "$out/opt/fastmail/app.asar.unpacked/node_modules/@img/"{sharp-linuxmusl-x64,sharp-libvips-linuxmusl-x64} - ''; + preFixup = + let + suffix = + { + aarch64-linux = "arm64"; + x86_64-linux = "x64"; + } + .${stdenvNoCC.targetPlatform.system}; + in + '' + rm -r "$out/opt/fastmail/app.asar.unpacked/node_modules/@img/"{sharp-linuxmusl-${suffix},sharp-libvips-linuxmusl-${suffix}} + ''; meta = meta // { mainProgram = "fastmail"; diff --git a/pkgs/by-name/fa/fastmail-desktop/package.nix b/pkgs/by-name/fa/fastmail-desktop/package.nix index ae6f88fdd833..20ad3f4fa7ae 100644 --- a/pkgs/by-name/fa/fastmail-desktop/package.nix +++ b/pkgs/by-name/fa/fastmail-desktop/package.nix @@ -26,6 +26,7 @@ callPackage (if isDarwin then ./darwin.nix else ./linux.nix) { ]; platforms = [ "aarch64-darwin" + "aarch64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix index 374f140afcaf..ed1f0b99d90a 100644 --- a/pkgs/by-name/fa/fastmail-desktop/sources.nix +++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix @@ -1,19 +1,26 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2026-03-23 +# Last updated: 2026-07-02 { fetchurl, fetchzip }: { aarch64-darwin = { - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.2.1-arm64-mac.zip"; - hash = "sha512-bu6IeL8X8ogD1qSlAuApWTBTCYIk5QrjWrzjOv8fel+kqYfCIcDXP1DP1FdJwULe91zoZn4M/uDX8CoOPWa0cA=="; + url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.3.0-arm64-mac.zip"; + hash = "sha512-6iRUcoI0dsW5ByaQ7dv7Oki5y0Y1wuMlQjjCpqWaThttsNJ4yYXh812RGsPjJTvcwVNMvPRbmPcbb/y//mXqRg=="; + }; + }; + aarch64-linux = { + version = "1.3.0"; + src = fetchurl { + url = "https://dl.fastmailcdn.com/desktop/production/linux/arm64/com.fastmail.Fastmail-1.3.0-arm64.AppImage"; + hash = "sha512-XJdxJVJ3xdhF04TInc3vmEtcUnzPzwujzTix+t2WbRo9qNEPqxnmN6hurGq0dZO/Dnk7jgOfAkjCpVq/kxWVRQ=="; }; }; x86_64-linux = { - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.2.1.AppImage"; - hash = "sha512-xudOPNjOaumYxD7yZyjQnYhuiKqDO10cBwMdFJtVEOfHVia0jJMgdUTJx03otIBn9ijM3/1Qo6wsq1HF0A/zlQ=="; + url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.3.0.AppImage"; + hash = "sha512-KnFAmjGQGXfA83JDynSixecoqqZbnC0bYGFQVf8YfP3ITwspHNDj3TIMp2jqXKtl9j4DlH1w8eLwSbKD0En9Wg=="; }; }; } diff --git a/pkgs/by-name/fa/fastmail-desktop/update.sh b/pkgs/by-name/fa/fastmail-desktop/update.sh index c21c13c3fe7a..4c84120dfefa 100755 --- a/pkgs/by-name/fa/fastmail-desktop/update.sh +++ b/pkgs/by-name/fa/fastmail-desktop/update.sh @@ -6,15 +6,19 @@ set -euo pipefail cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")" x86_64_linux_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/linux/x64/latest-linux.yml") +aarch64_linux_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/linux/arm64/latest-linux-arm64.yml") aarch64_darwin_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/mac/arm64/latest-mac.yml") x86_64_linux_version=$(yq -r '.version' <<<"$x86_64_linux_info") +aarch64_linux_version=$(yq -r '.version' <<<"$aarch64_linux_info") aarch64_darwin_version=$(yq -r '.version' <<<"$aarch64_darwin_info") x86_64_linux_url="https://dl.fastmailcdn.com/desktop/production/linux/x64/$(yq -r '.path' <<<"$x86_64_linux_info")" +aarch64_linux_url="https://dl.fastmailcdn.com/desktop/production/linux/arm64/$(yq -r '.path' <<<"$aarch64_linux_info")" aarch64_darwin_url="https://dl.fastmailcdn.com/desktop/production/mac/arm64/$(yq -r '.path' <<<"$aarch64_darwin_info")" x86_64_linux_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$x86_64_linux_info")") +aarch64_linux_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$aarch64_linux_info")") aarch64_darwin_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$aarch64_darwin_info")") cat >sources.nix <sources.nix < Date: Fri, 10 Jul 2026 01:14:51 -0400 Subject: [PATCH 23/44] adw-bluetooth: 1.1.0 -> 1.1.2 (cherry picked from commit 6e2e4934077ee77e10c4d40a217c3f764a0c46a9) --- pkgs/by-name/ad/adw-bluetooth/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/adw-bluetooth/package.nix b/pkgs/by-name/ad/adw-bluetooth/package.nix index f0b700ee9c9b..2052e675c892 100644 --- a/pkgs/by-name/ad/adw-bluetooth/package.nix +++ b/pkgs/by-name/ad/adw-bluetooth/package.nix @@ -15,13 +15,13 @@ }: let - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "ezratweaver"; repo = "adw-bluetooth"; tag = version; - hash = "sha256-h3cHtecwBsx3j33qXVn/zaq4FZext71P7flzunCHqHg="; + hash = "sha256-0rySzx03KeKeqtl0yrbnj/tVbpVPBAKDz+1qLQ5kZRc="; }; daemon = buildGoModule { From 9e480764f4de4a5e2f4521e70094d66fbc6bde03 Mon Sep 17 00:00:00 2001 From: Coca Date: Sun, 5 Jul 2026 12:26:31 +0100 Subject: [PATCH 24/44] space-station-14-launcher: add nix-update-script `nix-update-script` is needed for releases which change `nugetDeps` to get automatically updated. (cherry picked from commit d55366fd3768b601dc1b91537019b0e41dc9c3b0) --- pkgs/by-name/sp/space-station-14-launcher/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index 09262aa781c7..437fbdf2b704 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -2,6 +2,7 @@ lib, stdenv, config, + nix-update-script, buildDotnetModule, dotnetCorePackages, fetchFromGitHub, @@ -133,6 +134,8 @@ buildDotnetModule rec { icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico ${pname} $out ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster"; homepage = "https://spacestation14.io"; From ef84b10306ce613e63ee42fd3c2a171f0a72d97b Mon Sep 17 00:00:00 2001 From: Coca Date: Sun, 5 Jul 2026 12:28:45 +0100 Subject: [PATCH 25/44] space-station-14-launcher: 0.39.0 -> 0.39.1 Changelog (practically just one change): https://github.com/space-wizards/SS14.Launcher/compare/v0.39.0...v0.39.1 (cherry picked from commit 6f8d1c82b9515cfd8b14485eb68506918c118506) --- pkgs/by-name/sp/space-station-14-launcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index 437fbdf2b704..93efed21473b 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -40,7 +40,7 @@ }: let pname = "space-station-14-launcher"; - version = "0.39.0"; + version = "0.39.1"; in buildDotnetModule rec { inherit pname; @@ -53,7 +53,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; tag = "v${version}"; - hash = "sha256-i5jcaB1wa+Toj6orpEQ9sK3EX1CLWadnhTEQDOU7QU4="; + hash = "sha256-u3tsPWAFMckWSHhiPqL50i9BMxR+VrLnpUSWGRRu9AA="; fetchSubmodules = true; }; From 11d90917a8d6e681287532c111123b843cad6283 Mon Sep 17 00:00:00 2001 From: Holiu <165534185+Holiu618@users.noreply.github.com> Date: Thu, 9 Jul 2026 21:48:08 +0800 Subject: [PATCH 26/44] lakefs: 1.79.0 -> 1.83.0 (cherry picked from commit 566427f307a91422da170a0e85e0ca36b8ac1237) --- pkgs/by-name/la/lakefs/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/la/lakefs/package.nix b/pkgs/by-name/la/lakefs/package.nix index 1ad8c3fbc909..b275e4808f28 100644 --- a/pkgs/by-name/la/lakefs/package.nix +++ b/pkgs/by-name/la/lakefs/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "lakefs"; - version = "1.79.0"; + version = "1.83.0"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-UL9JvrNvtHADI0POguLXMDNNvO1oKHXXwfr8tOyvFYc="; + hash = "sha256-5/2iI5/87x+VJ1MbYw7zPEDeTm1XVuLmSsI6KssRGRE="; }; webui = buildNpmPackage { @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { nodejs = nodejs_22; - npmDepsHash = "sha256-Z9oOIKK6Hm/Bg3E37f4FqFFL1exMIf0KNEHQXIyox+Q="; + npmDepsHash = "sha256-AKCsxBW2ZBQB5fPkS1adAt8z6mHuC/zGMHhRW8pVyYs="; installPhase = '' runHook preInstall @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { subPackages = [ "cmd/lakefs" ]; proxyVendor = true; - vendorHash = "sha256-6XOJBDdAERD6mcneQ7UFqAPGq+pXroNlzQGNvycpVBc="; + vendorHash = "sha256-UNDIqP79CG2+M8HKkHT1l7X2/Dt6YDTQzADR5T7klUg="; ldflags = [ "-s" From 14ebd6072e006e4836071acb95485bd89745ae07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 14:04:34 +0000 Subject: [PATCH 27/44] zotero: 9.0.4 -> 9.0.5 (cherry picked from commit a3b43c83bc3dc259ee7f99f60168b0b6449277b0) --- pkgs/by-name/zo/zotero/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index 438a9eee0f86..f9759391318b 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -28,14 +28,14 @@ let nodejs = nodejs_22; pname = "zotero"; - version = "9.0.4"; + version = "9.0.5"; src = fetchFromGitHub { owner = "zotero"; repo = "zotero"; tag = version; fetchSubmodules = true; - hash = "sha256-YMaDCYdCNJQ8zXfCkV5tb3RA3foXRlKo2TWv6pgk8VM="; + hash = "sha256-yNGx3GpBnQHB6//7JNKRz9GKjJJeUb/UkYDGDdOUTAk="; }; pdf-js = buildNpmPackage { From ee1759ce730c66a55b3fdbddc38cda6ef707ce4d Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Fri, 10 Jul 2026 14:03:23 +0200 Subject: [PATCH 28/44] python3Packages.sqlalchemy_1_3: create new event loop if not exists This fixes the broken build: https://hydra.nixos.org/build/336830567 See also: https://github.com/NixOS/nixpkgs/pull/528120#issuecomment-4934908836 (cherry picked from commit 9b1f82d4af0068db750bac58602ced7ce54bf841) --- ...-create-new-event-loop-if-not-exists.patch | 26 +++++++++++++++++++ .../python-modules/sqlalchemy/1_3.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch diff --git a/pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch b/pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch new file mode 100644 index 000000000000..e10c13868423 --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch @@ -0,0 +1,26 @@ +From 98fd6e87243c6d5992429a9b90426af73dbcc3ff Mon Sep 17 00:00:00 2001 +From: Bart Oostveen +Date: Fri, 10 Jul 2026 13:59:21 +0200 +Subject: [PATCH] fix: create new event loop if not exists + +--- + lib/sqlalchemy/util/_concurrency_py3k.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/sqlalchemy/util/_concurrency_py3k.py b/lib/sqlalchemy/util/_concurrency_py3k.py +index 1e4ffef..5aaf12c 100644 +--- a/lib/sqlalchemy/util/_concurrency_py3k.py ++++ b/lib/sqlalchemy/util/_concurrency_py3k.py +@@ -190,6 +190,8 @@ def get_event_loop(): + try: + return asyncio.get_running_loop() + except RuntimeError: +- return asyncio.get_event_loop_policy().get_event_loop() ++ loop = asyncio.new_event_loop() ++ asyncio.set_event_loop(loop) ++ return loop + else: + return asyncio.get_event_loop() +-- +2.54.0 + diff --git a/pkgs/development/python-modules/sqlalchemy/1_3.nix b/pkgs/development/python-modules/sqlalchemy/1_3.nix index b57cd123a030..38670bc2b31c 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_3.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_3.nix @@ -37,6 +37,8 @@ buildPythonPackage (finalAttrs: { hash = "sha256-6qAjyqMVrugABHssAQuql3z1YHTAOSm5hARJuJXJJvo="; }; + patches = [ ./1.3-0001-fix-create-new-event-loop-if-not-exists.patch ]; + postPatch = '' sed -i '/tag_build = dev/d' setup.cfg ''; From 0976ddb447486f808afa74987f36baa58594cba4 Mon Sep 17 00:00:00 2001 From: Mukul Agarwal Date: Mon, 6 Jul 2026 19:24:25 -0400 Subject: [PATCH 29/44] zotero: change all instances of targetPlatform to hostPlatform (cherry picked from commit f4b1bade01b2239ab315431df7f1199b270bb440) --- pkgs/by-name/zo/zotero/package.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index f9759391318b..87f409fcef08 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -181,10 +181,10 @@ buildNpmPackage (finalAttrs: { rsync copyDesktopItems ] - ++ lib.optionals stdenv.targetPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ] - ++ lib.optionals (!stdenv.targetPlatform.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ wrapGAppsHook3 ]; @@ -246,12 +246,12 @@ buildNpmPackage (finalAttrs: { # The correct firefox version can be found in zotero/app/config.sh at `GECKO_VERSION_LINUX`. mkdir -p app/xulrunner/ '' - + lib.optionalString stdenv.targetPlatform.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' cp -r "${firefox-esr-140-unwrapped}/Applications/Firefox ESR.app" app/xulrunner/Firefox.app '' - + lib.optionalString (!stdenv.targetPlatform.isDarwin) '' - cp -r "${firefox-esr-140-unwrapped}/lib/firefox" "app/xulrunner/firefox-${stdenv.targetPlatform.parsed.kernel.name}-${ - lib.replaceString "aarch64" "arm64" stdenv.targetPlatform.parsed.cpu.name + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + cp -r "${firefox-esr-140-unwrapped}/lib/firefox" "app/xulrunner/firefox-${stdenv.hostPlatform.parsed.kernel.name}-${ + lib.replaceString "aarch64" "arm64" stdenv.hostPlatform.parsed.cpu.name }" '' + '' @@ -260,9 +260,7 @@ buildNpmPackage (finalAttrs: { build_dir=$(mktemp -d) ./app/scripts/prepare_build -s ./build -o "$build_dir" -c release ./app/build.sh -d "$build_dir" -c release -s \ - ${ - if stdenv.targetPlatform.isDarwin then "-p m" else "-p l -a ${zoteroArch stdenv.targetPlatform}" - } + ${if stdenv.hostPlatform.isDarwin then "-p m" else "-p l -a ${zoteroArch stdenv.hostPlatform}"} runHook postBuild ''; @@ -306,12 +304,12 @@ buildNpmPackage (finalAttrs: { installPhase = '' runHook preInstall '' - + lib.optionalString stdenv.targetPlatform.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Copy package contents mkdir -p $out/Applications cp -r app/staging/Zotero.app $out/Applications/ '' - + lib.optionalString (!stdenv.targetPlatform.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Copy package contents mkdir -p $out/lib/ cp -r app/staging/*/. $out/lib/ @@ -330,7 +328,7 @@ buildNpmPackage (finalAttrs: { runHook postInstall ''; - preFixup = lib.optionalString (!stdenv.targetPlatform.isDarwin) '' + preFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' gappsWrapperArgs+=(--suffix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ libGL @@ -340,7 +338,7 @@ buildNpmPackage (finalAttrs: { }) ''; - postFixup = lib.optionalString stdenv.targetPlatform.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin makeWrapper $out/Applications/Zotero.app/Contents/MacOS/zotero $out/bin/zotero ''; From bba87362a316e95c87fecd2747a68841e7159410 Mon Sep 17 00:00:00 2001 From: Mukul Agarwal Date: Mon, 6 Jul 2026 19:54:57 -0400 Subject: [PATCH 30/44] zotero: sign .app bundle on darwin (cherry picked from commit 37121b66bb50d612ffceae96780b0945f838ccc2) --- pkgs/by-name/zo/zotero/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index 87f409fcef08..ac26b577a26e 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, buildNpmPackage, + darwin, nodejs_22, perl, python3, @@ -183,6 +184,7 @@ buildNpmPackage (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper + darwin.autoSignDarwinBinariesHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ wrapGAppsHook3 From 941c3b285f55971419ab1fdbf23476eb6e98e87a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jul 2026 01:23:29 +0000 Subject: [PATCH 31/44] zotero: 9.0.5 -> 9.0.6 (cherry picked from commit a112faabfdee7ed17b2ea2c627925ee5ee603739) --- pkgs/by-name/zo/zotero/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index ac26b577a26e..e99c3efda3f9 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -29,14 +29,14 @@ let nodejs = nodejs_22; pname = "zotero"; - version = "9.0.5"; + version = "9.0.6"; src = fetchFromGitHub { owner = "zotero"; repo = "zotero"; tag = version; fetchSubmodules = true; - hash = "sha256-yNGx3GpBnQHB6//7JNKRz9GKjJJeUb/UkYDGDdOUTAk="; + hash = "sha256-9Rku6iF7Sczqekw8ms8hluIc+B/5BE9zHlBqp7vGlY4="; }; pdf-js = buildNpmPackage { From 785805e713e6a7ec72b1fdab81367e69acc81806 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Sat, 11 Jul 2026 18:05:27 -0400 Subject: [PATCH 32/44] gittuf: remove stale sandbox gendoc binary Signed-off-by: Anish Pallati (cherry picked from commit 1e179f89a6b50d47a5f6fb417230ad3dd5d571c5) --- pkgs/by-name/gi/gittuf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index b963b8db8bb4..2e58fb86b8e7 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { "-skip=TestSSH" ]; - postInstall = "rm $out/bin/cli"; # remove gendoc cli binary + postInstall = "rm $out/bin/cli $out/bin/sandbox"; # remove gendoc helper binaries meta = { changelog = "https://github.com/gittuf/gittuf/blob/v${finalAttrs.version}/CHANGELOG.md"; From 1f862753854b5fbbc82988eb4278f19f9403f0f2 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Sat, 11 Jul 2026 18:13:12 -0400 Subject: [PATCH 33/44] gittuf: 0.12.0 -> 0.15.0 Signed-off-by: Anish Pallati (cherry picked from commit a2f18e4e1e9f1af82c3ca3ef5dda255140e8d602) --- pkgs/by-name/gi/gittuf/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index 2e58fb86b8e7..a78ddb8d614c 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -3,26 +3,30 @@ fetchFromGitHub, buildGoModule, git, + gnupg, + less, openssh, }: buildGoModule (finalAttrs: { pname = "gittuf"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "gittuf"; repo = "gittuf"; rev = "v${finalAttrs.version}"; - hash = "sha256-/PKbo8LPvU6ZTav9n82mrj2h6z6AyJ225mCH7EfazVU="; + hash = "sha256-VWbM7y9XCs/pANJtPa3MDbDhuEtVQ97X5Cyo6yY0Rd8="; }; - vendorHash = "sha256-unj9PpRkfNHWQzeCmcjppMFGAlHNcP0/j9EiGvpRzRc="; + vendorHash = "sha256-VTfS0bLq7B037qmFABO5JDrV98zik5ycR4s6NZr3H4s="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${finalAttrs.version}" ]; nativeCheckInputs = [ git + gnupg + less openssh ]; checkFlags = [ From 64d7f12bd564f759ee043f1759473c610199c3e7 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Sat, 11 Jul 2026 18:13:13 -0400 Subject: [PATCH 34/44] gittuf: modernize Signed-off-by: Anish Pallati (cherry picked from commit 744b91139e0b2b3bdd6c9f84bc14d98fd42d31be) --- pkgs/by-name/gi/gittuf/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index a78ddb8d614c..147f39266e07 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -15,7 +15,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "gittuf"; repo = "gittuf"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VWbM7y9XCs/pANJtPa3MDbDhuEtVQ97X5Cyo6yY0Rd8="; }; @@ -23,21 +23,21 @@ buildGoModule (finalAttrs: { ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${finalAttrs.version}" ]; + __structuredAttrs = true; + strictDeps = true; + nativeCheckInputs = [ git gnupg less openssh ]; - checkFlags = [ - "-skip=TestLoadRepository" - "-skip=TestSSH" - ]; + checkFlags = [ "-skip=TestLoadRepository|TestSSH" ]; postInstall = "rm $out/bin/cli $out/bin/sandbox"; # remove gendoc helper binaries meta = { - changelog = "https://github.com/gittuf/gittuf/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/gittuf/gittuf/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Security layer for Git repositories"; homepage = "https://gittuf.dev"; license = lib.licenses.asl20; From 4d8d1279e284dfba199839ce1b6f24a83b8193b2 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Sat, 11 Jul 2026 18:13:13 -0400 Subject: [PATCH 35/44] gittuf: add versionCheckHook and update script Signed-off-by: Anish Pallati (cherry picked from commit a322b7b5aa502bc45abaad4b50c38c8baeff51c2) --- pkgs/by-name/gi/gittuf/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index 147f39266e07..f108db4750be 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -6,6 +6,8 @@ gnupg, less, openssh, + versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { @@ -36,6 +38,12 @@ buildGoModule (finalAttrs: { postInstall = "rm $out/bin/cli $out/bin/sandbox"; # remove gendoc helper binaries + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/gittuf/gittuf/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Security layer for Git repositories"; From c60691afdc92f588a5dfa5f28a4c4136f49d0e76 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Sat, 11 Jul 2026 18:13:13 -0400 Subject: [PATCH 36/44] gittuf: add anish as maintainer Signed-off-by: Anish Pallati (cherry picked from commit dae13962a07dee5511a13eeae5f46ed0100a9f4b) --- pkgs/by-name/gi/gittuf/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index f108db4750be..b20a034433b6 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -50,6 +50,9 @@ buildGoModule (finalAttrs: { homepage = "https://gittuf.dev"; license = lib.licenses.asl20; mainProgram = "gittuf"; - maintainers = with lib.maintainers; [ flandweber ]; + maintainers = with lib.maintainers; [ + flandweber + anish + ]; }; }) From e87d0ca108f94b0d178cc0c03108c1ce6f264764 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 12 Jul 2026 02:36:50 -0600 Subject: [PATCH 37/44] tandoor-recipes: 2.6.9 -> 2.6.13 https://github.com/TandoorRecipes/recipes/releases/tag/2.6.13 https://github.com/TandoorRecipes/recipes/releases/tag/2.6.12 Diff: https://github.com/TandoorRecipes/recipes/compare/2.6.9...2.6.13 (cherry picked from commit 9dad28e4d8beebe1a47dc93a04ad65efd9cbe48f) --- pkgs/by-name/ta/tandoor-recipes/common.nix | 6 +++--- pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index c66507a466d2..5e9c6b78eeea 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "2.6.9"; + version = "2.6.13"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; tag = version; - hash = "sha256-g151bUOpAp+7+K92kF+eK5SR2aCHPHdFc3UXqOO4aSw="; + hash = "sha256-7620qMp3Trg2be51CP0LKas/1egk3Rmo+aaMp0pe83k="; }; - yarnHash = "sha256-Un5pHocZZrXajY3AGfqV1kjT9twE8B93rwoJMi4CILg="; + yarnHash = "sha256-EpmFGyuWZeqzdi8wPX7ABjfJKWP8r5qqpdfNKdOFiso="; meta = { homepage = "https://tandoor.dev/"; diff --git a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch index 444b19df821f..012912f491a0 100644 --- a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch +++ b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch @@ -9,6 +9,3 @@ index 2755dc99..4026b96e 100644 -addopts = -n auto --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html +addopts = -n @NIX_BUILD_CORES@ --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html # addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html --asyncio_default_fixture_loop_scope = fixture -\ No newline at end of file -+asyncio_default_fixture_loop_scope = function From 5d820c54a1e55e21ffb63075ce5b4c357fdd5b79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jul 2026 09:53:20 +0000 Subject: [PATCH 38/44] fastmail-desktop: 1.3.0 -> 1.4.0 (cherry picked from commit c340b08594dd05ac14070b978e81811282ad1b2c) --- pkgs/by-name/fa/fastmail-desktop/sources.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix index ed1f0b99d90a..380636526ff8 100644 --- a/pkgs/by-name/fa/fastmail-desktop/sources.nix +++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix @@ -1,26 +1,26 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2026-07-02 +# Last updated: 2026-07-11 { fetchurl, fetchzip }: { aarch64-darwin = { - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.3.0-arm64-mac.zip"; - hash = "sha512-6iRUcoI0dsW5ByaQ7dv7Oki5y0Y1wuMlQjjCpqWaThttsNJ4yYXh812RGsPjJTvcwVNMvPRbmPcbb/y//mXqRg=="; + url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.4.0-arm64-mac.zip"; + hash = "sha512-QyZZu6pwFJ0SkVye0/OtvNTligl6qKsYbpJfdPeHojPj+OqVyV8bavz15Lest+v7ALJhACZ3x+2kBiWa0ZCSow=="; }; }; aarch64-linux = { - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/linux/arm64/com.fastmail.Fastmail-1.3.0-arm64.AppImage"; - hash = "sha512-XJdxJVJ3xdhF04TInc3vmEtcUnzPzwujzTix+t2WbRo9qNEPqxnmN6hurGq0dZO/Dnk7jgOfAkjCpVq/kxWVRQ=="; + url = "https://dl.fastmailcdn.com/desktop/production/linux/arm64/com.fastmail.Fastmail-1.4.0-arm64.AppImage"; + hash = "sha512-sw55AwedyijKTXWAAAaSi6sgGMGK0uF4nPtQRacp9VG5EwlC+0wedyO4ax2cWxhsVUSXnk9ngN4mkraSd07vag=="; }; }; x86_64-linux = { - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.3.0.AppImage"; - hash = "sha512-KnFAmjGQGXfA83JDynSixecoqqZbnC0bYGFQVf8YfP3ITwspHNDj3TIMp2jqXKtl9j4DlH1w8eLwSbKD0En9Wg=="; + url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.4.0.AppImage"; + hash = "sha512-0hNTRFNAnnLPq19isnaoVlXNl6za4Z5o6yh9ovU564JBMyAjsDNHk8h+2zArSSpydaUky6tIgAUsOhhWrIRtcg=="; }; }; } From 6da50c1bb2a05259e15413ca132564064680d2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Jul 2026 12:35:59 -0700 Subject: [PATCH 39/44] python3Packages.bentoml: mark insecure (cherry picked from commit d634535db18fdab6b85e768e3c3b7db247d6a53f) --- pkgs/development/python-modules/bentoml/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index 99703c943757..07dab66f838d 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -248,6 +248,14 @@ buildPythonPackage { description = "Build Production-Grade AI Applications"; homepage = "https://github.com/bentoml/BentoML"; changelog = "https://github.com/bentoml/BentoML/releases/tag/${src.tag}"; + knownVulnerabilities = [ + "CVE-2026-27905" + "CVE-2026-33744" + "CVE-2026-35043" + "CVE-2026-35044" + "CVE-2026-44345" + "CVE-2026-44346" + ]; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada From f3c5338d8812ed80e1dacc0e7447d94b696a85f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Jul 2026 12:57:02 -0700 Subject: [PATCH 40/44] openllm: mark insecure (cherry picked from commit 895f7deddc7515f5c094c8af312a274e3f90e570) --- pkgs/by-name/op/openllm/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/op/openllm/package.nix b/pkgs/by-name/op/openllm/package.nix index d197e40c8dd3..321e25db6daa 100644 --- a/pkgs/by-name/op/openllm/package.nix +++ b/pkgs/by-name/op/openllm/package.nix @@ -64,6 +64,9 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Run any open-source LLMs, such as Llama 3.1, Gemma, as OpenAI compatible API endpoint in the cloud"; homepage = "https://github.com/bentoml/OpenLLM"; changelog = "https://github.com/bentoml/OpenLLM/releases/tag/${finalAttrs.src.tag}"; + knownVulnerabilities = [ + "CVE-2026-15035" + ]; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada From 04bb332a3365b10f8a64303a5406490af35765c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 23 May 2026 22:08:43 -0700 Subject: [PATCH 41/44] python3Packages.litellm: 1.83.14 -> 1.86.0 Diff: https://github.com/BerriAI/litellm/compare/v1.83.14-stable...v1.86.0 Changelog: https://github.com/BerriAI/litellm/releases/tag/v1.86.0 (cherry picked from commit db6c4dfcb7f304d726a23d2b62e9bd7f254830d2) --- pkgs/development/python-modules/litellm/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 4720f405d2b8..e4b8edc8ff16 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -43,7 +43,6 @@ python-dotenv, python-multipart, pyyaml, - requests, resend, restrictedpython, rich, @@ -62,19 +61,19 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.83.14"; + version = "1.86.0"; pyproject = true; src = fetchFromGitHub { owner = "BerriAI"; repo = "litellm"; - tag = "v${version}-stable"; - hash = "sha256-SZow0qof9DRlohWjT3J/NHtmhe96OLLcdHt55RQ7Zmw="; + tag = "v${version}"; + hash = "sha256-uInjKBUduDAfXHg5dQj5/qqqMJhlDeTri1kULkz5unM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "uv_build==0.10.7" "uv_build" + --replace-fail "uv_build==0.11.8" "uv_build" ''; build-system = [ uv-build ]; @@ -90,7 +89,6 @@ buildPythonPackage rec { openai pydantic python-dotenv - requests tiktoken tokenizers ]; @@ -175,7 +173,7 @@ buildPythonPackage rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v([0-9]+\\.[0-9]+\\.[0-9]+)-stable" + "v([0-9]+\\.[0-9]+\\.[0-9]+)" ]; }; }; From e21ffd080f57433bdba3736f9b04bfc7a8264d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Jul 2026 13:10:54 -0700 Subject: [PATCH 42/44] python3Packages.vllm: add more known vulnerabilities (cherry picked from commit c11ef722638031b362942fac5b13182846785ccf) --- pkgs/development/python-modules/vllm/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 06946cc2ef2a..4b6a7c7aeca6 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -605,9 +605,21 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { "x86_64-darwin" ]; knownVulnerabilities = [ + "CVE-2026-25960" "CVE-2026-27893" + "CVE-2026-41523" "CVE-2026-44222" "CVE-2026-44223" + "CVE-2026-47155" + "CVE-2026-48746" + "CVE-2026-53923" + "CVE-2026-54232" + "CVE-2026-54233" + "CVE-2026-54234" + "CVE-2026-54235" + "CVE-2026-54236" + "CVE-2026-55514" + "CVE-2026-55574" ]; }; }) From d67fd7bdfd6793e4b6f5f807c6f4c1f3f9f624ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Jul 2026 20:59:48 +0200 Subject: [PATCH 43/44] privatebin: 2.0.4 -> 2.0.5 Diff: https://github.com/PrivateBin/PrivateBin/compare/2.0.4...2.0.5 Changelog: https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.5 (cherry picked from commit 30f2fa0ce11e48b79815b75b7591b1f484c5ca3e) --- pkgs/by-name/pr/privatebin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix index 58086830458d..9de52c4b9e4c 100644 --- a/pkgs/by-name/pr/privatebin/package.nix +++ b/pkgs/by-name/pr/privatebin/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "privatebin"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "PrivateBin"; repo = "PrivateBin"; tag = finalAttrs.version; - hash = "sha256-OyTEi1D+B33e0Dqr/l/uTBcPTlC7AAqc2atnClYhyGo="; + hash = "sha256-om0l9psEus4+XZ+aXQ3DK5iWtQeCfCi2D6lNP+9FM6U="; }; installPhase = '' From d92b5d2a16fd0a811242f82615a68bcf8a8028a0 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 9 Jul 2026 01:51:45 +0200 Subject: [PATCH 44/44] nixos/emacs: don't restartIfChanged Fixes https://github.com/NixOS/nixpkgs/issues/535449 This probably started happening with the rust rewrite of the switcher also restarting user units now. (cherry picked from commit 9ea8264500b87994378db382e93447bb9013aba1) --- nixos/modules/services/editors/emacs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 2cf753484a80..c47577a6ce09 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -80,6 +80,9 @@ in unitConfig = lib.optionalAttrs cfg.startWithGraphical { After = "graphical-session.target"; }; + + # Long-lived session that ought to only be restarted manually + restartIfChanged = false; } // lib.optionalAttrs cfg.enable { wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ];