Compare commits

..

No commits in common. "ee05202f5de8989f74f203635b250c825537dc3e" and "3c9a6ebd7d9bd63693043356310b03689061d9bf" have entirely different histories.

3 changed files with 14 additions and 32 deletions

View file

@ -13,8 +13,7 @@ let
storePathLength = builtins.stringLength (builtins.toString builtins.storeDir); storePathLength = builtins.stringLength (builtins.toString builtins.storeDir);
evaluatingInStore = (builtins.substring 0 storePathLength currentFilePath) == builtins.storeDir; evaluatingInStore = (builtins.substring 0 storePathLength currentFilePath) == builtins.storeDir;
gitlessSelfInStore = { selfInStore = builtins.path {
outPath = builtins.path {
path = ./.; path = ./.;
name = "source"; name = "source";
filter = path: type: filter = path: type:
@ -27,19 +26,6 @@ let
&& lib.runGitignoreFilter gitIgnoreFilters path type; && lib.runGitignoreFilter gitIgnoreFilters path type;
in result; in result;
}; };
selfMode = "path";
};
gitfullSelfInStore = builtins.fetchGit "file://${builtins.toString ./.}" // {
selfMode = "git";
};
selfInStore' = builtins.tryEval gitfullSelfInStore;
selfInStore = if selfInStore'.success then selfInStore'.value else gitlessSelfInStore;
in in
if !(evaluatingInStore) then { ... }@args: import selfInStore ({ if !(evaluatingInStore) then { ... }@args: import selfInStore ({ selfPath = selfInStore; } // args )
selfPath = {
outPath = builtins.toString ./.;
selfMode = "store";
};
} // args )
else { ... }@args: import ./outputs.nix ({ selfPath = selfInStore; } // args) else { ... }@args: import ./outputs.nix ({ selfPath = selfInStore; } // args)

View file

@ -54,7 +54,6 @@ in {
nix.package = wrappedNixExecutables false; nix.package = wrappedNixExecutables false;
environment.systemPackages = [ environment.systemPackages = [
pkgs.nix-output-monitor pkgs.nix-output-monitor
pkgs.nix-diff
] ++ lib.map (lib.hiPrio) [ ] ++ lib.map (lib.hiPrio) [
(wrappedNixExecutables true) (wrappedNixExecutables true)
wrappedNixosExecutables wrappedNixosExecutables

View file

@ -1,10 +1,7 @@
{ {
inputsPath ? ./inputs.nix, inputsPath ? ./inputs.nix,
inputs ? import inputsPath {}, inputs ? import inputsPath {},
selfPath ? { selfPath ? builtins.toString ./.,
outPath = builtins.toString ./.;
selfMode = "impure";
},
}: }:
let let