From c7aa2bdd7fdf17b13afff21328ea396ee7471ea5 Mon Sep 17 00:00:00 2001 From: Nick DeGroot Date: Thu, 20 Nov 2025 20:38:43 -0800 Subject: [PATCH 01/49] maintainers: add nickthegroot --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 50d9d827d21c..043f66e746a3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18569,6 +18569,12 @@ githubId = 151337; name = "Nick Novitski"; }; + nickthegroot = { + name = "Nick DeGroot"; + email = "nick@nickthegroot.com"; + github = "nickthegroot"; + githubId = 1966472; + }; nico202 = { email = "anothersms@gmail.com"; github = "nico202"; From 1803ac17ae5139617e9eb03c357af866b8e2b07e Mon Sep 17 00:00:00 2001 From: Nick DeGroot Date: Thu, 20 Nov 2025 20:38:48 -0800 Subject: [PATCH 02/49] playball: init at 3.2.0 --- pkgs/by-name/pl/playball/package.nix | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/pl/playball/package.nix diff --git a/pkgs/by-name/pl/playball/package.nix b/pkgs/by-name/pl/playball/package.nix new file mode 100644 index 000000000000..9b074d806476 --- /dev/null +++ b/pkgs/by-name/pl/playball/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "playball"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "paaatrick"; + repo = "playball"; + tag = "v${version}"; + hash = "sha256-xgAhzNWCLNmbrwaYAGmXMercoRgXWPjjV5dcnXunmeA="; + }; + + npmDepsHash = "sha256-s0JKBJnVYkeXOE62F6BZRKwd0Hg3IOuMai6rmKUi6TI="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + meta = { + changelog = "https://github.com/paaatrick/playball/releases/tag/v${version}"; + description = "Watch MLB games from the comfort of your own terminal"; + mainProgram = "playball"; + homepage = "https://github.com/paaatrick/playball"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nickthegroot ]; + }; +} From 0ee9b4c622f6d622508c5ac5412b50b01c2d0824 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Fri, 12 Dec 2025 14:53:29 +0100 Subject: [PATCH 03/49] xnviewmp: 1.9.7 -> 1.9.8 Changelog: https://newsgroup.xnview.com/viewtopic.php?p=210391#p210391 --- pkgs/by-name/xn/xnviewmp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xn/xnviewmp/package.nix b/pkgs/by-name/xn/xnviewmp/package.nix index 895c6f39b58c..a581c999df3c 100644 --- a/pkgs/by-name/xn/xnviewmp/package.nix +++ b/pkgs/by-name/xn/xnviewmp/package.nix @@ -25,11 +25,11 @@ let in appimageTools.wrapType2 rec { pname = "xnviewmp"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage"; - hash = "sha256-PUV46AmzFBtBh361dS84rtZM5N7mKBG9aLkoyvz16R0="; + hash = "sha256-BO5gFVy2rKqK8Xwtvh9ZNY2XRgc/+ewNFUkKlFqK1KA="; }; nativeBuildInputs = [ From 752a5ad36daeb57582ead737cd5267416bddabdd Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 13 Dec 2025 00:32:52 +0800 Subject: [PATCH 04/49] treewide: libressl.nc -> netcat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Quote from NixOS 25.11 release notes: > `meta.mainProgram` is now used to determine the `NIX_MAIN_PROGRAM` environment variable. This means that changing it can now lead to a package rebuild. And `netcat` is: ``` netcat = libressl.nc.overrideAttrs (old: { meta = old.meta // { description = "Utility which reads and writes data across network connections — LibreSSL implementation"; mainProgram = "nc"; }; }); ``` `netcat` and `libressl.nc` are 2 different derivations now, use just one of them in nixpkgs for consistency. This also fixes lots of warnings if `virtualisation.libvirtd.enable = true`: ``` pkgs.buildEnv warning: colliding subpath (ignored): `/nix/store/1mcayh9rmxmjcbmm6swkkyr59rjl66vc-libressl-4.2.1-nc/bin/nc' and `/nix/store/x1vmfpisbd494yykmvjkhvh3dplsnjhg-libressl-4.2.1-nc/bin/nc' ... ``` --- nixos/modules/virtualisation/libvirtd.nix | 2 +- nixos/tests/ceph-multi-node.nix | 2 +- nixos/tests/fail2ban.nix | 2 +- nixos/tests/jool.nix | 2 +- nixos/tests/samba-wsdd.nix | 2 +- pkgs/by-name/hy/hydra/package.nix | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index dc1ec27c967f..9029a0e8e0cb 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -421,7 +421,7 @@ in # this file is expected in /etc/qemu and not sysconfdir (/var/lib) etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges; systemPackages = with pkgs; [ - libressl.nc + netcat config.networking.firewall.package cfg.package cfg.qemu.package diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index 1c1077595d2a..7aaf31c14d3e 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -53,7 +53,7 @@ let sudo ceph xfsprogs - libressl.nc + netcat ]; boot.kernelModules = [ "xfs" ]; diff --git a/nixos/tests/fail2ban.nix b/nixos/tests/fail2ban.nix index 43acfa54cf7a..97e5b4edaeab 100644 --- a/nixos/tests/fail2ban.nix +++ b/nixos/tests/fail2ban.nix @@ -14,7 +14,7 @@ nodes.client = _: { environment.systemPackages = [ pkgs.sshpass - pkgs.libressl.nc + pkgs.netcat ]; }; diff --git a/nixos/tests/jool.nix b/nixos/tests/jool.nix index 3bbfc9469011..76076cba6a63 100644 --- a/nixos/tests/jool.nix +++ b/nixos/tests/jool.nix @@ -24,7 +24,7 @@ let printf 'HTTP/1.0 200 OK\n' printf 'Content-Length: ${toString (1 + builtins.stringLength msg)}\n' printf '\n${msg}\n\n' - } | ${pkgs.libressl.nc}/bin/nc -${toString ip}nvl 80 + } | ${pkgs.netcat}/bin/nc -${toString ip}nvl 80 done ''; }; diff --git a/nixos/tests/samba-wsdd.nix b/nixos/tests/samba-wsdd.nix index 07ad7d68f664..3277a8b0e6c8 100644 --- a/nixos/tests/samba-wsdd.nix +++ b/nixos/tests/samba-wsdd.nix @@ -40,7 +40,7 @@ server_wsdd.wait_for_unit("samba-wsdd") client_wsdd.wait_until_succeeds( - "echo list | ${pkgs.libressl.nc}/bin/nc -N -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD" + "echo list | ${pkgs.netcat}/bin/nc -N -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD" ) ''; } diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index cb9513095d83..cbeb09787e27 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -38,7 +38,7 @@ mdbook, foreman, python3, - libressl, + netcat, cacert, glibcLocales, meson, @@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: { foreman glibcLocales python3 - libressl.nc + netcat nix-eval-jobs openldap postgresql From 94ee0ed5262e6b3435d7f4f3c5e96e7de377465e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 18:13:54 +0000 Subject: [PATCH 05/49] mdfried: 0.14.6 -> 0.15.0 --- pkgs/by-name/md/mdfried/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix index 886f18c22817..28e7059e2cac 100644 --- a/pkgs/by-name/md/mdfried/package.nix +++ b/pkgs/by-name/md/mdfried/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdfried"; - version = "0.14.6"; + version = "0.15.0"; src = fetchFromGitHub { owner = "benjajaja"; repo = "mdfried"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ys/CoyaIKVVRtQfmjc4XOABdrktZ1lIPNqw0V8jlY5I="; + hash = "sha256-V++xkJBnTlqzcsw6BDkrqScIV+phzxyDqQXcV34L4ps="; }; - cargoHash = "sha256-ipNhqxcc+Kfr6XtF3QtFh896YK5v1u4kXapiMUjC9n8="; + cargoHash = "sha256-qnsJkwAmBcakYcoqGdYRqfN6e46PG5IH6SAXLvy3mM8="; doCheck = true; From 35b1cb52485213e04b23c31a3cf80cd979d5ddac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Dec 2025 10:49:59 +0000 Subject: [PATCH 06/49] sirius: 7.9.0 -> 7.10.0 --- pkgs/by-name/si/sirius/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index 8075deacb417..d352d6d571fd 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -53,13 +53,13 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation (finalAttrs: { pname = "SIRIUS"; - version = "7.9.0"; + version = "7.10.0"; src = fetchFromGitHub { owner = "electronic-structure"; repo = "SIRIUS"; tag = "v${finalAttrs.version}"; - hash = "sha256-/bhY+LCxOikS1at0ONFAhmvfnWhAVHsRQ4GfXJOZbBA="; + hash = "sha256-cq4ajtAJXfIH1B866FYhgROMSwd7nsbXf/6kbSwJAso="; }; outputs = [ From 7dd8b18e088025772c4550cfa4a90011abb67926 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 15 Dec 2025 10:54:22 +0800 Subject: [PATCH 07/49] slack: 4.47.59 -> 4.47.72 --- pkgs/by-name/sl/slack/sources.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix index 7071e28703d2..ec2f086eb4e0 100644 --- a/pkgs/by-name/sl/slack/sources.nix +++ b/pkgs/by-name/sl/slack/sources.nix @@ -1,26 +1,26 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-11-14 +# Last updated: 2025-12-15 { fetchurl }: { aarch64-darwin = { - version = "4.47.59"; + version = "4.47.72"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.47.59/Slack-4.47.59-macOS.dmg"; - hash = "sha256-q6rNYr2wCN/a50fCZMxNiM2R7PKC+DBxJ5KJy9Wnb/Y="; + url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.47.72/Slack-4.47.72-macOS.dmg"; + hash = "sha256-AihMQAjMMRWJftQOp9gnIC/df8nnrKnkpRym8sdtUkA="; }; }; x86_64-darwin = { - version = "4.47.59"; + version = "4.47.72"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.47.59/Slack-4.47.59-macOS.dmg"; - hash = "sha256-CIESzdXIHeDelIos7ZW9Z2/mnrltk7o92oqS1yM2MnY="; + url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.47.72/Slack-4.47.72-macOS.dmg"; + hash = "sha256-H1Dqtlqz1FxDqq4iAZJsTkugLp+WVU9fKB+H19l+vug="; }; }; x86_64-linux = { - version = "4.47.59"; + version = "4.47.72"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.47.59/slack-desktop-4.47.59-amd64.deb"; - hash = "sha256-R+WmtvIw6FLqsskG/hOdEdwZgsCZwWprGhbE7/Xpr1s="; + url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.47.72/slack-desktop-4.47.72-amd64.deb"; + hash = "sha256-o1WOTBG5u4jL+NGbTEZq+afM2UwUJZ0gtsWKsnsOkvE="; }; }; } From ec62a9683021ce69800072e9721b9ebb9436ec2f Mon Sep 17 00:00:00 2001 From: Dietrich Daroch Date: Mon, 15 Dec 2025 17:09:38 -0300 Subject: [PATCH 08/49] maintainers: add Dietr1ch --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7a5a6b616b34..fc5157a6e0fd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6606,6 +6606,12 @@ github = "dietmarw"; githubId = 9332; }; + Dietr1ch = { + name = "Dietrich Daroch"; + github = "Dietr1ch"; + githubId = 2096594; + email = "Dietrich@Daroch.me"; + }; different-name = { name = "different-name"; email = "hello@different-name.dev"; From af569643da6e5de4574a0326a0dae072bf027fc0 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Tue, 16 Dec 2025 07:39:41 +0000 Subject: [PATCH 09/49] models-dev: 0-unstable-2025-12-11 -> 0-unstable-2025-12-15 --- pkgs/by-name/mo/models-dev/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index a02fe56f487e..36965fdba4b1 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -9,12 +9,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2025-12-11"; + version = "0-unstable-2025-12-15"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "0c66fc84a2deb49500b9bb67e37d87428f544119"; - hash = "sha256-HAGUVpdW0gLXCo3jCU7pnjvh1cTp8xnU59MXgCwQkGs="; + rev = "14c7777ca5952619b9dcf46e5bf60a7dd25080be"; + hash = "sha256-+JJtaUmjwNXPnBP2jCc/r+Yswa+xViH9CVZzdmyXo+A="; }; node_modules = stdenvNoCC.mkDerivation { From bfddb3eeda61d75523e98897f4ff57df02b39518 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 13:50:02 +0000 Subject: [PATCH 10/49] gkrellm: 2.4.0 -> 2.5.0 --- pkgs/by-name/gk/gkrellm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix index 99bdbe267416..9db44ac580f3 100644 --- a/pkgs/by-name/gk/gkrellm/package.nix +++ b/pkgs/by-name/gk/gkrellm/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gkrellm"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { url = "http://gkrellm.srcbox.net/releases/gkrellm-${finalAttrs.version}.tar.bz2"; - hash = "sha256-b4NmV2C5Nq1LVfkYKx7HYB+vOKDyXqHkvdyZZQiPAy0="; + hash = "sha256-aMdaA6Brk1r6k9MzHKHC2GLB1Qw+nfGdmo1Ilw12a1U="; }; nativeBuildInputs = [ From bffac418ffdd27375303a5eba396e0e4e9cc2880 Mon Sep 17 00:00:00 2001 From: Dvd-Znf Date: Tue, 16 Dec 2025 16:46:16 +0100 Subject: [PATCH 11/49] television: 0.13.12 -> 0.14.0 - Release notes: https://github.com/alexpasmantier/television/releases/tag/0.14.0 --- pkgs/by-name/te/television/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 13c0ef10cebe..68d0801be970 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -19,16 +19,16 @@ let television = rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.13.12"; + version = "0.14.0"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-zAaTVKSE0OBcrpg/XKXC8aY3NXawe9RbC4i6pPJK1Nw="; + hash = "sha256-3xzgLG4iHd4SvBgMu3MgpOPD0saVDaC8gXy+Y/wJ4q4="; }; - cargoHash = "sha256-ZUaaVVGZzxVDPltZ4B5UHQFU7lyuzRzoQ/2upwS7njQ="; + cargoHash = "sha256-3Ttar63EffTmU4pnwgZb/Zl9zIN9T9hAcV/uFUjypeQ="; strictDeps = true; nativeBuildInputs = [ From 92c64b53be586fbc576e19ad36089d2e6d4947b2 Mon Sep 17 00:00:00 2001 From: Dietrich Daroch Date: Mon, 15 Dec 2025 18:37:54 -0300 Subject: [PATCH 12/49] ron-lsp: init at 0.1.1 --- pkgs/by-name/ro/ron-lsp/package.nix | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ro/ron-lsp/package.nix diff --git a/pkgs/by-name/ro/ron-lsp/package.nix b/pkgs/by-name/ro/ron-lsp/package.nix new file mode 100644 index 000000000000..ca2ad1d863db --- /dev/null +++ b/pkgs/by-name/ro/ron-lsp/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ron-lsp"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jasonjmcghee"; + repo = "ron-lsp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-c+cJrXINuoK+NR1rMSrOeZqZzrEcg/brSTKSTu5mNr4="; + }; + + cargoHash = "sha256-eEoxgnfc9s59b0SNozEIj/1wHv+OWDmd4bniBbGsgSQ="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "RON, Rusty Object Notation, Language Server"; + longDescription = '' + An LSP and CLI for RON files that provides autocomplete, + diagnostics, go to definition, code actions, and hover support + based on Rust type annotations + ''; + homepage = "https://github.com/jasonjmcghee/ron-lsp"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ + Dietr1ch + ]; + mainProgram = "ron-lsp"; + }; +}) From c6cb7b897b4d67ec284c8eda76d2bb9652d60a3a Mon Sep 17 00:00:00 2001 From: David Wronek Date: Tue, 16 Dec 2025 18:39:29 +0100 Subject: [PATCH 13/49] pmbootstrap: 3.6.0 -> 3.7.0 Signed-off-by: David Wronek --- pkgs/by-name/pm/pmbootstrap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 4e4c90d5a183..6d3fb3425a21 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "pmbootstrap"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; src = fetchFromGitLab { owner = "postmarketOS"; repo = "pmbootstrap"; tag = version; - hash = "sha256-sO042kmozpGbiojkivs4xbYDgVV4nVbiWkfxnbJFOJg="; + hash = "sha256-l8y1GoNZd6JeWzO2TI0GIVc/WlMv9EunFGH94pZ7ibk="; domain = "gitlab.postmarketos.org"; }; From c16985a57e902fd7506cd991c4a01cd20cd1ddb6 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Tue, 16 Dec 2025 18:42:41 +0100 Subject: [PATCH 14/49] pmbootstrap: add myself as maintainer I have contributed to postmarketOS in the past and would like to maintain this package as well. Signed-off-by: David Wronek --- pkgs/by-name/pm/pmbootstrap/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 6d3fb3425a21..cacb413cb856 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -84,6 +84,7 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ onny lucasew + ungeskriptet ]; mainProgram = "pmbootstrap"; }; From 80e7df793486f138ac350f10528b56783222f1ff Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Tue, 16 Dec 2025 13:12:33 -0500 Subject: [PATCH 15/49] cerberus: 0-unstable-2025-11-26 -> 0-unstable-2025-12-15 --- pkgs/by-name/ce/cerberus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/cerberus/package.nix b/pkgs/by-name/ce/cerberus/package.nix index 6e588d63d961..ae11a1e1176f 100644 --- a/pkgs/by-name/ce/cerberus/package.nix +++ b/pkgs/by-name/ce/cerberus/package.nix @@ -12,13 +12,13 @@ }: ocamlPackages.buildDunePackage rec { pname = "cerberus"; - version = "0-unstable-2025-11-26"; + version = "0-unstable-2025-12-15"; src = fetchFromGitHub { owner = "rems-project"; repo = "cerberus"; - rev = "6d60ef25944ebcdab892158c949a8e05501557dc"; - hash = "sha256-RucW01xuW5b6F9/O1OL99YJn3rSMCP7l7Cwjuv4PNIc="; + rev = "50621977ba282ac527e9259f7e9334d2c5bef41c"; + hash = "sha256-CAZeLG1M9oBzl/5EsIYwyV3St5fdwmfkPApACbsIYAc="; }; patches = [ From d9375f1c3b86dd29cfc1eccfa9ef91aa2abe30fb Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Tue, 16 Dec 2025 13:22:14 -0500 Subject: [PATCH 16/49] cerberus: Use fixed-point argument --- pkgs/by-name/ce/cerberus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/cerberus/package.nix b/pkgs/by-name/ce/cerberus/package.nix index ae11a1e1176f..f7eaddb31a2f 100644 --- a/pkgs/by-name/ce/cerberus/package.nix +++ b/pkgs/by-name/ce/cerberus/package.nix @@ -10,7 +10,7 @@ testers, cerberus, }: -ocamlPackages.buildDunePackage rec { +ocamlPackages.buildDunePackage (finalAttrs: { pname = "cerberus"; version = "0-unstable-2025-12-15"; @@ -35,7 +35,7 @@ ocamlPackages.buildDunePackage rec { # our version since git is impure postPatch = '' substituteInPlace tools/gen_version.ml \ - --replace-fail '"unknown"' '"${version}"' + --replace-fail '"unknown"' '"${finalAttrs.version}"' ''; minimalOCamlVersion = "4.12"; @@ -136,4 +136,4 @@ ocamlPackages.buildDunePackage rec { ]; platforms = lib.platforms.unix; }; -} +}) From 262ea85bb305f65c88ef1c3e200fa1edc6c852cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 20:04:15 +0000 Subject: [PATCH 17/49] fulcio: 1.8.3 -> 1.8.4 --- pkgs/by-name/fu/fulcio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix index cdba3ec955da..c01675a30b48 100644 --- a/pkgs/by-name/fu/fulcio/package.nix +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "sigstore"; repo = "fulcio"; tag = "v${version}"; - hash = "sha256-yR8Q1ksz1fB8sc8NA6Hr4dwe5VXerEgIQYiIpNTOEf8="; + hash = "sha256-+5aYfHR8v7A5U73rTkXoUInWDt044JcPDwQt2iKaqBw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -33,7 +33,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-G+vtNCm9Ecpj5IzxXojzcjGEQL47R5gNMFI/JCs7C0w="; + vendorHash = "sha256-EtanisQJclkIh2m+M51kGrWvOP/4Y+Y2zbxfSJ25cLk="; nativeBuildInputs = [ installShellFiles ]; From e1cc57867c28d3d2efec54b3fe5712655c098807 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 20:35:52 +0000 Subject: [PATCH 18/49] dbcsr: 2.8.0 -> 2.9.0 --- pkgs/by-name/db/dbcsr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbcsr/package.nix b/pkgs/by-name/db/dbcsr/package.nix index 3d403fee69c9..e63326f9abf3 100644 --- a/pkgs/by-name/db/dbcsr/package.nix +++ b/pkgs/by-name/db/dbcsr/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "dbcsr"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "cp2k"; repo = "dbcsr"; rev = "v${version}"; - hash = "sha256-YXySNw3+DiY7E57W1ypeWLyawwcWVGlmTM4Kgj7Nnmo="; + hash = "sha256-ZhcatDG0bbl75P3YI5Kqg8lhbDZ8EHYaZSixky6KJyo="; }; postPatch = '' From 0afd568f338af3c250489759c6d0689bc7a02c99 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 14 Dec 2025 23:04:02 +0000 Subject: [PATCH 19/49] python3Packages.lance-namespace: 0.2.1 -> 0.3.2 Diff: https://github.com/lancedb/lance-namespace/compare/v0.2.1...v0.3.2 --- pkgs/development/python-modules/lance-namespace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix index cc70c285605f..e57b95a944c1 100644 --- a/pkgs/development/python-modules/lance-namespace/default.nix +++ b/pkgs/development/python-modules/lance-namespace/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "lance-namespace"; - version = "0.2.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${version}"; - hash = "sha256-1SCsKjFd//1y28eR5MC2/M7cIMTRa083iDyuvWxLekw="; + hash = "sha256-tBInz9BEl6u7E8cAmtlHBqIG65kifPR+iv5/jNV3204="; }; sourceRoot = "${src.name}/python/lance_namespace"; From abaad1ffbb589b72ef4573f17d7671941401c37b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 23:43:14 +0000 Subject: [PATCH 20/49] python3Packages.unstructured-client: 0.42.4 -> 0.42.5 --- .../python-modules/unstructured-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index 90aeb49d74db..9779300c4200 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "unstructured-client"; - version = "0.42.4"; + version = "0.42.5"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${version}"; - hash = "sha256-gSUjv6LghlrSkwFxUqrnFeSSL5V7ryxI0IPRWkEGZ84="; + hash = "sha256-BLzWdiDLY4VTeaZnbaleUYSHR9bs62pnos6jJpzHzIg="; }; preBuild = '' From 4d354285007ff4297f76bb87ce11aeb035f7643e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 23:46:34 +0000 Subject: [PATCH 21/49] qownnotes: 25.12.5 -> 25.12.6 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 0a5caf02380e..d35528ad13c1 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.12.5"; + version = "25.12.6"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-LS1R5+wCkv/IvgC8RMqhvoIrrMmNlS0Hg+IgMViRJys="; + hash = "sha256-zlTyh0D7FXB4LDGQXi4Hb8WeujaM7F7hoO9TccZfzFg="; }; nativeBuildInputs = [ From 0bd3d857d4800cb44fe8a01181e0511ba1fbf953 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Wed, 17 Dec 2025 00:15:16 +0000 Subject: [PATCH 22/49] ty: 0.0.1-alpha.35 -> 0.0.2 Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.1 Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.2 --- pkgs/by-name/ty/ty/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 6f02940521cf..2bf88883b4d6 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.35"; + version = "0.0.2"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-dx6zZnThnkQHQbi5SXkKCnpkfw2kcrRDg0QEvb4WBqk="; + hash = "sha256-4Kv3UUn2QbOOOaQ/uzJB2KOUx++Gb+cKpZg4kGx99Q0="; }; # For Darwin platforms, remove the integration test for file notifications, From 1bfe0c4fbca0d0990a1120b2ad6642dec68be3d6 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Wed, 17 Dec 2025 01:23:10 +0100 Subject: [PATCH 23/49] ty: ignore unstable releases The project is technically still in beta, as per https://astral.sh/blog/ty, but the version number does not denote this. --- pkgs/by-name/ty/ty/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 2bf88883b4d6..d8329901eff8 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ); passthru = { - updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + updateScript = nix-update-script { }; }; meta = { From 6f09273e2756bbe74bfdecc3585b38f640f26e7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 00:27:37 +0000 Subject: [PATCH 24/49] bella: 0.1.3 -> 0.1.7 --- pkgs/by-name/be/bella/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/bella/package.nix b/pkgs/by-name/be/bella/package.nix index ce363020da48..6c16009b3eb9 100644 --- a/pkgs/by-name/be/bella/package.nix +++ b/pkgs/by-name/be/bella/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bella"; - version = "0.1.3"; + version = "0.1.7"; src = fetchFromGitHub { owner = "josephmawa"; repo = "Bella"; tag = "v${finalAttrs.version}"; - hash = "sha256-JSzgh56Ph8LjVY2uPfu1tacdr7BBbBzRfdWtcTRga7I="; + hash = "sha256-ePzDnaoGPa5Hku7Rpced989QB6uOXN/jfXgTwtlE7rQ="; }; strictDeps = true; From f3ac31a92b34538e06229814abd2fbb1345c1376 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 00:30:13 +0000 Subject: [PATCH 25/49] buildkit: 0.26.2 -> 0.26.3 --- pkgs/by-name/bu/buildkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index 3083d73a0557..7af50aac8eae 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.26.2"; + version = "0.26.3"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-AMsql+b5yUnkw6KkJte2qjN+MadJn06/0HohXP4N47c="; + hash = "sha256-2Utxan85hHmyt+7anfbjFxBHhKzmZb7k9K025vA76Ys="; }; vendorHash = null; From e2b692abf32573c419f91027d2172f55acc70c15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 00:37:36 +0000 Subject: [PATCH 26/49] shader-slang: 2025.24 -> 2025.24.1 --- pkgs/by-name/sh/shader-slang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 541a45c7d424..f194bb5aa0b4 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2025.24"; + version = "2025.24.1"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-lOvPEUsweyBIf/ryoCDnwBTkvz4J9xatkNSWDvM8zWc="; + hash = "sha256-w99pRi03HyI8xlvxbJL+i5k6Sr0ITkh28qB9nRY2iiU="; fetchSubmodules = true; }; From 47f58e0c710a5b0b3d98cd5dc6c27d2d655c8642 Mon Sep 17 00:00:00 2001 From: botnk Date: Wed, 17 Dec 2025 01:31:43 +0000 Subject: [PATCH 27/49] zed-editor: 0.216.1 -> 0.217.1 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.217.1 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 49459c74b12f..050abc5a7cf3 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -106,7 +106,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.216.1"; + version = "0.217.1"; outputs = [ "out" @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-7rLrPXnPvKTE4w9FYs4RHSs3wBbmwbaWtTdvC2iC6yY="; + hash = "sha256-4A2uiHeqnvJF1lLzUQsTMZ30v7iWp8MZTla5R1/AVFg="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-cnjLwoes71/M0vMB01dLBB7pujlVHT82hfQxwr/Z4XQ="; + cargoHash = "sha256-OsIau0R00zHWvaepXDyU3JMrMJUQbHdoYAilG95lvp4="; nativeBuildInputs = [ cmake From b99074a45d5bc56cbb94c9be0e5628135b11fea4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 03:11:22 +0000 Subject: [PATCH 28/49] zerofs: 0.22.1 -> 0.22.4 --- pkgs/by-name/ze/zerofs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix index c54af266ea04..58e0d57bfb80 100644 --- a/pkgs/by-name/ze/zerofs/package.nix +++ b/pkgs/by-name/ze/zerofs/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zerofs"; - version = "0.22.1"; + version = "0.22.4"; src = fetchFromGitHub { owner = "Barre"; repo = "ZeroFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-YdqZV8TdodSKP3h2Qa0+Xi7bfGKrtGq625Oco+UjIpU="; + hash = "sha256-17KYkB5TtD+JYXhLVj09gcvETlpG1yC/U2Ql04Ur57g="; }; sourceRoot = "${finalAttrs.src.name}/zerofs"; - cargoHash = "sha256-rPa8XmApLClhJ2oAQxEoQL2Hd+8QlJAOZVw+kzS70KY="; + cargoHash = "sha256-5Yn4aaYo34NnwSnZ5kVPMe0xfkvu9fGk9OHje9q1oLw="; nativeBuildInputs = [ cmake ]; From c58197ec860f31cb1e54441c87c11b2395cacc0f Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 17 Dec 2025 11:48:36 +0800 Subject: [PATCH 29/49] xh: 0.25.0 -> 0.25.3 --- pkgs/by-name/xh/xh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index c7dc146bbf62..f3d6be777469 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xh"; - version = "0.25.0"; + version = "0.25.3"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; tag = "v${finalAttrs.version}"; - hash = "sha256-UuWNLsJAoSjDPs/8VzW2vics3A/nsXWR5xmjMqTmYvQ="; + hash = "sha256-WRYClBIjw67lVrzvnIMqVHd6toi5yU7nClViqfXahKA="; }; - cargoHash = "sha256-SsJSBkOdQSpbEbFPK+qscSBePUKMLM1UpajpvpR2ZEo="; + cargoHash = "sha256-T2ZaijWXyH8ZJKFTTngGtQsdRWL9re4i3nKHp8srWSI="; buildFeatures = lib.optional withNativeTls "native-tls"; From 390d777296808465d21256a0b8cd88f1a984f642 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 04:26:59 +0000 Subject: [PATCH 30/49] python3Packages.edge-tts: 7.2.3 -> 7.2.7 --- pkgs/development/python-modules/edge-tts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edge-tts/default.nix b/pkgs/development/python-modules/edge-tts/default.nix index f6f3c8c23f2a..50d048eb161d 100644 --- a/pkgs/development/python-modules/edge-tts/default.nix +++ b/pkgs/development/python-modules/edge-tts/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "edge-tts"; - version = "7.2.3"; + version = "7.2.7"; pyproject = true; src = fetchFromGitHub { owner = "rany2"; repo = "edge-tts"; tag = version; - hash = "sha256-JnwfvSa60oEbSEyD6q88Ey6IyGOwVWO0T75VrUKZmos="; + hash = "sha256-KlQJ9U5RgifpqVKw5BrPwBFJYZHKibMUlyb3aX+4qf8="; }; build-system = [ From f1eec301dc5863845645a91410c4aea571064223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 05:43:42 +0000 Subject: [PATCH 31/49] python3Packages.disposable-email-domains: 0.0.152 -> 0.0.153 --- .../python-modules/disposable-email-domains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index d460f9ea9510..b581156b473f 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "disposable-email-domains"; - version = "0.0.152"; + version = "0.0.153"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "disposable_email_domains"; inherit version; - hash = "sha256-5F3ZC9tZ1cpX6qTvDm74bTEJQRYWEn1+QI0d04Yry8M="; + hash = "sha256-b4C/OKBMR48lJ5+e1Mx7PJO2ZvITvar213qYkrFnmV0="; }; build-system = [ From 8b27e8b3de787468bf8e7774cd3a0eaa789b3163 Mon Sep 17 00:00:00 2001 From: adeci Date: Wed, 17 Dec 2025 05:50:12 +0000 Subject: [PATCH 32/49] vscode-extensions.anthropic.claude-code: 2.0.70 -> 2.0.72 --- .../vscode/extensions/anthropic.claude-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 02b7d2fb8317..22af4b55c4f7 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.70"; - hash = "sha256-ed2oYB6G9EuSRqgt18W69JS73+uf6vqXtwQ1ZY+eWy8="; + version = "2.0.72"; + hash = "sha256-nfzcm8lEtZl3vD129rtpV4Oc5vKW7SKyZHfFg1jd8hU="; }; meta = { From 86aa2ff68b849bd6ee1650e581a0c509e6f29fa0 Mon Sep 17 00:00:00 2001 From: adeci Date: Wed, 17 Dec 2025 05:50:15 +0000 Subject: [PATCH 33/49] claude-code: 2.0.70 -> 2.0.71 --- pkgs/by-name/cl/claude-code/package-lock.json | 4 ++-- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index be9c57349c13..e9f4863a8962 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.70", + "version": "2.0.71", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.70", + "version": "2.0.71", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 5051f101efae..36bf5792f78e 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -11,14 +11,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.70"; + version = "2.0.71"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-RTMhrFhbamO8Ow5iKd3IiLoKoLF5cz279ArjPZymE9o="; + hash = "sha256-krbaIy1KfmbwroQRZpGR6bOYNc2l/GZKjhavmiwVCms="; }; - npmDepsHash = "sha256-coTUQVOOT/jonVtnmY/zenv1PI93JFlpFEqlUlhssJM="; + npmDepsHash = "sha256-cio+ZkVIPIkxRXXQzwFYXr08OUEBVJpRjtvmJLcH3Ag="; postPatch = '' cp ${./package-lock.json} package-lock.json From ac985a0c337714fdf43b50918897d88f396eb95d Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 17 Dec 2025 14:48:04 +0800 Subject: [PATCH 34/49] resp-app: drop --- pkgs/applications/misc/resp-app/default.nix | 105 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 pkgs/applications/misc/resp-app/default.nix diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix deleted file mode 100644 index 6bff5a503556..000000000000 --- a/pkgs/applications/misc/resp-app/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitHub, - fetchpatch, - brotli, - lz4, - pyotherside, - python3, - python3Packages, - qtbase, - qtcharts, - qmake, - qttools, - rdbtools, - snappy, - wrapQtAppsHook, - zstd, -}: - -let - rdbtools-patched = rdbtools.overridePythonAttrs (oldAttrs: { - # Add required additional flag for resp-app - patches = oldAttrs.patches or [ ] ++ [ - (fetchpatch { - name = "Add-flag-to-parse-only-key-names.patch"; - url = "https://github.com/uglide/redis-rdb-tools/commit/b74946e6fbca589947ef0186429d5ce45a074b87.patch"; - hash = "sha256-1gjqB/IDSsAbrwzWSezlAW/2SYr6BFm1QJ2HAHK2fFs="; - }) - ]; - }); -in -mkDerivation rec { - pname = "RESP.app"; - version = "2022.5"; - - src = fetchFromGitHub { - owner = "RedisInsight"; - repo = "RedisDesktopManager"; - fetchSubmodules = true; - rev = version; - hash = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4="; - }; - - nativeBuildInputs = [ - python3Packages.wrapPython - qmake - wrapQtAppsHook - ]; - - buildInputs = [ - brotli - lz4 - pyotherside - python3 - qtbase - qtcharts - qttools - snappy - zstd - ] - ++ pythonPath; - - pythonPath = with python3Packages; [ - bitstring - cbor - msgpack - phpserialize - rdbtools-patched - python-lzf - ]; - - postPatch = '' - substituteInPlace src/resp.pro \ - --replace 'which ccache' "false" \ - --replace 'target.files = $$DESTDIR/resp' "${placeholder "src"}/bin/linux/release/resp" \ - --replace '/opt/resp_app' "${placeholder "out"}" \ - --replace 'target.path = $$LINUX_INSTALL_PATH' 'target.path = $$LINUX_INSTALL_PATH/bin' \ - --replace '/usr/' "$out/" - rm -r 3rdparty/snappy - ''; - - qmakeFlags = [ - "SYSTEM_LZ4=1" - "SYSTEM_ZSTD=1" - "SYSTEM_SNAPPY=1" - "SYSTEM_BROTLI=1" - "VERSION=${version}" - "src/resp.pro" - ]; - - preFixup = '' - buildPythonPath "$pythonPath" - qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") - ''; - - meta = { - description = "Cross-platform Developer GUI for Redis"; - mainProgram = "resp"; - homepage = "https://resp.app/"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f370a755de55..e8d2a683659c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1402,6 +1402,7 @@ mapAliases { redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27 redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lacks maintenance upstream."; # Added 2025-11-09 remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11 + resp-app = throw "'resp-app' has been replaced by 'redisinsight'"; # Added 2025-12-17 responsively-app = throw "'responsively-app' has been removed due to lack of maintenance upstream."; # Added 2025-06-25 retroarchBare = throw "'retroarchBare' has been renamed to/replaced by 'retroarch-bare'"; # Converted to throw 2025-10-27 retroarchFull = throw "'retroarchFull' has been renamed to/replaced by 'retroarch-full'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70cba1140dc2..83f5c07ec7d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13871,8 +13871,6 @@ with pkgs; } ); - resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; - pgadmin4-desktopmode = pgadmin4.override { server-mode = false; }; philipstv = with python3Packages; toPythonApplication philipstv; From f86e8a5dfabdbb4ca5d3da19ed7787139ad604c6 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 11 Dec 2025 15:01:00 -0500 Subject: [PATCH 35/49] setserial: undrop, adopt and fix build --- pkgs/by-name/se/setserial/gcc-fixes.patch | 31 +++++++++++++++++ pkgs/by-name/se/setserial/package.nix | 42 +++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/se/setserial/gcc-fixes.patch create mode 100644 pkgs/by-name/se/setserial/package.nix diff --git a/pkgs/by-name/se/setserial/gcc-fixes.patch b/pkgs/by-name/se/setserial/gcc-fixes.patch new file mode 100644 index 000000000000..c9cc7d1b7eec --- /dev/null +++ b/pkgs/by-name/se/setserial/gcc-fixes.patch @@ -0,0 +1,31 @@ +diff --git a/setserial.c b/setserial.c +index fef6532768..b7cde26ac2 100644 +--- a/setserial.c ++++ b/setserial.c +@@ -10,11 +10,14 @@ + * Last modified: [tytso:19940520.0036EDT] + */ + ++#include ++#include + #include +-#include ++#include ++#include + #include +-#include +-#include ++#include ++#include + + #ifdef HAVE_ASM_IOCTLS_H + #include +@@ -714,7 +717,7 @@ + exit(1); + } + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { + int get_flag = 0, wild_intr_flag = 0; + int c; diff --git a/pkgs/by-name/se/setserial/package.nix b/pkgs/by-name/se/setserial/package.nix new file mode 100644 index 000000000000..fa873f457a5a --- /dev/null +++ b/pkgs/by-name/se/setserial/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchurl, + groff, + autoreconfHook, +}: + +stdenv.mkDerivation rec { + pname = "setserial"; + version = "2.17"; + + src = fetchurl { + url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz"; + sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y"; + }; + + patches = [ ./gcc-fixes.patch ]; + + nativeBuildInputs = [ + autoreconfHook + groff + ]; + + postConfigure = '' + substituteInPlace Makefile \ + --replace-fail /usr/man/ /share/man/ \ + --replace-fail DESTDIR out + ''; + + preInstall = '' + mkdir -p "$out/bin" "$out/share/man/man8" + ''; + + meta = { + description = "Serial port configuration utility"; + homepage = "https://setserial.sourceforge.net"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.mmlb ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f7ec34ee472..7d5882c5eeaf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1439,7 +1439,6 @@ mapAliases { sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27 serverless = throw "'serverless' has been removed because version 3.x is unmaintained upstream and vulnerable, and version 4.x lacks a suitable binary or source download."; # Added 2025-11-22 session-desktop-appimage = throw "'session-desktop-appimage' has been renamed to/replaced by 'session-desktop'"; # Converted to throw 2025-10-27 - setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18 sexp = throw "'sexp' has been renamed to/replaced by 'sexpp'"; # Converted to throw 2025-10-27 shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01 shared_desktop_ontologies = throw "'shared_desktop_ontologies' has been removed as it had been abandoned upstream"; # Added 2025-11-09 From c451947458f72320f0692f0b685294db6a7e777b Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 2 Dec 2025 23:03:27 +0100 Subject: [PATCH 36/49] gelly: init at 0.11.0 --- pkgs/by-name/ge/gelly/package.nix | 80 +++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 pkgs/by-name/ge/gelly/package.nix diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix new file mode 100644 index 000000000000..6acb8832f263 --- /dev/null +++ b/pkgs/by-name/ge/gelly/package.nix @@ -0,0 +1,80 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + dbus, + glib, + wrapGAppsHook4, + glib-networking, + gst_all_1, + gtk4, + libadwaita, + libseccomp, + openssl, + bubblewrap, + glycin-loaders, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "gelly"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "Fingel"; + repo = "gelly"; + tag = "v${finalAttrs.version}"; + hash = "sha256-fZrSfxbWkHX5yUwC4NkDmXcNDTvsdwceEBkmUmxWcoQ="; + }; + + cargoHash = "sha256-vnFbRvq+EPIcJ4w+QKpkXrl5BLr/KbELbmpRGQwcaUE="; + + nativeBuildInputs = [ + pkg-config + glib # for `glib-compile-schemas` and `glib-compile-resources` (used in upstream's `build.rs`) + wrapGAppsHook4 + ]; + + buildInputs = [ + dbus + # Very important, so that gstreamer supports TLS + glib-networking + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-rs + gtk4 + libadwaita + libseccomp + openssl + ]; + + # Adapted from upstream's `justfile` + postInstall = '' + install -Dm644 resources/io.m51.Gelly.desktop $out/share/applications/io.m51.Gelly.desktop + install -Dm644 resources/io.m51.Gelly.metainfo.xml $out/share/metainfo/io.m51.Gelly.metainfo.xml + install -Dm644 resources/io.m51.Gelly.svg $out/share/icons/hicolor/scalable/apps/io.m51.Gelly.svg + + # Use the gschemas location as specified in the glib hook + install -Dm644 resources/io.m51.Gelly.gschema.xml $out/share/gsettings-schemas/$name/glib-2.0/schemas/io.m51.Gelly.gschema.xml + glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "$out/bin:${lib.makeBinPath [ bubblewrap ]}" + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + + meta = { + description = "A Jellyfin GTK client for Linux focused on music"; + homepage = "https://github.com/Fingel/gelly"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ minijackson ]; + mainProgram = "gelly"; + platforms = lib.platforms.linux; + }; +}) From 00cdce2d2765949d0299e1122299a518a21c1bf1 Mon Sep 17 00:00:00 2001 From: ymstnt <21342713+ymstnt@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:51:09 +0100 Subject: [PATCH 37/49] hifile: fix missing startupwmclass --- pkgs/by-name/hi/hifile/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index cb40367c40a5..f01e102e0afe 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -27,6 +27,7 @@ appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/HiFile.png $out/share/icons/hicolor/512x512/apps/HiFile.png substituteInPlace $out/share/applications/HiFile.desktop \ --replace-fail 'Exec=HiFile' 'Exec=hifile' + echo "StartupWMClass=app.hifile.www.HiFile" >> $out/share/applications/HiFile.desktop ''; passthru.updateScript = ./update.sh; From bac883abd9bbe233c75b001080fff6972ea724af Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:58:49 +0100 Subject: [PATCH 38/49] meilisearch: 1.28.2 -> 1.30.0 --- pkgs/by-name/me/meilisearch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index a762f32c1ce3..50b85e298850 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.28.2"; + version = "1.30.0"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meiliSearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sp3YAAOgkBoBIz4Yj0AKJ0aI0HBAIg75E9BjtzGxXLM="; + hash = "sha256-oq/jP+b4KwjpVvj/yBmzIOm+TM13dup40dAD0ID2Juc="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-W6nTVgD0U4bZ0ybGU6wTQmp+SVvorZCqKOJnf1GG1gU="; + cargoHash = "sha256-ooggvDUSrtY6X+GGHjU/rsP/q9Br2OUMTvVYUfVdAtk="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; From 7b9cadf96a5aae004c3ddfdb625a8f034b519b79 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Tue, 16 Dec 2025 07:35:14 +0000 Subject: [PATCH 39/49] opencode: add delafthi to maintainers --- pkgs/by-name/op/opencode/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 628e2e6a0111..e8574c15aec9 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -211,6 +211,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/sst/opencode"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ delafthi ]; platforms = [ "aarch64-linux" "x86_64-linux" From 5d8723fc04b00d33a3208821d9c8b55d9280f831 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Tue, 16 Dec 2025 07:35:14 +0000 Subject: [PATCH 40/49] opencode: 1.0.150 -> 1.0.164 --- pkgs/by-name/op/opencode/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index e8574c15aec9..52e1b78dee38 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -13,12 +13,12 @@ }: let pname = "opencode"; - version = "1.0.150"; + version = "1.0.164"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${version}"; - hash = "sha256-8mFmFFk378g93MbFRwMOJkjuXqq3PVPdCuGVLPn6D44="; + hash = "sha256-bz20/y6zVhEWQZB17HocvYg0F9XNwy6EKg3LHSkmvLE="; }; node_modules = stdenvNoCC.mkDerivation { @@ -70,7 +70,7 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-3swARfDhEfLoaucjiUfse3px40ZBfQsEE8DPgUk/5K0="; + outputHash = "sha256-I7y6e+ODXShbMCmKOvC48+Y3wyrLKH0IES4S6gOnMiE="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; From f46b9643cc72edcaa8ced795dbc3cad70972f4e1 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 23 Oct 2025 14:24:41 +0100 Subject: [PATCH 41/49] prometheus: Move assets to npmBuildPackage --- .../pr/prometheus/disable-react-app.diff | 10 +++ pkgs/by-name/pr/prometheus/package.nix | 82 ++++++++++++++----- 2 files changed, 71 insertions(+), 21 deletions(-) create mode 100644 pkgs/by-name/pr/prometheus/disable-react-app.diff diff --git a/pkgs/by-name/pr/prometheus/disable-react-app.diff b/pkgs/by-name/pr/prometheus/disable-react-app.diff new file mode 100644 index 000000000000..f98eca28554a --- /dev/null +++ b/pkgs/by-name/pr/prometheus/disable-react-app.diff @@ -0,0 +1,10 @@ +--- ./build_ui.sh 2025-10-22 23:32:08.739188520 +0100 ++++ ./build_ui.sh 2025-10-22 23:32:23.753242986 +0100 +@@ -50,7 +50,6 @@ for i in "$@"; do + case ${i} in + --all) + buildModule +- buildReactApp + buildMantineUI + shift + ;; diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 7b75b0b7bff7..88050c435489 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -4,8 +4,8 @@ lib, go, buildGoModule, + buildNpmPackage, fetchFromGitHub, - fetchurl, nixosTests, enableAWS ? true, enableAzure ? true, @@ -32,31 +32,62 @@ enableZookeeper ? true, }: -buildGoModule (finalAttrs: { +let pname = "prometheus"; version = "3.8.0"; + src = fetchFromGitHub { + owner = "prometheus"; + repo = "prometheus"; + tag = "v${version}"; + hash = "sha256-bitRDX1oymFfzvQVYL31BON6UBfQYnqjZefQKc+yXx0="; + }; + + assets = buildNpmPackage { + pname = "${pname}-assets"; + inherit version; + + src = "${src}/web/ui"; + + npmDepsHash = "sha256-Uq7vikiYLqhRQNCpB49aMJgAE/uK4Mst/Iz6W+hdxBw="; + + patches = [ + # Disable old React app as it depends on deprecated create-react-apps + # script + ./disable-react-app.diff + ]; + + env.CI = true; + + doCheck = true; + checkPhase = '' + runHook preCheck + + npm test + + runHook postCheck + ''; + + postInstall = '' + mkdir -p $out/static + cp -r $out/lib/node_modules/prometheus-io/static/* $out/static + find $out/static -type f -exec gzip -f9 {} \; + + # Remove node_modules + rm -rf $out/lib + ''; + }; +in +buildGoModule (finalAttrs: { + inherit pname version src; + outputs = [ "out" "doc" "cli" ]; - src = fetchFromGitHub { - owner = "prometheus"; - repo = "prometheus"; - tag = "v${finalAttrs.version}"; - hash = "sha256-hRuZxwPPDLxQvy5MPKEyfmanNabcSjLRO+XbNKugPtk="; - }; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - vendorHash = "sha256-5wDaG01vcTtGzrS/S33U5XWXoSWM+N9z3dzXZlILxD8="; - - webUiStatic = fetchurl { - url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz"; - hash = "sha256-oOEvNZFlYtTNBsn+B2pAWXi0A2oJ6IAo7V8bOLtjfCM="; - }; + vendorHash = "sha256-V+qLxjqGOaT1veEwtklqcS7iO31ufvDHBA9DbZLzDiE="; excludedPackages = [ "documentation/prometheus-mixin" @@ -65,7 +96,7 @@ buildGoModule (finalAttrs: { ]; postPatch = '' - tar -C web/ui -xzf ${finalAttrs.webUiStatic} + cp -r ${assets}/static web/ui/static/ patchShebangs scripts @@ -99,9 +130,18 @@ buildGoModule (finalAttrs: { ''; preBuild = '' - if [[ -d vendor ]]; then - GOARCH= CC="$CC_FOR_BUILD" LD="$LD_FOR_BUILD" make -o assets assets-compress plugins - fi + if [[ -d vendor ]]; then GOARCH= make -o assets plugins; fi + + # Recreate the `make assets-compress` target here - workaround permissions + # errors + cp web/ui/embed.go.tmpl web/ui/embed.go + + find web/ui/static -type f -name '*.gz' -print0 | sort -z | xargs -0 echo //go:embed >> web/ui/embed.go + + echo 'var EmbedFS embed.FS' >> web/ui/embed.go + + # EmbedFS requires relative paths + substituteInPlace web/ui/embed.go --replace-fail "web/ui/" "" ''; tags = [ "builtinassets" ]; From 648378b1675776fa723da3567cab53cc4924dcd6 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 30 Oct 2025 17:10:07 +0000 Subject: [PATCH 42/49] prometheus: Split source definition to separate file --- pkgs/by-name/pr/prometheus/package.nix | 19 ++++++++++++------- pkgs/by-name/pr/prometheus/source.nix | 6 ++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/pr/prometheus/source.nix diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 88050c435489..248b90242d2b 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -1,6 +1,5 @@ { stdenv, - buildPackages, lib, go, buildGoModule, @@ -33,14 +32,17 @@ }: let + source = import ./source.nix; + + inherit (source) version vendorHash; + pname = "prometheus"; - version = "3.8.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "prometheus"; tag = "v${version}"; - hash = "sha256-bitRDX1oymFfzvQVYL31BON6UBfQYnqjZefQKc+yXx0="; + hash = source.hash; }; assets = buildNpmPackage { @@ -49,7 +51,7 @@ let src = "${src}/web/ui"; - npmDepsHash = "sha256-Uq7vikiYLqhRQNCpB49aMJgAE/uK4Mst/Iz6W+hdxBw="; + npmDepsHash = source.npmDepsHash; patches = [ # Disable old React app as it depends on deprecated create-react-apps @@ -79,7 +81,12 @@ let }; in buildGoModule (finalAttrs: { - inherit pname version src; + inherit + pname + version + vendorHash + src + ; outputs = [ "out" @@ -87,8 +94,6 @@ buildGoModule (finalAttrs: { "cli" ]; - vendorHash = "sha256-V+qLxjqGOaT1veEwtklqcS7iO31ufvDHBA9DbZLzDiE="; - excludedPackages = [ "documentation/prometheus-mixin" "internal/tools" diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix new file mode 100644 index 000000000000..c3bc5b3c9f2a --- /dev/null +++ b/pkgs/by-name/pr/prometheus/source.nix @@ -0,0 +1,6 @@ +{ + version = "3.8.0"; + hash = "sha256-hRuZxwPPDLxQvy5MPKEyfmanNabcSjLRO+XbNKugPtk="; + npmDepsHash = "sha256-pOHEchYVDv7A/3v37hpN60kK620SgQduhVIn6GMyOLM="; + vendorHash = "sha256-5wDaG01vcTtGzrS/S33U5XWXoSWM+N9z3dzXZlILxD8="; +} From e2ddd5a9178134098f7282dba3519463db96ce1b Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 23 Oct 2025 14:26:10 +0100 Subject: [PATCH 43/49] prometheus: Add update.sh script --- pkgs/by-name/pr/prometheus/package.nix | 6 +- pkgs/by-name/pr/prometheus/update.sh | 77 ++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100755 pkgs/by-name/pr/prometheus/update.sh diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 248b90242d2b..7390976c5c9b 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -186,12 +186,16 @@ buildGoModule (finalAttrs: { "-skip=TestEvaluations/testdata/aggregators.test" ]; - passthru.tests = { inherit (nixosTests) prometheus; }; + passthru = { + tests = { inherit (nixosTests) prometheus; }; + updateScript = ./update.sh; + }; meta = { description = "Service monitoring system and time series database"; homepage = "https://prometheus.io"; license = lib.licenses.asl20; + changelog = "https://github.com/prometheus/prometheus/blob/v${version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ fpletz Frostman diff --git a/pkgs/by-name/pr/prometheus/update.sh b/pkgs/by-name/pr/prometheus/update.sh new file mode 100755 index 000000000000..c09ec3a4064b --- /dev/null +++ b/pkgs/by-name/pr/prometheus/update.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix coreutils curl jq nix-prefetch-git prefetch-npm-deps + +set -euo pipefail + +OWNER=prometheus +REPO=prometheus + +# Current version. +LATEST_NIXPKGS_VERSION=$(nix eval --raw .#prometheus.version 2>/dev/null) +UPDATE_NIX_OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$LATEST_NIXPKGS_VERSION} + +TARGET_TAG="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/$OWNER/$REPO/releases/latest" | jq -r '.tag_name')" +TARGET_VERSION="$(echo "$TARGET_TAG" | sed -e 's/^v//')" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$TARGET_VERSION" ]]; then + # prometheus is up-to-date + if [[ -n "$UPDATE_NIX_ATTR_PATH" ]]; then + echo "[{}]"; + fi + + exit 0 +fi + +extractVendorHash() { + original="${1?original hash missing}" + result="$(nix-build -A prometheus.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } +} + +TMP=$(mktemp -d) +trap 'rm -rf "$TMP"' EXIT + +NIXPKGS_PROMETHEUS_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ +SOURCE_NIX="$NIXPKGS_PROMETHEUS_PATH/source.nix" + +PREFETCH_JSON=$TMP/prefetch.json +nix-prefetch-git --rev "$TARGET_TAG" --url "https://github.com/$OWNER/$REPO" > "$PREFETCH_JSON" +PREFETCH_HASH="$(jq '.hash' -r < "$PREFETCH_JSON")" +PREFETCH_PATH="$(jq '.path' -r < "$PREFETCH_JSON")" +NPM_DEPS_HASH="$(prefetch-npm-deps "$PREFETCH_PATH/web/ui/package-lock.json")" + +FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + +cat > "$SOURCE_NIX" <<-EOF +{ + version = "$TARGET_VERSION"; + hash = "$PREFETCH_HASH"; + npmDepsHash = "$NPM_DEPS_HASH"; + vendorHash = "$FAKE_HASH"; +} +EOF + +GO_HASH="$(nix-instantiate --eval -A prometheus.vendorHash | tr -d '"')" +VENDOR_HASH=$(extractVendorHash "$GO_HASH") + +cat > "$SOURCE_NIX" <<-EOF +{ + version = "$TARGET_VERSION"; + hash = "$PREFETCH_HASH"; + npmDepsHash = "$NPM_DEPS_HASH"; + vendorHash = "$VENDOR_HASH"; +} +EOF + +if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then + exit 0 +fi + +cat <<-EOF +[{ + "attrPath": "$UPDATE_NIX_ATTR_PATH", + "oldVersion": "$UPDATE_NIX_OLD_VERSION", + "newVersion": "$TARGET_VERSION", + "files": ["$SOURCE_NIX"] +}] +EOF From 985b1f40a8b54dcb195c73a60b5bce6614806a59 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 24 Oct 2025 09:13:01 +0000 Subject: [PATCH 44/49] prometheus: Add jpds to maintainers --- pkgs/by-name/pr/prometheus/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 7390976c5c9b..68d0a2591338 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -199,6 +199,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ fpletz Frostman + jpds ]; mainProgram = "prometheus"; }; From 0d17bb6789c89153acb0cca5be802e0f61d6b326 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 6 Nov 2025 13:20:19 +0000 Subject: [PATCH 45/49] prometheus: Add versionCheckHook --- pkgs/by-name/pr/prometheus/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 68d0a2591338..082dfcc2e044 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -29,6 +29,7 @@ enableVultr ? true, enableXDS ? true, enableZookeeper ? true, + versionCheckHook, }: let @@ -186,6 +187,12 @@ buildGoModule (finalAttrs: { "-skip=TestEvaluations/testdata/aggregators.test" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + passthru = { tests = { inherit (nixosTests) prometheus; }; updateScript = ./update.sh; From 46ce9a461e9ec8ffc2b8042bbf879841718fdd88 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 2 Dec 2025 13:11:58 +0000 Subject: [PATCH 46/49] nixos/prometheus: Use `lib.getExe` for systemd exec path --- nixos/modules/services/monitoring/prometheus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 965ef9313b53..09ab6c4fcf3f 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -1969,7 +1969,7 @@ in after = [ "network.target" ]; serviceConfig = { ExecStart = - "${cfg.package}/bin/prometheus" + "${lib.getExe cfg.package}" + optionalString (length cmdlineArgs != 0) (" \\\n " + concatStringsSep " \\\n " cmdlineArgs); ExecReload = mkIf cfg.enableReload "+${reload}/bin/reload-prometheus"; User = "prometheus"; From e1e7ee899e4f1b50cdd127996bf4a7f4e16dd221 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 2 Dec 2025 13:22:02 +0000 Subject: [PATCH 47/49] nixos/prometheus: Enable CapabilityBoundingSet hardening --- nixos/modules/services/monitoring/prometheus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 09ab6c4fcf3f..35fb022631e0 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -1980,6 +1980,7 @@ in StateDirectory = cfg.stateDir; StateDirectoryMode = "0700"; # Hardening + CapabilityBoundingSet = [ "" ]; DeviceAllow = [ "/dev/null rw" ]; DevicePolicy = "strict"; LockPersonality = true; From 3ea8d8cb0d53e810d1bfc447a26bb1b997eb322d Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 17 Dec 2025 09:42:51 +0000 Subject: [PATCH 48/49] =?UTF-8?q?prometheus:=203.8.0=20=E2=86=92=203.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/pr/prometheus/source.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix index c3bc5b3c9f2a..d112d1e2116c 100644 --- a/pkgs/by-name/pr/prometheus/source.nix +++ b/pkgs/by-name/pr/prometheus/source.nix @@ -1,6 +1,6 @@ { - version = "3.8.0"; - hash = "sha256-hRuZxwPPDLxQvy5MPKEyfmanNabcSjLRO+XbNKugPtk="; - npmDepsHash = "sha256-pOHEchYVDv7A/3v37hpN60kK620SgQduhVIn6GMyOLM="; - vendorHash = "sha256-5wDaG01vcTtGzrS/S33U5XWXoSWM+N9z3dzXZlILxD8="; + version = "3.8.1"; + hash = "sha256-mb1aMWpIELyZaqjYX1teYdtAK/+W9jzdPwzgbT7AVj4="; + npmDepsHash = "sha256-wmxvlQWQO2gP2apupMJssqAPr1ntWWIazduQU3AuodU="; + vendorHash = "sha256-35pVMl1Hu970BQE6jMzT1xaz/3FaIFWUtel0cl/uBdw="; } From 755c449eae831cf7075fa21ccfa5d39c3b8f919e Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Dec 2025 18:26:12 +0800 Subject: [PATCH 49/49] setserial: add meta.mainProgram --- pkgs/by-name/se/setserial/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/se/setserial/package.nix b/pkgs/by-name/se/setserial/package.nix index fa873f457a5a..ecc662f2ab93 100644 --- a/pkgs/by-name/se/setserial/package.nix +++ b/pkgs/by-name/se/setserial/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://setserial.sourceforge.net"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; + mainProgram = "setserial"; maintainers = [ lib.maintainers.mmlb ]; }; }