Fix tests/ to ensure they use the lib attribute introduced in 83ad1c2206710f356d362170402e461422d2ff3b

This commit is contained in:
boyreau 2026-08-20 12:19:49 +02:00
commit a057ce75e9
4 changed files with 12 additions and 12 deletions

View file

@ -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

View file

@ -12,8 +12,8 @@ spec = parallel $ inTestM $ do
it "can be imported using callPackage" $ do
[i|
let
jail-nix-without-flake = pkgs.callPackage <jail-nix> {};
jail-without-flake = jail-nix-without-flake.init pkgs;
jail-nix-without-flake = import <jail-nix> {};
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";

View file

@ -16,7 +16,7 @@ spec = parallel $ inTestM $ do
let
pkgs = import <nixpkgs> { 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 <nixpkgs> { 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 <nixpkgs> { 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 <nixpkgs> { overlays = [ jailOverlay ]; };
jailOverlay = final: prev:
jail-nix.mkOverlay {
jail-nix.lib.mkOverlay {
inherit final prev;
bubblewrapPackage = pkgs.writeShellApplication {
name = "my-bubblewrap";

View file

@ -158,7 +158,7 @@ runNixDrvWithinVm vmConfig nixDrvExpr = do
};
script = let
jail-nix = import <jail-nix> {};
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-nix> {};
jail = jail-nix.extend { inherit pkgs; suppressExperimentalWarnings = true; };
jail = jail-nix.lib.extend { inherit pkgs; suppressExperimentalWarnings = true; };
in #{nixExpr}
|]
liftIO $