From b1229f7b36bb3a9f25a30dda5dff61ca6d34633f Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Fri, 17 May 2024 22:32:46 +0300 Subject: [PATCH] flake.lock: update nix2lua --- flake.lock | 8 ++++---- modules/plugin.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index e4e48b2..7d6d833 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nix2lua": { "locked": { - "lastModified": 1715344083, - "narHash": "sha256-7UehRa7etk0oqSH4ty0nUsmeO3Z+Y1dbKwrGSlgaMIc=", + "lastModified": 1715960729, + "narHash": "sha256-SK14z5n6h+KgJVkGKzUG1YStpoVMbAbzc7AJPKj7YHU=", "ref": "refs/heads/main", - "rev": "6a096bf9a22903c92f0065ba3316d3821ddd8b72", - "revCount": 41, + "rev": "6ec872969faa552c246e8b490c287939d44300c1", + "revCount": 44, "type": "git", "url": "https://git.pleshevski.ru/mynix/nix2lua" }, diff --git a/modules/plugin.nix b/modules/plugin.nix index f5809d1..6a8db74 100644 --- a/modules/plugin.nix +++ b/modules/plugin.nix @@ -2,7 +2,7 @@ let - inherit (lib.nix2lua) require var local set pipe1 call; + inherit (lib.nix2lua) require requireTo var lset pipe1 call; pluginOpts = ({ name, config, ... }: { options = with lib; with types; { @@ -65,9 +65,9 @@ let var = if config.varName != null then var config.varName else require config.name; genConfig = with lib; mkIf config.enable (flatten [ - (lib.optional (config.varName != null) (local (set config.varName (require config.name)))) + (lib.optional (config.varName != null) (requireTo config.varName config.name)) (mapAttrsToList - (k: v: local (set k (if builtins.isString v then require v else v))) + (k: v: lset k (if builtins.isString v then require v else v)) config.extraImports )