From 2ddba3215ad468d27c1afd82737f20dd2cdc2044 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 18:32:22 +0300 Subject: [PATCH 01/61] dwm-status: migrate to `pkgs/by-name` --- .../dwm/dwm-status.nix => by-name/dw/dwm-status/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/window-managers/dwm/dwm-status.nix => by-name/dw/dwm-status/package.nix} (100%) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/by-name/dw/dwm-status/package.nix similarity index 100% rename from pkgs/applications/window-managers/dwm/dwm-status.nix rename to pkgs/by-name/dw/dwm-status/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1cc2650e9c0..04a3cdcf8e63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12059,8 +12059,6 @@ with pkgs; patches = config.dwm.patches or [ ]; }; - dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or [ ]; }; From 9b2228216a35d42922e5daf14e84fe1dd6845072 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 18:35:27 +0300 Subject: [PATCH 02/61] dwm-status: replace `rec` with `finalAttrs` --- pkgs/by-name/dw/dwm-status/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/dw/dwm-status/package.nix b/pkgs/by-name/dw/dwm-status/package.nix index 0da73c866772..55bc5836a37e 100644 --- a/pkgs/by-name/dw/dwm-status/package.nix +++ b/pkgs/by-name/dw/dwm-status/package.nix @@ -7,7 +7,7 @@ libnotify, makeWrapper, pkg-config, - xorg, + libX11, enableAlsaUtils ? true, alsa-utils, coreutils, @@ -31,14 +31,14 @@ let ]; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dwm-status"; version = "1.10.0"; src = fetchFromGitHub { owner = "Gerschtli"; - repo = pname; - tag = version; + repo = "dwm-status"; + tag = finalAttrs.version; hash = "sha256-982JFYZroskKppAOZjBWOFt624FfRjhXpYN57s/cM50="; }; @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { dbus gdk-pixbuf libnotify - xorg.libX11 + libX11 ]; useFetchCargoVendor = true; @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Highly performant and configurable DWM status service"; homepage = "https://github.com/Gerschtli/dwm-status"; - changelog = "https://github.com/Gerschtli/dwm-status/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Gerschtli/dwm-status/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gepbird @@ -74,4 +74,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "dwm-status"; platforms = lib.platforms.linux; }; -} +}) From 2f3357375f2a03b87698e8c2fea965dca57e05d7 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 19:31:59 +0300 Subject: [PATCH 03/61] dmenu{,-wayland}: migrate to `pkgs/by-name` --- .../dmenu/wayland.nix => by-name/dm/dmenu-wayland/package.nix} | 0 .../misc/dmenu/default.nix => by-name/dm/dmenu/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 3 deletions(-) rename pkgs/{applications/misc/dmenu/wayland.nix => by-name/dm/dmenu-wayland/package.nix} (100%) rename pkgs/{applications/misc/dmenu/default.nix => by-name/dm/dmenu/package.nix} (100%) diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/by-name/dm/dmenu-wayland/package.nix similarity index 100% rename from pkgs/applications/misc/dmenu/wayland.nix rename to pkgs/by-name/dm/dmenu-wayland/package.nix diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/by-name/dm/dmenu/package.nix similarity index 100% rename from pkgs/applications/misc/dmenu/default.nix rename to pkgs/by-name/dm/dmenu/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04a3cdcf8e63..233f7dc24f4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12008,9 +12008,6 @@ with pkgs; djview4 = djview; - dmenu = callPackage ../applications/misc/dmenu { }; - dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { }; - dmenu-rs-enable-plugins = dmenu-rs.override { enablePlugins = true; }; dmensamenu = callPackage ../applications/misc/dmensamenu { From 86fe2555d72dbfd6e3c12b43d1af37e9c9774dea Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 19:50:35 +0300 Subject: [PATCH 04/61] dmenu-wayland: modernize --- pkgs/by-name/dm/dmenu-wayland/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/dm/dmenu-wayland/package.nix b/pkgs/by-name/dm/dmenu-wayland/package.nix index eb9a12416714..0c5fbb9a360a 100644 --- a/pkgs/by-name/dm/dmenu-wayland/package.nix +++ b/pkgs/by-name/dm/dmenu-wayland/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { pname = "dmenu-wayland"; - version = "unstable-2023-05-18"; + version = "0-unstable-2023-05-18"; src = fetchFromGitHub { owner = "nyyManni"; @@ -63,12 +63,12 @@ stdenv.mkDerivation { --prefix PATH : $out/bin ''; - meta = with lib; { - license = licenses.mit; - platforms = platforms.linux; + meta = { + license = lib.licenses.mit; + platforms = lib.platforms.linux; description = "Efficient dynamic menu for wayland (wlroots)"; homepage = "https://github.com/nyyManni/dmenu-wayland"; - maintainers = with maintainers; [ rewine ]; + maintainers = with lib.maintainers; [ rewine ]; mainProgram = "dmenu-wl"; }; } From 3762fddd15ef00c7eb7897a8da1f5f209d914893 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 21:55:44 +0300 Subject: [PATCH 05/61] dmenu: allow setting options in nixpkgs.config Also added `extraLibs`, like st has --- pkgs/by-name/dm/dmenu/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix index 8479bf15d382..3a3694646cc5 100644 --- a/pkgs/by-name/dm/dmenu/package.nix +++ b/pkgs/by-name/dm/dmenu/package.nix @@ -9,8 +9,11 @@ pkg-config, zlib, writeText, - conf ? null, - patches ? null, + # customization + config, + conf ? config.dmenu.conf or null, + extraLibs ? config.dmenu.extraLibs or [ ], + patches ? config.dmenu.patches or [ ], # update script dependencies gitUpdater, }: @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { libXinerama zlib libXft - ]; + ] ++ extraLibs; inherit patches; From 2a48fede3a25f75619ee3363638a3c96bc553771 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:04:46 +0300 Subject: [PATCH 06/61] dmenu: remove pkg-config It's no longer necessary + this allows for compiling with extraLibs, if config.mk was patched --- pkgs/by-name/dm/dmenu/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix index 3a3694646cc5..41c301226052 100644 --- a/pkgs/by-name/dm/dmenu/package.nix +++ b/pkgs/by-name/dm/dmenu/package.nix @@ -6,7 +6,6 @@ libX11, libXinerama, libXft, - pkg-config, zlib, writeText, # customization @@ -27,7 +26,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8="; }; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig libX11 @@ -53,9 +51,6 @@ stdenv.mkDerivation rec { makeFlagsArray+=( PREFIX="$out" CC="$CC" - # default config.mk hardcodes dependent libraries and include paths - INCS="`$PKG_CONFIG --cflags fontconfig x11 xft xinerama`" - LIBS="`$PKG_CONFIG --libs fontconfig x11 xft xinerama`" ) ''; From 1a1cc628def37d9ca1ed9d8a4dacafb667749a10 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:06:51 +0300 Subject: [PATCH 07/61] dmenu: remove unused zlib --- pkgs/by-name/dm/dmenu/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix index 41c301226052..55121250203a 100644 --- a/pkgs/by-name/dm/dmenu/package.nix +++ b/pkgs/by-name/dm/dmenu/package.nix @@ -6,7 +6,6 @@ libX11, libXinerama, libXft, - zlib, writeText, # customization config, @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { fontconfig libX11 libXinerama - zlib libXft ] ++ extraLibs; From 6db88336326c1f440e8cbd691321d4ab30b5d3eb Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:09:58 +0300 Subject: [PATCH 08/61] dmenu: modernize --- pkgs/by-name/dm/dmenu/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix index 55121250203a..6996b62c0e47 100644 --- a/pkgs/by-name/dm/dmenu/package.nix +++ b/pkgs/by-name/dm/dmenu/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchzip, fontconfig, libX11, libXinerama, @@ -16,13 +16,13 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmenu"; version = "5.3"; - src = fetchurl { - url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; - sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8="; + src = fetchzip { + url = "https://dl.suckless.org/tools/dmenu-${finalAttrs.version}.tar.gz"; + hash = "sha256-3lRLa3NIg+7bUSDnef/rVL3XwvWWHTIPQ8mcVaq/SVI="; }; buildInputs = [ @@ -54,17 +54,17 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { url = "git://git.suckless.org/dmenu"; }; - meta = with lib; { + meta = { description = "Generic, highly customizable, and efficient menu for the X Window System"; homepage = "https://tools.suckless.org/dmenu"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pSub globin qusic _0david0mp ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "dmenu"; }; -} +}) From 7e06a7c2d0504ab94b3611922d47bd64bb374672 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:20:17 +0300 Subject: [PATCH 09/61] st: move nixpkgs.config options inside the recipe --- pkgs/applications/terminal-emulators/st/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 7657895061d7..23de36481dc5 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -9,9 +9,10 @@ libXft, ncurses, writeText, - conf ? null, - patches ? [ ], - extraLibs ? [ ], + config, + conf ? config.st.conf or null, + patches ? config.st.patches or [ ], + extraLibs ? config.st.extraLibs or [ ], nixosTests, # update script dependencies gitUpdater, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 233f7dc24f4d..8044575c5462 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1567,11 +1567,7 @@ with pkgs; emojiSupport = true; }; - st = callPackage ../applications/terminal-emulators/st { - conf = config.st.conf or null; - patches = config.st.patches or [ ]; - extraLibs = config.st.extraLibs or [ ]; - }; + st = callPackage ../applications/terminal-emulators/st { }; xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; From 593f2739dda83a0788dd4430873e2c056f10ed62 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:25:24 +0300 Subject: [PATCH 10/61] {mcaimi-,x,}st: move to pkgs/by-name --- .../st/mcaimi-st.nix => by-name/mc/mcaimi-st/package.nix} | 0 .../st/default.nix => by-name/st/st/package.nix} | 0 .../st/xst.nix => by-name/xs/xst/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 4 deletions(-) rename pkgs/{applications/terminal-emulators/st/mcaimi-st.nix => by-name/mc/mcaimi-st/package.nix} (100%) rename pkgs/{applications/terminal-emulators/st/default.nix => by-name/st/st/package.nix} (100%) rename pkgs/{applications/terminal-emulators/st/xst.nix => by-name/xs/xst/package.nix} (100%) diff --git a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/pkgs/by-name/mc/mcaimi-st/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/mcaimi-st.nix rename to pkgs/by-name/mc/mcaimi-st/package.nix diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/by-name/st/st/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/default.nix rename to pkgs/by-name/st/st/package.nix diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/by-name/xs/xst/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/xst.nix rename to pkgs/by-name/xs/xst/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8044575c5462..01664628ec11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1567,10 +1567,6 @@ with pkgs; emojiSupport = true; }; - st = callPackage ../applications/terminal-emulators/st { }; - xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; - mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; From f55945287895f6461ef285769cb7f195cc0daa21 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:33:40 +0300 Subject: [PATCH 11/61] mcaimi-st: update meta.homepage, modernize --- pkgs/by-name/mc/mcaimi-st/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix index 972b6523df16..30a3093cef8e 100644 --- a/pkgs/by-name/mc/mcaimi-st/package.nix +++ b/pkgs/by-name/mc/mcaimi-st/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { pname = "mcaimi-st"; - version = "0.pre+unstable=2021-08-30"; + version = "0-unstable-2021-08-30"; src = fetchFromGitHub { owner = "mcaimi"; @@ -40,12 +40,12 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { - homepage = "https://github.com/gnotclub/xst"; + meta = { + homepage = "https://github.com/mcaimi/st"; description = "Suckless Terminal fork"; mainProgram = "st"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } From f89c42fe609a3d30a6cee2f1e0795e8dc9d5fd6f Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:37:28 +0300 Subject: [PATCH 12/61] mcaimi-st: add update script --- pkgs/by-name/mc/mcaimi-st/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix index 30a3093cef8e..3d09c7b795a3 100644 --- a/pkgs/by-name/mc/mcaimi-st/package.nix +++ b/pkgs/by-name/mc/mcaimi-st/package.nix @@ -8,6 +8,7 @@ libXft, ncurses, pkg-config, + nix-update-script, }: stdenv.mkDerivation { @@ -40,6 +41,10 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = { homepage = "https://github.com/mcaimi/st"; description = "Suckless Terminal fork"; From b3cb8b7372aade4f8dcd7dc048279e8b0dcb8450 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 19:38:12 +0000 Subject: [PATCH 13/61] mcaimi-st: 0-unstable-2021-08-30 -> 0-unstable-2025-03-12 --- pkgs/by-name/mc/mcaimi-st/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix index 3d09c7b795a3..0e82a0f8e3b1 100644 --- a/pkgs/by-name/mc/mcaimi-st/package.nix +++ b/pkgs/by-name/mc/mcaimi-st/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "mcaimi-st"; - version = "0-unstable-2021-08-30"; + version = "0-unstable-2025-03-12"; src = fetchFromGitHub { owner = "mcaimi"; repo = "st"; - rev = "1a8cad03692ee6d32c03a136cdc76bdb169e15d8"; - hash = "sha256-xyVEvD8s1J9Wj9NB4Gg+0ldvde7M8IVpzCOTttC1IY0="; + rev = "f1ae5cdafadceaf622e1c0ff56da04803bf658b3"; + hash = "sha256-rGru0LqbuJQ4QOts6xYDztAST0K5HCys2gUPZg2w4SE="; }; nativeBuildInputs = [ From fab0654a5fa42434ccd93cf16ccde68bbe3c83b0 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:47:24 +0300 Subject: [PATCH 14/61] mcaimi-st: set installFlags the Nix way --- pkgs/by-name/mc/mcaimi-st/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix index 0e82a0f8e3b1..daf38a1f725e 100644 --- a/pkgs/by-name/mc/mcaimi-st/package.nix +++ b/pkgs/by-name/mc/mcaimi-st/package.nix @@ -33,13 +33,10 @@ stdenv.mkDerivation { ncurses ]; - installPhase = '' - runHook preInstall - - TERMINFO=$out/share/terminfo make install PREFIX=$out - - runHook postInstall - ''; + installFlags = [ + "TERMINFO=$(out)/share/terminfo" + "PREFIX=$(out)" + ]; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; From 9810b3608d2e4b3654eb147e2136d0aec40c1918 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:48:50 +0300 Subject: [PATCH 15/61] xst: modernize --- pkgs/by-name/xs/xst/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix index 904f939c6b8e..0605ebcafddd 100644 --- a/pkgs/by-name/xs/xst/package.nix +++ b/pkgs/by-name/xs/xst/package.nix @@ -10,15 +10,15 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xst"; version = "0.10.0"; src = fetchFromGitHub { owner = "gnotclub"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-2pXR9U2tTBd0lyeQ3BjnXW+Ne9aUQg/+rnpmYPPG06A="; + repo = "xst"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2pXR9U2tTBd0lyeQ3BjnXW+Ne9aUQg/+rnpmYPPG06A="; }; nativeBuildInputs = [ @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/gnotclub/xst"; description = "Simple terminal fork that can load config from Xresources"; mainProgram = "xst"; - license = licenses.mit; - maintainers = [ maintainers.vyp ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vyp ]; + platforms = lib.platforms.linux; }; -} +}) From 7f58a908dbf0e56a52a8a1ed75dba69274e30451 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:50:04 +0300 Subject: [PATCH 16/61] xst: set installFlags the Nix way --- pkgs/by-name/xs/xst/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix index 0605ebcafddd..1699ab5c2d69 100644 --- a/pkgs/by-name/xs/xst/package.nix +++ b/pkgs/by-name/xs/xst/package.nix @@ -32,13 +32,10 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; - installPhase = '' - runHook preInstall - - TERMINFO=$out/share/terminfo make install PREFIX=$out - - runHook postInstall - ''; + installFlags = [ + "TERMINFO=$(out)/share/terminfo" + "PREFIX=$(out)" + ]; meta = { homepage = "https://github.com/gnotclub/xst"; From d01eaee630edbaf5c0cdef20189383d37babdd0c Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:55:16 +0300 Subject: [PATCH 17/61] xst: add update script --- pkgs/by-name/xs/xst/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix index 1699ab5c2d69..8a089ac6ee85 100644 --- a/pkgs/by-name/xs/xst/package.nix +++ b/pkgs/by-name/xs/xst/package.nix @@ -8,6 +8,7 @@ libXft, ncurses, pkg-config, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -37,6 +38,8 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=$(out)" ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/gnotclub/xst"; description = "Simple terminal fork that can load config from Xresources"; From 28ae06f536a1128ce0dc18f292e297011b81d6c2 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 23:04:07 +0300 Subject: [PATCH 18/61] st: modernize --- pkgs/by-name/st/st/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/st/st/package.nix b/pkgs/by-name/st/st/package.nix index 23de36481dc5..c9ce15bbca56 100644 --- a/pkgs/by-name/st/st/package.nix +++ b/pkgs/by-name/st/st/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchzip, pkg-config, fontconfig, freetype, @@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "st"; version = "0.9.2"; - src = fetchurl { + src = fetchzip { url = "https://dl.suckless.org/st/st-${finalAttrs.version}.tar.gz"; - hash = "sha256-ayFdT0crIdYjLzDyIRF6d34kvP7miVXd77dCZGf5SUs="; + hash = "sha256-pFyK4XvV5Z4gBja8J996zF6wkdgQCNVccqUJ5+ejB/w="; }; outputs = [ @@ -74,12 +74,12 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; - license = licenses.mit; - maintainers = with maintainers; [ qusic ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qusic ]; + platforms = lib.platforms.unix; mainProgram = "st"; }; }) From df0a8d38ec8a8e657b86f7e289b2eb591dcab315 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 13 Jul 2025 08:34:36 +0300 Subject: [PATCH 19/61] dwm: move `nixpkgs.config` logic inside the recipe Also added support for `conf` and `extraLibs` --- pkgs/applications/window-managers/dwm/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index efb5f34363ce..62fb5a5e1043 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -7,8 +7,11 @@ libXft, writeText, pkg-config, - patches ? [ ], - conf ? null, + # customization + config, + conf ? config.dwm.conf or null, + patches ? config.dwm.patches or [ ], + extraLibs ? config.dwm.extraLibs or [ ], # update script dependencies gitUpdater, }: @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { libX11 libXinerama libXft - ]; + ] ++ extraLibs; prePatch = '' sed -i "s@/usr/local@$out@" config.mk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01664628ec11..ba9311b383ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12042,11 +12042,7 @@ with pkgs; wlroots = wlroots_0_18; }; - dwm = callPackage ../applications/window-managers/dwm { - # dwm is configured entirely through source modification. Allow users to - # specify patches through nixpkgs.config.dwm.patches - patches = config.dwm.patches or [ ]; - }; + dwm = callPackage ../applications/window-managers/dwm { }; evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or [ ]; From 8fb8dc8382d2a38cf5121763725a005468692874 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 13 Jul 2025 08:40:22 +0300 Subject: [PATCH 20/61] dwm: move to pkgs/by-name --- .../dwm/default.nix => by-name/dw/dwm/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/window-managers/dwm/default.nix => by-name/dw/dwm/package.nix} (100%) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/by-name/dw/dwm/package.nix similarity index 100% rename from pkgs/applications/window-managers/dwm/default.nix rename to pkgs/by-name/dw/dwm/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba9311b383ce..fa4f58b9d35f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12042,8 +12042,6 @@ with pkgs; wlroots = wlroots_0_18; }; - dwm = callPackage ../applications/window-managers/dwm { }; - evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or [ ]; }; From 051dd774d103bf43f06e248890bb3056ee02118b Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 13 Jul 2025 08:58:06 +0300 Subject: [PATCH 21/61] dwm: take PREFIX and CC from environment --- pkgs/by-name/dw/dwm/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix index 62fb5a5e1043..43a27b4f86a2 100644 --- a/pkgs/by-name/dw/dwm/package.nix +++ b/pkgs/by-name/dw/dwm/package.nix @@ -33,12 +33,14 @@ stdenv.mkDerivation rec { libXft ] ++ extraLibs; - prePatch = '' - sed -i "s@/usr/local@$out@" config.mk - ''; - - preBuild = lib.optional stdenv.hostPlatform.isStatic '' - makeFlagsArray+=(LDFLAGS="$(${stdenv.cc.targetPrefix}pkg-config --static --libs x11 xinerama xft)") + preBuild = '' + makeFlagsArray+=( + "PREFIX=$out" + "CC=$CC" + ${lib.optionalString stdenv.hostPlatform.isStatic '' + LDFLAGS="$(${stdenv.cc.targetPrefix}pkg-config --static --libs x11 xinerama xft)" + ''} + ) ''; # Allow users set their own list of patches @@ -52,8 +54,6 @@ stdenv.mkDerivation rec { in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - passthru.updateScript = gitUpdater { url = "git://git.suckless.org/dwm"; }; From 8764e26bd16ecac263f2d0dc0a09a185aa4ab3a7 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 13 Jul 2025 08:58:46 +0300 Subject: [PATCH 22/61] dwm: modernize --- pkgs/by-name/dw/dwm/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix index 43a27b4f86a2..39dcd69080b4 100644 --- a/pkgs/by-name/dw/dwm/package.nix +++ b/pkgs/by-name/dw/dwm/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchzip, libX11, libXinerama, libXft, @@ -16,13 +16,13 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dwm"; version = "6.5"; - src = fetchurl { - url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; - sha256 = "sha256-Ideev6ny+5MUGDbCZmy4H0eExp1k5/GyNS+blwuglyk="; + src = fetchzip { + url = "https://dl.suckless.org/dwm/dwm-${finalAttrs.version}.tar.gz"; + hash = "sha256-Cc4B8evvuRxOjbeOhg3oAs3Nxi/msxWg950/eiq536w="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isStatic pkg-config; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { url = "git://git.suckless.org/dwm"; }; - meta = with lib; { + meta = { homepage = "https://dwm.suckless.org/"; description = "Extremely fast, small, and dynamic window manager for X"; longDescription = '' @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { multiple tags. Selecting certain tags displays all windows with these tags. ''; - license = licenses.mit; - maintainers = with maintainers; [ neonfuz ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ neonfuz ]; + platforms = lib.platforms.all; mainProgram = "dwm"; }; -} +}) From 8900b9d7245e8f70a85f7d871e5f8fa512bc29f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Jul 2025 14:08:15 +0000 Subject: [PATCH 23/61] wordpress: 6.8.1 -> 6.8.2 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 962f5bb20c7b..fc3422913324 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -6,7 +6,7 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec { hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY="; }; wordpress_6_8 = { - version = "6.8.1"; - hash = "sha256-PGVNB5vELE6C/yCmlIxFYpPhBLZ2L/fJ/JSAcbMxAyg="; + version = "6.8.2"; + hash = "sha256-2Fpy45K/6GaBazwuvGpEaZByqlDMOmIPHE7S8TtkXis="; }; } From 12a1a8c85c9c164f38f3e2491a8912bb970a014f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 23 Jul 2025 21:47:46 +0800 Subject: [PATCH 24/61] fdroidcl: 0.7.0 -> 0.8.1 --- .../fd/fdroidcl/package.nix} | 24 +++++----- .../fdroidcl/go_mod_version_update.patch | 47 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 11 insertions(+), 62 deletions(-) rename pkgs/{development/mobile/fdroidcl/default.nix => by-name/fd/fdroidcl/package.nix} (52%) delete mode 100644 pkgs/development/mobile/fdroidcl/go_mod_version_update.patch diff --git a/pkgs/development/mobile/fdroidcl/default.nix b/pkgs/by-name/fd/fdroidcl/package.nix similarity index 52% rename from pkgs/development/mobile/fdroidcl/default.nix rename to pkgs/by-name/fd/fdroidcl/package.nix index 60bccaef812a..f637760f5871 100644 --- a/pkgs/development/mobile/fdroidcl/default.nix +++ b/pkgs/by-name/fd/fdroidcl/package.nix @@ -5,20 +5,18 @@ android-tools, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "fdroidcl"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { - owner = "mvdan"; + owner = "Hoverth"; repo = "fdroidcl"; - rev = "v${version}"; - hash = "sha256-tqhs3b/DHfnGOm9qcM56NSzt1GJflJfbemkp7+nXbug="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SmPtMNHxktyhc0/izWmAzcfCXqF2BpPNJjsrqRlU1K0="; }; - patches = [ ./go_mod_version_update.patch ]; - - vendorHash = "sha256-BWbwhHjfmMjiRurrZfW/YgIzJUH/hn+7qonD0BcTLxs="; + vendorHash = "sha256-PNj5gkFj+ruxv1I4SezJxebDO2e1qGTYp3ZgekRLNt0="; postPatch = '' substituteInPlace adb/{server,device}.go \ @@ -28,11 +26,11 @@ buildGoModule rec { # TestScript/search attempts to connect to fdroid doCheck = false; - meta = with lib; { + meta = { description = "F-Droid command line interface written in Go"; mainProgram = "fdroidcl"; - homepage = "https://github.com/mvdan/fdroidcl"; - license = licenses.bsd3; - maintainers = with maintainers; [ aleksana ]; + homepage = "https://github.com/Hoverth/fdroidcl"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ aleksana ]; }; -} +}) diff --git a/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch b/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch deleted file mode 100644 index 079ea02c0a15..000000000000 --- a/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/go.mod b/go.mod -index a482585..5c836dd 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,10 +1,19 @@ - module mvdan.cc/fdroidcl - --go 1.16 -+go 1.18 - - require ( - github.com/kr/pretty v0.3.0 - github.com/rogpeppe/go-internal v1.9.0 - github.com/schollz/progressbar/v3 v3.13.0 -- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect -+) -+ -+require ( -+ github.com/kr/text v0.2.0 // indirect -+ github.com/mattn/go-runewidth v0.0.14 // indirect -+ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect -+ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect -+ github.com/rivo/uniseg v0.4.3 // indirect -+ golang.org/x/sys v0.4.0 // indirect -+ golang.org/x/term v0.4.0 // indirect - ) -diff --git a/go.sum b/go.sum -index 7befc16..d8523cb 100644 ---- a/go.sum -+++ b/go.sum -@@ -23,8 +23,6 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ - github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= - github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= - github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= --github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= --github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= - github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= - github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= - github.com/schollz/progressbar/v3 v3.13.0 h1:9TeeWRcjW2qd05I8Kf9knPkW4vLM/hYoa6z9ABvxje8= -@@ -38,7 +36,4 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= - golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= --gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= --gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= --gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= - gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09c0c94c3a96..d004a90940c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2122,8 +2122,6 @@ with pkgs; fast-cli = nodePackages.fast-cli; - fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { }; - ### TOOLS/TYPESETTING/TEX advi = callPackage ../tools/typesetting/tex/advi { From 6526f0640925b7a62375cbf75edbaca54b4c3b4f Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Tue, 22 Jul 2025 15:50:19 -0400 Subject: [PATCH 25/61] clojure-lsp: Use the check hooks and remove redundant version checks --- pkgs/by-name/cl/clojure-lsp/package.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index 561a18d097f6..9ccd78034f9f 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -5,6 +5,8 @@ fetchurl, fetchFromGitHub, writeScript, + writableTmpDirAsHomeHook, + versionCheckHook, testers, }: @@ -25,21 +27,11 @@ buildGraalvmNativeImage (finalAttrs: { "--features=clj_easy.graal_build_time.InitClojureClasses" ]; - doCheck = true; - checkPhase = '' - runHook preCheck - - export HOME="$(mktemp -d)" - ./clojure-lsp --version | fgrep -q '${finalAttrs.version}' - - runHook postCheck - ''; - - passthru.tests.version = testers.testVersion { - inherit (finalAttrs) version; - package = finalAttrs.finalPackage; - command = "clojure-lsp --version"; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; passthru.updateScript = writeScript "update-clojure-lsp" '' #!/usr/bin/env nix-shell From 458368fb7ac99f0fba12b55f1bae045da75fb714 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 21:38:19 +0000 Subject: [PATCH 26/61] sdl_gamecontrollerdb: 0-unstable-2025-07-10 -> 0-unstable-2025-07-18 --- pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index e3df4161d946..dcfa2604ef00 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2025-07-10"; + version = "0-unstable-2025-07-18"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "0f63b5ea2932d1af560fcd874b9b8562b5c69403"; - hash = "sha256-AZkLkSxdNbybf5AJTPHsBd0BQmZ+/1YWg2mSSlUlZTs="; + rev = "dce2d3593c6a96a57716d13d58aa3b1d4965fe6f"; + hash = "sha256-a1466lU8pCQJcJSIe3cEplUcbVnYoABvnm/QQhwsuDw="; }; dontBuild = true; From e88fc16309084acb3a167f9eacbd758b8004758d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 23 Jul 2025 23:55:20 +0200 Subject: [PATCH 27/61] tor-browser: 14.5.4 -> 14.5.5 https://blog.torproject.org/new-release-tor-browser-1455/ --- pkgs/by-name/to/tor-browser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index d185f91634f7..aed15b05cb18 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.5.4"; + version = "14.5.5"; sources = { x86_64-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-27Wq9VwFB85swQZIRQMKZgeUeb/SgQ04aaWmZtlpY9s="; + hash = "sha256-rJGhgSSktaeH7KSOtf1KjJbrl/m4sdz+9UdjUN9ovz0="; }; i686-linux = fetchurl { @@ -131,7 +131,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-OgexrnQWGYSf9g3Le/LyBcpGo3xFqpCMq1NUHF5fi9M="; + hash = "sha256-mvlx817/vLi4QyA0aSPyAuWSBfMLjfkFG9Zse9rmSzw="; }; }; From ca97a99f888b58404f36ae5b05b10ab399d472b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 23 Jul 2025 23:57:25 +0200 Subject: [PATCH 28/61] mullvad-browser: 14.5.4 -> 14.5.5 https://github.com/mullvad/mullvad-browser/releases/tag/14.5.5 --- pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 028a70fe6c14..92d10debd1cd 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.5.4"; + version = "14.5.5"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-DJEc+2GJHxG49euVpwH8h/yLoR6DVn0a0ZUFS429XaA="; + hash = "sha256-PwqxYylW602XAKBvEJk4Rl8q6nWBGH3pFvTOuAYtr/w="; }; }; From b611ce9c3df1006e9722179c71d730778af5d9d9 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Wed, 23 Jul 2025 18:49:10 -0400 Subject: [PATCH 29/61] nix-init: modernize Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/ni/nix-init/package.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index 0f996a78bf6b..f11d31556646 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -11,12 +11,11 @@ openssl, zlib, zstd, - stdenv, spdx-license-list-data, nix, nurl, - testers, - nix-init, + versionCheckHook, + nix-update-script, }: let @@ -25,14 +24,14 @@ let }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "nix-init"; version = "0.3.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-init"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0RLEPVtYnwYH+pMnpO0/Evbp7x9d0RMobOVAqwgMJz4="; }; @@ -87,16 +86,18 @@ rustPlatform.buildRustPackage rec { ZSTD_SYS_USE_PKG_CONFIG = true; }; - passthru.tests.version = testers.testVersion { - package = nix-init; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Command line tool to generate Nix packages from URLs"; mainProgram = "nix-init"; homepage = "https://github.com/nix-community/nix-init"; - changelog = "https://github.com/nix-community/nix-init/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; + changelog = "https://github.com/nix-community/nix-init/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ figsoda ]; }; -} +}) From a16526c762b3482a1b6bea4109b1038451b2ccd5 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 24 Jul 2025 00:54:37 +0200 Subject: [PATCH 30/61] wofi: separate dev output --- pkgs/by-name/wo/wofi/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/wo/wofi/package.nix b/pkgs/by-name/wo/wofi/package.nix index 587ac8d03732..b7bf125930d3 100644 --- a/pkgs/by-name/wo/wofi/package.nix +++ b/pkgs/by-name/wo/wofi/package.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { pname = "wofi"; version = "1.4.1"; + outputs = [ + "out" + "dev" + ]; + src = fetchFromSourcehut { repo = "wofi"; owner = "~scoopta"; From 83ab2934b02505bfd6dbe3365111a077f9b3f548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 03:48:45 +0000 Subject: [PATCH 31/61] python3Packages.nitransforms: 24.1.2 -> 25.0.0 --- .../python-modules/nitransforms/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index f7509287253c..4a43c19b92eb 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -7,25 +7,25 @@ nibabel, numpy, scipy, + setuptools, setuptools-scm, - toml, }: buildPythonPackage rec { pname = "nitransforms"; - version = "24.1.2"; + version = "25.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-JKlKM9bd3pTTBp/xVj9Ywd/+Ok7lxo05AF01eeOBeoE="; + hash = "sha256-bGyrFyB8pjE3zLymQTWXdPAUxDopFQdJ00aQszlOp5g="; }; build-system = [ + setuptools setuptools-scm - toml ]; dependencies = [ @@ -49,12 +49,12 @@ buildPythonPackage rec { "nitransforms.patched" ]; - meta = with lib; { + meta = { homepage = "https://nitransforms.readthedocs.io"; description = "Geometric transformations for images and surfaces"; mainProgram = "nb-transform"; changelog = "https://github.com/nipy/nitransforms/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From e43c01c11d45c80bd28ae8c8cb6a5e5e1fee71f4 Mon Sep 17 00:00:00 2001 From: yvt Date: Thu, 17 Jul 2025 01:39:31 +0900 Subject: [PATCH 32/61] do-agent: remove yvt from maintainers --- pkgs/by-name/do/do-agent/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix index b22911ed1b7f..95438e444052 100644 --- a/pkgs/by-name/do/do-agent/package.nix +++ b/pkgs/by-name/do/do-agent/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { ''; homepage = "https://github.com/digitalocean/do-agent"; license = licenses.asl20; - maintainers = with maintainers; [ yvt ]; + maintainers = [ ]; platforms = platforms.linux; }; } From cf28a1eaeb634d86a12bc6e029de6e3ae3afc97d Mon Sep 17 00:00:00 2001 From: yvt Date: Thu, 24 Jul 2025 09:02:08 +0900 Subject: [PATCH 33/61] maintainers: drop yvt --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 04a1e3c0b6d3..98c1117a3c65 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27996,12 +27996,6 @@ githubId = 65394961; name = "Yves Straten"; }; - yvt = { - email = "i@yvt.jp"; - github = "yvt"; - githubId = 5253988; - name = "yvt"; - }; yzx9 = { email = "yuan.zx@outlook.com"; github = "yzx9"; From ec52fb35db93a413508c472f23fb1cbb312c21b9 Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 7 Jul 2025 16:05:41 +0800 Subject: [PATCH 34/61] p4est-sc: 0-unstable-2021-06-14 -> 2.8.7 --- pkgs/by-name/p4/p4est-sc/package.nix | 78 +++++++++++++++++++ .../science/math/p4est-sc/default.nix | 78 ------------------- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 79 insertions(+), 83 deletions(-) create mode 100644 pkgs/by-name/p4/p4est-sc/package.nix delete mode 100644 pkgs/development/libraries/science/math/p4est-sc/default.nix diff --git a/pkgs/by-name/p4/p4est-sc/package.nix b/pkgs/by-name/p4/p4est-sc/package.nix new file mode 100644 index 000000000000..1cf4510c4071 --- /dev/null +++ b/pkgs/by-name/p4/p4est-sc/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + mpi, + zlib, + jansson, + mpiCheckPhaseHook, + debug ? false, + mpiSupport ? true, + + # passthru.tests + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "p4est-sc"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "cburstedde"; + repo = "libsc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oeEYNaYx1IdEWefctgUZVUa6wnb8K3z5Il2Y9MtQwBc="; + }; + + strictDeps = true; + + postPatch = '' + echo $version > .tarball-version + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ] ++ lib.optional mpiSupport mpi; + + propagatedBuildInputs = [ + zlib + jansson + ]; + + configureFlags = + [ + "LDFLAGS=-lm" + ] + ++ lib.optionals mpiSupport [ + "--enable-mpi" + "CC=mpicc" + ] + ++ lib.optional debug "--enable-debug"; + + __darwinAllowLocalNetworking = mpiSupport; + + nativeCheckInputs = lib.optionals mpiSupport [ + mpiCheckPhaseHook + ]; + + doCheck = true; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + description = "Support for parallel scientific applications"; + longDescription = '' + The SC library provides support for parallel scientific applications. + Its main purpose is to support the p4est software library, hence + this package is called p4est-sc, but it works standalone, too. + ''; + homepage = "https://www.p4est.org/"; + downloadPage = "https://github.com/cburstedde/libsc.git"; + pkgConfigModules = [ "libsc" ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix deleted file mode 100644 index 559742f678e2..000000000000 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - mpiCheckPhaseHook, - autoreconfHook, - pkg-config, - p4est-sc-debugEnable ? true, - p4est-sc-mpiSupport ? true, - mpi, - zlib, -}: - -let - dbg = lib.optionalString debugEnable "-dbg"; - debugEnable = p4est-sc-debugEnable; - mpiSupport = p4est-sc-mpiSupport; -in -stdenv.mkDerivation { - pname = "p4est-sc${dbg}"; - version = "unstable-2021-06-14"; - - # fetch an untagged snapshot of the prev3-develop branch - src = fetchFromGitHub { - owner = "cburstedde"; - repo = "libsc"; - rev = "1ae814e3fb1cc5456652e0d77550386842cb9bfb"; - sha256 = "14vm0b162jh8399pgpsikbwq4z5lkrw9vfzy3drqykw09n6nc53z"; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - propagatedNativeBuildInputs = lib.optional mpiSupport mpi; - propagatedBuildInputs = [ zlib ]; - inherit debugEnable mpiSupport; - - postPatch = '' - echo "dist_scaclocal_DATA += config/sc_v4l2.m4" >> Makefile.am - ''; - preConfigure = '' - echo "2.8.0" > .tarball-version - ${lib.optionalString mpiSupport "unset CC"} - ''; - - configureFlags = - [ "--enable-pthread=-pthread" ] - ++ lib.optional debugEnable "--enable-debug" - ++ lib.optional mpiSupport "--enable-mpi"; - - dontDisableStatic = true; - enableParallelBuilding = true; - makeFlags = [ "V=0" ]; - - nativeCheckInputs = lib.optionals mpiSupport [ - mpiCheckPhaseHook - ]; - - # disallow Darwin checks due to prototype incompatibility of qsort_r - # to be fixed in a future version of the source code - doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; - - meta = { - branch = "prev3-develop"; - description = "Support for parallel scientific applications"; - longDescription = '' - The SC library provides support for parallel scientific applications. - Its main purpose is to support the p4est software library, hence - this package is called p4est-sc, but it works standalone, too. - ''; - homepage = "https://www.p4est.org/"; - downloadPage = "https://github.com/cburstedde/libsc.git"; - license = lib.licenses.lgpl21Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1106bcc38e36..1607e8dae266 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15397,11 +15397,7 @@ with pkgs; nodejs = nodejs_20; }; - p4est-sc = callPackage ../development/libraries/science/math/p4est-sc { - p4est-sc-debugEnable = false; - }; - - p4est-sc-dbg = callPackage ../development/libraries/science/math/p4est-sc { }; + p4est-sc-dbg = p4est-sc.override { debug = true; }; p4est = callPackage ../development/libraries/science/math/p4est { }; From 556cd7c66d2bd38c07416996e31734b9e2a79102 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 10 Jun 2025 06:53:26 +0800 Subject: [PATCH 35/61] p4est: 0-unstable-2021-06-22 -> 2.8.7 --- pkgs/by-name/p4/p4est/package.nix | 88 +++++++++++++++++++ .../libraries/science/math/p4est/default.nix | 77 ---------------- .../science/math/p4est/p4est-metis.patch | 26 ------ pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 89 insertions(+), 108 deletions(-) create mode 100644 pkgs/by-name/p4/p4est/package.nix delete mode 100644 pkgs/development/libraries/science/math/p4est/default.nix delete mode 100644 pkgs/development/libraries/science/math/p4est/p4est-metis.patch diff --git a/pkgs/by-name/p4/p4est/package.nix b/pkgs/by-name/p4/p4est/package.nix new file mode 100644 index 000000000000..996422b56194 --- /dev/null +++ b/pkgs/by-name/p4/p4est/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + metis, + p4est-sc, + mpi, + mpiCheckPhaseHook, + debug ? false, + withMetis ? true, + mpiSupport ? true, + + # passthru.tests + testers, +}: +let + p4est-sc' = p4est-sc.override { inherit mpi mpiSupport debug; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "p4est"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "cburstedde"; + repo = "p4est"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8JvKaYOP4IO1Xmim74KNHvMLOV3y9VRoT76RBCaRyhI="; + }; + + strictDeps = true; + + postPatch = '' + echo $version > .tarball-version + + substituteInPlace Makefile.am \ + --replace-fail "@P4EST_SC_AMFLAGS@" "-I ${p4est-sc}/share/aclocal" + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ] ++ lib.optional mpiSupport mpi; + + buildInputs = [ + metis + ]; + + propagatedBuildInputs = [ p4est-sc' ]; + + configureFlags = + [ + "--with-sc=${p4est-sc'}" + "--with-metis" + "--enable-p6est" + "LDFLAGS=-lm" + ] + ++ lib.optionals mpiSupport [ + "--enable-mpi" + "CC=mpicc" + ] + ++ lib.optional debug "--enable-debug"; + + doCheck = true; + + __darwinAllowLocalNetworking = mpiSupport; + + nativeCheckInputs = lib.optionals mpiSupport [ + mpiCheckPhaseHook + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + description = "Parallel AMR on Forests of Octrees"; + longDescription = '' + The p4est software library provides algorithms for parallel AMR. + AMR refers to Adaptive Mesh Refinement, a technique in scientific + computing to cover the domain of a simulation with an adaptive mesh. + ''; + homepage = "https://www.p4est.org/"; + downloadPage = "https://github.com/cburstedde/p4est.git"; + pkgConfigModules = [ "p4est" ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix deleted file mode 100644 index 31613dd64259..000000000000 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - pkg-config, - p4est-withMetis ? true, - metis, - p4est-sc, - mpiCheckPhaseHook, -}: - -let - inherit (p4est-sc) debugEnable mpiSupport; - dbg = lib.optionalString debugEnable "-dbg"; - withMetis = p4est-withMetis; -in -stdenv.mkDerivation { - pname = "p4est${dbg}"; - version = "unstable-2021-06-22"; - - # fetch an untagged snapshot of the prev3-develop branch - src = fetchFromGitHub { - owner = "cburstedde"; - repo = "p4est"; - rev = "7423ac5f2b2b64490a7a92e5ddcbd251053c4dee"; - sha256 = "0vffnf48rzw6d0as4c3x1f31b4kapmdzr1hfj5rz5ngah72gqrph"; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - propagatedBuildInputs = [ p4est-sc ]; - buildInputs = lib.optional withMetis metis; - inherit debugEnable mpiSupport withMetis; - - patches = [ ./p4est-metis.patch ]; - postPatch = '' - sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am - ''; - preAutoreconf = '' - echo "2.8.0" > .tarball-version - ''; - preConfigure = lib.optionalString mpiSupport '' - unset CC - ''; - - configureFlags = - p4est-sc.configureFlags ++ [ "--with-sc=${p4est-sc}" ] ++ lib.optional withMetis "--with-metis"; - - inherit (p4est-sc) - makeFlags - dontDisableStatic - enableParallelBuilding - doCheck - ; - - nativeCheckInputs = lib.optionals mpiSupport [ - mpiCheckPhaseHook - ]; - - meta = { - branch = "prev3-develop"; - description = "Parallel AMR on Forests of Octrees"; - longDescription = '' - The p4est software library provides algorithms for parallel AMR. - AMR refers to Adaptive Mesh Refinement, a technique in scientific - computing to cover the domain of a simulation with an adaptive mesh. - ''; - homepage = "https://www.p4est.org/"; - downloadPage = "https://github.com/cburstedde/p4est.git"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/science/math/p4est/p4est-metis.patch b/pkgs/development/libraries/science/math/p4est/p4est-metis.patch deleted file mode 100644 index 46b8dc8af08c..000000000000 --- a/pkgs/development/libraries/science/math/p4est/p4est-metis.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/p4est_connectivity.c b/src/p4est_connectivity.c -index 95339136..c93528f2 100644 ---- a/src/p4est_connectivity.c -+++ b/src/p4est_connectivity.c -@@ -3715,6 +3715,7 @@ p4est_connectivity_reorder_newid (sc_MPI_Comm comm, int k, - sc_array_t * newid) - { - const int n = (int) conn->num_trees; -+ int metis_n; - int *xadj; - int *adjncy; - int *part; -@@ -3862,10 +3863,12 @@ p4est_connectivity_reorder_newid (sc_MPI_Comm comm, int k, - - P4EST_GLOBAL_INFO ("Entering metis\n"); - /* now call metis */ -+ metis_n = n; - P4EST_EXECUTE_ASSERT_INT -- (METIS_PartGraphRecursive (&n, &ncon, xadj, adjncy, NULL, NULL, -+ (METIS_PartGraphRecursive (&metis_n, &ncon, xadj, adjncy, NULL, NULL, - NULL, &k, NULL, NULL, NULL, &volume, part), - METIS_OK); -+ P4EST_ASSERT (metis_n == n); - P4EST_GLOBAL_INFO ("Done metis\n"); - - P4EST_GLOBAL_STATISTICSF ("metis volume %d\n", volume); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1607e8dae266..0eb7afae7ba4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15399,11 +15399,7 @@ with pkgs; p4est-sc-dbg = p4est-sc.override { debug = true; }; - p4est = callPackage ../development/libraries/science/math/p4est { }; - - p4est-dbg = callPackage ../development/libraries/science/math/p4est { - p4est-sc = p4est-sc-dbg; - }; + p4est-dbg = p4est.override { debug = true; }; sageWithDoc = sage.override { withDoc = true; }; From e48d12554c410e16fc5ece2458023ed31b5a4f53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Jul 2025 02:12:43 +0200 Subject: [PATCH 36/61] nixos/tlsrpt: fix permissions for postfix Same as with other services giving postfix access, this needs to happen for the postfix user. Adding supplementary group permissions to the systemd unit does not propagate to child processes that ultimately call the unix domain socket. --- nixos/modules/services/mail/tlsrpt.nix | 14 +++++++++++--- nixos/tests/tlsrpt.nix | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix index 732679c9b05a..83b219443fd0 100644 --- a/nixos/modules/services/mail/tlsrpt.nix +++ b/nixos/modules/services/mail/tlsrpt.nix @@ -270,9 +270,17 @@ in }; }; - systemd.services.postfix.serviceConfig.SupplementaryGroups = mkIf ( - config.services.postfix.enable && cfg.collectd.configurePostfix - ) [ "tlsrpt" ]; + users.users.tlsrpt = { + isSystemUser = true; + group = "tlsrpt"; + }; + users.groups.tlsrpt = { }; + + users.users.postfix.extraGroups = + lib.mkIf (config.services.postfix.enable && cfg.collectd.configurePostfix) + [ + "tlsrpt" + ]; systemd.services.tlsrpt-collectd = { description = "TLSRPT datagram collector"; diff --git a/nixos/tests/tlsrpt.nix b/nixos/tests/tlsrpt.nix index d93ac78b5240..92a7d0cda78e 100644 --- a/nixos/tests/tlsrpt.nix +++ b/nixos/tests/tlsrpt.nix @@ -35,7 +35,7 @@ # Enabling postfix should put sendmail as the sendmail setting machine.succeed("grep -q sendmail_script=sendmail /etc/tlsrpt/reportd.cfg") - machine.succeed("systemctl show --property SupplementaryGroups postfix.service | grep tlsrpt") + machine.succeed("getent group tlsrpt | grep -q postfix") machine.log(machine.succeed("systemd-analyze security tlsrpt-collectd.service tlsrpt-reportd.service | grep -v ✓")) ''; From 27ef136c3b352b060f9cf2a0388527bf8e9c17b3 Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 24 Jul 2025 13:18:38 +0900 Subject: [PATCH 37/61] gh: 2.76.0 -> 2.76.1 https://github.com/cli/cli/releases/tag/v2.76.1 Signed-off-by: misilelab --- pkgs/by-name/gh/gh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 3608a13dd2c3..2af5d3736a3b 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.76.0"; + version = "2.76.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-69vSmV+CKRQOuUxsiBBlZBSRqwEtJil4oAse+RSuSVM="; + hash = "sha256-5m7BIjJqggQZYwxfUlsU+WBw6BxK0PBQYOSrw3I7gLA="; }; - vendorHash = "sha256-go5hB6vjZZrTa3PMHWpv+J0yNewijXkRD8iGL6O2GgM="; + vendorHash = "sha256-NXyqWeiESkLVb2Bb88MoD+4ssvfOy0HGHFAOrT83t0c="; nativeBuildInputs = [ installShellFiles ]; From 7460b458f017cc667423560979b6744a4a5549d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Jul 2025 03:49:43 +0000 Subject: [PATCH 38/61] terraform-providers.scaleway: 2.56.0 -> 2.57.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 031a7eb731e9..867138a9ee32 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1156,13 +1156,13 @@ "vendorHash": "sha256-HKmIl/GjGJZmhWLrK3lMjYo1F5nmo+U9ZpvBo5hDH/0=" }, "scaleway": { - "hash": "sha256-3MLtSOcMCIl3pFJH/xKK/fPQcRrW2Nx4b2jCZiUE2aw=", + "hash": "sha256-rSchMweT5Hxz2tpX6V7cBzntJzIeFB46bjV9lkaIWAQ=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.56.0", + "rev": "v2.57.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-EmLIBIyZ52iWua3c69m8JCQKsj8qykuGjo6Tf8Y+sM8=" + "vendorHash": "sha256-p9rESR1A1SEYlvjf8du2j2yAlI39LsMRcPvyyJIwWdg=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From 3c6ca4bc53f853a5b5f1e50581f4f74e26916831 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 08:45:37 +0000 Subject: [PATCH 39/61] terraform-providers.digitalocean: 2.57.0 -> 2.60.0 --- .../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 867138a9ee32..2cc090af927d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-XUwHBwxkOG4oK0W1IcvIWgov3AShMmeYPoc0gu6YEwY=", + "hash": "sha256-+JX1EJBRJee6nvn5srwGWSE++LagHw+n1bgfZTBXzKU=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.57.0", + "rev": "v2.60.0", "spdx": "MPL-2.0", "vendorHash": null }, From 6ecfdbdd62e25c20bbde68a49f508bf9c45ff548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Jul 2025 02:37:04 +0000 Subject: [PATCH 40/61] terraform-providers.dnsimple: 1.9.1 -> 1.10.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 2cc090af927d..2b5f81758fb5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -390,13 +390,13 @@ "vendorHash": "sha256-xu5t7VaLvbwo/Q7Xb4mkNt7UjU+hzfk7NgfFlxwbIhU=" }, "dnsimple": { - "hash": "sha256-7o8shnWECaCLTCvmXrJ2eYloxtln2A2No8OK8Ig36qE=", + "hash": "sha256-Zx4M0TKamyfm5Z5EAtiHWQQTNX/VT0EkAaHM7x/2SGk=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.9.1", + "rev": "v1.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0axKIqF1t4AW1PPi+fHfsFQLRrjhpsloQIZ9clR+8Gc=" + "vendorHash": "sha256-M6Z/wMOKhQncuHAhkSPfWT77b14lIZ/sVQT7DmM60FI=" }, "docker": { "hash": "sha256-THMGfpRrPFReRdYusdrJGnUKEUtxy4Pu+HdcceK2FNc=", From aef54566228215591cf16c23ac877a76faaad19c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Jul 2025 05:06:41 +0000 Subject: [PATCH 41/61] terraform-providers.buildkite: 1.21.0 -> 1.22.1 --- .../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 2b5f81758fb5..1f9d92adae1e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -216,13 +216,13 @@ "vendorHash": "sha256-r4Q7b7ZzK+ZDXhIabTSgP7HY5Q51Hz5ErnW+nV+ZIqA=" }, "buildkite": { - "hash": "sha256-oc6zIV2czDE1rPjCAFLxJ0OJ9ChNi7rd2cfT1NEDwfk=", + "hash": "sha256-XhO780RsMUx5J/GJ8xcFjN97b6XJ8eHuQjOQiuFUWHY=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.21.0", + "rev": "v1.22.1", "spdx": "MIT", - "vendorHash": "sha256-PzKn6QxmsD7p1WjKsXnETipDMs1QdbmWyrIV05JSNlo=" + "vendorHash": "sha256-UgGfLh7kDOQK/EwuHQM0HoAaN95WyPWwypGPboPY9+s=" }, "ccloud": { "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=", From 428f4ab6245f7c07827dad13f1f9c02217608a5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 12:12:38 +0000 Subject: [PATCH 42/61] terraform-providers.google: 6.40.0 -> 6.44.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 1f9d92adae1e..8d618688d82e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -516,13 +516,13 @@ "vendorHash": "sha256-G325isVj6JKs58i59V/A51vE8mzgxk/1EqSVvb6TiH4=" }, "google": { - "hash": "sha256-i3gKrK5EcIQbVwJI7sfRam3H0mideGO1VgPuzL4l+Xw=", + "hash": "sha256-la+jN1muZqAqgR2emDhB71L01gAVtH60OLZ199h6Cq0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v6.40.0", + "rev": "v6.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YZI6zhxXU2aABARP6GcTMeU98F4+imbL1vKIEMzsJHM=" + "vendorHash": "sha256-s5tShmcGeY/PivF2soP0PWZp9MlqYt9yvsjrNArqYGk=" }, "google-beta": { "hash": "sha256-DPvZzEAFrQaHwaIRbQoVsZpc1xEhgd3HvO6qF8uwBgE=", From 8b8cd0ae54055555e9a60c330f33b20433009185 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 17:39:23 +0000 Subject: [PATCH 43/61] terraform-providers.signalfx: 9.16.0 -> 9.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 8d618688d82e..c4f7a33b93ce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1201,13 +1201,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-8G+IYK3vt6kyNtccmuz0OtTWvZPH8p9kWSY0guAdASo=", + "hash": "sha256-EoehHn7j3nnXzpHEjX4FQSO1na9xSmVpnTiPnTqUrpE=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.16.0", + "rev": "v9.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1iRf42VxhKvmmasQ3IaPBbLcRmB8SavFXzwXlmFwYfU=" + "vendorHash": "sha256-404/DlCtz0yAaM8zJ3ngJ2/DwoUJImjIqKYwdigHl4U=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", From 0c76f796426a9199344ad27ef13ba074179d9d85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 07:40:38 +0000 Subject: [PATCH 44/61] terraform-providers.datadog: 3.67.0 -> 3.68.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 c4f7a33b93ce..b6b69feaf911 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -326,13 +326,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-u+iiWStjO2OFMkQp8Skynb4seTK61ETSKrEP+6o16LA=", + "hash": "sha256-BywMGXd6UedyjcVjT0SUq9D+1FpgR9yvas/vWdkLmW8=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.67.0", + "rev": "v3.68.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fLdJxYuN4p0ZwXUXcN6BtATcwVg9asgdjHg9nOPcxK4=" + "vendorHash": "sha256-AQ+/+NCBBj4ptBGHJmibH6QZo4560dRRbs55SqY9buE=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", From c98cca9ed7455411a3d5b7fca50ca78f516889b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 06:39:29 +0000 Subject: [PATCH 45/61] terraform-providers.opentelekomcloud: 1.36.42 -> 1.36.43 --- .../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 b6b69feaf911..51f16dab1657 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -976,13 +976,13 @@ "vendorHash": "sha256-ke7Dd3I/6Mja8SzrDy/f4GGgcB3C9xpCT4KiCr0PNZw=" }, "opentelekomcloud": { - "hash": "sha256-u2bKqEPsytjYU5NeY7NZmDemHA4hgqSn8fKiJxwCNKI=", + "hash": "sha256-HbtNk5UAr+q09mOICkKzh9wIP0HM9MFVVR6gEIBdnvs=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.42", + "rev": "v1.36.43", "spdx": "MPL-2.0", - "vendorHash": "sha256-lgz2WH6vuwjC6tpkVDAneLcXLZSwNfJnd/xRXyLW1b4=" + "vendorHash": "sha256-9ese4fUPQifxbvcK6QiSIet++WFaK9XuyBv6oJiIOGA=" }, "openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=", From 3f133d92e7e2438c79ac9442747e185e5e140407 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 06:30:40 +0000 Subject: [PATCH 46/61] terraform-providers.migadu: 2025.6.19 -> 2025.7.17 --- .../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 51f16dab1657..d88e85930417 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -822,13 +822,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-91aWxh7q1q46FaORwgZJ9Aqm/xrF7hLjqbKB9PZD5Ts=", + "hash": "sha256-3q9vhHt4VDqcIYHEZjJY0whvGPQWMDHkGsAQEES8EkE=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.6.19", + "rev": "2025.7.17", "spdx": "0BSD", - "vendorHash": "sha256-eAPRtvpaVBirZ5WwmUi53S8oCKCrZyZNHiak76whLuQ=" + "vendorHash": "sha256-oipY2hwgRrntCxxHPyH06e8p+0fKfAQwhh2iBI4RGHQ=" }, "minio": { "hash": "sha256-q5qpzrkQpT8dkcir7UdadbiLSf2bJry1HjQzMUp6xGw=", From 1c9f0a4a82d3812df8888d5710ac3551d527a6b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 05:39:42 +0000 Subject: [PATCH 47/61] terraform-providers.huaweicloud: 1.76.4 -> 1.76.5 --- .../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 d88e85930417..25e399294c4b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -624,11 +624,11 @@ "vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM=" }, "huaweicloud": { - "hash": "sha256-jXppJtVMPpipXbEhgenVtFP5YxwlQzekquRoZmgoP0Q=", + "hash": "sha256-hop7Uv/llV5oUYXZy5dC4YdMDD3BIBz56aHoB/m8ktI=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.76.4", + "rev": "v1.76.5", "spdx": "MPL-2.0", "vendorHash": null }, From 3c822c41daf24ee8d622a96961270290abd0501a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Jul 2025 15:14:37 +0000 Subject: [PATCH 48/61] terraform-providers.cloudflare: 5.6.0 -> 5.7.1 --- .../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 25e399294c4b..3cab33bd346a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -261,13 +261,13 @@ "vendorHash": "sha256-shRiTPn4A1rmwBnoSlRDfdYuHqSFvL4o6o8vAJutu3Q=" }, "cloudflare": { - "hash": "sha256-RChYMs2i4E+7RqRnYfeQftETUyHMWh/UeUd4/6kNmag=", + "hash": "sha256-GCyynAWMTVbZ58XLpFF8JkFDhdGwavg3VpYtzy6NdOg=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v5.6.0", + "rev": "v5.7.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-BecQ41WKBb+w3eWGH3U/h6GjIKceCB+xDSzQSqrqJ2k=" + "vendorHash": "sha256-erBpARE/YlmD8RjlV3uBE0S8NyH/WR5rmsiY6gO9mSQ=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", From 33e674f53a6cba7f0bf99cf669496bdcb663a424 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Jul 2025 00:25:50 +0000 Subject: [PATCH 49/61] terraform-providers.keycloak: 5.2.0 -> 5.3.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 3cab33bd346a..2a9345ebbb55 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -714,13 +714,13 @@ "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU=" }, "keycloak": { - "hash": "sha256-DqGM7nmblbt0sD5dKzQ7URL9LYbaMSfP01nrjEwyado=", + "hash": "sha256-IgSc6GhXpyH1LCElGALMmEE7MACTvwOzLLQgWl5qEcc=", "homepage": "https://registry.terraform.io/providers/keycloak/keycloak", "owner": "keycloak", "repo": "terraform-provider-keycloak", - "rev": "v5.2.0", + "rev": "v5.3.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-I1e1/Qr/22zAXDcEmfx7BHqKVUl8tcomqBk7SQv8aR4=" + "vendorHash": "sha256-n78cEI1JKtPKZmNnAHykt9oRixZUjddpAIWD3ct3e1c=" }, "kubectl": { "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=", From 4077f0e0524268f9f9077bf3b6d0bf8ad7c29a8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Jul 2025 17:25:05 +0000 Subject: [PATCH 50/61] terraform-providers.google-beta: 6.42.0 -> 6.43.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 2a9345ebbb55..bb73408ad265 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -525,13 +525,13 @@ "vendorHash": "sha256-s5tShmcGeY/PivF2soP0PWZp9MlqYt9yvsjrNArqYGk=" }, "google-beta": { - "hash": "sha256-DPvZzEAFrQaHwaIRbQoVsZpc1xEhgd3HvO6qF8uwBgE=", + "hash": "sha256-FmVPRx7EWPUT38IKKnmPf96FJGHj8FUzNzfYzCm2UeA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.42.0", + "rev": "v6.43.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RTcJIBbeoVX5iZ9kNHnsJHRMKXrizVDtd+Hbh4ZWAFo=" + "vendorHash": "sha256-dvmv7tOY89Gft0qdb33mX90gD7WX/hhPkUSBogMevPA=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", From 197c9efb3cd1754495ae6429f7cb1a3960950df1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 20:20:15 +0000 Subject: [PATCH 51/61] terraform-providers.grafana: 3.25.6 -> 3.25.9 --- .../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 bb73408ad265..e17c1990971b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -543,11 +543,11 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-c/ed8oLmpwE3UjUpwc06O65PItX/3VzuVbn3pzzmrbI=", + "hash": "sha256-qa5ynLx77SEAgJzRHPAj2VtX2ryYpYA2JCH56aZOKuA=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v3.25.6", + "rev": "v3.25.9", "spdx": "MPL-2.0", "vendorHash": "sha256-QTcWJlwE6s4nEPSg6svzIhsJo9p9rk1gQiSr4qSTfns=" }, From fc0402c5e7057a25e2694d78fd9b0c721fd416fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Jul 2025 07:27:06 +0000 Subject: [PATCH 52/61] terraform-providers.sumologic: 3.1.0 -> 3.1.1 --- .../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 e17c1990971b..c51c5a046e28 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1291,13 +1291,13 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-7UjfkRCYay2bHUrnvLbadjSeCrhm6w6RzvRtUznpTDA=", + "hash": "sha256-+/evQ3bpgvjTjRD7BT90rkJtMYPddf95p/MP8QxL5xI=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.1.0", + "rev": "v3.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-jGGdSKXpg/N80lNsHFt1nU1t3oW5uDphGYHhBZmAgxE=" + "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo=" }, "sysdig": { "hash": "sha256-RGHf1JpcPP6VMPZSvj3HsL4Z7EnJKv5Y0T+tSk2hauc=", From a07d518bcf498de8b3e53b1c755de6f6f3e3d645 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Jul 2025 09:33:06 +0000 Subject: [PATCH 53/61] terraform-providers.spacelift: 1.25.0 -> 1.27.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 c51c5a046e28..10ab9ef042ff 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1246,13 +1246,13 @@ "vendorHash": "sha256-4gtM8U//RXpYc4klCgpZS/3ZRzAHfcbOPTnNqlX4H7M=" }, "spacelift": { - "hash": "sha256-lBt1ZtQ5pxX/t4b264LzQwajXDozE9veYOOV3lhfTZQ=", + "hash": "sha256-qz7rOdjC3H+Qu0FXqPG91AlGozhQVPAVow/ZrJHgZ+E=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.25.0", + "rev": "v1.27.0", "spdx": "MIT", - "vendorHash": "sha256-Tft0YjNUtwDH0SliSseXHqMKB2yzQTsAG1Wfc5ihpvE=" + "vendorHash": "sha256-D8VG9CWP4wo+cxb/ewP+b6qAeaBCu6lNwH2leoiBMAc=" }, "spotinst": { "hash": "sha256-BDg9ttK3hDewGPPYVa84uKITMPGHNLO11Yk9juhHr1M=", From 69e76adabf9c20346b0721f72c4801fe30b9731d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Jul 2025 06:18:44 +0000 Subject: [PATCH 54/61] terraform-providers.spotinst: 1.221.0 -> 1.224.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 10ab9ef042ff..2c73b823b779 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1255,13 +1255,13 @@ "vendorHash": "sha256-D8VG9CWP4wo+cxb/ewP+b6qAeaBCu6lNwH2leoiBMAc=" }, "spotinst": { - "hash": "sha256-BDg9ttK3hDewGPPYVa84uKITMPGHNLO11Yk9juhHr1M=", + "hash": "sha256-GU0r4mdV3pv7uv2r/GkDVhvTyHA3lsxd3npSaYdA1Kw=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.221.0", + "rev": "v1.224.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-QXIKjBV19mGdiqFTpoilegMRQ8b1QeCi3TG6ImYydtU=" + "vendorHash": "sha256-vY8ii9HtItuNmbX1ij/orH7RmVV6OhIbKV0VEjQpaig=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", From d931da8540dd3d933b4c2d9b07a0c5cbfe6a4aed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Jul 2025 09:06:17 +0000 Subject: [PATCH 55/61] terraform-providers.pagerduty: 3.26.3 -> 3.27.2 --- .../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 2c73b823b779..a27a21385047 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1012,11 +1012,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-X2u/JSm1JhIxvW5F/8QQqhlVdmAUvP/2Ux5QxmfKejI=", + "hash": "sha256-L4ZqC11Uz7DhzAxcGfCfOEf3s9Fg+YFVa3Imy9GuYBU=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.26.3", + "rev": "v3.27.2", "spdx": "MPL-2.0", "vendorHash": null }, From 51c9ea2e7d280468363a5c5316abbbab8f1e5e1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Jul 2025 06:51:15 +0000 Subject: [PATCH 56/61] terraform-providers.mongodbatlas: 1.37.0 -> 1.38.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 a27a21385047..610097c4d62a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -840,13 +840,13 @@ "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g=" }, "mongodbatlas": { - "hash": "sha256-qoGhHEWhkznrC2G0Rv0/6dPLSjJzME6bz8Ffc3zXDII=", + "hash": "sha256-ZmQw87cBWt8bfLTkeEAopVBEoLCvyAXb001mWK6SnZE=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.37.0", + "rev": "v1.38.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fCor4fuOnOmxvAgejaQyH44FyuQULdXm0GBlffVZxok=" + "vendorHash": "sha256-r874TWc0OCXMin2VYHmOSg4sBjIgCxJUiykw+A7oMsk=" }, "namecheap": { "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", From 2de387499f4ff14d998186fe106250fea0bd8222 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Jul 2025 03:13:23 +0000 Subject: [PATCH 57/61] terraform-providers.alicloud: 1.252.0 -> 1.253.0 --- .../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 610097c4d62a..9f9c42a29f0c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,11 +54,11 @@ "vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q=" }, "alicloud": { - "hash": "sha256-RSZaZ8+m+e2ZbJIcv9In0HJRhuk1rTGmMcUT0hTqwHA=", + "hash": "sha256-HXrE/EsxTPH6lO2jpxz9Mkr6/eSodfLK9Akpv6wGUK0=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.252.0", + "rev": "v1.253.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Ww4l3ffnx0CB+wnQfaiHI+25JtnNsGaTCsmXfd54R4g=" }, From 2a196500c76a9ad4d8609488be467456d0cd3ae4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Jul 2025 02:13:52 +0000 Subject: [PATCH 58/61] terraform-providers.tencentcloud: 1.82.5 -> 1.82.11 --- .../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 9f9c42a29f0c..4316a43436b7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1336,11 +1336,11 @@ "vendorHash": "sha256-PVN3oPT3cxsnWH03twbPSIIERGHCp3XAmcqrQAOULZ4=" }, "tencentcloud": { - "hash": "sha256-MMmBhzhD5SPvTJPzuxAPEmE2ydcwVH4cYAx21ze/umk=", + "hash": "sha256-oHvmCNgGguKdu/LbTyRG/vl9+xGan1vR6T9Ej5MX9l4=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.82.5", + "rev": "v1.82.11", "spdx": "MPL-2.0", "vendorHash": null }, From 63a3e49d3ce85c80776dd8d9af84ba89daaf340f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Jul 2025 23:30:23 +0000 Subject: [PATCH 59/61] terraform-providers.rancher2: 7.2.0 -> 7.3.2 --- .../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 4316a43436b7..1a54bba99ca9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1093,11 +1093,11 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-5NkvGETjJ5eoZC5Ohnoq2y1DQVs2WTrh/wEVO1HQsOA=", + "hash": "sha256-vRZdNxtuXAoCbc7QFL1IAPokug8perRRk/PfRpZJDUQ=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v7.2.0", + "rev": "v7.3.2", "spdx": "MPL-2.0", "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8=" }, From 993b18913d583c559eb8e24e93564552d1bd82be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 23:54:19 +0000 Subject: [PATCH 60/61] terraform-providers.minio: 3.5.4 -> 3.6.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 1a54bba99ca9..91a4975c796c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -831,11 +831,11 @@ "vendorHash": "sha256-oipY2hwgRrntCxxHPyH06e8p+0fKfAQwhh2iBI4RGHQ=" }, "minio": { - "hash": "sha256-q5qpzrkQpT8dkcir7UdadbiLSf2bJry1HjQzMUp6xGw=", + "hash": "sha256-DRWzgVp01qTvyf30GgxWx9/RvjAfoNu3SXZQVQ1jYa0=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.5.4", + "rev": "v3.6.1", "spdx": "AGPL-3.0", "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g=" }, From 3e086ec3b8a2ad0a2cb5a11b53bc20bf72b36408 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 17:51:36 +0000 Subject: [PATCH 61/61] terraform-providers.acme: 2.32.1 -> 2.34.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 91a4975c796c..654be090912b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -18,13 +18,13 @@ "vendorHash": null }, "acme": { - "hash": "sha256-/EY9I0o8vlc+J2KvMwCXApFwDfJuA0NqYraugnJ7tcM=", + "hash": "sha256-GHS8CRu89cd6RMMbEB8ct27w2w4lWdKTbvoihaVpexQ=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.32.1", + "rev": "v2.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eaDEZyweUL9D1e2BhOQJy4ewSWJry7DmXiYzQgBqEes=" + "vendorHash": "sha256-tGfA5LMXECGsu5BIIeMb1+ze7T84Gyrn4h+IzcI79OA=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",