From 249bd9cda4fe9b02f3c85b22179109794eb57256 Mon Sep 17 00:00:00 2001 From: tristan Date: Tue, 2 Jan 2024 09:16:52 +0000 Subject: [PATCH] fix when imported --- flake.nix | 5 ++--- testing/default.nix | 3 +-- testing/import.nix | 7 +++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 1ba1fae..1bf2323 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,10 @@ { description = "A testing library for nix"; - outputs = { self, nixpkgs }: + outputs = { self, nixpkgs }: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; testing = import ./testing/. { inherit pkgs; }; - in - testing; + in testing; } diff --git a/testing/default.nix b/testing/default.nix index ce8bc15..6c2fb01 100644 --- a/testing/default.nix +++ b/testing/default.nix @@ -1,5 +1,4 @@ -{ pkgs ? import {} }: -{ +{ pkgs ? import { } }: { run = import ./run.nix pkgs; it = import ./it.nix; import = import ./import.nix; diff --git a/testing/import.nix b/testing/import.nix index f3d3cc7..3bd8e78 100644 --- a/testing/import.nix +++ b/testing/import.nix @@ -1,7 +1,6 @@ path: -builtins.trace ("testing " + builtins.baseNameOf path) - -{ +let it = import ./it.nix; +in builtins.trace ("testing " + builtins.baseNameOf path) { inherit path; - results = (import path); + results = (import path { inherit it; }); }