From 0f21ed5182a158d2f84e9136f6bf8539fd9a6890 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Mon, 30 Jun 2025 17:19:07 +0200
Subject: [PATCH] bash: change sessionVariables to attrsOf ... (#7300)

I had programs.bash.sessionVariables.CDPATH = ... defined in the
different nix files. One was taken into account and the other one
ignored.

Turns out plain "types.attrs" has the following merging strategy:

===
merge = loc: foldl' (res: def: res // def.value) { };
===

Changing it to "attrsOf", the module system warned me of the conflicting
values.
---
 modules/programs/bash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index 0d30f27f..f706f8df 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -137,7 +137,7 @@ in
 
       sessionVariables = mkOption {
         default = { };
-        type = types.attrs;
+        type = with types; lazyAttrsOf (either str int);
         example = {
           MAILCHECK = 30;
         };