From d07cc49cdc225cb4b97240de14e6110c6c4a95ba Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 22 Jul 2026 00:04:20 +0200 Subject: [PATCH 01/95] nixos/fedimintd: map vhost via lib.mkDefault --- nixos/modules/services/networking/fedimintd.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/fedimintd.nix b/nixos/modules/services/networking/fedimintd.nix index 6b617cbe72e9..ec84e8351dd9 100644 --- a/nixos/modules/services/networking/fedimintd.nix +++ b/nixos/modules/services/networking/fedimintd.nix @@ -13,7 +13,6 @@ let mkEnableOption mkIf mkOption - mkOverride mkPackageOption nameValuePair recursiveUpdate @@ -351,13 +350,11 @@ in fedimintdName: cfg: (nameValuePair cfg.nginx.fqdn ( lib.mkMerge [ - cfg.nginx.config + (lib.mapAttrsRecursive (_: lib.mkDefault) cfg.nginx.config) { - # Note: we want by default to enable OpenSSL, but it seems anything 100 and above is - # overridden by default value from vhost-options.nix - enableACME = mkOverride 99 true; - forceSSL = mkOverride 99 true; + enableACME = true; + forceSSL = true; locations.${cfg.nginx.path_ws} = { proxyPass = "http://127.0.0.1:${toString cfg.api_ws.port}/"; proxyWebsockets = true; From ec82f0308676131f5ce30928479cde4437dc4d31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Aug 2026 01:48:51 +0000 Subject: [PATCH 02/95] simplebluez: 0.11.0 -> 1.1.0 --- pkgs/by-name/si/simplebluez/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplebluez/package.nix b/pkgs/by-name/si/simplebluez/package.nix index ae22fa9f527f..b0d3d7488b00 100644 --- a/pkgs/by-name/si/simplebluez/package.nix +++ b/pkgs/by-name/si/simplebluez/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simplebluez"; - version = "0.11.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "simpleble"; repo = "SimpleBLE"; rev = "v${finalAttrs.version}"; - hash = "sha256-SWZdVWBC8udwkn195FdvsXSniMtzd8+WfnMsARLYSQ4="; + hash = "sha256-GNLD62w5zTfW7CaknaZmU0jBro92HFw3gA29KJqOHGA="; }; outputs = [ From e93035fc75477af417db89e44f6f02439bb44222 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Aug 2026 11:25:04 +0000 Subject: [PATCH 03/95] sdrangel: 7.27.1 -> 7.27.2 --- pkgs/by-name/sd/sdrangel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 4322a0d654e4..975120e18f49 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.27.1"; + version = "7.27.2"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; tag = "v${finalAttrs.version}"; - hash = "sha256-rdPXqA0ySnqh/rlMlfcDLyAd6egbggWHrRQRnXeQPFM="; + hash = "sha256-Hq43N6wK8qhGmVOWaslDcPMCLFznzdgziLZq0Ver/AI="; }; __structuredAttrs = true; From 344273fedfde85b36a500674dc486847aeb8daef Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 21 Aug 2026 15:38:44 +0200 Subject: [PATCH 04/95] darwin.basic_cmds: set license to bsd3 Found no refrence to `ISC` in the source code --- pkgs/os-specific/darwin/by-name/ba/basic_cmds/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/ba/basic_cmds/package.nix b/pkgs/os-specific/darwin/by-name/ba/basic_cmds/package.nix index df11030e7f89..63488886281d 100644 --- a/pkgs/os-specific/darwin/by-name/ba/basic_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/ba/basic_cmds/package.nix @@ -12,9 +12,6 @@ mkAppleDerivation { meta = { description = "Basic commands for Darwin"; - license = [ - lib.licenses.isc - lib.licenses.bsd3 - ]; + license = lib.licenses.bsd3; }; } From 037be2d137b29148acf312da842cade1c17a074c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 21 Aug 2026 17:37:59 +0200 Subject: [PATCH 05/95] darwin.shell_cmds: update license Ran `scancode` through the source code to find those --- .../darwin/by-name/sh/shell_cmds/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix index 955a2bc84542..ca8a68878872 100644 --- a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix @@ -63,9 +63,16 @@ mkAppleDerivation { meta = { description = "Darwin shell commands and the Almquist shell"; - license = [ - lib.licenses.bsd2 - lib.licenses.bsd3 - ]; + license = + with lib.licenses; + AND [ + apple-psl20 + bsd2 + bsd2WithViews + bsd3 + bsdOriginal + bsdOriginalUC + publicDomain + ]; }; } From d04a605371ca4c0da38a5c38f517f58724bcce04 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 9 Sep 2026 11:44:13 +0200 Subject: [PATCH 06/95] python3Packages.fontmake: use finalAttrs --- pkgs/development/python-modules/fontmake/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index ad3cda6872a9..935ce1a31aa4 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -15,7 +15,7 @@ ufolib2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fontmake"; version = "3.12.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googlefonts"; repo = "fontmake"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dgforezrilmD2d6MFY3Z5X/82yPRfSW/I/OxXcZ+xJw="; }; @@ -51,15 +51,15 @@ buildPythonPackage rec { repacker = fonttools.optional-dependencies.repacker; }; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.autohint; + nativeCheckInputs = [ pytestCheckHook ] ++ finalAttrs.passthru.optional-dependencies.autohint; pythonImportsCheck = [ "fontmake" ]; meta = { description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)"; homepage = "https://github.com/googlefonts/fontmake"; - changelog = "https://github.com/googlefonts/fontmake/releases/tag/${src.tag}"; + changelog = "https://github.com/googlefonts/fontmake/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) From 2606fefd61fbe49a14e56878a4b28293397a57c0 Mon Sep 17 00:00:00 2001 From: Sergei Volkov Date: Thu, 10 Sep 2026 14:33:38 +0200 Subject: [PATCH 07/95] julia-bin: add strictDeps = true and __structuredAttrs = true required by CI for adding new julia_113-bin package --- pkgs/development/compilers/julia/generic-bin.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix index b14b8001866b..6186ef9a913d 100644 --- a/pkgs/development/compilers/julia/generic-bin.nix +++ b/pkgs/development/compilers/julia/generic-bin.nix @@ -66,6 +66,9 @@ stdenv.mkDerivation { inherit version patches; + strictDeps = true; + __structuredAttrs = true; + src = { x86_64-linux = fetchurl { From dc457e1ad8e32ee2ebd20acf5dcf6946fa97521c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Sep 2026 06:21:11 +0000 Subject: [PATCH 08/95] yubioath-flutter: 7.4.1 -> 7.4.2 --- pkgs/by-name/yu/yubioath-flutter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yu/yubioath-flutter/package.nix b/pkgs/by-name/yu/yubioath-flutter/package.nix index 5117fa42d205..d8ac241e99c7 100644 --- a/pkgs/by-name/yu/yubioath-flutter/package.nix +++ b/pkgs/by-name/yu/yubioath-flutter/package.nix @@ -16,13 +16,13 @@ flutter344.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "7.4.1"; + version = "7.4.2"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; tag = version; - hash = "sha256-7863P463ZOtYcrCN9KLQIj2YOTmKH62PFap5Ja7m5Ig="; + hash = "sha256-TtMWXJTWjIGoU980j2taPXvJudQLUf1Lbin+DgdXTpM="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; From a042edd23a6c3109d73ec8a2537d53654a642661 Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Fri, 18 Sep 2026 18:58:38 +0200 Subject: [PATCH 09/95] netboxPlugins.netbox-cable-labels: init at 0.1.0 --- .../plugins/netbox-cable-labels/package.nix | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/ne/netbox/plugins/netbox-cable-labels/package.nix diff --git a/pkgs/by-name/ne/netbox/plugins/netbox-cable-labels/package.nix b/pkgs/by-name/ne/netbox/plugins/netbox-cable-labels/package.nix new file mode 100644 index 000000000000..0df2c8b9bebb --- /dev/null +++ b/pkgs/by-name/ne/netbox/plugins/netbox-cable-labels/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + python, +}: +buildPythonPackage (finalAttrs: { + pname = "netbox-cable-labels"; + version = "0.1.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jsenecal"; + repo = "netbox-cable-labels"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aTZXCHRyumfYk50bc0rFiDGscZt1n+fsW2uYZAkZwOQ="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + + pythonImportsCheck = [ "netbox_cable_labels" ]; + + passthru.pluginName = "netbox_cable_labels"; + + meta = { + description = "NetBox plugin for automated label generated based on a user defined template"; + homepage = "https://github.com/jsenecal/netbox-cable-labels"; + changelog = "https://github.com/jsenecal/netbox-cable-labels/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + platforms = lib.platforms.linux; + }; +}) From e972c5f42e843e5727655e741e1b1cd9f71ddf04 Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Fri, 18 Sep 2026 19:02:28 +0200 Subject: [PATCH 10/95] netboxPlugins.netbox-notices: init at 1.3.0 --- .../netbox/plugins/netbox-notices/package.nix | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/ne/netbox/plugins/netbox-notices/package.nix diff --git a/pkgs/by-name/ne/netbox/plugins/netbox-notices/package.nix b/pkgs/by-name/ne/netbox/plugins/netbox-notices/package.nix new file mode 100644 index 000000000000..076d06c227cb --- /dev/null +++ b/pkgs/by-name/ne/netbox/plugins/netbox-notices/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + icalendar, + netbox, + python, +}: +buildPythonPackage (finalAttrs: { + pname = "netbox-notices"; + version = "1.3.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jsenecal"; + repo = "netbox-notices"; + tag = "v${finalAttrs.version}"; + hash = "sha256-He7F4DAkrrhjNorhJ8Aok8out0txvmtSbiZ4BzRVPWg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ icalendar ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + + pythonImportsCheck = [ "notices" ]; + + passthru.pluginName = "notices"; + + meta = { + description = "NetBox plugin to track maintenance and outage events against NetBox models"; + homepage = "https://github.com/jsenecal/netbox-notices"; + changelog = "https://github.com/jsenecal/netbox-notices/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + platforms = lib.platforms.linux; + }; +}) From 12e424e1f60fa60174b07796a2928633d3ebe745 Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Sat, 19 Sep 2026 15:13:58 +0200 Subject: [PATCH 11/95] netboxPlugins.netbox-sqids: init at 0.2.0 --- .../netbox/plugins/netbox-sqids/package.nix | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/ne/netbox/plugins/netbox-sqids/package.nix diff --git a/pkgs/by-name/ne/netbox/plugins/netbox-sqids/package.nix b/pkgs/by-name/ne/netbox/plugins/netbox-sqids/package.nix new file mode 100644 index 000000000000..55c43c9fdd7f --- /dev/null +++ b/pkgs/by-name/ne/netbox/plugins/netbox-sqids/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + sqids, + netbox, + python, +}: +buildPythonPackage (finalAttrs: { + pname = "netbox-sqids"; + version = "0.2.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jsenecal"; + repo = "netbox-sqids"; + tag = "v${finalAttrs.version}"; + hash = "sha256-B9BUjaKUqORlITbjiDYFetCaSx8lL0ECRU9yuPkoA0k="; + }; + + build-system = [ setuptools ]; + + dependencies = [ sqids ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + + pythonImportsCheck = [ "netbox_sqids" ]; + + passthru.pluginName = "netbox_sqids"; + + meta = { + description = "NetBox plugin for short, URL-safe, globally unique identifiers"; + homepage = "https://github.com/jsenecal/netbox-sqids"; + changelog = "https://github.com/jsenecal/netbox-sqids/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + platforms = lib.platforms.linux; + }; +}) From 2db5041958fc0b815e6a71cdb9dda7f7a503873e Mon Sep 17 00:00:00 2001 From: Skye Soss Date: Sun, 20 Sep 2026 18:01:47 -0500 Subject: [PATCH 12/95] nixos/account-utils: add nss module path to pwaccessd The pwaccessd service looks up passwords with getspent, which the nscd socket protocol does not handle. --- nixos/modules/security/account-utils.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/account-utils.nix b/nixos/modules/security/account-utils.nix index 42daaf188ca6..bea5d3d313b2 100644 --- a/nixos/modules/security/account-utils.nix +++ b/nixos/modules/security/account-utils.nix @@ -51,7 +51,10 @@ in sockets.pwupdd.wantedBy = lib.optional config.users.mutableUsers "sockets.target"; # immutable users do not need password updating sockets.newidmapd.wantedBy = [ "sockets.target" ]; services."pwupdd@".environment.PWUPDD_OPTS = lib.escapeShellArgs cfg.extraArgs; - services."pwaccessd".environment.PWACCESSD_OPTS = lib.escapeShellArgs cfg.extraArgs; + services."pwaccessd".environment = { + LD_LIBRARY_PATH = config.system.nssModules.path; + PWACCESSD_OPTS = lib.escapeShellArgs cfg.extraArgs; + }; }; environment.systemPackages = [ cfg.package ]; From 29616af29508c06d8583f1bcdb3fbe9082b9a020 Mon Sep 17 00:00:00 2001 From: Skye Soss Date: Sun, 20 Sep 2026 18:03:20 -0500 Subject: [PATCH 13/95] nixos/accounts-daemon: add nss module path to service The accounts-daemon service looks up user accounts, so it needs access to the NSS shared libraries. --- nixos/modules/services/desktops/accountsservice.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index fd328e357ce2..a86b90eb3e89 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -48,6 +48,7 @@ # Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice environment.XDG_DATA_DIRS = "${config.system.path}/share"; + environment.LD_LIBRARY_PATH = config.system.nssModules.path; } ( From 1b46221907777e6023c03bc56589a89b8f5430e6 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 22 Sep 2026 12:59:02 +0200 Subject: [PATCH 14/95] remind: Replace gitUpdate with custom update script --- pkgs/by-name/re/remind/package.nix | 5 +---- pkgs/by-name/re/remind/update.sh | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100755 pkgs/by-name/re/remind/update.sh diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 567713b94e5b..58acae52a5a6 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchzip, - gitUpdater, bashNonInteractive, tk, tclPackages, @@ -51,9 +50,7 @@ tcl.mkTclDerivation (finalAttrs: { ]; }; - passthru.updateScript = gitUpdater { - ignoredVersions = "-BETA"; - }; + passthru.updateScript = ./update.sh; meta = { homepage = "https://dianne.skoll.ca/projects/remind/"; diff --git a/pkgs/by-name/re/remind/update.sh b/pkgs/by-name/re/remind/update.sh new file mode 100755 index 000000000000..bee41e15f04c --- /dev/null +++ b/pkgs/by-name/re/remind/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils gnused nix-update + +updateUrl="https://dianne.skoll.ca/projects/remind/" +version=$(curl -sL "${updateUrl}" \ + | sed -nEe '/(BETA|\.sig)/q;/>remind/s/.*>remind-([^<]*).tar.gz<.*/\1/p') +nix-update --version="$version" remind From 4a80decdc38644e70c171e4b7cf14b4843d8114c Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 22 Sep 2026 13:07:36 +0200 Subject: [PATCH 15/95] remind: 06.02.10 -> 06.03.04 --- pkgs/by-name/re/remind/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 58acae52a5a6..27af539f8deb 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,11 +16,11 @@ tcl.mkTclDerivation (finalAttrs: { pname = "remind"; - version = "06.02.10"; + version = "06.03.04"; src = fetchzip { url = "https://dianne.skoll.ca/projects/remind/download/remind-${finalAttrs.version}.tar.gz"; - hash = "sha256-R6kceXLzg5CRMYAgMyhnmKxWT49ayXIFm/IpXuDgl8I="; + hash = "sha256-EIcnNTzBUreqAZK8pEUkwU9l+J07d24pvzFlOJ84Q1o="; }; buildInputs = [ @@ -37,7 +37,7 @@ tcl.mkTclDerivation (finalAttrs: { # as rem2pdf is currently not build since it requires the JSON::MaybeXS, # Pango and Cairo Perl modules. substituteInPlace scripts/tkremind.in \ - --replace-fail "exec wish" "exec ${lib.getExe' tk "wish"}" \ + --replace-fail '@TCLSH@' '${lib.getExe' tcl "tclsh"}' \ --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \ --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\"" ''; From c47c6eafcb77b5ce05428eebb8cb7f34d985095f Mon Sep 17 00:00:00 2001 From: Thomas Bemme Date: Tue, 22 Sep 2026 18:07:49 +0200 Subject: [PATCH 16/95] librewolf-unwrapped: 156.0-1 -> 156.0.1-1 --- pkgs/by-name/li/librewolf-unwrapped/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index 786552fc210a..8f1f48272d59 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "156.0-1", + "packageVersion": "156.0.1-1", "source": { - "rev": "156.0-1", - "hash": "sha256-r5i+lFRxx5pcMcDotl9gIEuRytqyY0/opAYTcljUF4c=" + "rev": "156.0.1-1", + "hash": "sha256-XPHluJoaPEerOw6FRhBCXd/B5Ndrr72MR3fjJaH7xsY=" }, "firefox": { - "version": "156.0", - "hash": "sha512-BGMwSgiYZw0kgRT2b3wjUWauI5fDmJp8h4yW8MWJ+7uh8ch0MtqiJjO5+t2UOUrfHcN/DmfSKwZsde/l7q11zg==" + "version": "156.0.1", + "hash": "sha512-gKMqeSaLZyIG9Ud8pr/eYgy3QZsnqsCQ4B8G3waZDuC72Bu1xKp4rB0O2yaxM7HG+hHLZSJEXszXDILnGaJNWw==" } } From 5fc9e6f08954290c4973b8703b4b70f20568d6bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Sep 2026 03:08:17 +0000 Subject: [PATCH 17/95] wine-staging: 11.16 -> 11.18 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index a07adc5219ec..7d5f252b7515 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -151,9 +151,9 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "11.16"; + version = "11.18"; url = "https://dl.winehq.org/wine/source/11.x/wine-${version}.tar.xz"; - hash = "sha256-xm4gkDQ9zXJ/f3/S+H7gv7CxGHkMHXRat7ikw6QZfy8="; + hash = "sha256-xigvbU2uzxHzq5+aK2xZj2e+fijDY7osroo8RLYR56Q="; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -163,7 +163,7 @@ rec { # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { inherit version; - hash = "sha256-14VEZMMlWCsStm2AJNO+wBPPO67EGDsQyNiFBBtIcUg="; + hash = "sha256-KZCkra0y3XFNrbD2lZ+YUCLyq1POC30Sd4sGCJZuwgQ="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; From 913b6c23f494f54b330f83abe9c9283fe66b0c0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Sep 2026 08:12:21 +0000 Subject: [PATCH 18/95] graphify: 0.9.61 -> 0.9.66 --- pkgs/by-name/gr/graphify/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/graphify/package.nix b/pkgs/by-name/gr/graphify/package.nix index 248ec0b0bed5..20408f84b8bd 100644 --- a/pkgs/by-name/gr/graphify/package.nix +++ b/pkgs/by-name/gr/graphify/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { __structuredAttrs = true; pname = "graphify"; - version = "0.9.61"; + version = "0.9.66"; pyproject = true; src = fetchFromGitHub { owner = "Graphify-Labs"; repo = "graphify"; tag = "v${version}"; - hash = "sha256-9AEbHmqqZv/fBioUMNv60KAb/FpvWpwC6QhGSdBxISs="; + hash = "sha256-u6LCj74qI7x0TS972VOL2sYTyhRVBkFy7R+pIycCI4U="; }; build-system = [ From 3703849be570e68f9a50d50202c63a2e49e1862f Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 01:21:38 -0400 Subject: [PATCH 19/95] postgresqlPackages.pg_squeeze: fix broken test Signed-off-by: Anish Pallati --- pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index eba3f20b7b6f..e1b6fb42db98 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -26,6 +26,7 @@ postgresqlBuildExtension (finalAttrs: { postgresqlExtraSettings = '' wal_level = logical shared_preload_libraries = 'pg_squeeze' + output_plugin_libraries = 'pg_squeeze' ''; sql = '' CREATE EXTENSION pg_squeeze; From 9d5173db3134f69bb98dd158e12ed8a921262313 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 01:27:33 -0400 Subject: [PATCH 20/95] nixosTests.postgresql.wal2json: fix broken test Signed-off-by: Anish Pallati --- nixos/tests/postgresql/wal2json.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index 511b1a7a2e8c..e1f8cf248c54 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -22,6 +22,7 @@ let wal_level = "logical"; max_replication_slots = "10"; max_wal_senders = "10"; + output_plugin_libraries = "wal2json"; }; }; }; From 50beab5ec1c89400edd9cc9d8719744ac473ff91 Mon Sep 17 00:00:00 2001 From: ProxyVT Date: Sun, 6 Sep 2026 16:43:00 +0300 Subject: [PATCH 21/95] ariang-native: init at 1.3.14 https://github.com/mayswind/AriaNg-Native/releases/tag/1.3.14 --- pkgs/by-name/ar/ariang-native/package.nix | 76 +++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 pkgs/by-name/ar/ariang-native/package.nix diff --git a/pkgs/by-name/ar/ariang-native/package.nix b/pkgs/by-name/ar/ariang-native/package.nix new file mode 100644 index 000000000000..e7adececbf9a --- /dev/null +++ b/pkgs/by-name/ar/ariang-native/package.nix @@ -0,0 +1,76 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, + copyDesktopItems, + icoutils, + makeWrapper, + makeDesktopItem, + electron, +}: + +buildNpmPackage (finalAttrs: { + pname = "ariang-native"; + version = "1.3.14"; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "mayswind"; + repo = "AriaNg-Native"; + tag = finalAttrs.version; + hash = "sha256-ByQPAZVQEqqjD7th0wq06NdOsAR7YchWpV3LHu4QzTk="; + }; + + dontNpmBuild = true; + npmDepsFetcherVersion = 2; + npmDepsHash = "sha256-mTu/QcsPq7YoUSuKtS34P+y38oIoB3zyuDL9ELQDoBQ="; + npmFlags = [ "--ignore-scripts" ]; + + nativeBuildInputs = [ + copyDesktopItems + icoutils + makeWrapper + ]; + + desktopItems = with finalAttrs; [ + (makeDesktopItem { + name = pname; + desktopName = "AriaNg Native"; + genericName = meta.description; + comment = meta.description; + icon = pname; + exec = "${pname} %U"; + mimeTypes = [ "x-scheme-handler/magnet" ]; + categories = [ "Network" ]; + startupWMClass = pname; + }) + ]; + + postInstall = with finalAttrs; '' + # Create desktop icons + icotool -x assets/AriaNg.ico + ls *.png | sort -V | while read -r file; do + size=$(echo "$file" | awk -F '_' '{print $3}' | cut -d 'x' -f 1) + mkdir -p "$out/share/icons/hicolor/''${size}x''${size}/apps" + mv "$file" "$out/share/icons/hicolor/''${size}x''${size}/apps/${pname}.png" + done + + makeWrapper ${lib.getExe electron} $out/bin/${pname} \ + --inherit-argv0 \ + --add-flags "$out/lib/node_modules/${pname}" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Aria2 desktop frontend based on AriaNg with additional desktop features"; + homepage = "https://github.com/mayswind/AriaNg-Native"; + changelog = "https://github.com/mayswind/AriaNg-Native/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ProxyVT ]; + mainProgram = finalAttrs.pname; + platforms = lib.platforms.linux; + }; +}) From b3151ec88356f4a7142248a1fcca46472b99f40f Mon Sep 17 00:00:00 2001 From: Jared Biel Date: Thu, 24 Sep 2026 11:32:19 -0500 Subject: [PATCH 22/95] php85: 8.5.10 -> 8.5.11 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 47f139dd04c0..50ef993ff024 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -78,7 +78,7 @@ in hash = "sha256-lSzMF4Uma5WPSh3PxYDgjqu7efRCItHv8ZK82Y2R9uM="; }; php85 = mkPhp { - version = "8.5.10"; - hash = "sha256-15vU86kkjly1gzdmug1RzTXdAbhyfyPzC826b6vFHT4="; + version = "8.5.11"; + hash = "sha256-3JQHFqjHPlMcAHjuy5VdWV0yHsLMnUcUnPAInqbhj2Q="; }; } From 9aa47de919449aa8b62c66856db499dee6fe6266 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 15:37:12 -0400 Subject: [PATCH 23/95] groonga: 16.1.0 -> 16.1.1 Signed-off-by: Anish Pallati --- pkgs/by-name/gr/groonga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix index f15f82be40dd..added20f479e 100644 --- a/pkgs/by-name/gr/groonga/package.nix +++ b/pkgs/by-name/gr/groonga/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "groonga"; - version = "16.1.0"; + version = "16.1.1"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; - hash = "sha256-4QNwMIYHvHtJnwq4gMT5fdKtifhe3PHStTTjAa4/t7M="; + hash = "sha256-94u5rLxaW0xued2W++xQ2YvYB/+bqV3JMfD43zDhzI8="; }; patches = [ From 652a1106deb8418c375aeb6edf21f333d81b2cf3 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 15:37:13 -0400 Subject: [PATCH 24/95] groonga: fix plugin and data install paths Signed-off-by: Anish Pallati --- .../gr/groonga/fix-cmake-install-path.patch | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch b/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch index bca9b6d5d023..2a02f8d633f6 100644 --- a/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch +++ b/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch @@ -2,8 +2,37 @@ Fix CMake install path --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1879,11 +1879,11 @@ - +@@ -212,12 +212,12 @@ + CACHE STRING "wait time in nanosecond to acquire a lock.") + set(GRN_RELATIVE_PLUGINS_DIR + "${CMAKE_INSTALL_LIBDIR}/${GRN_PROJECT_NAME}/plugins") +-set(GRN_PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/${GRN_RELATIVE_PLUGINS_DIR}") ++set(GRN_PLUGINS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${GRN_PROJECT_NAME}/plugins") + set(GRN_PLUGIN_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}") + set(GRN_RELATIVE_GGML_BACKENDS_DIR + "${CMAKE_INSTALL_LIBDIR}/${GRN_PROJECT_NAME}/ggml") + set(GRN_GGML_BACKENDS_DIR +- "${CMAKE_INSTALL_PREFIX}/${GRN_RELATIVE_GGML_BACKENDS_DIR}") ++ "${CMAKE_INSTALL_FULL_LIBDIR}/${GRN_PROJECT_NAME}/ggml") + set(GRN_DLL_FILENAME "libgroonga${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE + "${GRN_CONFIG_DIR}/synonyms.tsv") +@@ -225,11 +225,11 @@ + set(GRN_RELATIVE_RUBY_SCRIPTS_DIR + "${CMAKE_INSTALL_LIBDIR}/${GRN_PROJECT_NAME}/scripts/ruby") + set(GRN_RUBY_SCRIPTS_DIR +- "${CMAKE_INSTALL_PREFIX}/${GRN_RELATIVE_RUBY_SCRIPTS_DIR}") ++ "${CMAKE_INSTALL_FULL_LIBDIR}/${GRN_PROJECT_NAME}/scripts/ruby") + set(GRN_RELATIVE_LANGUAGE_MODELS_DIR + "${CMAKE_INSTALL_DATADIR}/${GRN_PROJECT_NAME}/language_models") + set(GRN_LANGUAGE_MODELS_DIR +- "${CMAKE_INSTALL_PREFIX}/${GRN_RELATIVE_LANGUAGE_MODELS_DIR}") ++ "${CMAKE_INSTALL_FULL_DATADIR}/${GRN_PROJECT_NAME}/language_models") + + if(GRN_C_COMPILER_GNU_LIKE) + set(GRN_C_COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS} $<$:-g3 -O0>") +@@ -2407,11 +2407,11 @@ + set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\${prefix}") -set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}") From 24d2b721cc26e54378864b935cd0134ab7cdbad2 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 15:38:25 -0400 Subject: [PATCH 25/95] groonga: build stem token filter Signed-off-by: Anish Pallati --- pkgs/by-name/gr/groonga/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix index added20f479e..51dd2acc0476 100644 --- a/pkgs/by-name/gr/groonga/package.nix +++ b/pkgs/by-name/gr/groonga/package.nix @@ -4,6 +4,7 @@ cmake, fetchurl, kytea, + libstemmer, msgpack-c, mecab, pkg-config, @@ -46,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { zstd mecab kytea + libstemmer msgpack-c ] ++ lib.optionals lz4Support [ From 01ab9375cdf77415ae4c7d92c76747f030a77fa9 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 15:50:25 -0400 Subject: [PATCH 26/95] groonga: modernize Signed-off-by: Anish Pallati --- pkgs/by-name/gr/groonga/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix index 51dd2acc0476..f7e1aaf8d8e0 100644 --- a/pkgs/by-name/gr/groonga/package.nix +++ b/pkgs/by-name/gr/groonga/package.nix @@ -12,6 +12,7 @@ testers, xxhash, zstd, + versionCheckHook, postgresqlPackages, suggestSupport ? false, zeromq, @@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + mecab # mecab-config pkg-config ]; @@ -63,11 +65,14 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = lib.optionalString zlibSupport "-I${zlib.dev}/include"; + strictDeps = true; + __structuredAttrs = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + passthru.tests = { inherit (postgresqlPackages) pgroonga; - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; moduleNames = [ "groonga" ]; @@ -76,10 +81,14 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://groonga.org/"; + changelog = "https://groonga.org/docs/news/${lib.versions.major finalAttrs.version}.html#release-${ + lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version + }"; description = "Open-source fulltext search engine and column store"; license = lib.licenses.lgpl21; maintainers = [ ]; platforms = lib.platforms.all; + mainProgram = "groonga"; longDescription = '' Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search. From 56b893cf5f25579352dc7552de02e7b3d98eddd6 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 16:11:56 -0400 Subject: [PATCH 27/95] groonga: add anish as maintainer Signed-off-by: Anish Pallati --- pkgs/by-name/gr/groonga/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix index f7e1aaf8d8e0..521c923b8da7 100644 --- a/pkgs/by-name/gr/groonga/package.nix +++ b/pkgs/by-name/gr/groonga/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { }"; description = "Open-source fulltext search engine and column store"; license = lib.licenses.lgpl21; - maintainers = [ ]; + maintainers = with lib.maintainers; [ anish ]; platforms = lib.platforms.all; mainProgram = "groonga"; longDescription = '' From 73a1f269c3075e1a4e62f8953069a5ed96fe4ea5 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 03:44:21 -0400 Subject: [PATCH 28/95] postgresqlPackages.pgroonga: 4.0.5 -> 4.0.9 Signed-off-by: Anish Pallati --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 59 +++++++++++++++++--- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 8dcca959985a..5149605db401 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,37 +2,82 @@ fetchFromGitHub, groonga, lib, + meson, msgpack-c, + ninja, pkg-config, postgresql, postgresqlBuildExtension, + ruby, + stdenvNoCC, xxhash, }: postgresqlBuildExtension (finalAttrs: { pname = "pgroonga"; - version = "4.0.5"; + version = "4.0.9"; src = fetchFromGitHub { owner = "pgroonga"; repo = "pgroonga"; tag = finalAttrs.version; - hash = "sha256-PwUnjwqnmoWQ9kKZuKsAVzVBRyKvT+aexrm5eeRiRIQ="; + hash = "sha256-ADHrHCUrpu5aCAU84QyLkmDDJ6QwICLsL6M8o/OMWxU="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; buildInputs = [ msgpack-c groonga xxhash ]; - makeFlags = [ - "HAVE_XXHASH=1" - "HAVE_MSGPACK=1" - "MSGPACK_PACKAGE_NAME=msgpack-c" + mesonFlags = [ + (lib.mesonEnable "message_pack" true) + # tests need pgroonga installed on a running server, run in passthru.tests.regression + (lib.mesonBool "test" false) ]; + # postgresqlBuildExtension moves files out of DESTDIR in postInstall + mesonInstallFlags = [ "--destdir=${placeholder "out"}" ]; + + passthru.tests.regression = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-regression"; + inherit (finalAttrs) version src; + + nativeBuildInputs = [ ruby ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + patchShebangs test/short-pgappname + ruby test/prepare.rb schedule + # the expected parallel plan depends on the planner's index size estimate + sed -i '/declarative-partitioning\/builtin/d' schedule + # fails intermittently + sed -i '/function\/wal-apply\/delete$/d' schedule + + ${lib.getDev postgresql}/lib/pgxs/src/test/regress/pg_regress \ + --bindir=${postgresql.withPackages (_: [ finalAttrs.finalPackage ])}/bin \ + --inputdir=. \ + --outputdir=. \ + --temp-instance=./tmp_check \ + --encoding=UTF8 \ + --launcher=test/short-pgappname \ + --load-extension=pgroonga \ + --schedule=schedule + + runHook postBuild + ''; + + installPhase = "touch $out"; + }; + meta = { description = "PostgreSQL extension to use Groonga as the index"; longDescription = '' From 38220de882e5a401ed385ae76ee916db1b97de33 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Thu, 24 Sep 2026 16:19:04 -0400 Subject: [PATCH 29/95] postgresqlPackages.pgroonga: add anish as maintainer Signed-off-by: Anish Pallati --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 5149605db401..2d46b48234a7 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -90,6 +90,9 @@ postgresqlBuildExtension (finalAttrs: { changelog = "https://github.com/pgroonga/pgroonga/releases/tag/${finalAttrs.version}"; license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with lib.maintainers; [ DerTim1 ]; + maintainers = with lib.maintainers; [ + DerTim1 + anish + ]; }; }) From 8859f5089e69c6857d3e169a667ce6ac81b53fa4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 9 Sep 2026 11:44:13 +0200 Subject: [PATCH 30/95] python3Packages.fontmake: clean up depencies --- pkgs/development/python-modules/fontmake/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 935ce1a31aa4..d65e80afab85 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pytestCheckHook, + cattrs, fontmath, fonttools, glyphslib, @@ -46,12 +46,18 @@ buildPythonPackage (finalAttrs: { optional-dependencies = { pathops = [ skia-pathops ]; + lxml = [ ]; + mutatormath = [ ]; autohint = [ ttfautohint-py ]; json = ufolib2.optional-dependencies.json; repacker = fonttools.optional-dependencies.repacker; }; - nativeCheckInputs = [ pytestCheckHook ] ++ finalAttrs.passthru.optional-dependencies.autohint; + nativeCheckInputs = [ + pytestCheckHook + cattrs + ] + ++ finalAttrs.passthru.optional-dependencies.autohint; pythonImportsCheck = [ "fontmake" ]; From 5521645b2c111385e3b6e15263adcc4256b87fa3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 9 Sep 2026 11:44:13 +0200 Subject: [PATCH 31/95] python3Packahes.fontmake: adopt --- pkgs/development/python-modules/fontmake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index d65e80afab85..eb8d3978bc9c 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -66,6 +66,6 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/googlefonts/fontmake"; changelog = "https://github.com/googlefonts/fontmake/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; }; }) From 29fa973b023722b24554020e6c35ad44643b8b0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Sep 2026 16:05:55 +0000 Subject: [PATCH 32/95] livekit-cli: 2.18.6 -> 2.18.8 --- pkgs/by-name/li/livekit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix index 4aeab80fb1ea..02222b2d5221 100644 --- a/pkgs/by-name/li/livekit-cli/package.nix +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "livekit-cli"; - version = "2.18.6"; + version = "2.18.8"; __structuredAttrs = true; __darwinAllowLocalNetworking = true; @@ -19,10 +19,10 @@ buildGoModule (finalAttrs: { owner = "livekit"; repo = "livekit-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-kdvlrRS9sKi84QL1DRsB0gTQoP+J4qYaIAtQUh61goY="; + hash = "sha256-IuqgAaaZZblAl8a/rs2xE+zhuY4s3UNND+kmQOq/yPg="; }; - vendorHash = "sha256-AF1764F5g7dfo26G0Veoo0D0xiMPDArARR3Osm8htEI="; + vendorHash = "sha256-B/woYmWYrdtL+qFDQzvBmyXLEo2HarOjRQlEX/GcPNQ="; # Use nixpkgs portaudio package + pkg-config rather than relying on a vendored # git submodule, similar to the homebrew solution From 9bafacb7b2ff8c77a120e1ab434eb16f12c63879 Mon Sep 17 00:00:00 2001 From: MithicSpirit Date: Fri, 25 Sep 2026 13:50:37 -0400 Subject: [PATCH 33/95] xwayland-satellite: add mithicspirit as maintainer --- pkgs/by-name/xw/xwayland-satellite/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 55440713e509..54576ee4f431 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -78,6 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: { if-loop69420 sodiboo getchoo + mithicspirit ]; mainProgram = "xwayland-satellite"; platforms = lib.platforms.linux; From c24ac651a424faa8468252a107f3a911123b9cfc Mon Sep 17 00:00:00 2001 From: MithicSpirit Date: Wed, 23 Sep 2026 23:55:01 -0400 Subject: [PATCH 34/95] xwayland-satellite: 0.8.2 -> 0.8.3 https://github.com/Supreeeme/xwayland-satellite/releases/tag/v0.8.3 --- pkgs/by-name/xw/xwayland-satellite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 54576ee4f431..182881c1d5ce 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -13,13 +13,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "xwayland-satellite"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "Supreeeme"; repo = "xwayland-satellite"; tag = "v${finalAttrs.version}"; - hash = "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk="; + hash = "sha256-eFEjCCniMCKeWU0PcZNv+tDYe08SLFPjRplyPY8OFt4="; }; postPatch = '' @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/local/bin' "$out/bin" ''; - cargoHash = "sha256-Saa3SRsQuY6u6pfBGezaEExOt/ReblnrG7pAXjA6Dk8="; + cargoHash = "sha256-gMGFvnbxM3hD5fmkSimaFd87GEf6BXFe/MGjoS6VNVU="; nativeBuildInputs = [ installShellFiles From 71445f2a5cfff53f5be6b39cd8401462fa3d6756 Mon Sep 17 00:00:00 2001 From: Jared Biel Date: Fri, 25 Sep 2026 18:05:48 -0500 Subject: [PATCH 35/95] php83: 8.3.33 -> 8.3.35 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 47f139dd04c0..2c238b0e9166 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -70,8 +70,8 @@ in hash = "sha256-U2Lyp6DnFoznIv6gBIsaHSjg98wmXEF99nDGVnBpUBg="; }; php83 = mkPhp { - version = "8.3.33"; - hash = "sha256-+cn00M12ksbj2jY81MpyqCakmuGPXtQwtvyue8KIHhg="; + version = "8.3.35"; + hash = "sha256-4nnZ7JDZvKuQDRRoFuWxHT6JJLgOK6NsfX2ufXHcvy0="; }; php84 = mkPhp { version = "8.4.25"; From 4df552d5637bd803e1556fc0bf1edebf2498edeb Mon Sep 17 00:00:00 2001 From: Jared Biel Date: Fri, 25 Sep 2026 18:06:44 -0500 Subject: [PATCH 36/95] php82: 8.2.33 -> 8.2.34 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 47f139dd04c0..672b2e2b8824 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -66,8 +66,8 @@ let in { php82 = mkPhp { - version = "8.2.33"; - hash = "sha256-U2Lyp6DnFoznIv6gBIsaHSjg98wmXEF99nDGVnBpUBg="; + version = "8.2.34"; + hash = "sha256-BGfWOoGQFoEdNf0U9zR2SBOrFJdQN5eQY0KUxyPNdWI="; }; php83 = mkPhp { version = "8.3.33"; From eb2d9129bd9784275fb4dd1734ce3c6f329d8079 Mon Sep 17 00:00:00 2001 From: Jared Biel Date: Fri, 25 Sep 2026 18:07:18 -0500 Subject: [PATCH 37/95] php84: 8.4.25 -> 8.4.26 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 47f139dd04c0..d426bf2921af 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -74,8 +74,8 @@ in hash = "sha256-+cn00M12ksbj2jY81MpyqCakmuGPXtQwtvyue8KIHhg="; }; php84 = mkPhp { - version = "8.4.25"; - hash = "sha256-lSzMF4Uma5WPSh3PxYDgjqu7efRCItHv8ZK82Y2R9uM="; + version = "8.4.26"; + hash = "sha256-QglpTXsPY8RaN3PgfNwrv8cSSSZaXZUbH/U+EUftxco="; }; php85 = mkPhp { version = "8.5.10"; From ef401924ffb3b8a1689d2baac52839eeb36191aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Sep 2026 00:53:30 +0000 Subject: [PATCH 38/95] pycharm: 2026.2.0.1 -> 2026.2.3 --- pkgs/by-name/py/pycharm/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/py/pycharm/package.nix b/pkgs/by-name/py/pycharm/package.nix index 70806a3004ae..1997c7b61793 100644 --- a/pkgs/by-name/py/pycharm/package.nix +++ b/pkgs/by-name/py/pycharm/package.nix @@ -15,16 +15,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/python/pycharm-2026.2.0.1.tar.gz"; - hash = "sha256-SjfLLRVwNVPGHoFNjgFL+kcwhQhHDeX5aMTpZFt3FnU="; + url = "https://download.jetbrains.com/python/pycharm-2026.2.3.tar.gz"; + hash = "sha256-6OT75Nq0Q5DQn2geBZoxbmksq9JLLhHOmP92yBIPoxM="; }; aarch64-linux = { - url = "https://download.jetbrains.com/python/pycharm-2026.2.0.1-aarch64.tar.gz"; - hash = "sha256-8ptqeCpY+rsjJxXbj++XZb/a68brWQ7UYsT5ZWIidCc="; + url = "https://download.jetbrains.com/python/pycharm-2026.2.3-aarch64.tar.gz"; + hash = "sha256-waxrdED02JRiQdYCIg6dua+sdfQYMcoh3FFozfNonQ4="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/python/pycharm-2026.2.0.1-aarch64.dmg"; - hash = "sha256-X3YP6mtKkBvBp2UoQWfwX5AjenwwwKTSmP9GUESVDdQ="; + url = "https://download.jetbrains.com/python/pycharm-2026.2.3-aarch64.dmg"; + hash = "sha256-o4hXS1XSwywItdc7oDAsZpCBBgrCCYjbt2d+hD4s77A="; }; }; # update-script-end: urls @@ -38,8 +38,8 @@ jetbrains.mkJetBrainsProduct { product = "PyCharm"; # update-script-start: version - version = "2026.2.0.1"; - buildNumber = "262.8665.369"; + version = "2026.2.3"; + buildNumber = "262.10968.92"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); From de37ec11387e68a49155d52b431429f0b536e568 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Sep 2026 07:27:09 +0000 Subject: [PATCH 39/95] slint-tr-extractor: 1.17.1 -> 1.18.1 --- pkgs/by-name/sl/slint-tr-extractor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slint-tr-extractor/package.nix b/pkgs/by-name/sl/slint-tr-extractor/package.nix index 3955135e2b11..55655863271b 100644 --- a/pkgs/by-name/sl/slint-tr-extractor/package.nix +++ b/pkgs/by-name/sl/slint-tr-extractor/package.nix @@ -7,13 +7,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "slint-tr-extractor"; - version = "1.17.1"; + version = "1.18.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-ytJLH7CcfLjpzRXljTUZS1rzueBljGXwpDOpKKdBJ+k="; + hash = "sha256-QgVPJ607mEOSbKU/o+osZ4rgvKOaf5gBHYwW0TBi1sk="; }; - cargoHash = "sha256-D+wHG+e2gVt7I7h0KobY4bLkphZJXWaTCoSp2gpNctE="; + cargoHash = "sha256-/a39Jc29XdirQNWjt4Fu9sUGqAxlB0rtYEiU3Kv1rP0="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 94ab58a194b5fa1f93bf19641b29e7114564dfad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Sep 2026 12:54:28 +0000 Subject: [PATCH 40/95] folo: 1.13.0 -> 1.14.0 --- pkgs/by-name/fo/folo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/folo/package.nix b/pkgs/by-name/fo/folo/package.nix index 8cad217db0d5..b5c36b0cd7a8 100644 --- a/pkgs/by-name/fo/folo/package.nix +++ b/pkgs/by-name/fo/folo/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "folo"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "RSSNext"; repo = "Folo"; tag = "desktop/v${finalAttrs.version}"; - hash = "sha256-lK371YSqYcYzVjDJCfAbrl+wdAbDzmT6R4SlZXjiZLc="; + hash = "sha256-16hKEgTv2pWDsoxMG7Ct2xCvjCnmbPK2bymyutb1uW8="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-bdqcY+ylviWHnbIvPxwRZimenXWFS5bJfDeFxMtOVM0="; + hash = "sha256-6ExELKJr6oAkywYSjsw+c24IHtipJ213N74aSzhEUTs="; }; __structuredAttrs = true; From 242dcea3a9be55e9cd6932c2869536486f2fd7b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Sep 2026 13:24:53 +0000 Subject: [PATCH 41/95] ocamlPackages.unstrctrd: 0.4 -> 0.5 --- pkgs/development/ocaml-modules/unstrctrd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/unstrctrd/default.nix b/pkgs/development/ocaml-modules/unstrctrd/default.nix index 1426a68f14d3..851b4b642d49 100644 --- a/pkgs/development/ocaml-modules/unstrctrd/default.nix +++ b/pkgs/development/ocaml-modules/unstrctrd/default.nix @@ -15,11 +15,11 @@ buildDunePackage rec { pname = "unstrctrd"; - version = "0.4"; + version = "0.5"; src = fetchzip { url = "https://github.com/dinosaure/unstrctrd/releases/download/v${version}/unstrctrd-${version}.tbz"; - hash = "sha256-CGcDqEr+VDTbDYkjxeYB6IFWiTkOTLJJl/Y2bHtv19g="; + hash = "sha256-WmjFDxgFTkOmHwcy+9aXBz688DvBBqSeevl2K3/Sv9Y="; }; propagatedBuildInputs = [ From 72c9531286b44bcf9b56a12b84bcf4bc11f96882 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Sep 2026 13:58:50 +0000 Subject: [PATCH 42/95] inspircd: 4.12.0 -> 4.12.1 --- pkgs/by-name/in/inspircd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index 3e2ce814b6ce..62de129c44e7 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -151,13 +151,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "inspircd"; - version = "4.12.0"; + version = "4.12.1"; src = fetchFromGitHub { owner = "inspircd"; repo = "inspircd"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-bzhh6fAAHahfVRgy+8HTqGVY+Rzk7MSmKTbaFZBILUY="; + sha256 = "sha256-crIxqqBMwu+lYnftlOdZ/jNvOh0vS7Zr0YDMAR8wlfs="; }; outputs = [ From 990a62071508dc767912d6d9d8ce6fe4a99139f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Sep 2026 15:11:17 +0000 Subject: [PATCH 43/95] aiken: 1.1.23 -> 1.1.24 --- pkgs/by-name/ai/aiken/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index 2918f02a8278..8b09d8e56fa4 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aiken"; - version = "1.1.23"; + version = "1.1.24"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; tag = "v${finalAttrs.version}"; - hash = "sha256-9CPwIqUoOih4711vSEeV3AX1T1GGQ/AeYj7HnWI5UO8="; + hash = "sha256-yG96JwZ/H4/MrLkrmsResRg3HGUfh1Kz3kA6qv0Y62c="; }; - cargoHash = "sha256-98oyeVo3z49DGikhSBMB7QSiz6+I7GkvqJIpOusuEz4="; + cargoHash = "sha256-BDe1GQtKzE2fyKPDdOEriF4wUxONe/jLfnyHiF/dUh4="; buildInputs = [ openssl ]; From 4c7d183e82cc023f90d9ff8c466be12422ff5dd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Sep 2026 15:36:15 +0000 Subject: [PATCH 44/95] todoist-cli: 5.3.6 -> 5.4.2 --- pkgs/by-name/to/todoist-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/todoist-cli/package.nix b/pkgs/by-name/to/todoist-cli/package.nix index 460bca685547..45948979bea8 100644 --- a/pkgs/by-name/to/todoist-cli/package.nix +++ b/pkgs/by-name/to/todoist-cli/package.nix @@ -7,16 +7,16 @@ }: buildNpmPackage rec { pname = "todoist-cli"; - version = "5.3.6"; + version = "5.4.2"; src = fetchFromGitHub { owner = "Doist"; repo = "todoist-cli"; rev = "v${version}"; - sha256 = "sha256-x1zoHqNXWCwv2wQS56H3Z5DUxWTXFbcaYlupOvm/lfs="; + sha256 = "sha256-1WoWzIrZQT8bQTUQl55e8E7oCqLKmjSbm6aJB7GWga8="; }; - npmDepsHash = "sha256-ll3UnmbJrvzv6F5LvhJRMkyA3FRxaiJvVCwk0Wy81Ks="; + npmDepsHash = "sha256-0GOgPDvNC/oaPA3ZV3SfFziyDLh/6aiw50k+ztJsvxw="; doCheck = true; From 3f7d49579dafdef97b10795e0ac6067b4d660505 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 26 Sep 2026 15:52:07 +0000 Subject: [PATCH 45/95] python3Packages.orbax-checkpoint: 0.12.5 -> 0.12.6 Diff: https://github.com/google/orbax/compare/v0.12.5...v0.12.6 Changelog: https://github.com/google/orbax/blob/v0.12.6/checkpoint/CHANGELOG.md --- pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 634ac53be3fa..496fb97472e7 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: { pname = "orbax-checkpoint"; - version = "0.12.5"; + version = "0.12.6"; pyproject = true; __structuredAttrs = true; @@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: { owner = "google"; repo = "orbax"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lw1GXim5N1DjRfcZQ1lnUTaQ98RdaftMyqCPuSIBd8E="; + hash = "sha256-Dyi3a+ecGCu0I1tDIvqmjuGsZcUjnXiKhxggS6jsE3c="; }; sourceRoot = "${finalAttrs.src.name}/checkpoint"; From 7a1e0f89693f5cd367dda0c28aa26554ee88d1b3 Mon Sep 17 00:00:00 2001 From: Aiden Schembri Date: Sun, 6 Sep 2026 15:42:34 +0200 Subject: [PATCH 46/95] discord: move to pkgs/by-name --- pkgs/by-name/di/discord-canary/package.nix | 6 ++++++ .../di/discord-development/package.nix | 6 ++++++ pkgs/by-name/di/discord-ptb/package.nix | 6 ++++++ .../di}/discord/darwin.nix | 0 .../di}/discord/disable-breaking-updates.py | 0 .../di}/discord/linux.nix | 0 .../di/discord/metadata.nix} | 17 +++++++--------- .../di/discord/package.nix} | 20 +++++++++++-------- .../di}/discord/sources.json | 0 .../di}/discord/update.py | 0 pkgs/top-level/all-packages.nix | 7 ------- 11 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 pkgs/by-name/di/discord-canary/package.nix create mode 100644 pkgs/by-name/di/discord-development/package.nix create mode 100644 pkgs/by-name/di/discord-ptb/package.nix rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/darwin.nix (100%) rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/disable-breaking-updates.py (100%) rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/linux.nix (100%) rename pkgs/{applications/networking/instant-messengers/discord/default.nix => by-name/di/discord/metadata.nix} (93%) rename pkgs/{applications/networking/instant-messengers/discord/wrapper.nix => by-name/di/discord/package.nix} (96%) rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/sources.json (100%) rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/update.py (100%) diff --git a/pkgs/by-name/di/discord-canary/package.nix b/pkgs/by-name/di/discord-canary/package.nix new file mode 100644 index 000000000000..968c5990523f --- /dev/null +++ b/pkgs/by-name/di/discord-canary/package.nix @@ -0,0 +1,6 @@ +{ + discord, + ... +}@args: + +discord.override ({ pname = "discord-canary"; } // removeAttrs args [ "discord" ]) diff --git a/pkgs/by-name/di/discord-development/package.nix b/pkgs/by-name/di/discord-development/package.nix new file mode 100644 index 000000000000..6d3d34251320 --- /dev/null +++ b/pkgs/by-name/di/discord-development/package.nix @@ -0,0 +1,6 @@ +{ + discord, + ... +}@args: + +discord.override ({ pname = "discord-development"; } // removeAttrs args [ "discord" ]) diff --git a/pkgs/by-name/di/discord-ptb/package.nix b/pkgs/by-name/di/discord-ptb/package.nix new file mode 100644 index 000000000000..52785ef6fc54 --- /dev/null +++ b/pkgs/by-name/di/discord-ptb/package.nix @@ -0,0 +1,6 @@ +{ + discord, + ... +}@args: + +discord.override ({ pname = "discord-ptb"; } // removeAttrs args [ "discord" ]) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/by-name/di/discord/darwin.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/darwin.nix rename to pkgs/by-name/di/discord/darwin.nix diff --git a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py b/pkgs/by-name/di/discord/disable-breaking-updates.py similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py rename to pkgs/by-name/di/discord/disable-breaking-updates.py diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/by-name/di/discord/linux.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/linux.nix rename to pkgs/by-name/di/discord/linux.nix diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/by-name/di/discord/metadata.nix similarity index 93% rename from pkgs/applications/networking/instant-messengers/discord/default.nix rename to pkgs/by-name/di/discord/metadata.nix index 31facadf34d7..193774b55506 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/by-name/di/discord/metadata.nix @@ -1,5 +1,4 @@ { - callPackage, lib, stdenv, discord, @@ -95,13 +94,11 @@ lib.genAttrs [ "discord" "discord-ptb" "discord-canary" "discord-development" ] platformName = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; source = sources."${platformName}-${args.branch}"; in - callPackage ./wrapper.nix ( - args - // { - inherit pname source; - meta = meta // { - mainProgram = args.binaryName; - }; - } - ) + args + // { + inherit source; + meta = meta // { + mainProgram = args.binaryName; + }; + } ) diff --git a/pkgs/applications/networking/instant-messengers/discord/wrapper.nix b/pkgs/by-name/di/discord/package.nix similarity index 96% rename from pkgs/applications/networking/instant-messengers/discord/wrapper.nix rename to pkgs/by-name/di/discord/package.nix index 5184722f636d..510af8075a22 100644 --- a/pkgs/applications/networking/instant-messengers/discord/wrapper.nix +++ b/pkgs/by-name/di/discord/package.nix @@ -1,12 +1,6 @@ { # Package metadata - pname, - source, - meta, - binaryName, - desktopName, - self, - branch, + pname ? "discord", # Feature flags (cross-platform) withOpenASAR ? false, withVencord ? false, @@ -46,7 +40,17 @@ let inherit (stdenv.hostPlatform) isLinux; - pkgArgs = removeAttrs args [ + metadata = (callPackage ./metadata.nix { }).${pname}; + inherit (metadata) + source + meta + binaryName + desktopName + self + branch + ; + + pkgArgs = removeAttrs (args // metadata) [ "branch" "self" "unwrappedDiscord" diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/by-name/di/discord/sources.json similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/sources.json rename to pkgs/by-name/di/discord/sources.json diff --git a/pkgs/applications/networking/instant-messengers/discord/update.py b/pkgs/by-name/di/discord/update.py similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/update.py rename to pkgs/by-name/di/discord/update.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cce505519d7..bd5049e7da98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10673,13 +10673,6 @@ with pkgs; dartHooks = recurseIntoAttrs (callPackage ../build-support/dart/build-dart-application/hooks { }); - inherit (callPackage ../applications/networking/instant-messengers/discord { }) - discord - discord-ptb - discord-canary - discord-development - ; - torcs-without-data = callPackage ../by-name/to/torcs/without-data.nix { }; hy = with python3Packages; toPythonApplication hy; From d44f6925118ccb47b79985501b152f62a0e7d76e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Sep 2026 19:07:54 +0000 Subject: [PATCH 47/95] sarasa-gothic: 1.0.41 -> 1.0.42 --- pkgs/by-name/sa/sarasa-gothic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 64143cc0a586..5ef9edac74ed 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.41"; + version = "1.0.42"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-XEi+/xE0ogGGmUknVlYgo8Zs4szj6+NP74yPh3T8kos="; + hash = "sha256-I9jrDiXC0qhiioKVMHYyl7j3ltlOLoZt9AE5dwr8uug="; }; sourceRoot = "."; From 3d8bcf1c41410d3d780cf090717134d587a63cc9 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 26 Sep 2026 21:23:19 +0200 Subject: [PATCH 48/95] {libapparmor,apparmor-*}: add CPE --- pkgs/by-name/li/libapparmor/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix index 66c68b1a0620..6b51edcba633 100644 --- a/pkgs/by-name/li/libapparmor/package.nix +++ b/pkgs/by-name/li/libapparmor/package.nix @@ -107,5 +107,8 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = lib.teams.apparmor.members; platforms = lib.platforms.linux; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "canonical" finalAttrs.version // { + product = "apparmor"; + }; }; }) From 7cc1fd5e1636dd6fcf321029946d655371576337 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Sat, 26 Sep 2026 21:12:15 +0100 Subject: [PATCH 49/95] immich: prevent node-gyp .pyc unreproducible files Disable writing python bytecode since those files contain timestamps, causing unreproducible builds. There are still other causes of unreproducibility in this package, but this is a step in the right direction. See #566878 --- pkgs/by-name/im/immich/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 13a0e5f955da..77680ff05cab 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -169,6 +169,8 @@ stdenv.mkDerivation (finalAttrs: { env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; # fix for node-gyp, see https://github.com/nodejs/node-gyp/issues/1191#issuecomment-301243919 env.npm_config_nodedir = nodejs; + # Prevent Python (via node-gyp) from writing bytecode to ensure build determinism + env.PYTHONDONTWRITEBYTECODE = "1"; buildPhase = '' runHook preBuild From 670ddeed256bb41757d5d670e84891c95076c36d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 21 Sep 2026 18:52:14 -0300 Subject: [PATCH 50/95] msedgedriver: refactor, add darwin support --- pkgs/by-name/ms/msedgedriver/package.nix | 53 +++++++++++++----------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 43de4807a9a0..376901f228c5 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -14,39 +14,44 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; version = "154.0.4258.37"; - src = fetchzip { - url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; - hash = "sha256-XbOQl9FyckF3Qybb+40474ImJDKahBkekPoydf/TxV0="; - stripRoot = false; - }; + src = + let + driverArch = + { + aarch64-darwin = "mac64_m1"; + x86_64-linux = "linux64"; + } + .${stdenvNoCC.hostPlatform.system}; + in + fetchzip { + url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_${driverArch}.zip"; + hash = + { + mac64_m1 = "sha256-6nwe/vRPh5MkQLTiZNXepfFsLtILwoK925mgLCUUVNg="; + linux64 = "sha256-XbOQl9FyckF3Qybb+40474ImJDKahBkekPoydf/TxV0="; + } + .${driverArch}; + stripRoot = false; + }; - buildInputs = [ + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ glib libxcb nspr nss ]; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + autoPatchelfHook + ]; - installPhase = - if stdenvNoCC.hostPlatform.isDarwin then - '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p $out/{Applications/msedgedriver,bin} - cp -R . $out/Applications/msedgedriver + install -D msedgedriver $out/bin/msedgedriver - runHook postInstall - '' - else - '' - runHook preInstall - - install -m777 -D "msedgedriver" $out/bin/msedgedriver - - runHook postInstall - ''; + runHook postInstall + ''; meta = { homepage = "https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver"; @@ -54,7 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = microsoft-edge.meta.maintainers; - platforms = [ + platforms = lib.platforms.darwin ++ [ "x86_64-linux" ]; mainProgram = "msedgedriver"; From 143592c313044d9a1fa97828982aa573b4849579 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 21 Sep 2026 18:53:51 -0300 Subject: [PATCH 51/95] microsoft-edge: refactor, add darwin support --- pkgs/by-name/mi/microsoft-edge/package.nix | 294 +++++++++++++-------- pkgs/by-name/mi/microsoft-edge/update.py | 46 ---- pkgs/by-name/mi/microsoft-edge/update.sh | 257 ++++++++++++++++++ 3 files changed, 447 insertions(+), 150 deletions(-) delete mode 100755 pkgs/by-name/mi/microsoft-edge/update.py create mode 100755 pkgs/by-name/mi/microsoft-edge/update.sh diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 13cdd8b602e7..b9023e0be7b7 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -1,11 +1,13 @@ { - lib, - stdenvNoCC, + bintools, fetchurl, + lib, makeWrapper, patchelf, - bintools, + stdenvNoCC, + testers, dpkg, + # Linked dynamic libraries alsa-lib, at-spi2-atk, @@ -46,15 +48,20 @@ pipewire, vulkan-loader, wayland, # ozone/wayland + # Command line programs coreutils, + # command line arguments which are always set e.g "--disable-gpu" commandLineArgs ? "", + # Will crash without. systemd, + # Loaded at runtime. libexif, pciutils, + # Additional dependencies according to other distros ## Ubuntu curl, @@ -73,27 +80,38 @@ ## Gentoo bzip2, libcap, + # Necessary for USB audio devices. libpulseaudio, pulseSupport ? true, + adwaita-icon-theme, gsettings-desktop-schemas, + # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) libva, libvaSupport ? true, + # For Vulkan support (--enable-features=Vulkan) addDriverRunpath, - # For QT support + undmg, + + # Enables Edge's "Use QT" appearance to introspect the user's Plasma theme + plasmaSupport ? false, qt6, - # Edge AAD sync + kdePackages, + + # Edge Specific and AAD sync cacert, libsecret, - # Edge Specific libuuid, + # Create a symlink at $out/bin/microsoft-edge-stable withSymlink ? true, }: + let + pname = "microsoft-edge"; opusWithCustomModes = libopus.override { withCustomModes = true; }; deps = [ @@ -115,15 +133,20 @@ let gcc-unwrapped.lib gdk-pixbuf glib + gtk3 + gtk4 harfbuzz icu libcap libdrm liberation_ttf libexif + libgbm libglvnd libkrb5 libpng + libsecret + libuuid libx11 libxcb libxcomposite @@ -138,7 +161,6 @@ let libxscrnsaver libxshmfence libxtst - libgbm nspr nss opusWithCustomModes @@ -152,124 +174,178 @@ let vulkan-loader wayland wget - libsecret - libuuid - gtk3 - gtk4 + ] + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional libvaSupport libva + ++ lib.optionals plasmaSupport [ qt6.qtbase qt6.qtwayland - ] - ++ lib.optionals pulseSupport [ libpulseaudio ] - ++ lib.optionals libvaSupport [ libva ]; -in -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "microsoft-edge"; - version = "154.0.4258.37"; - - src = fetchurl { - url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-xvopdHM5kTIbRsQGS3hc3sWhTYzd0YK8X9oFfjfnYD0="; - }; - - # With strictDeps on, some shebangs were not being patched correctly - # ie, $out/share/microsoft/msedge/microsoft-edge - strictDeps = false; - - nativeBuildInputs = [ - makeWrapper - patchelf - dpkg + kdePackages.plasma-integration + kdePackages.breeze ]; - buildInputs = [ - # needed for XDG_ICON_DIRS - adwaita-icon-theme - glib - gtk3 - gtk4 - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas - ]; + linux = stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname meta; + version = "154.0.4258.37"; - rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; - binpath = lib.makeBinPath deps; + src = fetchurl { + url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; + hash = "sha256-xvopdHM5kTIbRsQGS3hc3sWhTYzd0YK8X9oFfjfnYD0="; + }; - installPhase = '' - runHook preInstall + # With strictDeps on, some shebangs were not being patched correctly + # ie, $out/share/microsoft/msedge/microsoft-edge + strictDeps = false; - appname=msedge - dist=stable + nativeBuildInputs = [ + makeWrapper + patchelf + dpkg + ]; - exe=$out/bin/microsoft-edge + buildInputs = [ + # needed for XDG_ICON_DIRS + adwaita-icon-theme + glib + gtk3 + gtk4 + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas + ]; - mkdir -p $out/bin - cp -v -a usr/share $out/share - cp -v -a opt/microsoft $out/share/microsoft + rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; + binpath = lib.makeBinPath deps; - # replace bundled vulkan-loader - rm -v $out/share/microsoft/$appname/libvulkan.so.1 - ln -v -s -t "$out/share/microsoft/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" + installPhase = '' + runHook preInstall - substituteInPlace $out/share/microsoft/$appname/microsoft-edge \ - --replace-fail 'CHROME_WRAPPER' 'WRAPPER' - substituteInPlace $out/share/applications/microsoft-edge.desktop \ - --replace-fail /usr/bin/microsoft-edge-$dist $exe - substituteInPlace $out/share/applications/com.microsoft.Edge.desktop \ - --replace-fail /usr/bin/microsoft-edge-$dist $exe - substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \ - --replace-fail /opt/microsoft/msedge $exe + appname=msedge + dist=stable - for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do - num_and_suffix="''${icon_file##*logo_}" - if [ $dist = "stable" ]; then - icon_size="''${num_and_suffix%.*}" - else - icon_size="''${num_and_suffix%_*}" - fi - logo_output_prefix="$out/share/icons/hicolor" - logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" - mkdir -p "$logo_output_path" - mv "$icon_file" "$logo_output_path/microsoft-edge.png" - done + exe=$out/bin/microsoft-edge-$dist - # "--simulate-outdated-no-au" disables auto updates and browser outdated popup - makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \ - --prefix QT_PLUGIN_PATH : "${qt6.qtbase}/lib/qt-6/plugins" \ - --prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/lib/qt-6/plugins" \ - --prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \ - --prefix LD_LIBRARY_PATH : "$rpath" \ - --prefix PATH : "$binpath" \ - --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ - --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \ - --set CHROME_WRAPPER "microsoft-edge-$dist" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ - --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ - --add-flags ${lib.escapeShellArg commandLineArgs} + mkdir -p $out/bin $out/share + cp -v -a opt/* $out/share + cp -v -a usr/share/* $out/share - # Edge specific set liboneauth - patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so + # replace bundled vulkan-loader + rm -v $out/share/microsoft/$appname/libvulkan.so.1 + ln -v -s -t "$out/share/microsoft/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" - for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do - patchelf --set-rpath $rpath $elf - patchelf --set-interpreter ${bintools.dynamicLinker} $elf - done + substituteInPlace $out/share/microsoft/$appname/microsoft-edge \ + --replace-fail 'CHROME_WRAPPER' 'WRAPPER' + substituteInPlace $out/share/applications/microsoft-edge.desktop \ + --replace-fail /usr/bin/microsoft-edge-$dist $exe + substituteInPlace $out/share/applications/com.microsoft.Edge.desktop \ + --replace-fail /usr/bin/microsoft-edge-$dist $exe + substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \ + --replace-fail /opt/microsoft/$appname $exe - ${lib.optionalString withSymlink '' - ln -s $out/bin/microsoft-edge $out/bin/microsoft-edge-stable - ''} + for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do + num_and_suffix="''${icon_file##*logo_}" + if [ $dist = "stable" ]; then + icon_size="''${num_and_suffix%.*}" + else + icon_size="''${num_and_suffix%_*}" + fi + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" + mkdir -p "$logo_output_path" + mv "$icon_file" "$logo_output_path/microsoft-edge.png" + done - runHook postInstall - ''; + # "--simulate-outdated-no-au" disables auto updates and browser outdated popup + makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \ + ${lib.optionalString plasmaSupport '' + --prefix QT_PLUGIN_PATH : "${qt6.qtbase}/lib/qt-6/plugins" \ + --prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/lib/qt-6/plugins" \ + --prefix QT_PLUGIN_PATH : "${kdePackages.plasma-integration}/lib/qt-6/plugins" \ + --prefix QT_PLUGIN_PATH : "${kdePackages.breeze}/lib/qt-6/plugins" \ + --prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \ + ''} \ + --prefix LD_LIBRARY_PATH : "$rpath" \ + --prefix PATH : "$binpath" \ + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ + --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + --set CHROME_WRAPPER "microsoft-edge-$dist" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ + --add-flags ${lib.escapeShellArg commandLineArgs} - passthru.updateScript = ./update.py; + # Edge specific set liboneauth + patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so + + for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do + patchelf --set-rpath $rpath $elf + patchelf --set-interpreter ${bintools.dynamicLinker} $elf + done + + runHook postInstall + ''; + + postInstall = lib.optionalString withSymlink '' + ln -s $out/bin/microsoft-edge-stable $out/bin/microsoft-edge + ''; + + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + }); + + darwin = stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname meta; + version = "154.0.4258.37"; + uuid = "f7dec597-801d-4c4b-ae51-c8a53c78925c"; + + src = fetchurl { + url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/${finalAttrs.uuid}/MicrosoftEdge-${finalAttrs.version}.dmg"; + hash = "sha256-R385aGFby0WK64wxHGCbKnDymsUIG+lzTpQfVO2NBgA="; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + nativeBuildInputs = [ + makeWrapper + undmg + ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + mkdir -p $out/bin + + # "--simulate-outdated-no-au" disables auto updates and browser outdated popup + makeWrapper $out/Applications/Microsoft\ Edge.app/Contents/MacOS/Microsoft\ Edge $out/bin/microsoft-edge-stable \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + runHook postInstall + ''; + + postInstall = lib.optionalString withSymlink '' + ln -s $out/bin/microsoft-edge-stable $out/bin/microsoft-edge + ''; + + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + }); meta = { - changelog = "https://learn.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel"; description = "Web browser from Microsoft"; homepage = "https://www.microsoft.com/en-us/edge"; + changelog = "https://learn.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel"; license = lib.licenses.unfree; - mainProgram = "microsoft-edge"; maintainers = with lib.maintainers; [ cholli ulrikstrid @@ -278,7 +354,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { jonhermansen iedame ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.darwin ++ [ + "x86_64-linux" + ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "microsoft-edge-stable"; }; -}) + +in +if stdenvNoCC.hostPlatform.isDarwin then + darwin +else if stdenvNoCC.hostPlatform.isLinux then + linux +else + throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}" diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py deleted file mode 100755 index 1e6419338fce..000000000000 --- a/pkgs/by-name/mi/microsoft-edge/update.py +++ /dev/null @@ -1,46 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts - -import subprocess -from collections import OrderedDict -from os.path import abspath, dirname -from urllib import request - -from debian.deb822 import Packages -from debian.debian_support import Version - -PIN_PATH = dirname(abspath(__file__)) + "/default.nix" - - -def packages(): - packages_url = "https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages" - handle = request.urlopen(packages_url) - return handle - - -def latest_packages(packages: bytes): - latest_packages: OrderedDict[str, Packages] = {} - for package in Packages.iter_paragraphs(packages, use_apt_pkg=False): - name: str = package["Package"] - if not name.startswith("microsoft-edge-stable"): - continue - channel = name.replace("microsoft-edge-", "") - if channel not in latest_packages: - latest_packages[channel] = package - else: - old_package = latest_packages[channel] - if old_package.get_version() < package.get_version(): # type: ignore - latest_packages[channel] = package - return OrderedDict(sorted(latest_packages.items(), key=lambda x: x[0])) - - -def write_expression(): - latest = latest_packages(packages()) - version = Version.re_valid_version.match(latest["stable"]["Version"]).group( - "upstream_version" - ) - subprocess.run(["update-source-version", "microsoft-edge", version]) - subprocess.run(["update-source-version", "msedgedriver", version]) - - -write_expression() diff --git a/pkgs/by-name/mi/microsoft-edge/update.sh b/pkgs/by-name/mi/microsoft-edge/update.sh new file mode 100755 index 000000000000..ac352ca9f7d3 --- /dev/null +++ b/pkgs/by-name/mi/microsoft-edge/update.sh @@ -0,0 +1,257 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl gawk nix common-updater-scripts python3Packages.python-debian +# shellcheck shell=bash + +set -euo pipefail + +DEFAULT_NIX="$(realpath "./pkgs/by-name/mi/microsoft-edge/package.nix")" +DRIVER_NIX="$(realpath "./pkgs/by-name/ms/msedgedriver/package.nix")" + +get_linux_version_info() { + local packages_url + local response + local version + local current_version + local download_url + + packages_url="https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages" + + response="$(curl --silent --fail "$packages_url")" + read -r version download_url <<< "$( + python3 -c ' +import sys +from debian.deb822 import Packages +from debian.debian_support import Version + +latest = None + +for package in Packages.iter_paragraphs(sys.stdin, use_apt_pkg=False): + if package["Package"] != "microsoft-edge-stable": + continue + + if latest is None or latest.get_version() < package.get_version(): + latest = package + +if latest is None: + raise SystemExit("microsoft-edge-stable not found") + +version = Version.re_valid_version.match( + latest["Version"] +).group("upstream_version") + +url = ( + "https://packages.microsoft.com/repos/edge/" + + latest["Filename"] +) + +print(version, url) +' <<< "$response" + )" + + current_version="$( + awk ' + /^ linux = stdenvNoCC.mkDerivation/ { in_block=1 } + in_block && /version = "/ { + match($0, /version = "([^"]+)"/, arr) + print arr[1] + exit + } + in_block && /^ \};/ { exit } + ' "$DEFAULT_NIX" + )" + + echo "$version" "$current_version" "$download_url" +} + +get_darwin_version_info() { + local redirect_url + local final_url + local version + local current_version + local uuid + + redirect_url="https://go.microsoft.com/fwlink/?linkid=2192091" + + final_url="$( + curl \ + --silent \ + --show-error \ + --fail \ + --location \ + --output /dev/null \ + --write-out '%{url_effective}' \ + "$redirect_url" + )" + + if [[ "$final_url" =~ /files/([^/]+)/MicrosoftEdge-([0-9.]+)\.dmg$ ]]; then + uuid="${BASH_REMATCH[1]}" + version="${BASH_REMATCH[2]}" + else + echo "Could not parse Darwin URL: $final_url" >&2 + exit 1 + fi + + current_version="$( + awk ' + /^ darwin = stdenvNoCC.mkDerivation/ { in_block=1 } + in_block && /version = "/ { + match($0, /version = "([^"]+)"/, arr) + print arr[1] + exit + } + in_block && /^ \};/ { exit } + ' "$DEFAULT_NIX" + )" + + echo "$version" "$current_version" "$uuid" "$final_url" +} + +update_linux() { + local version_info + local version + local current_version + local download_url + local new_hash + + read -ra version_info <<< "$(get_linux_version_info)" + + version="${version_info[0]}" + current_version="${version_info[1]}" + download_url="${version_info[2]}" + + if [[ "$current_version" = "$version" ]]; then + echo "[Nix] Linux microsoft-edge: same version" + return 0 + fi + + new_hash="$( + nix --extra-experimental-features nix-command \ + hash convert \ + --hash-algo sha256 \ + --to sri \ + "$(nix-prefetch-url "$download_url" 2>/dev/null)" + )" + + sed -i \ + "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s/version = \".*\"/version = \"$version\"/" \ + "$DEFAULT_NIX" + + sed -i \ + "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_hash\"|" \ + "$DEFAULT_NIX" + + echo "[Nix] Linux microsoft-edge: $current_version -> $version with hash $new_hash" + +} + +update_darwin() { + local version_info + local version + local current_version + local uuid + local url + local new_hash + + read -ra version_info <<< "$(get_darwin_version_info)" + + version="${version_info[0]}" + current_version="${version_info[1]}" + uuid="${version_info[2]}" + url="${version_info[3]}" + + if [[ "$current_version" = "$version" ]]; then + echo "[Nix] Darwin microsoft-edge: same version" + return 0 + fi + + new_hash="$( + nix --extra-experimental-features nix-command \ + hash convert \ + --hash-algo sha256 \ + --to sri \ + "$(nix-prefetch-url "$url" 2>/dev/null)" + )" + + sed -i \ + "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s/version = \".*\"/version = \"$version\"/" \ + "$DEFAULT_NIX" + + sed -i \ + "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s|uuid = \".*\"|uuid = \"$uuid\"|" \ + "$DEFAULT_NIX" + + sed -i \ + "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_hash\"|" \ + "$DEFAULT_NIX" + + echo "[Nix] Darwin microsoft-edge: $current_version -> $version with hash $new_hash" +} + +update_msedgedriver() { + local version="$1" + local current_version + local new_hash + local driver_arch + local url + + current_version="$( + awk ' + /pname = "msedgedriver";/ { in_block=1 } + in_block && /version = "/ { + match($0, /version = "([^"]+)"/, arr) + print arr[1] + exit + } + ' "$DRIVER_NIX" + )" + + if [[ "$current_version" = "$version" ]]; then + echo "[Nix] msedgedriver: same version" + return 0 + fi + + # All supported driver archives use the Linux Edge version. + # The archive names correspond to the driverArch mapping in + # msedgedriver/package.nix + declare -A hashes=( + [mac64_m1]="" + [linux64]="" + ) + + for driver_arch in mac64_m1 linux64; do + url="https://msedgedriver.microsoft.com/${version}/edgedriver_${driver_arch}.zip" + + new_hash="$( + nix --extra-experimental-features nix-command \ + hash convert \ + --hash-algo sha256 \ + --to sri \ + "$(nix-prefetch-url --unpack "$url" 2>/dev/null)" + )" + + hashes["$driver_arch"]="$new_hash" + + echo "[Nix] msedgedriver ${driver_arch}: $new_hash" + done + + sed -i \ + "/pname = \"msedgedriver\";/,/^ meta = {/s/version = \".*\"/version = \"$version\"/" \ + "$DRIVER_NIX" + + for driver_arch in mac64_m1 linux64; do + sed -i \ + "/pname = \"msedgedriver\";/,/^ meta = {/s|${driver_arch} = \".*\"|${driver_arch} = \"${hashes[$driver_arch]}\"|" \ + "$DRIVER_NIX" + done + + echo "[Nix] msedgedriver: $current_version -> $version" +} + +update_linux +update_darwin + +# Linux is the canonical platform for the shared msedgedriver version +linux_version_info="$(get_linux_version_info)" +read -r linux_version _ _ <<< "$linux_version_info" + +update_msedgedriver "$linux_version" From 785b85d8a2d5a62662522bc7b59ad3f09c64642c Mon Sep 17 00:00:00 2001 From: coolcuber Date: Sat, 26 Sep 2026 17:47:38 -0400 Subject: [PATCH 52/95] jackline: fix version --- .../networking/instant-messengers/jackline/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 6cff3de031f0..bc502dcca0df 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -8,7 +8,7 @@ with ocamlPackages; buildDunePackage { pname = "jackline"; - version = "unstable-2024-10-21"; + version = "0.1.0-unstable-2024-10-21"; minimalOCamlVersion = "4.13"; From 7327a6a0cea6253388c2844fc5b268eb7082e764 Mon Sep 17 00:00:00 2001 From: Sergei Volkov Date: Thu, 10 Sep 2026 14:34:19 +0200 Subject: [PATCH 53/95] julia_113-bin: init at 1.13.1 --- pkgs/development/compilers/julia/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index c9a9f09f46d9..01d2f078c986 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -51,6 +51,16 @@ in }; }) { } ); + julia_113-bin = wrapJulia ( + callPackage (import ./generic-bin.nix { + version = "1.13.1"; + sha256 = { + x86_64-linux = "0209grj6fn7yjs021rc99cwxza7p2abcv2fh263jq2m6vv41hbhg"; + aarch64-linux = "1q2wxknfsh681qfsm9dbk4xc49r6qn1m2yd85wffld27w9i1hd3q"; + aarch64-darwin = "0zqgkb294y2ih643z4fbil229hf6nvak98fbq9vbghkp8yfjbq53"; + }; + }) { } + ); julia_110 = wrapJulia ( callPackage (import ./generic.nix { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0760bff694a..80f8d29dfe79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3818,6 +3818,7 @@ with pkgs; julia_110-bin julia_111-bin julia_112-bin + julia_113-bin julia_110 julia_111 julia_112 @@ -3828,7 +3829,7 @@ with pkgs; julia = julia-stable; julia-lts-bin = julia_110-bin; - julia-stable-bin = julia_112-bin; + julia-stable-bin = julia_113-bin; julia-bin = julia-stable-bin; kotlin = callPackage ../development/compilers/kotlin { }; From 104561095ccf694d10725301fcfbb0bbdd1cac07 Mon Sep 17 00:00:00 2001 From: Sergei Volkov Date: Thu, 10 Sep 2026 14:21:01 +0200 Subject: [PATCH 54/95] julia: add __structuredAttrs = true; required for adding new package julia_113 --- pkgs/development/compilers/julia/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index 85b22313cc24..af09a91b3210 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ which From d4405d55defaa97b8e62433b7940fc268430e53a Mon Sep 17 00:00:00 2001 From: penelope zhong Date: Wed, 10 Jun 2026 18:40:35 -0500 Subject: [PATCH 55/95] maintainers: add hideyosh1 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 050f0d950ba3..91562200a1bb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11513,6 +11513,13 @@ githubId = 58676303; name = "hhydraa"; }; + hideyosh1 = { + email = "penelope.zhong@proton.me"; + keys = [ { fingerprint = "01E9 0D3E 815F 84CA 1003 E7D7 2F75 2D18 C2C1 7AF8"; } ]; + name = "Penelope Zhong"; + github = "hideyosh1"; + githubId = 64223175; + }; higebu = { name = "Yuya Kusakabe"; email = "yuya.kusakabe@gmail.com"; From b0e48c1969c111c75516eb3ddd44b3693ed17f30 Mon Sep 17 00:00:00 2001 From: penelope zhong Date: Wed, 29 Jul 2026 11:57:24 -0500 Subject: [PATCH 56/95] gnomeExtensions.impatience: add hideyosh1 as maintainer --- pkgs/desktops/gnome/extensions/impatience/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index a6e12f01109e..2467644fcd92 100644 --- a/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -44,6 +44,7 @@ stdenvNoCC.mkDerivation { maintainers = with lib.maintainers; [ timbertson tiramiseb + hideyosh1 ]; homepage = "http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml"; }; From 941cca3c744c32dfcf5cb5bc6807137b45c8cfb4 Mon Sep 17 00:00:00 2001 From: coolcuber Date: Sat, 26 Sep 2026 20:05:13 -0400 Subject: [PATCH 57/95] mpvScripts.youtube-chat: fix version --- pkgs/by-name/mp/mpv/scripts/youtube-chat.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mp/mpv/scripts/youtube-chat.nix b/pkgs/by-name/mp/mpv/scripts/youtube-chat.nix index d621b92989da..84f0d09ff158 100644 --- a/pkgs/by-name/mp/mpv/scripts/youtube-chat.nix +++ b/pkgs/by-name/mp/mpv/scripts/youtube-chat.nix @@ -7,7 +7,7 @@ buildLua { pname = "youtube-chat"; - version = "unstable-2024-06-08"; + version = "0-unstable-2024-06-08"; src = fetchFromGitHub { owner = "BanchouBoo"; From 02a875bea95f686d44a7c03ca5cd6d07324ccc15 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Sat, 26 Sep 2026 19:25:57 -0500 Subject: [PATCH 58/95] tsgolint: 7.0.2001 -> 7.0.2003 https://github.com/oxc-project/tsgolint/releases/tag/v7.0.2003 --- pkgs/by-name/ts/tsgolint/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ts/tsgolint/package.nix b/pkgs/by-name/ts/tsgolint/package.nix index 3e121bc744d3..3c0d8430543b 100644 --- a/pkgs/by-name/ts/tsgolint/package.nix +++ b/pkgs/by-name/ts/tsgolint/package.nix @@ -8,13 +8,13 @@ buildGo126Module (finalAttrs: { pname = "tsgolint"; - version = "7.0.2001"; + version = "7.0.2003"; src = fetchFromGitHub { owner = "oxc-project"; repo = "tsgolint"; tag = "v${finalAttrs.version}"; - hash = "sha256-UU5tNa/rOxDWW7TwE1SrhzkVWvHRTe82YbK/o42+vuA="; + hash = "sha256-Bux2WAskdj0jRWJyhRzcSv+L0hITl0RJUbdnsg04aCc="; fetchSubmodules = true; }; @@ -34,6 +34,7 @@ buildGo126Module (finalAttrs: { (finalAttrs.src + "/patches/0003-fix-early-return-from-invalid-tsconfig-for-better-er.patch") (finalAttrs.src + "/patches/0004-fix-collections-avoid-internal-json-import-in-ordere.patch") (finalAttrs.src + "/patches/0005-perf-vfs-cache-ReadFile-results-in-cachedvfs.patch") + (finalAttrs.src + "/patches/0006-perf-add-opt-in-node-count-checker-assignment.patch") ]; postPatch = @@ -44,7 +45,7 @@ buildGo126Module (finalAttrs: { ''; proxyVendor = true; - vendorHash = "sha256-YdoEXZ9M1sK/v5AlHjYS7aa8XPJXU4mFVUyVS6JFUlo="; + vendorHash = "sha256-X+JPv4SLJXyF938H34ldDgK2XsuORbDxbWhJ0svYTAs="; subPackages = [ "cmd/tsgolint" ]; From 12e98d5c1aa488266e212fbdcee03b1632c4f7ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 01:03:34 +0000 Subject: [PATCH 59/95] scopehal-apps: 0.2.2 -> 0.3 --- pkgs/by-name/sc/scopehal-apps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix index f0d13037e83e..c4c2579d20af 100644 --- a/pkgs/by-name/sc/scopehal-apps/package.nix +++ b/pkgs/by-name/sc/scopehal-apps/package.nix @@ -28,7 +28,7 @@ }: let - version = "0.2.2"; + version = "0.3"; in stdenv.mkDerivation { pname = "scopehal-apps"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { owner = "ngscopeclient"; repo = "scopehal-apps"; tag = "v${version}"; - hash = "sha256-LhkhSuoj6lHz3zB4U37qDkMxfV1UktIjwJvwbVGKDDM="; + hash = "sha256-zA1kRGEMM/71PAH0vfy7OdJHf80eSPXW9T9H8kb30n0="; fetchSubmodules = true; }; From ce1eaf2515f1fa336b68bdfa53308c2e2525c664 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 02:19:24 +0000 Subject: [PATCH 60/95] sgt-puzzles: 20260912.ea09098 -> 20260923.616da16 --- pkgs/by-name/sg/sgt-puzzles/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix index 235c5f7b1369..ef0d4d377068 100644 --- a/pkgs/by-name/sg/sgt-puzzles/package.nix +++ b/pkgs/by-name/sg/sgt-puzzles/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sgt-puzzles"; - version = "20260912.ea09098"; + version = "20260923.616da16"; src = fetchurl { url = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz"; - hash = "sha256-UFgy+02CaCyWXISID9Qu3+1t7F8JMLVaSmR0v9iQRPQ="; + hash = "sha256-zEGcgGC04ivjmKoD4wZR+84Ubu5RBkXDA/tvXxt3t44="; }; sgt-puzzles-menu = fetchurl { From 26d249985e3cc1dacab1bd898f35205b79828085 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 26 Sep 2026 19:37:06 -0700 Subject: [PATCH 61/95] keycloak: fix cross-compilation --- pkgs/by-name/ke/keycloak/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index cba209a1c020..12f856c62265 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -6,6 +6,7 @@ jre_headless, nixosTests, callPackage, + bash, confFile ? null, plugins ? [ ], extraFeatures ? [ ], @@ -36,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: { jre_headless ]; + buildInputs = [ + bash + ]; + patches = [ # Make home.dir and config.dir configurable through the # KC_HOME_DIR and KC_CONF_DIR environment variables. @@ -59,10 +64,9 @@ stdenv.mkDerivation (finalAttrs: { ${lib.concatMapStringsSep "\n" (pl: "install_plugin ${lib.escapeShellArg pl}") plugins} '' + '' - patchShebangs bin/kc.sh export KC_HOME_DIR=$(pwd) export KC_CONF_DIR=$(pwd)/conf - bin/kc.sh build ${featuresSubcommand} + bash bin/kc.sh build ${featuresSubcommand} runHook postBuild ''; From 465dfea5aff515ecbd8fd9f7d3226e56d716304d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 02:49:01 +0000 Subject: [PATCH 62/95] cargo-generate: 0.23.9 -> 0.25.0 --- pkgs/by-name/ca/cargo-generate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index ec305bab7e7f..46cfb273a7e0 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-generate"; - version = "0.23.9"; + version = "0.25.0"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; tag = "v${finalAttrs.version}"; - hash = "sha256-myakseKwLEjQa9GgcxdWZJWdjMFXh7Wi64CwrN2ZwSU="; + hash = "sha256-x0UkYgYJ1xe6ensm3yU5SEW+nnxHmnN+CbGCJXth8WQ="; }; - cargoHash = "sha256-IAUgpk3HD9znLORCQKNw+AO6NG9GEVWMU/cez3B+CKc="; + cargoHash = "sha256-cXPks2uTUVnVyBXP9JT5Xm87pFkCvPHQy86R7vd2/zU="; nativeBuildInputs = [ pkg-config ]; From 461821773fd812a824a7a9546a9adc6c7d8e8f1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 04:11:18 +0000 Subject: [PATCH 63/95] appium-inspector: 2026.7.1 -> 2026.9.2 --- pkgs/by-name/ap/appium-inspector/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix index 065942ab9a38..2a338e30df80 100644 --- a/pkgs/by-name/ap/appium-inspector/package.nix +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, copyDesktopItems, - electron_43, + electron_44, fetchFromGitHub, makeDesktopItem, makeWrapper, @@ -14,21 +14,21 @@ }: let - electron = electron_43; + electron = electron_44; in buildNpmPackage (finalAttrs: { pname = "appium-inspector"; - version = "2026.7.1"; + version = "2026.9.2"; src = fetchFromGitHub { owner = "appium"; repo = "appium-inspector"; tag = "v${finalAttrs.version}"; - hash = "sha256-7pxXlY/aifrg4cuGZSgxONF+RPL8P7JcZ6Gobqv2nz4="; + hash = "sha256-ePHLOHEXaigZwoCrZG18K7oYVeFEg3ZhZIKJJHyFQe8="; }; - npmDepsHash = "sha256-W9FWIHhtS2d9xBpIEGB8sWmDfcdyphL+0eCk1+8pu2s="; + npmDepsHash = "sha256-MvDKtSx/1w3s8NjQczEzvxSE6SmJrWb5CUpPYhSX7Ts="; npmFlags = [ "--ignore-scripts" ]; nativeBuildInputs = [ From f0ec4e25ab0cfe2a147f9e13b501d4d94e8ef25c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 04:47:03 +0000 Subject: [PATCH 64/95] home-assistant-custom-lovelace-modules.light-entity-card: 6.4.0 -> 6.4.1 --- .../custom-lovelace-modules/light-entity-card/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix index 67aaf7fe9cad..6c795141822c 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "light-entity-card"; - version = "6.4.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ljmerza"; repo = "light-entity-card"; tag = "v${finalAttrs.version}"; - hash = "sha256-19P+X59S32kOo+qZ1sh9iFiVT7+jhuYsRrGp/6E0HD4="; + hash = "sha256-7nRONIGy7kOYJBx813f7luwMI1rDu9FR75OP5HBsDxY="; }; - npmDepsHash = "sha256-Sl2TgA73Wq1n//lqokLC7iHcE1Oqt+ZP6MT+Deidhn0="; + npmDepsHash = "sha256-askNG1clZXaJbRBJH7HG/JGhxejmBq38py+A6sSmM3w="; installPhase = '' runHook preInstall From 0d328ff88ed8323eabdf73964aa66dca19e415dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 06:02:22 +0000 Subject: [PATCH 65/95] paratest: 7.24.1 -> 7.25.0 --- pkgs/by-name/pa/paratest/composer.lock | 144 ++++++++++++------------- pkgs/by-name/pa/paratest/package.nix | 6 +- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/pkgs/by-name/pa/paratest/composer.lock b/pkgs/by-name/pa/paratest/composer.lock index c117bdca44df..c176ba99cb12 100644 --- a/pkgs/by-name/pa/paratest/composer.lock +++ b/pkgs/by-name/pa/paratest/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e05bb884082da19a1a78e8a5f8a64417", + "content-hash": "1f220d5db23e158a3958000e9ad56f0d", "packages": [ { "name": "fidry/cpu-core-counter", @@ -189,16 +189,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.8.0", + "version": "v5.9.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f" + "reference": "9e33da9553fe7786f0962b35f4e4ecf01be89def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/044a6a392ff8ad0d61f14370a5fbbd0a0107152f", - "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9e33da9553fe7786f0962b35f4e4ecf01be89def", + "reference": "9e33da9553fe7786f0962b35f4e4ecf01be89def", "shasum": "" }, "require": { @@ -240,9 +240,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.8.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.9.0" }, - "time": "2026-07-04T14:30:18+00:00" + "time": "2026-09-13T18:51:52+00:00" }, { "name": "phar-io/manifest", @@ -364,16 +364,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "14.3.1", + "version": "14.3.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6ce313bb110384148d1dc7695a99175f59529069" + "reference": "96af7aaa1e15561a67b2fa5b98906b063ebec9c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6ce313bb110384148d1dc7695a99175f59529069", - "reference": "6ce313bb110384148d1dc7695a99175f59529069", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/96af7aaa1e15561a67b2fa5b98906b063ebec9c2", + "reference": "96af7aaa1e15561a67b2fa5b98906b063ebec9c2", "shasum": "" }, "require": { @@ -381,7 +381,7 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^5.8.0", + "nikic/php-parser": "^5.9.0", "php": ">=8.4", "phpunit/php-text-template": "^6.0", "sebastian/complexity": "^6.0", @@ -392,7 +392,7 @@ "theseer/tokenizer": "^2.0.1" }, "require-dev": { - "phpunit/phpunit": "^13.3.1" + "phpunit/phpunit": "^13.3.4" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -430,7 +430,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.3.1" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.3.5" }, "funding": [ { @@ -450,7 +450,7 @@ "type": "tidelift" } ], - "time": "2026-08-16T05:23:47+00:00" + "time": "2026-09-25T08:28:49+00:00" }, { "name": "phpunit/php-file-iterator", @@ -747,16 +747,16 @@ }, { "name": "phpunit/phpunit", - "version": "13.3.1", + "version": "13.3.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fc024931d6ad047404e9d86536735923fe63a06b" + "reference": "1b482b9a77774705a5c4a47ab7d60819d2589e90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc024931d6ad047404e9d86536735923fe63a06b", - "reference": "fc024931d6ad047404e9d86536735923fe63a06b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b482b9a77774705a5c4a47ab7d60819d2589e90", + "reference": "1b482b9a77774705a5c4a47ab7d60819d2589e90", "shasum": "" }, "require": { @@ -770,14 +770,14 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.4.1", - "phpunit/php-code-coverage": "^14.3", - "phpunit/php-file-iterator": "^7.0.1", + "phpunit/php-code-coverage": "^14.3.5", + "phpunit/php-file-iterator": "^7.0.2", "phpunit/php-invoker": "^7.0.0", "phpunit/php-text-template": "^6.0.0", "phpunit/php-timer": "^9.0.0", "sebastian/cli-parser": "^5.0.1", "sebastian/comparator": "^8.4", - "sebastian/diff": "^9.0", + "sebastian/diff": "^9.0.1", "sebastian/environment": "^9.3.2", "sebastian/exporter": "^8.2.1", "sebastian/file-filter": "^1.0", @@ -827,7 +827,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/13.3.1" + "source": "https://github.com/sebastianbergmann/phpunit/tree/13.3.5" }, "funding": [ { @@ -835,7 +835,7 @@ "type": "other" } ], - "time": "2026-08-13T13:14:23+00:00" + "time": "2026-09-25T08:41:20+00:00" }, { "name": "psr/container", @@ -2050,16 +2050,16 @@ }, { "name": "symfony/console", - "version": "v8.1.5", + "version": "v8.1.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d07c06839e33047e2c894a6793248f3fb66c8129" + "reference": "29afb89f4e941f68a6e90f28e3f52ff1f6793a7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d07c06839e33047e2c894a6793248f3fb66c8129", - "reference": "d07c06839e33047e2c894a6793248f3fb66c8129", + "url": "https://api.github.com/repos/symfony/console/zipball/29afb89f4e941f68a6e90f28e3f52ff1f6793a7d", + "reference": "29afb89f4e941f68a6e90f28e3f52ff1f6793a7d", "shasum": "" }, "require": { @@ -2126,7 +2126,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v8.1.5" + "source": "https://github.com/symfony/console/tree/v8.1.7" }, "funding": [ { @@ -2146,7 +2146,7 @@ "type": "tidelift" } ], - "time": "2026-08-21T14:29:57+00:00" + "time": "2026-09-13T10:55:57+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2636,16 +2636,16 @@ }, { "name": "symfony/process", - "version": "v8.1.5", + "version": "v8.1.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d863f5e70d7c87abb906ac11b61f83036093000b" + "reference": "10823b09358e690df4ff943e24e8492bb1019fc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d863f5e70d7c87abb906ac11b61f83036093000b", - "reference": "d863f5e70d7c87abb906ac11b61f83036093000b", + "url": "https://api.github.com/repos/symfony/process/zipball/10823b09358e690df4ff943e24e8492bb1019fc3", + "reference": "10823b09358e690df4ff943e24e8492bb1019fc3", "shasum": "" }, "require": { @@ -2677,7 +2677,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v8.1.5" + "source": "https://github.com/symfony/process/tree/v8.1.7" }, "funding": [ { @@ -2697,20 +2697,20 @@ "type": "tidelift" } ], - "time": "2026-08-21T17:47:34+00:00" + "time": "2026-09-02T12:40:29+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.7.1", + "version": "v3.7.3", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "c0a284bab1ed8aa0417e3d69250ab437739563a0" + "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/c0a284bab1ed8aa0417e3d69250ab437739563a0", - "reference": "c0a284bab1ed8aa0417e3d69250ab437739563a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/15e6a07ec2a2c75ceb1b21dd98105ee8456d2257", + "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257", "shasum": "" }, "require": { @@ -2764,7 +2764,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.7.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.7.3" }, "funding": [ { @@ -2784,20 +2784,20 @@ "type": "tidelift" } ], - "time": "2026-06-16T09:55:08+00:00" + "time": "2026-07-27T15:39:01+00:00" }, { "name": "symfony/string", - "version": "v8.1.2", + "version": "v8.1.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc" + "reference": "d950140b5f56f31901e5b7a0c04ffc3a3deb943c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc", - "reference": "286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc", + "url": "https://api.github.com/repos/symfony/string/zipball/d950140b5f56f31901e5b7a0c04ffc3a3deb943c", + "reference": "d950140b5f56f31901e5b7a0c04ffc3a3deb943c", "shasum": "" }, "require": { @@ -2854,7 +2854,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v8.1.2" + "source": "https://github.com/symfony/string/tree/v8.1.7" }, "funding": [ { @@ -2874,7 +2874,7 @@ "type": "tidelift" } ], - "time": "2026-07-28T07:35:25+00:00" + "time": "2026-09-11T14:51:16+00:00" }, { "name": "theseer/tokenizer", @@ -3082,16 +3082,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "2.3.3", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "fb19eedd2bb67ff8cf7a5502ad329e701d6398a3" + "reference": "148cefffaf0233e4c08cc13db8a195a56dd6dfe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fb19eedd2bb67ff8cf7a5502ad329e701d6398a3", - "reference": "fb19eedd2bb67ff8cf7a5502ad329e701d6398a3", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/148cefffaf0233e4c08cc13db8a195a56dd6dfe9", + "reference": "148cefffaf0233e4c08cc13db8a195a56dd6dfe9", "shasum": "" }, "require": { @@ -3123,17 +3123,17 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.3" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.5" }, - "time": "2026-07-08T07:01:06+00:00" + "time": "2026-08-31T16:05:28+00:00" }, { "name": "phpstan/phpstan", - "version": "2.2.9", + "version": "2.2.16", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/13d6b4f347bad222da436580c8304fa6f83e6bd0", - "reference": "13d6b4f347bad222da436580c8304fa6f83e6bd0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46a6d9060e5a7763adfcc21ebcb8b504ebdbcb92", + "reference": "46a6d9060e5a7763adfcc21ebcb8b504ebdbcb92", "shasum": "" }, "require": { @@ -3189,7 +3189,7 @@ "type": "github" } ], - "time": "2026-08-22T07:38:16+00:00" + "time": "2026-09-25T09:31:51+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -3244,22 +3244,22 @@ }, { "name": "phpstan/phpstan-phpunit", - "version": "2.0.18", + "version": "2.0.19", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "f5dc20ff8082d02339b60cab68ec3eb0d859fb30" + "reference": "33a190a5e8e69fd18308443a80d4f43f42d43604" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/f5dc20ff8082d02339b60cab68ec3eb0d859fb30", - "reference": "f5dc20ff8082d02339b60cab68ec3eb0d859fb30", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/33a190a5e8e69fd18308443a80d4f43f42d43604", + "reference": "33a190a5e8e69fd18308443a80d4f43f42d43604", "shasum": "" }, "require": { "phar-io/version": "^3.2", "php": "^7.4 || ^8.0", - "phpstan/phpstan": "^2.2.3" + "phpstan/phpstan": "^2.2.6" }, "conflict": { "phpunit/phpunit": "<7.0" @@ -3296,9 +3296,9 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.18" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.19" }, - "time": "2026-07-04T12:16:09+00:00" + "time": "2026-09-26T17:07:06+00:00" }, { "name": "phpstan/phpstan-strict-rules", @@ -3503,16 +3503,16 @@ }, { "name": "symfony/filesystem", - "version": "v8.1.5", + "version": "v8.1.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "6b2f4a0eeb28b5d74f90862592923a654bc629b3" + "reference": "7599ebb855fede59413ddb7f15198d67bfcae7ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/6b2f4a0eeb28b5d74f90862592923a654bc629b3", - "reference": "6b2f4a0eeb28b5d74f90862592923a654bc629b3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7599ebb855fede59413ddb7f15198d67bfcae7ba", + "reference": "7599ebb855fede59413ddb7f15198d67bfcae7ba", "shasum": "" }, "require": { @@ -3550,7 +3550,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v8.1.5" + "source": "https://github.com/symfony/filesystem/tree/v8.1.6" }, "funding": [ { @@ -3570,7 +3570,7 @@ "type": "tidelift" } ], - "time": "2026-08-21T12:16:08+00:00" + "time": "2026-08-23T10:06:25+00:00" } ], "aliases": [], @@ -3579,7 +3579,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.4.0 || ~8.5.0", + "php": "~8.4.0 || ~8.5.0 || ~8.6.0", "ext-dom": "*", "ext-pcre": "*", "ext-reflection": "*", diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix index 3ca41261d2a4..21455834f3a4 100644 --- a/pkgs/by-name/pa/paratest/package.nix +++ b/pkgs/by-name/pa/paratest/package.nix @@ -8,17 +8,17 @@ (php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject2 (finalAttrs: { pname = "paratest"; - version = "7.24.1"; + version = "7.25.0"; src = fetchFromGitHub { owner = "paratestphp"; repo = "paratest"; tag = "v${finalAttrs.version}"; - hash = "sha256-wNdZyZ7r9UpXCJwE4yucEg9FmWCy06HRr56s1XZQWB0="; + hash = "sha256-rvxDqtcZ6KbhjX5rBkiPn1FxqT1s+YtYfIwhMyTTTZU="; }; composerLock = ./composer.lock; - vendorHash = "sha256-LomuNhr/g9Fa6du0xPcRHPSEXDLRcbqEOqha9wwtY7M="; + vendorHash = "sha256-bszTB7FcalfGLywtjn4qt2kBBDqyESUc/a20IfMpQ6Y="; passthru.updateScript = ./update.sh; From a46b00347da4a338fe6735f27c24de7edf289e27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 06:13:22 +0000 Subject: [PATCH 66/95] restate: 1.7.10 -> 1.7.12 --- pkgs/by-name/re/restate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index d3300840058b..a8bf44cc4bec 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -26,16 +26,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.7.10"; + version = "1.7.12"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-LVzgyaY7v44tzzcRcAdWFEa7DZfzYnZvI8k4tiDHB3Q="; + hash = "sha256-UL6FVyydzqNAsHorqQXbcXRZCZcQ0DCZho1x23YM9+o="; }; - cargoHash = "sha256-b1xwzpqef9WHhcXIgzb/eIhNrsXuNskQAIRti8wdgMQ="; + cargoHash = "sha256-bKGJZ5gmp+sG3BuMoT0i62fDJFC1mNu9iOEQFEf7rRA="; env = { PROTOC = lib.getExe protobuf; From d7e4059378b749b4d24dfaabf17a1445615646c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 06:35:07 +0000 Subject: [PATCH 67/95] keycloakPlugins.keycloak-magic-link: 0.75 -> 0.84 --- pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix b/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix index 84b66528a905..ad99defd9807 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix @@ -6,13 +6,13 @@ }: maven.buildMavenPackage (finalAttrs: { pname = "keycloak-magic-link"; - version = "0.75"; + version = "0.84"; src = fetchFromGitHub { owner = "p2-inc"; repo = "keycloak-magic-link"; tag = "v${finalAttrs.version}"; - hash = "sha256-k8+DRkMVhJyifXMdoxS3fPO7LPrfw2rUrZQ/zDBzLVo="; + hash = "sha256-t+OACAr9TJvJbjAQZzFbMf33CuhK9s/n+MESPRD4lUU="; }; mvnHash = "sha256-nSJvNSgo1gftGYmx0lFXHIeIhpZ+Ph1KvOHz8jF3voE="; From 961c9b60526356e1e733ed821d06c5cbd7c008c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 06:35:34 +0000 Subject: [PATCH 68/95] keycloakPlugins.keycloak-orgs: 0.180 -> 0.182 --- pkgs/by-name/ke/keycloak/keycloak-orgs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/keycloak-orgs/default.nix b/pkgs/by-name/ke/keycloak/keycloak-orgs/default.nix index a48dc5eb4bda..3dd179974e57 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-orgs/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-orgs/default.nix @@ -6,13 +6,13 @@ }: maven.buildMavenPackage (finalAttrs: { pname = "keycloak-orgs"; - version = "0.180"; + version = "0.182"; src = fetchFromGitHub { owner = "p2-inc"; repo = "keycloak-orgs"; tag = "v${finalAttrs.version}"; - hash = "sha256-M9adZ3oNf4ZcPgSVT++66ltznCc2vJM+eOrYrUk9qI4="; + hash = "sha256-X+PjAw7L6373Zp2hikxP9+KotqBziUDo/aRuw2gnias="; }; mvnHash = "sha256-kU9nmiu/hWJaEfQzdVKC/IIWqZarRPpOqDP/bJQIIEY="; From c82d70bc35056881429502f66ca79f206d42ccf5 Mon Sep 17 00:00:00 2001 From: Sergei Volkov Date: Thu, 10 Sep 2026 14:29:39 +0200 Subject: [PATCH 69/95] julia_113: init at 1.13.1 --- pkgs/development/compilers/julia/default.nix | 22 +++++++++++++++++++ .../patches/1.13/0001-llvm-zlib-rpath.patch | 19 ++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/julia/patches/1.13/0001-llvm-zlib-rpath.patch diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 01d2f078c986..89edbf8cfdd3 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -113,4 +113,26 @@ in { } ) ); + julia_113 = wrapJulia ( + callPackage + (import ./generic.nix { + version = "1.13.1"; + hash = "sha256-HCAGvO16H4tsklmO9lt7JPx0rqrcU1NaReTGGXABBXw="; + patches = [ + # Upstream only sets CMAKE_BUILD_RPATH on Darwin (JuliaLang/julia#63103). + # On Linux in the Nix sandbox, intermediate build tools like llvm-min-tblgen + # need build_shlibdir in RPATH to find bundled libz/libzstd during LLVM compilation. + ./patches/1.13/0001-llvm-zlib-rpath.patch + ]; + }) + ( + if stdenv.cc.isGNU then + { + stdenv = gcc14Stdenv; + gfortran = gfortran14; + } + else + { } + ) + ); } diff --git a/pkgs/development/compilers/julia/patches/1.13/0001-llvm-zlib-rpath.patch b/pkgs/development/compilers/julia/patches/1.13/0001-llvm-zlib-rpath.patch new file mode 100644 index 000000000000..bb7eb3a4c6d4 --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.13/0001-llvm-zlib-rpath.patch @@ -0,0 +1,19 @@ +From: Sergei Volkov +Subject: [PATCH] llvm: add zlib and zstd build rpath + +When building LLVM as part of Julia source build, intermediate build tools +like llvm-min-tblgen dynamically link against zlib/zstd located in build_shlibdir. +Upstream (JuliaLang/julia#63103) added CMAKE_BUILD_RPATH only for Darwin, +so on Linux in the Nix build sandbox these tools fail to load libz.so.1 unless +build_shlibdir is also added to CMAKE_BUILD_RPATH. + +--- a/deps/llvm.mk ++++ b/deps/llvm.mk +@@ -108,6 +108,7 @@ LLVM_CMAKE += -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:STRING="$(LLVM_EXPERIMENTAL_T + LLVM_CMAKE += -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_HOST_TRIPLE="$(or $(XC_HOST),$(BUILD_MACHINE))" + LLVM_CMAKE += -DLLVM_ENABLE_ZLIB=FORCE_ON -DZLIB_ROOT="$(build_prefix)" + LLVM_CMAKE += -DLLVM_ENABLE_ZSTD=FORCE_ON -DZSTD_ROOT="$(build_prefix)" ++LLVM_CMAKE += -DCMAKE_BUILD_RPATH="$(build_shlibdir)" + ifeq ($(USE_POLLY_ACC),1) + LLVM_CMAKE += -DPOLLY_ENABLE_GPGPU_CODEGEN=ON + endif diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80f8d29dfe79..d6e853c43181 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3822,10 +3822,11 @@ with pkgs; julia_110 julia_111 julia_112 + julia_113 ; julia-lts = julia_110-bin; - julia-stable = julia_112; + julia-stable = julia_113; julia = julia-stable; julia-lts-bin = julia_110-bin; From e44a874f28614ba7c33276922d9d178348f720be Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 27 Sep 2026 02:34:29 -0500 Subject: [PATCH 70/95] lmstudio: 0.4.23.1 -> 0.4.25.1 --- pkgs/by-name/lm/lmstudio/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index d68a3ee29e4a..fd0c05310742 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,12 +7,12 @@ let pname = "lmstudio"; - version_aarch64-linux = "0.4.23-1"; - hash_aarch64-linux = "sha256-MzPygFB0StS8KTuZWq0AR+ZtiQIJ353QHlgpddOa19Y="; - version_aarch64-darwin = "0.4.23-1"; - hash_aarch64-darwin = "sha256-9FD1ENl1YIpF+/VM2JKRXChQZswHy/NEHX3bC6Mynw4="; - version_x86_64-linux = "0.4.23-1"; - hash_x86_64-linux = "sha256-wb3xlSgeJdySGvXJHrJQIDUkDc4SFxQMQwNtbPMDj9g="; + version_aarch64-linux = "0.4.25-1"; + hash_aarch64-linux = "sha256-4+8yo3ZW5+Tlza31LnL6kp1fJutgB74WZsduT9uo4IQ="; + version_aarch64-darwin = "0.4.25-1"; + hash_aarch64-darwin = "sha256-i6uFfD0pAOFKtGQ18NFHHeBo8WXnYbucF3CT6KJeF3Q="; + version_x86_64-linux = "0.4.25-1"; + hash_x86_64-linux = "sha256-7KRnRGyDOCRpfovvqzAP5Saf35hOPuQ4X8uthQLwfFM="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; From e4c399830251cd35a560b051cf9560d847ee5488 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Sun, 27 Sep 2026 10:00:13 +0200 Subject: [PATCH 71/95] maven_4: 4.0.0-rc-6 -> 4.0.0-rc-7 --- pkgs/by-name/ma/maven_4/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maven_4/package.nix b/pkgs/by-name/ma/maven_4/package.nix index 47ebbce73d4d..71c8d9a23b23 100644 --- a/pkgs/by-name/ma/maven_4/package.nix +++ b/pkgs/by-name/ma/maven_4/package.nix @@ -13,11 +13,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "maven"; - version = "4.0.0-rc-6"; + version = "4.0.0-rc-7"; src = fetchurl { url = "mirror://apache/maven/maven-4/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-/B0VCwGZnwlmKbuvSOiuQ00ATV3DbDOWK8i+ZXnT+R0="; + hash = "sha256-lRxjJnaH1Bi7nAbAjiVUQyhYNRmRm5Zheqci+BOxnm8="; }; sourceRoot = "."; From 85c46e0d56222fb4e0214dbda505f952032724c6 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 27 Sep 2026 10:08:36 +0200 Subject: [PATCH 72/95] doc/readme: Format for readability --- doc/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/README.md b/doc/README.md index 14de0dd2651b..358ce0a7546c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -7,10 +7,11 @@ This directory houses the source files for the Nixpkgs manual. > We are actively restructuring our documentation to be more beginner friendly. > -When writing new docs use **Progressive Disclosure** +When writing new docs use **Progressive Disclosure:** -Start simple, pick up beginners. -Use **examples** first to show how to get something done. Keep **Explanation** lean. +- Start simple, pick up beginners. +- Use **examples** first to show how to get something done. +- Keep **explanation** lean. Use our [styleguide](./styleguide.md) for more in depth guidance on writing good documentation. From 97faf364f3740eaafbe9b2a4a3436925a4756246 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 27 Sep 2026 10:15:29 +0200 Subject: [PATCH 73/95] davs2: add cpe information --- pkgs/by-name/da/davs2/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/da/davs2/package.nix b/pkgs/by-name/da/davs2/package.nix index 40bf44c78238..907d3aa8d3a8 100644 --- a/pkgs/by-name/da/davs2/package.nix +++ b/pkgs/by-name/da/davs2/package.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "davs2" ]; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.all; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "davs2_project" finalAttrs.version; }; }) From e7c0ea6129f1cb2a511adfeda089645f890bf1eb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 27 Sep 2026 10:12:56 +0200 Subject: [PATCH 74/95] ffmpeg: add cpe information --- pkgs/development/libraries/ffmpeg/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7f439e6f9e9e..20b20be026d9 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1112,6 +1112,9 @@ stdenv.mkDerivation ( emily ]; mainProgram = "ffmpeg"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "ffmpeg" finalAttrs.version // { + product = "ffmpeg"; + }; }; } // lib.optionalAttrs withCudaLLVM { From 795f334f0756efc2cc5d5da66edd20256291085b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 27 Sep 2026 10:11:07 +0200 Subject: [PATCH 75/95] doc: Use more common spelling of "style guide" See [trend](https://trends.google.com/explore?q=styleguide%2Cstyle%2520guide&date=all&geo=Worldwide) for one indication that the new spelling is much more common. --- ci/github-script/reminders/docs-styleguide.md | 2 +- doc/README.md | 6 +++--- doc/styleguide.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/github-script/reminders/docs-styleguide.md b/ci/github-script/reminders/docs-styleguide.md index d42fc5265e11..7947d5fac888 100644 --- a/ci/github-script/reminders/docs-styleguide.md +++ b/ci/github-script/reminders/docs-styleguide.md @@ -1,6 +1,6 @@ Thanks for contributing to the documentation -Make sure you follow the [documentation styleguide](https://github.com/NixOS/nixpkgs/blob/master/doc/styleguide.md), most notably: +Make sure you follow the [documentation style guide](https://github.com/NixOS/nixpkgs/blob/master/doc/styleguide.md), most notably: - Show, don't tell: lead with a minimal working example; explanation follows the code. - No meta-commentary: don't write "This section explains how to…", just do it. diff --git a/doc/README.md b/doc/README.md index 358ce0a7546c..cbcccbad8262 100644 --- a/doc/README.md +++ b/doc/README.md @@ -13,7 +13,7 @@ When writing new docs use **Progressive Disclosure:** - Use **examples** first to show how to get something done. - Keep **explanation** lean. -Use our [styleguide](./styleguide.md) for more in depth guidance on writing good documentation. +Use our [style guide](./styleguide.md) for more in depth guidance on writing good documentation. Documentation about Nixpkgs belongs here, this includes 'getting-started'-guides and 'onboarding-guides' for *using* Nixpkgs and the language frameworks it ships. @@ -216,7 +216,7 @@ When needed, each convention explains why it exists, so you can make a decision Note that these conventions are about the **structure** of the manual (and its source files), not about the content that goes in it. You, as the writer of documentation, are still in charge of its content. -**For prose style, see the [documentation styleguide](./styleguide.md).** +**For prose style, see the [documentation style guide](./styleguide.md).** ### Document structure @@ -286,7 +286,7 @@ When changing existing content, update formatting if possible, but avoid excessi ### Examples first -Put examples before detailed explanations (see the [styleguide](./styleguide.md) for the rationale). +Put examples before detailed explanations (see the [style guide](./styleguide.md) for the rationale). Use this structure for each documented item: diff --git a/doc/styleguide.md b/doc/styleguide.md index 6f3c63ca201a..57e0db15e38a 100644 --- a/doc/styleguide.md +++ b/doc/styleguide.md @@ -1,4 +1,4 @@ -# Styleguide +# Style guide Use this page as a reference and style guide for our internal and external documentation. From f3f105dcd19764cbc497144e0d7991fc13615d8a Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sun, 27 Sep 2026 10:15:59 +0200 Subject: [PATCH 76/95] elmPackages.elm-xref: Fix compatibility with elm 0.19.2 Apply patch to fix build with updated elm compiler --- .../compilers/elm/packages/elm-xref/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/elm/packages/elm-xref/default.nix b/pkgs/development/compilers/elm/packages/elm-xref/default.nix index 697d9f5caaff..cd9b1a5bffee 100644 --- a/pkgs/development/compilers/elm/packages/elm-xref/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-xref/default.nix @@ -3,6 +3,7 @@ buildNpmPackage, fetchFromGitHub, elmPackages, + fetchpatch, }: buildNpmPackage (finalAttrs: { @@ -16,7 +17,16 @@ buildNpmPackage (finalAttrs: { hash = "sha256-J58NTSMo2uxpWFnPX+AGHVAqQOiRfgBxYzis/PZp1MA="; }; - npmDepsHash = "sha256-LZynUf2M+g31mia41jw7vmGNugUUUAX/TehDxQ7j+YY="; + patches = [ + # Upstream PR: + # https://github.com/zwilias/elm-xref/pull/17 + (fetchpatch { + url = "https://github.com/turboMaCk/elm-xref/commit/55ad630c1afc110197a4785bd2a4cd2388a1d160.patch"; + hash = "sha256-67s8gozhkWN8ci/S3OSwnNABdATY7gpBPy7zaZJPamw="; + }) + ]; + + npmDepsHash = "sha256-QH/F0vhva806AL5F3ySMAyfyrLLqCV32WMGTi715X5I="; nativeBuildInputs = [ elmPackages.elm From 6b896a5a8c881b85a8e2a58376ef02f77ad88722 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 27 Sep 2026 10:21:11 +0200 Subject: [PATCH 77/95] doc/treewide: use channels.nixos.org instead of GitHub tarballs Signed-off-by: Sefa Eyeoglu --- doc/getting-started/dev-environments.md | 4 ++-- doc/getting-started/first-package.chapter.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/getting-started/dev-environments.md b/doc/getting-started/dev-environments.md index 4b85ed40733a..e63124fd6ede 100644 --- a/doc/getting-started/dev-environments.md +++ b/doc/getting-started/dev-environments.md @@ -5,7 +5,7 @@ Create a `shell.nix` with the following: ```nix # shell.nix let - nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"; + nixpkgs = fetchTarball "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"; pkgs = import nixpkgs { }; in pkgs.mkShell { @@ -25,7 +25,7 @@ nix-shell This activates your `shell.nix` and you should see: ```sh -unpacking 'https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz' into the Git cache... +unpacking 'https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst' into the Git cache... Welcome in your nix shell ``` diff --git a/doc/getting-started/first-package.chapter.md b/doc/getting-started/first-package.chapter.md index 19a8583fea79..7a4ce105d9a3 100644 --- a/doc/getting-started/first-package.chapter.md +++ b/doc/getting-started/first-package.chapter.md @@ -53,7 +53,7 @@ Pin Nixpkgs and call the package from `default.nix`: ```nix # default.nix let - nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"; + nixpkgs = fetchTarball "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"; pkgs = import nixpkgs { }; in pkgs.callPackage ./package.nix { } From 804aa6551974592df3db7ab18ac5c1f485c66b73 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 27 Sep 2026 10:25:48 +0200 Subject: [PATCH 78/95] firefox-{beta,devedition}-unwrapped: add cpe information --- .../networking/browsers/firefox/packages/firefox-beta.nix | 4 ++++ .../browsers/firefox/packages/firefox-devedition.nix | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index fb86b569b675..2a307f172274 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -29,6 +29,10 @@ buildMozillaMach rec { maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = binaryName; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "mozilla" version // { + product = "firefox"; + sw_edition = "beta"; + }; }; tests = { inherit (nixosTests) firefox-beta; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 9780a5b14ebe..81770b4ef3c5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -42,6 +42,11 @@ maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = binaryName; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "mozilla" version // { + product = "firefox"; + sw_edition = "devedition"; + }; + }; tests = { inherit (nixosTests) firefox-devedition; From dae69f6c3232d158169f2e4ee49b3bca5b150b60 Mon Sep 17 00:00:00 2001 From: Coca Date: Sun, 27 Sep 2026 10:55:39 +0200 Subject: [PATCH 79/95] doc/styleguide: fix meta-commentary example's styling Github's markdown renderer combines the two bad/good examples into one line without a extra space leading to a incredible amount of confusion. Co-Authored-By: ryndubei Co-Authored-By: jappeace --- doc/styleguide.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/styleguide.md b/doc/styleguide.md index 6f3c63ca201a..8649548f52c2 100644 --- a/doc/styleguide.md +++ b/doc/styleguide.md @@ -90,11 +90,13 @@ Don't describe what the documentation does. Just do it. **Don't:** > This section explains how to configure networking. + > The following guide walks you through setting up a web server. **Do:** > Configure networking by setting: + > Set up a web server: ### Code Examples From 2b43631ff2355eca688da124096e70bb2eda3d7b Mon Sep 17 00:00:00 2001 From: Myxogastria0808 Date: Sun, 27 Sep 2026 18:07:01 +0900 Subject: [PATCH 80/95] maintainers: add Myxogastria0808 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 050f0d950ba3..b0d6d9f824f4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20094,6 +20094,12 @@ githubId = 52401682; name = "myul"; }; + Myxogastria0808 = { + email = "r.rstudio.c@gmail.com"; + github = "Myxogastria0808"; + githubId = 78744619; + name = "Yuki Osada"; + }; myypo = { email = "nikirsmcgl@gmail.com"; github = "myypo"; From faf8f7063a91e7960e635823e493675338e6b3f8 Mon Sep 17 00:00:00 2001 From: Myxogastria0808 Date: Sun, 27 Sep 2026 18:07:13 +0900 Subject: [PATCH 81/95] elmPackages.elm-watch: init at 1.2.6 --- pkgs/development/compilers/elm/default.nix | 2 + .../elm/packages/elm-watch/default.nix | 57 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/compilers/elm/packages/elm-watch/default.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 9c07aa4261de..5daac321b1ab 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -61,6 +61,8 @@ lib.makeScope pkgs.newScope ( elm-verify-examples = callPackage ./packages/elm-verify-examples { }; + elm-watch = callPackage ./packages/elm-watch { }; + elm-xref = callPackage ./packages/elm-xref { }; lamdera = callPackage ./packages/lamdera { }; diff --git a/pkgs/development/compilers/elm/packages/elm-watch/default.nix b/pkgs/development/compilers/elm/packages/elm-watch/default.nix new file mode 100644 index 000000000000..a3509b89192d --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-watch/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + makeBinaryWrapper, + nodejs, + nix-update-script, +}: +buildNpmPackage (finalAttrs: { + pname = "elm-watch"; + version = "1.2.6"; + + inherit nodejs; + + src = fetchFromGitHub { + owner = "lydell"; + repo = "elm-watch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qfKXbONIqlfv9joAMhAxGMinfHaZvKEz2FL6YFl7OSI="; + fetchSubmodules = true; + }; + + npmDepsHash = "sha256-ae4bUl5/GGAtYR7cc8om3C4/XjCUe8v3sWpIhIXBGV8="; + + npmFlags = [ "--ignore-scripts" ]; + + dontNpmInstall = true; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + + local moduleDir="$out/lib/node_modules/elm-watch" + mkdir -p "$moduleDir" + + npm prune --omit=dev --ignore-scripts --no-save + cp -r build/. "$moduleDir/" + cp -r node_modules "$moduleDir/" + + mkdir -p "$out/bin" + makeWrapper ${nodejs}/bin/node "$out/bin/elm-watch" \ + --add-flags "$moduleDir/index.js" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "`elm make` in watch mode. Fast and reliable"; + homepage = "https://github.com/lydell/elm-watch"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Myxogastria0808 ]; + mainProgram = "elm-watch"; + }; +}) From 9ac6245a024262b3195ed37cfdf332b22fd190e8 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 27 Sep 2026 10:44:10 +0200 Subject: [PATCH 82/95] doc/readme: Simplify nix-direnv setup Co-Authored-By: Sefa Eyeoglu --- doc/README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/README.md b/doc/README.md index 14de0dd2651b..29217dff7c9e 100644 --- a/doc/README.md +++ b/doc/README.md @@ -51,14 +51,16 @@ $ cd /path/to/nixpkgs/doc $ nix-shell ``` -To load the development utilities automatically when entering that directory, [set up `nix-direnv`](https://nix.dev/guides/recipes/direnv). +To load the documentation development environment automatically when entering that directory: -Make sure that your local files aren't added to Git history by adding the following lines to `.git/info/exclude` at the root of the Nixpkgs repository: +1. Install [`nix-direnv`](https://search.nixos.org/packages?channel=unstable&query=nix-direnv#show=nix-direnv) +1. Set up direnv in the documentation directory: -``` -/**/.envrc -/**/.direnv -``` + ```ShellSession + $ cd doc + $ echo "use nix" > .envrc + $ direnv allow + ``` #### Live preview From 5b1059092b4e74f9761c14db14e449c6a3ebfeca Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 27 Sep 2026 10:25:11 +0200 Subject: [PATCH 83/95] doc/readme: Remove unnecessary punctuation Co-authored-by: Matt Sturgeon --- doc/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index cbcccbad8262..8a4baeb7eb10 100644 --- a/doc/README.md +++ b/doc/README.md @@ -15,7 +15,8 @@ When writing new docs use **Progressive Disclosure:** Use our [style guide](./styleguide.md) for more in depth guidance on writing good documentation. -Documentation about Nixpkgs belongs here, this includes 'getting-started'-guides and 'onboarding-guides' for *using* Nixpkgs and the language frameworks it ships. +Documentation about Nixpkgs belongs here. +This includes getting started guides and onboarding guides for *using* Nixpkgs and the language frameworks it ships. Write **guides** task-first: lead with a working example, then explain in prose. Write **reference** as the specification of functions and attributes. From b99a7f357d30e110a8f5033fb550e5c8b47e00ea Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 27 Sep 2026 10:26:51 +0200 Subject: [PATCH 84/95] doc/readme: Clarify and format `:doc` REPL command Co-authored-by: Matt Sturgeon --- doc/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index 8a4baeb7eb10..45d5283bc515 100644 --- a/doc/README.md +++ b/doc/README.md @@ -21,7 +21,12 @@ This includes getting started guides and onboarding guides for *using* Nixpkgs a Write **guides** task-first: lead with a working example, then explain in prose. Write **reference** as the specification of functions and attributes. -We are actively working to generate reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code, which also lets you view it locally with `:doc` in `nix repl`. +We are actively working to generate reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code, which also lets you view it locally with the `:doc` command in `nix repl`, e.g.: + +``` +nix-repl> :l +nix-repl> :doc lib.mapAttrsToList +``` See [Document structure](#document-structure) for a structural template. From d06348039d2f459c697294a866ebb0f8860ae547 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 27 Sep 2026 10:37:03 +0200 Subject: [PATCH 85/95] doc/readme: Join overlapping sentences --- doc/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/README.md b/doc/README.md index 45d5283bc515..23d68b929a16 100644 --- a/doc/README.md +++ b/doc/README.md @@ -49,9 +49,7 @@ If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual. ### Development environment -To reduce repetition, consider using tools from the provided development environment: - -Load it from the Nixpkgs documentation directory with +To reduce repetition, consider using tools from the documentation development environment: ```ShellSession $ cd /path/to/nixpkgs/doc From 127988eea9f4a8b188fea177266bc645ac295c17 Mon Sep 17 00:00:00 2001 From: Kenji Berthold Date: Sun, 27 Sep 2026 11:12:37 +0200 Subject: [PATCH 86/95] doc/cosmic: remove filler words Align with the documentation styleguide and remove filler words. --- doc/languages-frameworks/cosmic.section.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/cosmic.section.md b/doc/languages-frameworks/cosmic.section.md index 9e07985b1295..3538275a7f77 100644 --- a/doc/languages-frameworks/cosmic.section.md +++ b/doc/languages-frameworks/cosmic.section.md @@ -5,7 +5,7 @@ COSMIC (Computer Operating System Main Interface Components) is a desktop environment developed by System76, primarily for the Pop!_OS Linux distribution. Applications in the COSMIC ecosystem are written in Rust and use libcosmic, which builds on the Iced GUI framework. This section explains -how to properly package and integrate COSMIC applications within Nix. +how to package and integrate COSMIC applications within Nix. ### libcosmicAppHook {#ssec-cosmic-libcosmic-app-hook} @@ -17,7 +17,7 @@ and wrapping applications based on libcosmic. It handles many common requirement - Managing Vergen environment variables for build-time information - Setting up Rust linker flags for specific libraries -To use the hook, simply add it to your package's `nativeBuildInputs`: +Add the hook to your package's `nativeBuildInputs`: ```nix { @@ -61,8 +61,9 @@ rustPlatform.buildRustPackage { } ``` -Note that `cosmic-settings` is a separate application and not a part of the libcosmic settings -system itself. It's included by default in `libcosmicAppHook` only to provide these fallback theme +> [!Note] +> `cosmic-settings` is a separate application and not a part of the libcosmic settings +> system itself. It's included by default in `libcosmicAppHook` only to provide these fallback theme settings. ### Icons {#ssec-cosmic-icons} From eb69748cbe2c01d9a026a51dc20434835d716c61 Mon Sep 17 00:00:00 2001 From: theKlisha Date: Sun, 27 Sep 2026 11:26:00 +0200 Subject: [PATCH 87/95] doc(nvim): link to section on packaging vim plugins --- doc/languages-frameworks/neovim.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index 164ebd163807..d7ebc4120166 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -63,7 +63,7 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs - `wrapperArgs`: Extra arguments forwarded to the `makeWrapper` call. - `wrapRc`: Nix, not being able to write in your `$HOME`, loads the generated Neovim configuration via the `$VIMINIT` environment variable, i.e. : `export VIMINIT='lua dofile("/nix/store/…-init.lua")'`. This has side effects like preventing Neovim from sourcing your `init.lua` in `$XDG_CONFIG_HOME/nvim` (see bullet 7 of [`:help startup`](https://neovim.io/doc/user/starting.html#startup) in Neovim). Disable it if you want to generate your own wrapper. You can still reuse the generated vimscript init code via `neovim.passthru.initRc`. -- `plugins`: A list of plugins to add to the wrapper. +- `plugins`: A list of plugins to add to the wrapper. If a plugin is missing from nixpkgs, you can package it yourself as, described in [](#what-if-your-favourite-vim-plugin-isnt-already-packaged). - `extraLuaPackages`: A function passed on to `lua.withPackages`. - `extraPython3Packages`: A function passed on to `python3.withPackages`. - `withPython3`, `withNodeJs`, `withRuby`, `withPerl` control when to enable neovim From 423c3536366d819a6317e8af6815dc5874cd3e9f Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sun, 27 Sep 2026 11:31:12 +0200 Subject: [PATCH 88/95] incus-ui-canonical: 0.21.6 -> 0.21.7 Diff: https://github.com/zabbly/incus-ui-canonical/compare/incus-0.21.6...incus-0.21.7 --- pkgs/by-name/in/incus-ui-canonical/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index f5f3d1c69e22..4fac6562f439 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -20,14 +20,14 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "incus-ui-canonical"; - version = "0.21.6"; + version = "0.21.7"; src = fetchFromGitHub { owner = "zabbly"; repo = "incus-ui-canonical"; # only use tags prefixed by incus- they are the tested fork versions tag = "incus-${finalAttrs.version}"; - hash = "sha256-emg02O8WUk9RWsA3Uz+bIfNXkE1IUa3ob1Xm14AAj98="; + hash = "sha256-8RxAgtcKHCOMPOebENSmDsf7K7BYSv965GU2/xxP8GY="; }; offlineCache = fetchYarnDeps { From 724ffde083a7a5170eee8d3b2325f0d2864dc3a1 Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sun, 27 Sep 2026 11:03:53 +0200 Subject: [PATCH 89/95] doc/treewide: purge "utilize" in favor of "use" following styleguide Reapply "doc/treewide: purge utilize in favor of use according to styleguide" This reverts commit 847e39f8f358af7f26e066b59c39e96a6f19cd9a. --- doc/hooks/check-phase-thread-limit-hook.section.md | 2 +- doc/toolchains/llvm.chapter.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/hooks/check-phase-thread-limit-hook.section.md b/doc/hooks/check-phase-thread-limit-hook.section.md index 0adc0d309c47..d1922070c98e 100644 --- a/doc/hooks/check-phase-thread-limit-hook.section.md +++ b/doc/hooks/check-phase-thread-limit-hook.section.md @@ -3,7 +3,7 @@ This hook defaults a variety of environment variables known to control thread counts to 1. Many of these otherwise default to `$(nproc)`, which causes massive overloads on build machines -if nix build jobs and build cores are already tuned to fully utilize +if nix build jobs and build cores are already tuned to fully use compute capacity of a builder without additional parallelism. Currently sets the following environment variables: diff --git a/doc/toolchains/llvm.chapter.md b/doc/toolchains/llvm.chapter.md index 2b1df8209253..c0a5a668d936 100644 --- a/doc/toolchains/llvm.chapter.md +++ b/doc/toolchains/llvm.chapter.md @@ -22,7 +22,7 @@ import { } ``` -Note that we set `linker` to `lld`. This is because LLVM has its own linker, called "lld". By setting it, we utilize Clang and lld within this new instance of Nixpkgs. There is a shorthand method for building everything with LLVM: `pkgsLLVM`. This is easier to use with `nix-build` (or `nix build`): +Note that we set `linker` to `lld`. This is because LLVM has its own linker, called "lld". By setting it, we use Clang and lld within this new instance of Nixpkgs. There is a shorthand method for building everything with LLVM: `pkgsLLVM`. This is easier to use with `nix-build` (or `nix build`): ```bash nix-build -A pkgsLLVM.hello From 059287195673bb945eca397ff0fb0c33c0ed4c52 Mon Sep 17 00:00:00 2001 From: theKlisha Date: Sun, 27 Sep 2026 11:45:50 +0200 Subject: [PATCH 90/95] doc(nvim): reword to avoid anonyomus link --- doc/languages-frameworks/neovim.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index d7ebc4120166..72418205add6 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -63,7 +63,7 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs - `wrapperArgs`: Extra arguments forwarded to the `makeWrapper` call. - `wrapRc`: Nix, not being able to write in your `$HOME`, loads the generated Neovim configuration via the `$VIMINIT` environment variable, i.e. : `export VIMINIT='lua dofile("/nix/store/…-init.lua")'`. This has side effects like preventing Neovim from sourcing your `init.lua` in `$XDG_CONFIG_HOME/nvim` (see bullet 7 of [`:help startup`](https://neovim.io/doc/user/starting.html#startup) in Neovim). Disable it if you want to generate your own wrapper. You can still reuse the generated vimscript init code via `neovim.passthru.initRc`. -- `plugins`: A list of plugins to add to the wrapper. If a plugin is missing from nixpkgs, you can package it yourself as, described in [](#what-if-your-favourite-vim-plugin-isnt-already-packaged). +- `plugins`: A list of plugins to add to the wrapper. If a plugin is not available in nixpkgs, you can [package it yourself](#what-if-your-favourite-vim-plugin-isnt-already-packaged). - `extraLuaPackages`: A function passed on to `lua.withPackages`. - `extraPython3Packages`: A function passed on to `python3.withPackages`. - `withPython3`, `withNodeJs`, `withRuby`, `withPerl` control when to enable neovim From c01431ab86fa99c34301c75c974651c38b5b442b Mon Sep 17 00:00:00 2001 From: aaravrav <37036762+aaravrav@users.noreply.github.com> Date: Sun, 27 Sep 2026 15:09:54 +0530 Subject: [PATCH 91/95] maintainers: add Matrix for aaravrav --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 31f14a652597..362bd515cf47 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -454,6 +454,7 @@ name = "aaravrav"; github = "aaravrav"; githubId = 37036762; + matrix = "@hepara:matrix.org"; }; aarnphm = { email = "contact@aarnphm.xyz"; From f4f9faa5641ef92303fd67ab9351452181d526ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ha=CC=88cker?= Date: Fri, 30 Jan 2026 16:22:12 +0100 Subject: [PATCH 92/95] nixos/misc/nixpkgs: add documentation for nixpkgs.config.allowUnfreePackages --- doc/using/configuration.chapter.md | 51 +++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index 98f5d76250d9..7317b5b198fd 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -105,27 +105,48 @@ There are several ways to tweak how Nix handles a package which has been marked $ export NIXPKGS_ALLOW_UNFREE=1 ``` -- It is possible to permanently allow individual unfree packages, while still blocking unfree packages by default using the `allowUnfreePredicate` configuration option in the user configuration file. - - This option is a function which accepts a package as a parameter, and returns a boolean. The following example configuration accepts a package and always returns false: - - ```nix - { allowUnfreePredicate = (pkg: false); } - ``` - - For a more useful example, try the following. This configuration only allows unfree packages named roon-server and Visual Studio Code: +- To allow specific unfree packages, add their names to your Nixpkgs configuration file: ```nix { - allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "roon-server" - "vscode" - ]; + allowUnfreePackages = [ + "fence" + "roon-server" + "vscode" + ]; } ``` + `allowUnfreePackages` permits the listed unfree packages. + + In NixOS modules, lists set through `nixpkgs.config.allowUnfreePackages` merge additively across modules. This allows you to declare your unfree exceptions in the same modules that triggered them. + + To allow unfree packages programmatically: + + ```nix + { lib, ... }: + { + allowUnfreePredicate = pkg: lib.hasPrefix "roon" (lib.getName pkg); + } + ``` + + This permits packages such as `roon-bridge` and `roon-server`. + + To combine the list and predicate, set both options: + + ```nix + { lib, ... }: + { + allowUnfreePackages = [ + "fence" + "vscode" + ]; + allowUnfreePredicate = pkg: lib.hasPrefix "roon" (lib.getName pkg); + } + ``` + + This permits unfree packages that match either option. + - It is also possible to allow and block licenses that are specifically acceptable or not acceptable, using `allowlistedLicenses` and `blocklistedLicenses`, respectively. The following example configuration allowlists the licenses `amd` and `wtfpl`: From 199ee26b831049241a7588c78c01314bd9b0902b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana?= Date: Sun, 27 Sep 2026 10:11:57 +0200 Subject: [PATCH 93/95] lib.modules: document mkOverride Co-authored-by: Robert Hensing --- lib/modules.nix | 67 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 74ff0f04eb1e..64a86c55407f 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1595,17 +1595,76 @@ let */ mkDefinition = args@{ file, value, ... }: args // { _type = "definition"; }; + /** + Labels a definition with a priority. + See the documentation of `filterOverrides` for the interpretation of the priority value. + Nesting this function usually leads to an invalid definition. + `mkDefault`, `mkOptionDefault`, and `mkForce` partially apply `mkOverride` with common priorities used in the NixOS module system. + + # Inputs + + `priority` + + : A numeric value representing the precedence. + See the documentation of `filterOverrides` for the interpretation of this value. + + `content` + + : The definition to be labeled with a given priority. + + # Examples + :::{.example} + ## `lib.modules.mkOverride` usage example + + ```nix + mkOverride 1000 "hello, world!" + => { _type = "override"; content = "hello, world!"; priority = 1000; } + ``` + + ```nix + (lib.evalModules { + modules = [ + { options.foo = lib.mkOption { }; } + { config.foo = lib.mkOverride 20 1; } + { config.foo = lib.mkOverride 10 2; } + ]; + }).config + => { foo = 2; } + ``` + ::: + */ mkOverride = priority: content: { _type = "override"; inherit priority content; }; - mkOptionDefault = mkOverride 1500; # priority of option defaults - mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default + /** + Labels a definition with the priority of option declaration defaults. + */ + mkOptionDefault = mkOverride 1500; + + /** + Labels a definition with the priority used in config sections of non-user modules to set a default. + */ + mkDefault = mkOverride 1000; + defaultOverridePriority = 100; - mkImageMediaOverride = mkOverride 60; # image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow user to mkForce + + /** + Labels a definition with the priority used in image media profiles. + Image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow users to `mkForce`. + */ + mkImageMediaOverride = mkOverride 60; + + /** + Labels a definition with a high priority (low value). + */ mkForce = mkOverride 50; - mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ + + /** + Labels a definition with used by {command}`nixos-rebuild build-vm`. + */ + mkVMOverride = mkOverride 10; mkFixStrictness = warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id; From ef0c36db1cd8027e54a635ddfae39bfcf31b1810 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sun, 27 Sep 2026 12:54:40 +0200 Subject: [PATCH 94/95] freecad: add cpe --- pkgs/by-name/fr/freecad/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index fd82870893dc..b27991389cf3 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -215,6 +215,8 @@ freecad-utils.makeCustomizable ( ]; platforms = lib.platforms.linux; mainProgram = "freecad"; + # repology claims `freecadweb` as vendor, but newer CVEs (e.g. CVE-2026-73235) are listed with freecad/freecad + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "freecad" finalAttrs.version; }; }) ) From 62e7db8d71b46585019abbc0ee51b30a5f27b24c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Sep 2026 11:12:11 +0000 Subject: [PATCH 95/95] cockpit: 367 -> 368 --- pkgs/by-name/co/cockpit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index ec5ac8a3a0fd..f4149ce9f4e3 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -47,13 +47,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "367"; + version = "368"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-TWB39cnhU9zgr/FP4FfXEzdMEnjXOs/HamYjSXLVadY="; + hash = "sha256-2bFQwK5L0S84nLSkUeHmbNgBkjBJIxR88t/21h5jmps="; fetchSubmodules = true; };