From 3bbd6acf4f3bec1ecf323a44ee837ffc0fe86aab Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 12 Feb 2025 23:50:37 +0100 Subject: [PATCH] re-use global pins --- {website/npins => npins}/default.nix | 0 {website/npins => npins}/sources.json | 0 website/default.nix | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename {website/npins => npins}/default.nix (100%) rename {website/npins => npins}/sources.json (100%) diff --git a/website/npins/default.nix b/npins/default.nix similarity index 100% rename from website/npins/default.nix rename to npins/default.nix diff --git a/website/npins/sources.json b/npins/sources.json similarity index 100% rename from website/npins/sources.json rename to npins/sources.json diff --git a/website/default.nix b/website/default.nix index d3fc159..f68ec04 100644 --- a/website/default.nix +++ b/website/default.nix @@ -1,4 +1,4 @@ -{ sources ? import ./npins +{ sources ? import ../npins , system ? builtins.currentSystem , pkgs ? import sources.nixpkgs { inherit system; @@ -65,12 +65,12 @@ rec { tests = with pkgs; with lib; let source = fileset.toSource { - root = ./.; + root = ../.; fileset = fileset.unions [ ./default.nix ./tests.nix ./lib.nix - ./npins + ../npins ]; }; in @@ -86,7 +86,7 @@ rec { # adding it verbatim will result in --source, so rename it first cp -r ${sources.nixpkgs} source nix-store --add --store "$HOME" source - ${getExe nix-unit} --gc-roots-dir "$HOME" --store "$HOME" ${source}/tests.nix "$@" + ${getExe nix-unit} --gc-roots-dir "$HOME" --store "$HOME" ${source}/website/tests.nix "$@" touch $out ''; }