From 40412c4c7c477abc7ae6e3610074dcb2e5b3c7bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 01:45:15 +0000 Subject: [PATCH 01/22] comaps: 2025.10.20-1 -> 2025.11.01-7 --- pkgs/by-name/co/comaps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix index 5667c5231ed1..74944ce825ef 100644 --- a/pkgs/by-name/co/comaps/package.nix +++ b/pkgs/by-name/co/comaps/package.nix @@ -36,14 +36,14 @@ let in organicmaps.overrideAttrs (oldAttrs: rec { pname = "comaps"; - version = "2025.10.20-1"; + version = "2025.11.01-7"; src = fetchFromGitea { domain = "codeberg.org"; owner = "comaps"; repo = "comaps"; tag = "v${version}"; - hash = "sha256-9L7wyIXieKkKSrudnmPyiLPu4Jfp10xWi5o5lGslLWc="; + hash = "sha256-qmIL8VIjHYivFCR5lAYY55aeQgsYsvzBwpSVxc74EC8="; fetchSubmodules = true; }; From 3bdb8d8f9370b76bf336e9ad3ed74bb4e0cae580 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 6 Nov 2025 18:50:31 +0800 Subject: [PATCH 02/22] cagebreak: 3.0.0 -> 3.1.0 --- pkgs/by-name/ca/cagebreak/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/cagebreak/package.nix b/pkgs/by-name/ca/cagebreak/package.nix index 49601ee280cf..5f4a1d2c5b01 100644 --- a/pkgs/by-name/ca/cagebreak/package.nix +++ b/pkgs/by-name/ca/cagebreak/package.nix @@ -23,18 +23,18 @@ wayland-scanner, withXwayland ? true, xwayland, - wlroots_0_18, + wlroots_0_19, }: stdenv.mkDerivation (finalAttrs: { pname = "cagebreak"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "project-repo"; repo = "cagebreak"; tag = finalAttrs.version; - hash = "sha256-vXRIZqFyywRettzriOArl1FGdzWdaeVOfYFZCiPLQZg="; + hash = "sha256-ADRtfzmn8DmDNbiJO3WbhQZiriJoUAG2TxPmx+RwPXE="; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { systemd wayland wayland-protocols - wlroots_0_18 + wlroots_0_19 ]; mesonFlags = [ From b66c90b658ad6276bea3e5f54b65fa5e590d7c93 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 9 Nov 2025 12:38:50 +0900 Subject: [PATCH 03/22] plemoljp, plemoljp-{nf,hs}: refine updateScript * Share `version` and `meta` in font variants While fonts have fewer restrictions than executables, the motivation is essentially the same as 900ebdb9e482bdfc63f8231d93a058d4836e7ae9. There is no reason to update these packages individually. * Add `updateScript` Upstream used `-beta*` tags for the 2.0.0 release. The script now only targets tags for stable versions. * Prefer `finalAttrs` over `rec`' I included this modernization in the same commit because it relates to the version reference. --- pkgs/by-name/pl/plemoljp-hs/package.nix | 19 +++++++++---------- pkgs/by-name/pl/plemoljp-nf/package.nix | 19 +++++++++---------- pkgs/by-name/pl/plemoljp/package.nix | 13 ++++++++++--- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index edd261d80865..d7be0af69b5b 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -1,15 +1,18 @@ { - lib, stdenvNoCC, fetchzip, + plemoljp, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp-hs"; - version = "3.0.0"; + + # plemoljp's updateScript also updates this version. + # nixpkgs-update: no auto update + inherit (plemoljp) version; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_HS_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_HS_v${finalAttrs.version}.zip"; hash = "sha256-V21T8ktNZE4nq3SH6aN9iIJHmGTkZuMsvT84yHbwSqI="; }; @@ -24,11 +27,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = { + meta = plemoljp.meta // { description = "Composite font of IBM Plex Mono, IBM Plex Sans JP and hidden full-width space"; - homepage = "https://github.com/yuru7/PlemolJP"; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ kachick ]; }; -} +}) diff --git a/pkgs/by-name/pl/plemoljp-nf/package.nix b/pkgs/by-name/pl/plemoljp-nf/package.nix index b54b18dada26..c37d584f9292 100644 --- a/pkgs/by-name/pl/plemoljp-nf/package.nix +++ b/pkgs/by-name/pl/plemoljp-nf/package.nix @@ -1,15 +1,18 @@ { - lib, stdenvNoCC, fetchzip, + plemoljp, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp-nf"; - version = "3.0.0"; + + # plemoljp's updateScript also updates this version. + # nixpkgs-update: no auto update + inherit (plemoljp) version; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_NF_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_NF_v${finalAttrs.version}.zip"; hash = "sha256-m8zR9ySl88DnVzG4fKJtc9WjSLDMLU4YDX+KXhcP2WU="; }; @@ -22,11 +25,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = { + meta = plemoljp.meta // { description = "Composite font of IBM Plex Mono, IBM Plex Sans JP and nerd-fonts"; - homepage = "https://github.com/yuru7/PlemolJP"; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ kachick ]; }; -} +}) diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix index 4aee3298f8b8..3899f7448193 100644 --- a/pkgs/by-name/pl/plemoljp/package.nix +++ b/pkgs/by-name/pl/plemoljp/package.nix @@ -2,14 +2,15 @@ lib, stdenvNoCC, fetchzip, + nix-update-script, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp"; version = "3.0.0"; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_v${finalAttrs.version}.zip"; hash = "sha256-R4zC1pnM72FVqBQ5d03z8vyVccsM163BE15m2hdEnSA="; }; @@ -24,6 +25,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; + }; + }; + meta = { description = "Composite font of IBM Plex Mono and IBM Plex Sans JP"; homepage = "https://github.com/yuru7/PlemolJP"; @@ -31,4 +38,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ kachick ]; }; -} +}) From 6b659f0f352341e327089437bb1a0cf4a9815ffe Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 9 Nov 2025 01:46:22 -0600 Subject: [PATCH 04/22] lmstudio: 0.3.30.2 -> 0.3.31.7 --- pkgs/by-name/lm/lmstudio/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 3b5bd0383065..e47f63cb38b1 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.30-2"; - hash_aarch64-darwin = "sha256-49wubBIteg+gs9RQEozRiiFgWnVlHm1aOf7EqK1uvt4="; - version_x86_64-linux = "0.3.30-2"; - hash_x86_64-linux = "sha256-v2m5/BoyGXRi09To9rHp79+t2QnT5U0XuL5WNpfWWRU="; + version_aarch64-darwin = "0.3.31-7"; + hash_aarch64-darwin = "sha256-OyPHKUmZsIU0kc3JxwxdxACSN7hR6gFWjMnGp1x5diQ="; + version_x86_64-linux = "0.3.31-7"; + hash_x86_64-linux = "sha256-NeVteQlzygHkwwgLkB5n7meH02WhFE68KkbGRulDiC0="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; From 528ae39cd99815631ffe21776675e3ac30b2b5b1 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sun, 9 Nov 2025 12:57:15 -0500 Subject: [PATCH 05/22] cemu-ti: disable deploy script generation It's broken with Qt 6.10 and not used by this package. --- .../science/math/cemu-ti/cmake-no-deploy.patch | 13 +++++++++++++ pkgs/applications/science/math/cemu-ti/default.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch diff --git a/pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch b/pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch new file mode 100644 index 000000000000..919dbc05331d --- /dev/null +++ b/pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 68ce1294..5c2924f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -350,7 +350,7 @@ message("Binary dir: ${CMAKE_CURRENT_BINARY_DIR}") + + # TODO: linux .desktop/.xml files + +-if(COMMAND qt_generate_deploy_app_script) ++if(FALSE) + qt_generate_deploy_app_script( + TARGET CEmu + FILENAME_VARIABLE deploy_script diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix index 01e1602406fd..1a4f3c253513 100644 --- a/pkgs/applications/science/math/cemu-ti/default.nix +++ b/pkgs/applications/science/math/cemu-ti/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: { # This is resolved upstream, but I can't apply the patch because the # sourceRoot isn't set to the base of the Git repo. ./resolve-ambiguous-constexpr.patch + # Disable the deploy_script generation. It's broken with Qt 6.10 and not used by this package. + ./cmake-no-deploy.patch ]; nativeBuildInputs = [ From 7b3e094d9e67441418619e30a54d0cc3e49c932b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 21:50:54 +0000 Subject: [PATCH 06/22] ruffle: 0.2.0-nightly-2025-11-03 -> 0.2.0-nightly-2025-11-09 --- pkgs/by-name/ru/ruffle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 1acc5e8c6098..6709bf59af50 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0.2.0-nightly-2025-11-03"; + version = "0.2.0-nightly-2025-11-09"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version; - hash = "sha256-CthzW6yJLQPqzLotDD8jy46nvQKSUbK5I3z18y/CyyU="; + hash = "sha256-InOLycAjM1w1G+6yvPK5Je+X/EE5/wpeyJ5JAbB7YzU="; }; postPatch = @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "OpenH264Version(${major}, ${minor}, ${patch})" ''; - cargoHash = "sha256-i0qyi3hBEmc5LuKaBpKPFwk24BQNj2AT26Erz2P5ENk="; + cargoHash = "sha256-GV9tXroySDCA6JWxa2Zgxp0R/Xy9ZPVoYZW2GEow7Tk="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = From 05f91b8dd1b5d9f62cc65cc81ac116c8d65df8b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 14:53:41 +0000 Subject: [PATCH 07/22] snipe-it: 8.3.4 -> 8.3.5 --- pkgs/by-name/sn/snipe-it/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 33996474eea8..0d102e644a9f 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -12,16 +12,16 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "snipe-it"; - version = "8.3.4"; + version = "8.3.5"; src = fetchFromGitHub { owner = "grokability"; repo = "snipe-it"; tag = "v${finalAttrs.version}"; - hash = "sha256-Oi2UClik3l9tGTmzSmhK0B2ce6gNQtwPc1cSMPn207M="; + hash = "sha256-n0N164v3pSlrsFCx52hBGB1f7E1FSoo5XS7uM+SHQXg="; }; - vendorHash = "sha256-gqLVjhixJVfZZA9ilsCNiIoJz2VbAeGHVCARCJ14Rs4="; + vendorHash = "sha256-QRRvjaLYuYXnvrSVx+OITjHtn/UdWRC8aSEXy8uu5IA="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" From 735b827525b296a13617680c367169d20ee11e51 Mon Sep 17 00:00:00 2001 From: er0k Date: Mon, 10 Nov 2025 13:20:58 -0500 Subject: [PATCH 08/22] aws-vault: 7.7.5 -> 7.6.5 There was a breaking change introduced in 7.7.0 on darwin platforms using the keychain backend, as reported by @retrry. This reverts to the last known working version, 7.6.5. --- pkgs/by-name/aw/aws-vault/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index f571c25b9782..9ef03bb306d8 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -9,25 +9,21 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "7.7.5"; + version = "7.6.5"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${version}"; - hash = "sha256-K91GNyvtjDO6UMU9cC+TbUdMWdXrPlKLU8u5cbEMdRA="; + hash = "sha256-2Z3gh4F29v04pV5hz4XEn1GZFLjXMBnbBghGKczoCBk="; }; - proxyVendor = true; - vendorHash = "sha256-3AL3vjKqzjrzgPrLLwIgWpn1hRB6soTMbaRly/fvziA="; - + vendorHash = "sha256-nzeNwiNiDXBO9fwMVlc09Ulj/SPzxV+vrMb70PB5N+8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; - env.CGO_ENABLED = "0"; - postInstall = '' # make xdg-open overrideable at runtime # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links From 19e0510dba1908eeef8cee3e5b9ba2e386194579 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 21:02:21 +0000 Subject: [PATCH 09/22] snort: 3.9.6.0 -> 3.9.7.0 --- pkgs/by-name/sn/snort/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix index 2a58e87a1bb4..599a065c34df 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snort"; - version = "3.9.6.0"; + version = "3.9.7.0"; src = fetchFromGitHub { owner = "snort3"; repo = "snort3"; tag = finalAttrs.version; - hash = "sha256-YZCS2w4T9XskydnC4C2EMies9cUklvL56Umdw9EogLo="; + hash = "sha256-oJTRTcPQ3ByC2v9yM3yp7UVZqcX84StP4Ii96ZX/sIQ="; }; nativeBuildInputs = [ From 694cb8ac102f3bc3a427fe3cf716a844648b5bad Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Mon, 10 Nov 2025 20:57:47 +0100 Subject: [PATCH 10/22] workflows/teams: restrict to NixOS org without the restriction the workflow would trigger on all forks, but it is only relevant on NixOS/nixpkgs --- .github/workflows/teams.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index b848983b5aa2..cca0ca1f65da 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -14,6 +14,7 @@ defaults: jobs: sync: + if: github.event_name != 'schedule' || github.repository_owner == 'NixOS' runs-on: ubuntu-24.04-arm steps: # Use a GitHub App to create the PR so that CI gets triggered and to From 9ee7704b8c80050d91c5876baa0fcebe31975f7d Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 18:24:48 -0500 Subject: [PATCH 11/22] home-assistant-custom-lovelace-modules.atomic-calendar-revive: modernize Gets rid of mkYarnPackage and the custom update script, which was only needed because of mkYarnPackage's need for a package.json file. --- .../atomic-calendar-revive/package.json | 142 ------------------ .../atomic-calendar-revive/package.nix | 45 +++--- .../atomic-calendar-revive/update.sh | 42 ------ 3 files changed, 21 insertions(+), 208 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json delete mode 100755 pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json deleted file mode 100644 index c6c7707172b3..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "name": "atomic-calendar-revive", - "version": "10.0.0", - "description": "Calendar Card for Home Assistant", - "main": "atomic-calendar-revive.js", - "scripts": { - "lint": "eslint src/*.ts | more ", - "lintindex": "eslint src/index.ts | more", - "lintindexfix": "eslint src/index.ts --fix", - "lintfixall": "eslint src/*.ts --fix", - "linteditor": "eslint src/index-editor.ts", - "babel": "babel dist/index.js --out-file dist/atomic-calendar-revive.js", - "rollup": "rollup -c", - "start": "rollup -c --watch --bundleConfigAsCjs", - "build": "rollup -c --bundleConfigAsCjs", - "watch": "rollup -c rollup-dev.config.mjs --bundleConfigAsCjs", - "commit": "cz" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/totaldebug/atomic-calendar-revive.git" - }, - "author": "Steven Marks", - "license": "ISC", - "devDependencies": { - "@babel/cli": "^7.24.7", - "@babel/core": "^7.24.7", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.24.7", - "@babel/plugin-transform-template-literals": "^7.24.7", - "@babel/preset-env": "^7.24.7", - "@rollup/plugin-babel": "^6.0.4", - "@rollup/plugin-commonjs": "^26.0.1", - "@rollup/plugin-eslint": "^9.0.5", - "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-terser": "^0.4.4", - "@semantic-release/changelog": "^6.0.3", - "@semantic-release/exec": "^6.0.3", - "@semantic-release/git": "^10.0.1", - "@typescript-eslint/eslint-plugin": "^7.13.1", - "@typescript-eslint/parser": "^7.13.1", - "babel-preset-minify": "^0.5.2", - "commitizen": "^4.3.0", - "conventional-changelog-conventionalcommits": "^8.0.0", - "cz-conventional-changelog": "^3.3.0", - "eslint": "^9.5.0", - "eslint-config-prettier": "^9.1.0", - "eslint-import-resolver-typescript": "^3.6.1", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-prettier": "^5.1.3", - "prettier": "^3.3.2", - "rollup": "^4.18.0", - "rollup-plugin-serve": "^2.0.3", - "rollup-plugin-typescript2": "^0.36.0", - "semantic-release": "^24.0.0" - }, - "dependencies": { - "@formatjs/icu-messageformat-parser": "^2.7.8", - "@lit-labs/scoped-registry-mixin": "^1.0.3", - "@lit/reactive-element": "2.0.4", - "@material/mwc-formfield": "^0.27.0", - "@material/mwc-icon-button": "^0.27.0", - "@material/mwc-linear-progress": "^0.27.0", - "@material/mwc-list": "^0.27.0", - "@material/mwc-menu": "^0.27.0", - "@material/mwc-notched-outline": "^0.27.0", - "@material/mwc-ripple": "^0.27.0", - "@material/mwc-select": "^0.27.0", - "@material/mwc-switch": "^0.27.0", - "@material/mwc-textfield": "^0.27.0", - "@mdi/js": "^7.4.47", - "@webcomponents/webcomponentsjs": "^2.8.0", - "dayjs": "^1.11.11", - "home-assistant-js-websocket": "^9.4.0", - "lit": "^3.1.4", - "memoize-one": "^6.0.0", - "npm": "^10.8.1", - "typescript": "^5.5.2" - }, - "resolutions": { - "lit": "^3.0.2", - "@lit/reactive-element": "2.0.1" - }, - "bugs": { - "url": "https://github.com/totaldebug/atomic-calendar-revive/issues" - }, - "homepage": "https://github.com/totaldebug/atomic-calendar-revive#readme", - "config": { - "commitizen": { - "path": "./node_modules/cz-conventional-changelog" - } - }, - "release": { - "plugins": [ - [ - "@semantic-release/commit-analyzer", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/release-notes-generator", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/npm", - { - "npmPublish": false - } - ], - [ - "@semantic-release/exec", - { - "prepareCmd": "yarn run build" - } - ], - [ - "@semantic-release/git", - { - "assets": [ - "package.json" - ], - "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" - } - ], - [ - "@semantic-release/github", - { - "assets": [ - { - "path": "dist/atomic-calendar-revive.js" - } - ] - } - ], - "@semantic-release/changelog" - ] - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix index f2d4262a8595..8f71dcce88bf 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix @@ -1,56 +1,53 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, + yarnBuildHook, + yarnConfigHook, + nodejs, + nix-update-script, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "atomic-calendar-revive"; version = "10.0.0"; src = fetchFromGitHub { owner = "totaldebug"; repo = "atomic-calendar-revive"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TaxvxAUcewQH0IMJ0/VjW4+T6squ1tuZIFGn3PE3jhU="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - name = "${pname}-yarn-offline-cache"; - yarnLock = src + "/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-d3lk3mwgaWMPFl/EDUWH/tUlAC7OfhNycOLbi1GzkfM="; }; - buildPhase = '' - runHook preBuild - - yarn run build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; installPhase = '' runHook preInstall mkdir $out - cp ./deps/atomic-calendar-revive/dist/atomic-calendar-revive.js $out + cp ./dist/atomic-calendar-revive.js $out runHook postInstall ''; - doDist = false; + passthru.updateScript = nix-update-script { }; - passthru.updateScript = ./update.sh; - - meta = with lib; { - changelog = "https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v${src.rev}"; + meta = { + changelog = "https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v${finalAttrs.version}"; description = "Advanced calendar card for Home Assistant Lovelace"; homepage = "https://github.com/totaldebug/atomic-calendar-revive"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh deleted file mode 100755 index e3841f2a2feb..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update git jq -# shellcheck shell=bash - -ROOT=$(git rev-parse --show-toplevel) -ATTR=home-assistant-custom-lovelace-modules.atomic-calendar-revive - -cd "$ROOT" || exit 1 - -# get current version in nixpkgs -CURRENT_VERSION=$(nix eval -f ./default.nix --raw "$ATTR") - -# get latest release tag -LATEST_RELEASE=$(curl https://api.github.com/repos/totaldebug/atomic-calendar-revive/releases | jq "[.[] | select(.prerelease == false)][0].tag_name") - -# strip version prefix -LATEST_VERSION=${LATEST_RELEASE//"v"} - -# strip quotes -LATEST_VERSION=${LATEST_VERSION%\"} -LATEST_VERSION=${LATEST_VERSION#\"} - -if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; -then - echo Already on latest version - exit 0 -fi - -echo "Updating to ${LATEST_VERSION}" - -PKGDIR=$(dirname "$0") - -# change to package directory -cd "$PKGDIR" || exit 1 - -# update package.json -echo "https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/v${LATEST_VERSION}/package.json" -curl -o ./package.json "https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/v${LATEST_VERSION}/package.json" - -# update package -cd "$ROOT" || exit 1 -nix-update --version "$LATEST_VERSION" "$ATTR" From 4599cad6b9687b316ee39ed549b88cb809ee0b3a Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 18:25:08 -0500 Subject: [PATCH 12/22] home-assistant-custom-lovelace-modules.button-card: modernize Gets rid of mkYarnPackage and its need for a package.json --- .../button-card/package.json | 78 ------------------- .../button-card/package.nix | 41 +++++----- 2 files changed, 19 insertions(+), 100 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json deleted file mode 100644 index 55bf12512470..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "name": "button-card", - "version": "4.1.2", - "description": "Button card for lovelace", - "main": "dist/button-card.js", - "scripts": { - "build": "npm run lint && npm run rollup", - "rollup": "rollup -c", - "babel": "babel dist/button-card.js --out-file dist/button-card.js", - "lint": "eslint src/*.ts", - "watch": "rollup -c --watch", - "postversion": "npm run build", - "audit-fix": "npx yarn-audit-fix" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/custom-cards/button-card.git" - }, - "keywords": [ - "lovelace" - ], - "author": "kuuji", - "contributors": [ - "Ian Richardson (https://github.com/iantrich)", - "Jérôme Wiedemann (https://github.com/RomRider)" - ], - "license": "MIT", - "bugs": { - "url": "https://github.com/custom-cards/button-card/issues" - }, - "homepage": "https://github.com/custom-cards/button-card#readme", - "devDependencies": { - "@babel/core": "^7.12.3", - "@babel/plugin-proposal-class-properties": "^7.12.1", - "@babel/plugin-proposal-decorators": "^7.12.1", - "@rollup/plugin-babel": "^5.2.1", - "@rollup/plugin-commonjs": "^16.0.0", - "@rollup/plugin-json": "^4.0.2", - "@rollup/plugin-node-resolve": "^10.0.0", - "@semantic-release/changelog": "^5.0.1", - "@semantic-release/commit-analyzer": "^8.0.1", - "@semantic-release/exec": "^5.0.0", - "@semantic-release/git": "^9.0.0", - "@semantic-release/npm": "^7.0.10", - "@semantic-release/release-notes-generator": "^9.0.1", - "@typescript-eslint/eslint-plugin": "^6.1.0", - "@typescript-eslint/parser": "^6.1.0", - "conventional-changelog-conventionalcommits": "^4.5.0", - "eslint": "7.12.1", - "eslint-config-airbnb-base": "^14.1.0", - "eslint-config-prettier": "^6.15.0", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-prettier": "^3.1.2", - "npm": "^6.14.3", - "prettier": "^2.1.2", - "prettier-eslint": "^11.0.0", - "rollup": "^2.33.1", - "rollup-plugin-cleanup": "^3.2.1", - "rollup-plugin-serve": "^1.1.0", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.29.0", - "semantic-release": "^17.3.8", - "ts-lit-plugin": "^1.1.10", - "typescript": "^4.0.5", - "typescript-styled-plugin": "^0.15.0", - "yarn-audit-fix": "^9.3.10" - }, - "dependencies": { - "@ctrl/tinycolor": "^3.1.6", - "@material/mwc-ripple": "^0.19.1", - "fast-copy": "^2.1.0", - "home-assistant-js-websocket": "^8.2.0", - "lit": "^2.7.6", - "lit-element": "^3.3.2", - "lit-html": "^2.7.5", - "memoize-one": "^6.0.0" - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix index e0c4883406cc..adab8aafae02 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix @@ -1,53 +1,50 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, + yarnBuildHook, + yarnConfigHook, + nodejs, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "button-card"; version = "4.1.2"; src = fetchFromGitHub { owner = "custom-cards"; repo = "button-card"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ntg1sNgAehcL2fT0rP0YHzV5q6rB5p1TyFXtbZyB3Vo="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-OFnsRR9zA9D22xBdh4XfLueGVA2ERXmGEp54x0OFDFY="; }; - buildPhase = '' - runHook preBuild - - yarn build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; installPhase = '' runHook preInstall mkdir $out - cp ./deps/button-card/dist/button-card.js $out + cp ./dist/button-card.js $out runHook postInstall ''; - doDist = false; - - meta = with lib; { + meta = { description = "Lovelace button-card for home assistant"; homepage = "https://github.com/custom-cards/button-card"; - changelog = "https://github.com/custom-cards/button-card/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ k900 ]; - platforms = platforms.all; + changelog = "https://github.com/custom-cards/button-card/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ k900 ]; + platforms = lib.platforms.all; }; -} +}) From 68005ab69dc94f56111186bbc3b5199efc676ccf Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 18:25:20 -0500 Subject: [PATCH 13/22] home-assistant-custom-lovelace-modules.multiple-entity-row: modernize Gets rid of mkYarnPackage and its need for a package.json --- .../multiple-entity-row/package.json | 39 ------------------- .../multiple-entity-row/package.nix | 39 +++++++++---------- 2 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json deleted file mode 100644 index 28a6d7b3bb86..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "multiple-entity-row", - "version": "4.5.1", - "description": "Show multiple entity states, attributes and icons on entity rows in Home Assistant's Lovelace UI", - "keywords": [ - "home-assistant", - "homeassistant", - "lovelace", - "custom-cards", - "multiple", - "entity", - "row" - ], - "module": "multiple-entity-row.js", - "repository": "https://github.com/benct/lovelace-multiple-entity-row.git", - "author": "benct ", - "license": "MIT", - "dependencies": { - "custom-card-helpers": "1.8.0", - "lit": "^2.7.4", - "memoize-one": "^6.0.0" - }, - "devDependencies": { - "@babel/core": "^7.22.1", - "@babel/preset-env": "^7.22.4", - "babel-loader": "^9.1.2", - "eslint": "^8.41.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-prettier": "^4.2.1", - "prettier": "^2.8.8", - "webpack": "^5.84.1", - "webpack-cli": "^5.1.1" - }, - "scripts": { - "lint": "eslint src/**/*.js", - "dev": "webpack -c webpack.config.js", - "build": "yarn lint && webpack -c webpack.config.js" - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix index 2ece70bd477d..3ff0c62aa1e1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix @@ -1,52 +1,49 @@ { lib, - mkYarnPackage, + stdenv, fetchFromGitHub, fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "multiple-entity-row"; version = "4.5.1"; src = fetchFromGitHub { owner = "benct"; repo = "lovelace-multiple-entity-row"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CXRgXyH1NUg7ssQhenqP0tXr1m2qOkHna3Rf30K3SjI="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-8YIcQhbYf0e2xO620zVHEk/0sssBmzF/jCq+2za+D6E="; }; - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnBuildHook + yarnConfigHook + nodejs + ]; installPhase = '' runHook preInstall mkdir $out - install -m0644 ./deps/multiple-entity-row/multiple-entity-row.js $out + install -m0644 ./multiple-entity-row.js $out runHook postInstall ''; - doDist = false; - - meta = with lib; { + meta = { description = "Show multiple entity states and attributes on entity rows in Home Assistant's Lovelace UI"; homepage = "https://github.com/benct/lovelace-multiple-entity-row"; - changelog = "https://github.com/benct/lovelace-multiple-entity-row/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + changelog = "https://github.com/benct/lovelace-multiple-entity-row/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; }; -} +}) From 4f4005dd713aa37f6b0b0d19b7d75e9d6bb67753 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 18:25:51 -0500 Subject: [PATCH 14/22] home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap: modernize Gets rid of mkYarnPackage and its need for a package.json, as well as the custom updateScript which was needed because of the package.json --- .../zigbee2mqtt-networkmap/package.json | 25 ---------- .../zigbee2mqtt-networkmap/package.nix | 49 +++++++------------ .../zigbee2mqtt-networkmap/update.sh | 13 ----- 3 files changed, 19 insertions(+), 68 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json delete mode 100755 pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json deleted file mode 100644 index e1096d103f1f..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "zigbee2mqtt-networkmap", - "version": "0.1.0", - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" - }, - "dependencies": { - "vue": "^2.7.15" - }, - "devDependencies": { - "@babel/core": "^7.26.0", - "@babel/eslint-parser": "^7.25.9", - "@material/mwc-button": "^0.27.0", - "@vue/cli-plugin-eslint": "^5.0.8", - "@vue/cli-service": "^5.0.8", - "@vue/eslint-config-standard": "^8.0.1", - "eslint": "^8.57.1", - "eslint-plugin-vue": "^9.32.0", - "lodash.isequal": "^4.5.0", - "vue-d3-network": "^0.1.28" - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix index 2a16391ef221..36e0f5e8fbf1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix @@ -1,44 +1,35 @@ { lib, + stdenv, fetchFromGitHub, fetchYarnDeps, - mkYarnPackage, + yarnConfigHook, + yarnBuildHook, + nodejs, + nix-update-script, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "zigbee2mqtt-networkmap"; version = "0.10.0"; src = fetchFromGitHub { owner = "azuwis"; repo = "zigbee2mqtt-networkmap"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-S4iUTjI+pFfa8hg1/lJSI1tl2nEIh+LO2WTYhWWLh/s="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-yo+K3vUJH6WwyNj/UuvbhhmhdqzJ3XUzX+cKUueutjE="; }; - configurePhase = '' - runHook preConfigure - - cp -r $node_modules node_modules - chmod +w node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; installPhase = '' runHook preInstall @@ -51,16 +42,14 @@ mkYarnPackage rec { dontFixup = true; - doDist = false; - passthru.entrypoint = "zigbee2mqtt-networkmap.js"; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; - meta = with lib; { - changelog = "https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v${version}"; + meta = { + changelog = "https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v${finalAttrs.version}"; description = "Home Assistant Custom Card to show Zigbee2mqtt network map"; homepage = "https://github.com/azuwis/zigbee2mqtt-networkmap"; - maintainers = with maintainers; [ azuwis ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ azuwis ]; + license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh deleted file mode 100755 index 6370cc85efcc..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update - -set -xe - -dirname="$(dirname "$0")" - -# nix-update picks the wrong file `pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix` -nix-update --override-filename "$dirname/package.nix" home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap - -# update package.json -source=$(nix-build -A home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap.src) -cp "$source/package.json" "$dirname/package.json" From b99a5528c601010853e16b8899a5bc62308375a6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Nov 2025 23:40:40 +0000 Subject: [PATCH 15/22] python3Packages.finetuning-scheduler: 2.9.0 -> 2.9.1 Diff: https://github.com/speediedan/finetuning-scheduler/compare/v2.9.0...v2.9.1 Changelog: https://github.com/speediedan/finetuning-scheduler/blob/v2.9.1/CHANGELOG.md --- .../python-modules/finetuning-scheduler/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index 85b46d882a52..bf61fe277f3f 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -17,24 +17,16 @@ buildPythonPackage rec { pname = "finetuning-scheduler"; - version = "2.9.0"; + version = "2.9.1"; pyproject = true; src = fetchFromGitHub { owner = "speediedan"; repo = "finetuning-scheduler"; tag = "v${version}"; - hash = "sha256-AfkrWuqpFS71Zrh5NsamzxMitKCsqPF50F9zTDdDhRg="; + hash = "sha256-6v7KhY2dOc/Sbw85UO9KVDSS0+4DJ+VWrQ5Tg5E8Ddc="; }; - # See https://github.com/speediedan/finetuning-scheduler/pull/21 - postPatch = '' - substituteInPlace src/finetuning_scheduler/strategy_adapters/base.py \ - --replace-fail \ - "from lightning.fabric.utilities.types import ReduceLROnPlateau" \ - "from torch.optim.lr_scheduler import ReduceLROnPlateau" - ''; - build-system = [ setuptools ]; pythonRelaxDeps = [ From 57c93f7deeb59f3e6c17cb0478fa7de6c0993bc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 00:07:53 +0000 Subject: [PATCH 16/22] terraform-providers.wgebis_mailgun: 0.8.0 -> 0.8.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2c413730cf25..9a9a7205de6c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1489,11 +1489,11 @@ "vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8=" }, "wgebis_mailgun": { - "hash": "sha256-/AYzQgMWo2cPjEMlrOSZLn4IVq4At09KFXkIpc7L5p0=", + "hash": "sha256-W+cvYNwsa5T6ZIPeEVbO9ogdZurwDPOKUwJfPXNKSqg=", "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", "repo": "terraform-provider-mailgun", - "rev": "v0.8.0", + "rev": "v0.8.1", "spdx": "MPL-2.0", "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, From 7254157b1cab080f97aa9af889585177259a48ea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 11 Nov 2025 00:42:25 +0000 Subject: [PATCH 17/22] python3Packages.sse-starlette: fix build in the darwin sandbox --- pkgs/development/python-modules/sse-starlette/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index 97227795ec1c..8a2882414cae 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -77,11 +77,13 @@ buildPythonPackage rec { "test_sse_server_termination" ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Server Sent Events for Starlette and FastAPI"; homepage = "https://github.com/sysid/sse-starlette"; changelog = "https://github.com/sysid/sse-starlette/blob/${src.tag}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; }; } From 01d9bf2846d7441d79c2dbbe8ed34fd7b24fea92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 03:08:11 +0000 Subject: [PATCH 18/22] python3Packages.qh3: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/qh3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix index 6b048f63c97d..a64c015f77dc 100644 --- a/pkgs/development/python-modules/qh3/default.nix +++ b/pkgs/development/python-modules/qh3/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "qh3"; - version = "1.5.5"; + version = "1.5.6"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "qh3"; tag = "v${version}"; - hash = "sha256-mUbKIjPFmuQB+GV7IMtUPXTKClCKWG8lAKLs1ezKYEU="; + hash = "sha256-QJfun9CjqdtVmn7Ws4+VJaeGCQgxnEy+L3SMCZFMK1o="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-drTXh7WkcXpNwWNfDGf+7qlXLUIOH0ysom6pUkVSD6s="; + hash = "sha256-4CLvkyOd0GYh4/v40Qtv3rPJXRwOPXHg9Oo+eWN0luA="; }; nativeBuildInputs = [ From d509172e86f92aa0ac29cbca8b77d1c23bccd194 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 04:20:55 +0000 Subject: [PATCH 19/22] olympus-unwrapped: 25.11.02.03 -> 25.11.09.03 --- pkgs/by-name/ol/olympus-unwrapped/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index b49bc930d789..57fbcc195e8e 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -31,9 +31,9 @@ let phome = "$out/lib/olympus"; # The following variables are to be updated by the update script. - version = "25.11.02.03"; - buildId = "5271"; # IMPORTANT: This line is matched with regex in update.sh. - rev = "79673980d47003d9756b373001a9f57c267acbfb"; + version = "25.11.09.03"; + buildId = "5277"; # IMPORTANT: This line is matched with regex in update.sh. + rev = "6a1e895a5fa5ccf2d0ba494d03ffe3280aebd9d9"; in buildDotnetModule { pname = "olympus-unwrapped"; @@ -44,7 +44,7 @@ buildDotnetModule { owner = "EverestAPI"; repo = "Olympus"; fetchSubmodules = true; # Required. See upstream's README. - hash = "sha256-KMGSAIYNlzWK9jvn7QTmxUQRNjn0VQU5kLVzTc9mzf8="; + hash = "sha256-Qog5U4MuGm50aULo1U0WcSASH+hEJ1QMyhV6u+1r6jU="; }; nativeBuildInputs = [ From 483a5e7a0e868e4fe43dcc95afb82085b93f586d Mon Sep 17 00:00:00 2001 From: Rowenna Emma Date: Thu, 25 Sep 2025 21:15:57 -0700 Subject: [PATCH 20/22] buildGraalvm: remove unset vars This patch removes remaining uses of unset bash var $extraNativeImageArgs which commit bc1bc1aa3 forgot to remove when deleting the var. --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 7be63b3a0a5f..d1ef2e8470f1 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -224,7 +224,7 @@ let # -H:+StaticExecutableWithDynamicLibC is only available in Linux lib.optionalString (stdenv.hostPlatform.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility HelloWorld ./helloworld | fgrep 'Hello World' '' } @@ -233,7 +233,7 @@ let # --static is only available in x86_64 Linux lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" - $out/bin/native-image $extraNativeImageArgs -march=compatibility --libc=musl --static HelloWorld + $out/bin/native-image -march=compatibility --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' '' } From 727a55225f6018476bacdc4ae428329a3dbb7695 Mon Sep 17 00:00:00 2001 From: Rowenna Emma Date: Sat, 27 Sep 2025 21:36:33 -0700 Subject: [PATCH 21/22] buildGraalvm: refactor use of --add-flags Simplifies the flag-handling code by using only one --add-flags, rather than treating --add-flags like --add-flag by mapping it onto every flag --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index d1ef2e8470f1..13c9ff105e91 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -137,8 +137,8 @@ let postInstall = let - cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs); - preservedNixVariables = [ + cLibsFlags = (map (l: "-H:CLibraryPath=${l}/lib") cLibs); + preservedNixVarFlags = [ "-ENIX_BINTOOLS" "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" "-ENIX_BUILD_CORES" @@ -161,7 +161,6 @@ let "-EMACOSX_DEPLOYMENT_TARGET_FOR_TARGET" "-ENIX_APPLE_SDK_VERSION" ]; - preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables); in '' # jni.h expects jni_md.h to be in the header search path. @@ -182,7 +181,7 @@ let wrapProgram $out/bin/native-image \ --prefix PATH : ${binPath} \ - ${toString (cLibsAsFlags ++ preservedNixVariablesAsFlags)} + --add-flags "${toString (cLibsFlags ++ preservedNixVarFlags)}" ''; preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' From 006ab01d64a708cd1c9c30454b1a4a002ab77b72 Mon Sep 17 00:00:00 2001 From: Rowenna Emma Date: Thu, 25 Sep 2025 21:30:11 -0700 Subject: [PATCH 22/22] buildGraalvm: fix native-image on darwin On Darwin, it is apparently Oracle's intention to be hostile towards builds of Clang which are not by Apple. see https://github.com/oracle/graal/issues/12041 If you want native-image to both work on Darwin and use the nix-provided CC then you must pass it the flags to disable toolchain checking entirely. Since the flags are mandatory for functionality, they should be part of the wrapper. --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 13c9ff105e91..5b4821bf63df 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -161,6 +161,10 @@ let "-EMACOSX_DEPLOYMENT_TARGET_FOR_TARGET" "-ENIX_APPLE_SDK_VERSION" ]; + checkToolchainFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "-H:+UnlockExperimentalVMOptions" + "-H:-CheckToolchain" + ]; in '' # jni.h expects jni_md.h to be in the header search path. @@ -181,7 +185,7 @@ let wrapProgram $out/bin/native-image \ --prefix PATH : ${binPath} \ - --add-flags "${toString (cLibsFlags ++ preservedNixVarFlags)}" + --add-flags "${toString (cLibsFlags ++ preservedNixVarFlags ++ checkToolchainFlags)}" ''; preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' @@ -216,7 +220,7 @@ let $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility HelloWorld + $out/bin/native-image -H:+ReportExceptionStackTraces -march=compatibility HelloWorld ./helloworld | fgrep 'Hello World' ${