From 40e05909b27c81ba438256576f47a7c1a65a3b40 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Tue, 30 Jun 2026 16:10:23 +0100 Subject: [PATCH 01/12] basiliskii: unstable-2025-07-16 -> unstable-2026-06-30 --- pkgs/by-name/ba/basiliskii/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/basiliskii/package.nix b/pkgs/by-name/ba/basiliskii/package.nix index 256055aa1ca4..061f9be79724 100644 --- a/pkgs/by-name/ba/basiliskii/package.nix +++ b/pkgs/by-name/ba/basiliskii/package.nix @@ -11,15 +11,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "basiliskii"; - version = "unstable-2025-07-16"; + version = "unstable-2026-06-30"; # This src is also used to build pkgs/os-specific/linux/sheep-net # Therefore changes to it may effect the sheep-net package src = fetchFromGitHub { owner = "kanjitalk755"; repo = "macemu"; - rev = "030599cf8d31cb80afae0e1b086b5706dbdd2eea"; - sha256 = "sha256-gxaj+2ymelH6uWmjMLXi64xMNrToo6HZcJ7RW7sVMzo="; + rev = "51b5255eead47203ae78636796a6e6d5713e6705"; + sha256 = "sha256-/8k5NNnfl3PZWFXECtiNdLi2CwACp2b5uiIpSOmWcDI="; }; sourceRoot = "${finalAttrs.src.name}/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; From c3038ff45d1991a40e0fab3bf66db234cc71c496 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 9 Jul 2026 15:16:46 -0500 Subject: [PATCH 02/12] hh-suite: switch from openmp to llvmPackages.openmp and modernize derivation This updates hh-suite to use llvmPackages.openmp instead of requiring openmp to be passed at the call site. The callPackage override in all-packages.nix is removed accordingly. Additional cleanups: - migrate fetchFromGitHub to `tag` + `hash` - enable strictDeps and __structuredAttrs - adopt finalAttrs form for mkDerivation --- .../science/biology/hh-suite/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/biology/hh-suite/default.nix b/pkgs/applications/science/biology/hh-suite/default.nix index d5ba108135c6..0cda352af86e 100644 --- a/pkgs/applications/science/biology/hh-suite/default.nix +++ b/pkgs/applications/science/biology/hh-suite/default.nix @@ -7,19 +7,22 @@ xxd, enableMpi ? false, mpi, - openmp, + llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hh-suite"; version = "3.3.0"; src = fetchFromGitHub { owner = "soedinglab"; repo = "hh-suite"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw="; }; + strictDeps = true; + __structuredAttrs = true; + patches = [ # Should be removable as soon as this upstream PR is merged: https://github.com/soedinglab/hh-suite/pull/357 (fetchpatch { @@ -39,7 +42,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.avx2Support "-DHAVE_AVX2=1" ++ lib.optional stdenv.hostPlatform.sse4_1Support "-DHAVE_SSE4_1=1"; - buildInputs = lib.optional stdenv.cc.isClang openmp ++ lib.optional enableMpi mpi; + buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp ++ lib.optional enableMpi mpi; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -55,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ natsukium ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbf846bfadc4..af60b2b5c5dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10322,9 +10322,7 @@ with pkgs; deep-translator = with python3Packages; toPythonApplication deep-translator; - hh-suite = callPackage ../applications/science/biology/hh-suite { - inherit (llvmPackages) openmp; - }; + hh-suite = callPackage ../applications/science/biology/hh-suite { }; nest-mpi = nest.override { withMpi = true; }; From 068f09b80eaa15211e07d7ff61baee3444b133ff Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 9 Jul 2026 15:19:41 -0500 Subject: [PATCH 03/12] hh-suite: migrate to by-name --- .../hh-suite/default.nix => by-name/hh/hh-suite/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/biology/hh-suite/default.nix => by-name/hh/hh-suite/package.nix} (100%) diff --git a/pkgs/applications/science/biology/hh-suite/default.nix b/pkgs/by-name/hh/hh-suite/package.nix similarity index 100% rename from pkgs/applications/science/biology/hh-suite/default.nix rename to pkgs/by-name/hh/hh-suite/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af60b2b5c5dd..315a9582a977 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10322,8 +10322,6 @@ with pkgs; deep-translator = with python3Packages; toPythonApplication deep-translator; - hh-suite = callPackage ../applications/science/biology/hh-suite { }; - nest-mpi = nest.override { withMpi = true; }; neuron-mpi = neuron.override { useMpi = true; }; From e796608fc046e8ac9577b6e22df3779c2639e923 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jul 2026 00:26:51 +0000 Subject: [PATCH 04/12] oxfmt: 0.57.0 -> 0.58.0 --- pkgs/by-name/ox/oxfmt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index f6fa9d35c54c..581b3741a0f0 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -21,25 +21,25 @@ # A pure Rust build would lack the Prettier plugin functionality. stdenv.mkDerivation (finalAttrs: { pname = "oxfmt"; - version = "0.57.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxfmt_v${finalAttrs.version}"; - hash = "sha256-jwEuBM45CM7KB2Z0NouwtLWQZUx6dWhZxkPUXMmO5eY="; + hash = "sha256-sENfR27kqr/S25+43NiFEJsQrwYLqmuvTC/AhJETGsk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-4D3yTwqzUb4ALTfJwVmGfBIFJ6/5VfeU7edEHpc8d5k="; + hash = "sha256-RkZ6e07SnJArjL0CNo5Qfo/hYrw1HIM4g8bvMJm9ypE="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-QvR4zi9m1V1dvoH82dSsxs4dW6nDCC8IkyTnvsX9IRI="; + hash = "sha256-eSPMGwkgpNgyPS4eebGoGi+gu9xqw8OWGvK7DK2goMk="; }; nativeBuildInputs = [ From 168bc6f699151c900471c75b4267e4edbba4527b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 11 Jul 2026 19:31:06 +0800 Subject: [PATCH 05/12] nixos/mate: Opt into pkexec https://github.com/mate-desktop/mate-power-manager/blob/v1.28.1/src/gpm-brightness.c#L162 Same as 29e29c39b151f037. --- nixos/modules/services/x11/desktop-managers/mate.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 764e903cc2c5..be5ed185e68d 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -141,6 +141,10 @@ in services.libinput.enable = mkDefault true; security.pam.services.mate-screensaver.unixAuth = true; + security.polkit = { + enable = true; + enablePkexecWrapper = mkDefault true; + }; xdg.portal.configPackages = mkDefault [ pkgs.mate-desktop ]; From b27618bc1e638e418d19317111a54a2bef0fbbc8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 11 Jul 2026 19:03:16 +0800 Subject: [PATCH 06/12] mate-power-manager: Fix backlight-helper polkit popup Same as 4d9714d7c9e07f5f. --- pkgs/by-name/ma/mate-power-manager/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mate-power-manager/package.nix b/pkgs/by-name/ma/mate-power-manager/package.nix index 9f67b36f661b..a46e9e41daee 100644 --- a/pkgs/by-name/ma/mate-power-manager/package.nix +++ b/pkgs/by-name/ma/mate-power-manager/package.nix @@ -56,7 +56,16 @@ stdenv.mkDerivation (finalAttrs: { mate-panel ]; - configureFlags = [ "--enable-applets" ]; + configureFlags = [ + "--enable-applets" + "--sbindir=$(out)/bin" + ]; + + postPatch = '' + # Fixes polkit popup after `nixos-rebuild switch`. + substituteInPlace src/gpm-brightness.c \ + --replace-fail 'SBINDIR "/mate-power-backlight-helper' '"/run/current-system/sw/bin/mate-power-backlight-helper' + ''; enableParallelBuilding = true; From 8574e120211d4bf90c28842463ac6fab1b28e4e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jul 2026 18:42:12 +0000 Subject: [PATCH 07/12] panache: 2.60.0 -> 2.61.0 --- pkgs/by-name/pa/panache/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/panache/package.nix b/pkgs/by-name/pa/panache/package.nix index 60bf3c5e1011..c69084bfcec4 100644 --- a/pkgs/by-name/pa/panache/package.nix +++ b/pkgs/by-name/pa/panache/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "panache"; - version = "2.60.0"; + version = "2.61.0"; src = fetchFromGitHub { owner = "jolars"; repo = "panache"; tag = "v${finalAttrs.version}"; - hash = "sha256-NQev+TDZf7NCtPD06ctlhApZYGvsR2PhSJR8gyU8aoo="; + hash = "sha256-ZHiebrY0a7tUx8e6rC/l91rqAyyj/2fasOIhGi4E7FI="; }; - cargoHash = "sha256-Hu5pAR4aQadfxyuhGxR33U1uuu0LTKNMl6CwTuut5/0="; + cargoHash = "sha256-VL3ftML4GUNIqmY52N+Cr1sKmPFwCJp9s2eb1z5Au7o="; nativeBuildInputs = [ installShellFiles From 9986a19f6c4ba8eaa7aa54782b99e374350122da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Jul 2026 22:48:47 +0200 Subject: [PATCH 08/12] postsrsd: 2.0.11 -> 2.2.7 https://github.com/roehling/postsrsd/blob/2.2.7/CHANGELOG.rst --- nixos/modules/services/mail/postsrsd.nix | 12 +++++++++--- pkgs/by-name/po/postsrsd/package.nix | 24 +++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index dac11fdea236..9cf435e4893a 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -281,7 +281,7 @@ in environment.etc."postsrsd.conf".source = configFile; systemd.services.postsrsd = { - description = "PostSRSd SRS rewriting server"; + description = "Sender Rewriting Scheme daemon for Postfix"; after = [ "network.target" "postsrsd-generate-secrets.service" @@ -289,14 +289,20 @@ in before = [ "postfix.service" ]; wantedBy = [ "multi-user.target" ]; requires = [ "postsrsd-generate-secrets.service" ]; - restartTriggers = [ configFile ]; + reloadTriggers = [ configFile ]; serviceConfig = { + Type = "notify-reload"; ExecStart = utils.escapeSystemdExecArgs [ (lib.getExe cfg.package) "-C" "/etc/postsrsd.conf" ]; + ExecReload = toString [ + (lib.getExe' pkgs.coreutils "kill") + "-SIGHUP" + "$MAINPID" + ]; User = cfg.user; Group = cfg.group; RuntimeDirectory = "postsrsd"; @@ -319,7 +325,7 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectSystem = "strict"; - ProtectProc = "invisible"; + ProtectProc = "noaccess"; ProcSubset = "pid"; RemoveIPC = true; RestrictAddressFamilies = diff --git a/pkgs/by-name/po/postsrsd/package.nix b/pkgs/by-name/po/postsrsd/package.nix index 1721a5018c10..bca74e3c5139 100644 --- a/pkgs/by-name/po/postsrsd/package.nix +++ b/pkgs/by-name/po/postsrsd/package.nix @@ -1,37 +1,30 @@ { + cmake, + fetchFromGitHub, lib, libconfuse, stdenv, - fetchFromGitHub, - cmake, - help2man, }: stdenv.mkDerivation (finalAttrs: { pname = "postsrsd"; - version = "2.0.11"; + version = "2.2.7"; src = fetchFromGitHub { owner = "roehling"; repo = "postsrsd"; - rev = finalAttrs.version; - sha256 = "sha256-Q7tXCd2Mz3WIGnIrbb8mfgT7fcmtVS4EtF0ztYmEsmM="; + tag = finalAttrs.version; + hash = "sha256-xBVkhhnLBzCaMFrYze+MdHDJQPJefQdr6jJDTVmN1dU="; }; cmakeFlags = [ - "-DGENERATE_SRS_SECRET=OFF" - "-DINIT_FLAVOR=systemd" - "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" - "-DINSTALL_SYSTEMD_SERVICE=OFF" + (lib.cmakeBool "GENERATE_SRS_SECRET" false) + (lib.cmakeBool "INSTALL_SYSTEMD_SERVICE" false) + (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") ]; - preConfigure = '' - sed -i "s,\"/etc\",\"$out/etc\",g" CMakeLists.txt - ''; - nativeBuildInputs = [ cmake - help2man ]; buildInputs = [ @@ -39,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { + changelog = "https://github.com/roehling/postsrsd/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; mainProgram = "postsrsd"; From 5fd7b6365b82b2a44676d519386bf6e7172cf25c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Jul 2026 22:48:55 +0200 Subject: [PATCH 09/12] postrsd: adopt --- pkgs/by-name/po/postsrsd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/po/postsrsd/package.nix b/pkgs/by-name/po/postsrsd/package.nix index bca74e3c5139..2cfdf214d631 100644 --- a/pkgs/by-name/po/postsrsd/package.nix +++ b/pkgs/by-name/po/postsrsd/package.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "postsrsd"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = [ lib.maintainers.hexa ]; }; }) From eb6c88783df03e85722862b72707d82a947883d5 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 12 Jul 2026 01:07:50 +0200 Subject: [PATCH 10/12] nixos/redmine: Remove period from descriptions using mkEnableOption The period is already added by the function `lib.mkEnableOption`. So drop it from the description text. Signed-off-by: Felix Singer --- nixos/modules/services/misc/redmine.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index c017dd333e1a..8788da104e72 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -245,19 +245,19 @@ in }; components = { - subversion = lib.mkEnableOption "Subversion integration."; + subversion = lib.mkEnableOption "Subversion integration"; - mercurial = lib.mkEnableOption "Mercurial integration."; + mercurial = lib.mkEnableOption "Mercurial integration"; - git = lib.mkEnableOption "git integration."; + git = lib.mkEnableOption "git integration"; - cvs = lib.mkEnableOption "cvs integration."; + cvs = lib.mkEnableOption "cvs integration"; - breezy = lib.mkEnableOption "bazaar integration."; + breezy = lib.mkEnableOption "bazaar integration"; - imagemagick = lib.mkEnableOption "exporting Gant diagrams as PNG."; + imagemagick = lib.mkEnableOption "exporting Gant diagrams as PNG"; - ghostscript = lib.mkEnableOption "exporting Gant diagrams as PDF."; + ghostscript = lib.mkEnableOption "exporting Gant diagrams as PDF"; minimagick_font_path = lib.mkOption { type = lib.types.str; From d674d9f0c1c4e2325f17eab20a7909d27740e702 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 12 Jul 2026 01:34:42 +0200 Subject: [PATCH 11/12] nixos/redmine: Add option for pandoc support allowing document preview The pandoc support allows previewing LibreOffice and Microsoft Office documents using a Markdown rendered text. Add an enable switch for it, so it can be easily used. Signed-off-by: Felix Singer --- nixos/modules/services/misc/redmine.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 8788da104e72..8939ec31cd5a 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -265,6 +265,8 @@ in description = "MiniMagick font path"; example = "/run/current-system/sw/share/X11/fonts/LiberationSans-Regular.ttf"; }; + + pandoc = lib.mkEnableOption "pandoc integration for previewing LibreOffice and Microsoft Office documents"; }; }; }; @@ -310,6 +312,7 @@ in imagemagick_convert_command = lib.optionalString cfg.components.imagemagick "${pkgs.imagemagick}/bin/convert"; gs_command = lib.optionalString cfg.components.ghostscript "${pkgs.ghostscript}/bin/gs"; minimagick_font_path = "${cfg.components.minimagick_font_path}"; + pandoc_command = lib.optionalString cfg.components.pandoc "${pkgs.pandoc}/bin/pandoc"; }; }; From 215a0280434c3ed8f94a9bc7e0e01ef53faf25e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jul 2026 18:09:17 +0000 Subject: [PATCH 12/12] python3Packages.keystoneauth1: 5.14.0 -> 5.15.0 --- pkgs/development/python-modules/keystoneauth1/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 6730b6cf2510..9f81f82eada2 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -11,7 +11,6 @@ os-service-types, oslo-config, oslo-utils, - pbr, pycodestyle, pyyaml, requests, @@ -27,12 +26,12 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.14.0"; + version = "5.15.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-e5QghNPbJ90oXBMlPN/uELBb4ENtscAeFdx0SQIZen8="; + hash = "sha256-ziys39Ao5lvSP/QD1lcuv6s7AG1tLd46qFwmNnWp+7U="; }; build-system = [ setuptools ]; @@ -40,7 +39,6 @@ buildPythonPackage rec { dependencies = [ iso8601 os-service-types - pbr requests stevedore typing-extensions