From 18b22ac8a643da7183ba1f0abdd7aeb32393bfe5 Mon Sep 17 00:00:00 2001 From: MidAutumnMoon Date: Wed, 19 Nov 2025 15:48:42 +0800 Subject: [PATCH 01/14] swayimg: v4.5 -> v4.6 Diff: https://github.com/artemsen/swayimg/compare/v4.5...v4.6 Release note: https://github.com/artemsen/swayimg/releases/tag/v4.6 --- pkgs/by-name/sw/swayimg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 28458e6e3720..c2531c4ea799 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; tag = "v${finalAttrs.version}"; - hash = "sha256-Dne9Oj8dd/Skrvr7aCKwwdjw5Ocz+1LUTNwdDGLvQYY="; + hash = "sha256-Q5TqY5UgSGZVVoARcz1ig0UkZBKgRoT9Ndvg/f1T38Q="; }; strictDeps = true; From 44c616f977b697131a82c733045534146c746ec4 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Wed, 19 Nov 2025 09:05:31 +0100 Subject: [PATCH 02/14] dediprog-sf100: Grant seat sessions access to device in udev rules By adding the `uaccess` tag, udev grants access to the device to seat sessions. Signed-off-by: Felix Singer --- pkgs/by-name/de/dediprog-sf100/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/de/dediprog-sf100/package.nix b/pkgs/by-name/de/dediprog-sf100/package.nix index 300e4ac8b126..957f2110e93a 100644 --- a/pkgs/by-name/de/dediprog-sf100/package.nix +++ b/pkgs/by-name/de/dediprog-sf100/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; udevRules = pkgs.writeText "dediprog.rules" '' - ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="dada", MODE="660", GROUP="plugdev" + ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="dada", MODE="660", GROUP="plugdev", TAG+="uaccess" ''; installPhase = '' From a3d7d0dce350a3feb7256999c7200b24d596a491 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Wed, 19 Nov 2025 09:31:22 +0100 Subject: [PATCH 03/14] dediprog-sf100: Use tag attribute Signed-off-by: Felix Singer --- pkgs/by-name/de/dediprog-sf100/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/de/dediprog-sf100/package.nix b/pkgs/by-name/de/dediprog-sf100/package.nix index 957f2110e93a..188fabb21f11 100644 --- a/pkgs/by-name/de/dediprog-sf100/package.nix +++ b/pkgs/by-name/de/dediprog-sf100/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "DediProgSW"; repo = "SF100Linux"; - rev = "V${finalAttrs.dediprogVersion}"; + tag = "V${finalAttrs.dediprogVersion}"; hash = finalAttrs.dediprogHash; }; From 8b3261dcd8cc903000c7a03905ef53189807324d Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Wed, 19 Nov 2025 14:02:55 +0100 Subject: [PATCH 04/14] dediprog-sf100: Set mainProgram attribute to `dpcmd` Signed-off-by: Felix Singer --- pkgs/by-name/de/dediprog-sf100/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/de/dediprog-sf100/package.nix b/pkgs/by-name/de/dediprog-sf100/package.nix index 188fabb21f11..05c3d2a373ac 100644 --- a/pkgs/by-name/de/dediprog-sf100/package.nix +++ b/pkgs/by-name/de/dediprog-sf100/package.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation (finalAttrs: { thillux felixsinger ]; + mainProgram = "dpcmd"; }; }) From 24fcc7cf1492fe2a31ad74aeb9d2ee87f236634b Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 21 Nov 2025 19:22:18 +0100 Subject: [PATCH 05/14] electrs: 0.10.10 -> 0.11.0 --- pkgs/by-name/el/electrs/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/el/electrs/package.nix b/pkgs/by-name/el/electrs/package.nix index 6d497461e810..70a0dc81c99a 100644 --- a/pkgs/by-name/el/electrs/package.nix +++ b/pkgs/by-name/el/electrs/package.nix @@ -2,26 +2,26 @@ lib, rustPlatform, fetchFromGitHub, - rocksdb_7_10, + rocksdb_9_10, }: let - rocksdb = rocksdb_7_10; + rocksdb = rocksdb_9_10; in rustPlatform.buildRustPackage (finalAttrs: { pname = "electrs"; - version = "0.10.10"; + version = "0.11.0"; src = fetchFromGitHub { owner = "romanz"; repo = "electrs"; rev = "v${finalAttrs.version}"; - hash = "sha256-FSsTo2m88U7t6wMXaSuYhF5bCMRq11EBQsq6uiMdF7c="; + hash = "sha256-MDdxu+ITEEUs+DXKfRKlwStT94Bv8tYIqh2eQlqPgrQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-hVPtnMqaFH+1QJ52ZG9vZ3clsMTsEpvF5JjTKWoKSPE="; + hash = "sha256-D8edLG3Zr/Qsk42husi/Nw1wGjvMb71Enl8hbifvLbk="; }; # needed for librocksdb-sys From 619ffab529670a2b3530d7f8406c9073f250708b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Nov 2025 07:42:51 +0000 Subject: [PATCH 06/14] neocmakelsp: 0.8.26 -> 0.9.0 --- pkgs/by-name/ne/neocmakelsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix index 2639474d60a3..53d3c8e88f4f 100644 --- a/pkgs/by-name/ne/neocmakelsp/package.nix +++ b/pkgs/by-name/ne/neocmakelsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.8.26"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-fJmkCi2xG0cJUxolhuT4Kuf0kK5tFLHcM9eFE1BDeFQ="; + hash = "sha256-TFan3gJ5j2sCfM3p8a2bqPwqzn1hFN8ZyCAwAdHRZBU="; }; - cargoHash = "sha256-DEIQbnNDd1JQpeVLwvpQccZlIRb/e1JTQtYdi4UsJq8="; + cargoHash = "sha256-lqD6o+QXapd6JWMEYUWpAmZK4EWkIlqc5ZN/fMmySTs="; nativeBuildInputs = [ installShellFiles From 0f6b06a4d65023898263d7e3af55199a48f7d6fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Nov 2025 08:14:42 +0000 Subject: [PATCH 07/14] androidStudioPackages.beta: 2025.2.2.5 -> 2025.2.2.6 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 77ff2a196ab4..ce67176a49cb 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -20,8 +20,8 @@ let sha256Hash = "sha256-eqai5G60OH3vH06iK4tKK2gCHvqFBlNHxBGHQ5/SUJY="; }; betaVersion = { - version = "2025.2.2.5"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 1" - sha256Hash = "sha256-Z6HV0kx/28cn5IdUxQCWI5mhc8IIG64+9SAOzjzwcuI="; + version = "2025.2.2.6"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 2" + sha256Hash = "sha256-ciu+To5Kcus8FPDz1D43AD+qOqfPHaW4JsEBr9fx2PE="; }; latestVersion = { version = "2025.2.3.1"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 1" From 338ecb71ce08411e73f09f4c3e9df5bae3ea0c1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Nov 2025 10:03:50 +0000 Subject: [PATCH 08/14] terraform-providers.exoscale_exoscale: 0.67.0 -> 0.67.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6e13fe4da13d..3cbddbdb0cd0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -372,11 +372,11 @@ "vendorHash": "sha256-GEdgHY2cIiXxeIYev7zbGd4c+IyZZfeZtSj9Z/gG6E4=" }, "exoscale_exoscale": { - "hash": "sha256-dOgWrQoVMLGpTYaa80f22BS14073Iio9JrCyJl36caY=", + "hash": "sha256-8FIZO+iRqYa7y5Li8GoGnFT069vx4q4KczCgEB4SKuk=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.67.0", + "rev": "v0.67.1", "spdx": "MPL-2.0", "vendorHash": null }, From 6489d7d561d05a502eb159a7398946c4cb185461 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Nov 2025 10:34:41 +0000 Subject: [PATCH 09/14] terraform-providers.grafana_grafana: 4.14.0 -> 4.17.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6e13fe4da13d..5df3c7a18e3a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -462,13 +462,13 @@ "vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U=" }, "grafana_grafana": { - "hash": "sha256-ou8S+18+vFmfPr1GuB2KjHzDCAQ0OT/a/KcrivnWo0g=", + "hash": "sha256-GfWspwBBff1Ds9RFFKFTGLDpuS7VSVwG/9iXrR9Q5e8=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.14.0", + "rev": "v4.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jdf10eXhTj0FGkG9bCZQYclbuGWwS0HAZX+4oET7oTQ=" + "vendorHash": "sha256-Fs6xaO8I56mXRUqc63tTB+yQQeSZo72rMlgwqTyqH6Q=" }, "gridscale_gridscale": { "hash": "sha256-XdBGD94kMLcB3ycZABVT+skiPg7rYyR4ycfvnubj6JM=", From 6d5dec6f5a62c3f8cddf389c9c63bb77a31b39b6 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Nov 2025 18:27:20 +0000 Subject: [PATCH 10/14] prometheus-node-exporter: Add versionCheckHook --- pkgs/by-name/pr/prometheus-node-exporter/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index 00fdc2b5c3b9..be970ad93fc4 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -3,6 +3,7 @@ buildGoModule, fetchFromGitHub, nixosTests, + versionCheckHook, }: buildGoModule rec { @@ -36,6 +37,11 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) node; }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = { description = "Prometheus exporter for machine metrics"; mainProgram = "node_exporter"; From 2f90ad13bfd82bb2efcc728df919846563ccfe01 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Nov 2025 18:29:19 +0000 Subject: [PATCH 11/14] prometheus-node-exporter: Use finalAttrs --- .../by-name/pr/prometheus-node-exporter/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index be970ad93fc4..ef311b013bdd 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -6,15 +6,14 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "node_exporter"; version = "1.10.2"; - rev = "v${version}"; src = fetchFromGitHub { - inherit rev; owner = "prometheus"; repo = "node_exporter"; + tag = "${finalAttrs.version}"; hash = "sha256-UaybbRmcvifXNwTNXg7mIYN9JnonSxwG62KfvU5auIE="; }; @@ -28,8 +27,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/prometheus/common/version.Version=${version}" - "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" + "-X github.com/prometheus/common/version.Revision=unknown" "-X github.com/prometheus/common/version.Branch=unknown" "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" "-X github.com/prometheus/common/version.BuildDate=unknown" @@ -46,7 +45,7 @@ buildGoModule rec { description = "Prometheus exporter for machine metrics"; mainProgram = "node_exporter"; homepage = "https://github.com/prometheus/node_exporter"; - changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/prometheus/node_exporter/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ benley @@ -55,4 +54,4 @@ buildGoModule rec { Frostman ]; }; -} +}) From b4128c780603bf6d27db5819be3b6b05c64b4318 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Nov 2025 17:58:22 +0000 Subject: [PATCH 12/14] promethus-alertmanager: Use finalAttrs --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 18b4dc52e323..651706399c79 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -7,15 +7,14 @@ nixosTests, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "alertmanager"; version = "0.29.0"; - rev = "v${version}"; src = fetchFromGitHub { - inherit rev; owner = "prometheus"; repo = "alertmanager"; + tag = "v${finalAttrs.version}"; hash = "sha256-2uP4JCbQEe7/en5sBq/k73kqK6YVmuLvfiUy1fqPitw="; }; @@ -31,8 +30,8 @@ buildGoModule rec { t = "github.com/prometheus/common/version"; in [ - "-X ${t}.Version=${version}" - "-X ${t}.Revision=${src.rev}" + "-X ${t}.Version=${finalAttrs.version}" + "-X ${t}.Revision=unknown" "-X ${t}.Branch=unknown" "-X ${t}.BuildUser=nix@nixpkgs" "-X ${t}.BuildDate=unknown" @@ -53,7 +52,7 @@ buildGoModule rec { meta = with lib; { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/alertmanager"; - changelog = "https://github.com/prometheus/alertmanager/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/prometheus/alertmanager/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ benley @@ -62,4 +61,4 @@ buildGoModule rec { Frostman ]; }; -} +}) From fc317efeeac928923844aa557b9179828c6371c5 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Nov 2025 18:05:04 +0000 Subject: [PATCH 13/14] prometheus-alertmanager: Migrate to by-name --- .../pr/prometheus-alertmanager/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{servers/monitoring/prometheus/alertmanager.nix => by-name/pr/prometheus-alertmanager/package.nix} (100%) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/by-name/pr/prometheus-alertmanager/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/alertmanager.nix rename to pkgs/by-name/pr/prometheus-alertmanager/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cf76772b6b0..3689dcff2953 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9528,7 +9528,6 @@ with pkgs; postgrest = haskellPackages.postgrest.bin; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix From 9b1b9887f5ed7fd9ffe6af0056be582faf9a7dc2 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Nov 2025 18:10:01 +0000 Subject: [PATCH 14/14] prometheus-alertmanager: Add versionCheckHook --- pkgs/by-name/pr/prometheus-alertmanager/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/pr/prometheus-alertmanager/package.nix b/pkgs/by-name/pr/prometheus-alertmanager/package.nix index 651706399c79..297ccdaf93b3 100644 --- a/pkgs/by-name/pr/prometheus-alertmanager/package.nix +++ b/pkgs/by-name/pr/prometheus-alertmanager/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, installShellFiles, nixosTests, + versionCheckHook, }: buildGoModule (finalAttrs: { @@ -49,11 +50,17 @@ buildGoModule (finalAttrs: { passthru.tests = { inherit (nixosTests.prometheus) alertmanager; }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = with lib; { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/alertmanager"; changelog = "https://github.com/prometheus/alertmanager/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; + mainProgram = "alertmanager"; maintainers = with maintainers; [ benley fpletz