From 73b8a831f9fc24393cd0abb5dd1aac021270248f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 25 Mar 2024 18:12:29 -0700 Subject: [PATCH] Avoid top-level `with ...;` in pkgs/development/ruby-modules/bundled-common/default.nix --- .../ruby-modules/bundled-common/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 6aca502550b6..cd2f6f379efc 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -28,9 +28,18 @@ assert name == null -> pname != null; -with import ./functions.nix { inherit lib gemConfig; }; - let + functions = import ./functions.nix { inherit lib gemConfig; }; + + inherit (functions) + applyGemConfigs + bundlerFiles + composeGemAttrs + filterGemset + genStubsScript + pathDerivation + ; + gemFiles = bundlerFiles args; importedGemset = if builtins.typeOf gemFiles.gemset != "set"