From 2ca02c8bfe0a1d28d0b11da0ccb5274431615a87 Mon Sep 17 00:00:00 2001 From: Alex David Date: Thu, 7 Aug 2025 16:36:13 -0700 Subject: [PATCH] Use camelCase for state attributes --- lib/combinators.nix | 6 +++--- lib/jail.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/combinators.nix b/lib/combinators.nix index 5d55f01..5e36640 100644 --- a/lib/combinators.nix +++ b/lib/combinators.nix @@ -122,9 +122,9 @@ in rec { ''; __functor = _: key: combinator: state: - if lib.elem key state.included-once + if lib.elem key state.includedOnce then state - else combinator (state // { included-once = state.included-once ++ [ key ]; }) + else combinator (state // { includedOnce = state.includedOnce ++ [ key ]; }) ; }; @@ -281,7 +281,7 @@ in rec { See BWRAP(1) for more information and security implications. ''; __functor = _: - state: state // { new-session = false; } + state: state // { newSession = false; } ; }; diff --git a/lib/jail.nix b/lib/jail.nix index e407e2a..0ecc523 100644 --- a/lib/jail.nix +++ b/lib/jail.nix @@ -27,11 +27,11 @@ in { path = []; argv = "\"$@\""; runtime = ""; - new-session = true; + newSession = true; hostname = "jail"; env = {}; namespaces = {}; - included-once = []; # See include-once combinator + includedOnce = []; # See include-once combinator cleanup = []; # See cleanup combinator }; in lib.pipe initialState ( @@ -53,7 +53,7 @@ in { ] s ) (s: if builtins.length s.path > 0 then set-env "PATH" (lib.concatStringsSep ":" s.path) s else s) - (s: if s.new-session then unsafe-add-raw-args "--new-session" s else s) + (s: if s.newSession then unsafe-add-raw-args "--new-session" s else s) (s: lib.foldr (envVar: assert pkgs.lib.isValidPosixName envVar; unsafe-add-raw-args "--setenv ${envVar} ${s.env.${envVar}}"