lib: move compat to lib
This commit is contained in:
parent
fbce126f4d
commit
127cb25bd1
7 changed files with 7 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
|||
let
|
||||
inherit (default.inputs.nixos) lib;
|
||||
|
||||
default = (import ./compat).defaultNix;
|
||||
default = (import ./lib/compat).defaultNix;
|
||||
in
|
||||
builtins.mapAttrs (_: v: lib.recurseIntoAttrs v) default.packages // {
|
||||
shell = import ./shell.nix;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
let
|
||||
inherit (lock.nodes.flake-compat.locked) rev narHash;
|
||||
|
||||
lock = builtins.fromJSON (builtins.readFile ../flake.lock);
|
||||
lock = builtins.fromJSON (builtins.readFile ../../flake.lock);
|
||||
flake = (import
|
||||
(
|
||||
fetchTarball {
|
||||
|
@ -10,7 +10,7 @@ let
|
|||
}
|
||||
)
|
||||
{
|
||||
src = ../.;
|
||||
src = ../../.;
|
||||
});
|
||||
in
|
||||
flake
|
|
@ -37,7 +37,7 @@ let
|
|||
|
||||
nix.nixPath = [
|
||||
"nixpkgs=${nixos}"
|
||||
"nixos-config=${self}/compat/nixos"
|
||||
"nixos-config=${self}/lib/compat/nixos"
|
||||
"home-manager=${inputs.home}"
|
||||
];
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
let
|
||||
inherit (default.inputs.nixos) lib;
|
||||
|
||||
default = (import "${../.}/compat").defaultNix;
|
||||
default = (import "${../lib}/compat").defaultNix;
|
||||
|
||||
ciSystems = [
|
||||
"aarch64-linux"
|
||||
|
|
|
@ -77,7 +77,7 @@ in
|
|||
'';
|
||||
|
||||
# fix nixos-option
|
||||
nixos-option = "nixos-option -I nixpkgs=${toString ../../compat}";
|
||||
nixos-option = "nixos-option -I nixpkgs=${toString ../../lib/compat}";
|
||||
|
||||
# sudo
|
||||
s = ifSudo "sudo -E ";
|
||||
|
|
|
@ -1 +1 @@
|
|||
(import ./compat).shellNix
|
||||
(import ./lib/compat).shellNix
|
||||
|
|
Loading…
Reference in a new issue