From 9f28eb66baaabf64629ab62273cd55140e58c708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Dec 2024 03:23:27 +0100
Subject: [PATCH] nixos/nixpkgs: merge lists inside config

eg permittedInsecurePackages
---
 nixos/modules/misc/nixpkgs.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index e1c705eef3b5a..37f8d2d5fb177 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -19,7 +19,19 @@ let
       lhs = optCall lhs_ { inherit pkgs; };
       rhs = optCall rhs_ { inherit pkgs; };
     in
-    lib.recursiveUpdate lhs rhs
+    (lib.zipAttrsWith
+      (
+        name: values:
+        let
+          rhs' = lib.elemAt values 0;
+        in
+        if builtins.isList rhs' then lib.concatLists values else rhs'
+      )
+      [
+        lhs
+        rhs
+      ]
+    )
     // lib.optionalAttrs (lhs ? packageOverrides) {
       packageOverrides =
         pkgs: