From a057ce75e9c06fcd24477a29b4c9f8f293e9e5b4 Mon Sep 17 00:00:00 2001 From: boyreau Date: Thu, 20 Aug 2026 12:19:49 +0200 Subject: [PATCH] Fix tests/ to ensure they use the lib attribute introduced in 83ad1c2206710f356d362170402e461422d2ff3b --- tests/spec/CombinatorsSpec.hs | 4 ++-- tests/spec/JailSpec.hs | 8 ++++---- tests/spec/OverlaySpec.hs | 8 ++++---- tests/spec/TestPrelude.hs | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/spec/CombinatorsSpec.hs b/tests/spec/CombinatorsSpec.hs index 996928f..2c24c54 100644 --- a/tests/spec/CombinatorsSpec.hs +++ b/tests/spec/CombinatorsSpec.hs @@ -152,7 +152,7 @@ spec = parallel $ inTestM $ do runNixDrv [i| let - jail' = jail-nix.extend { + jail' = jail-nix.lib.extend { inherit pkgs; bubblewrapPackage = pkgs.writeShellApplication { name = "my-bubblewrap"; @@ -429,7 +429,7 @@ spec = parallel $ inTestM $ do it "clears all set permissions - including ones set in base permissions" $ do [i| let - jail' = jail-nix.extend { + jail' = jail-nix.lib.extend { inherit pkgs; basePermissions = c: [ c.base diff --git a/tests/spec/JailSpec.hs b/tests/spec/JailSpec.hs index d501d19..e46861a 100644 --- a/tests/spec/JailSpec.hs +++ b/tests/spec/JailSpec.hs @@ -12,8 +12,8 @@ spec = parallel $ inTestM $ do it "can be imported using callPackage" $ do [i| let - jail-nix-without-flake = pkgs.callPackage {}; - jail-without-flake = jail-nix-without-flake.init pkgs; + jail-nix-without-flake = import {}; + jail-without-flake = jail-nix-without-flake.lib.init pkgs; in jail-without-flake "hello" pkgs.hello [] |] @@ -85,7 +85,7 @@ spec = parallel $ inTestM $ do liftIO $ writeFile secretPath "hunter2" [i| let - jail' = jail-nix.extend { + jail' = jail-nix.lib.extend { inherit pkgs; basePermissions = c: [ (c.readonly #{toNixString secretPath}) @@ -101,7 +101,7 @@ spec = parallel $ inTestM $ do it "allows overriding the bubblewrap package" $ do [i| let - jail' = jail-nix.extend { + jail' = jail-nix.lib.extend { inherit pkgs; bubblewrapPackage = pkgs.writeShellApplication { name = "my-bubblewrap"; diff --git a/tests/spec/OverlaySpec.hs b/tests/spec/OverlaySpec.hs index 5c7c045..b344cd6 100644 --- a/tests/spec/OverlaySpec.hs +++ b/tests/spec/OverlaySpec.hs @@ -16,7 +16,7 @@ spec = parallel $ inTestM $ do let pkgs = import { overlays = [ jailOverlay ]; }; jailOverlay = final: prev: - jail-nix.mkOverlay { + jail-nix.lib.mkOverlay { inherit final prev; packages = combinators: with combinators; { nodejs = [ (readonly #{toNixString $ tmpDir "visible"}) ]; @@ -53,7 +53,7 @@ spec = parallel $ inTestM $ do let pkgs = import { overlays = [ jailOverlay ]; }; jailOverlay = final: prev: - jail-nix.mkOverlay { + jail-nix.lib.mkOverlay { inherit final prev; additionalCombinators = combinators: { my-combinator = combinators.readonly #{toNixString $ tmpDir "file"}; @@ -76,7 +76,7 @@ spec = parallel $ inTestM $ do let pkgs = import { overlays = [ jailOverlay ]; }; jailOverlay = final: prev: - jail-nix.mkOverlay { + jail-nix.lib.mkOverlay { inherit final prev; basePermissions = combinators: [ (combinators.readonly #{toNixString $ tmpDir "file"}) @@ -100,7 +100,7 @@ spec = parallel $ inTestM $ do let pkgs = import { overlays = [ jailOverlay ]; }; jailOverlay = final: prev: - jail-nix.mkOverlay { + jail-nix.lib.mkOverlay { inherit final prev; bubblewrapPackage = pkgs.writeShellApplication { name = "my-bubblewrap"; diff --git a/tests/spec/TestPrelude.hs b/tests/spec/TestPrelude.hs index e562393..ed5a50a 100644 --- a/tests/spec/TestPrelude.hs +++ b/tests/spec/TestPrelude.hs @@ -158,7 +158,7 @@ runNixDrvWithinVm vmConfig nixDrvExpr = do }; script = let jail-nix = import {}; - jail = jail-nix.extend { inherit pkgs; suppressExperimentalWarnings = true; }; + jail = jail-nix.lib.extend { inherit pkgs; suppressExperimentalWarnings = true; }; testToRun = #{nixDrvExpr}; in '' ( @@ -204,7 +204,7 @@ evalNixExpr nixExpr = do lib = pkgs.lib; sh = script: (pkgs.writeShellApplication { name = "test-script"; text = script; }); jail-nix = import {}; - jail = jail-nix.extend { inherit pkgs; suppressExperimentalWarnings = true; }; + jail = jail-nix.lib.extend { inherit pkgs; suppressExperimentalWarnings = true; }; in #{nixExpr} |] liftIO $