lix-project/nixos-module
15
7
Fork 14
Code Issues 4 Pull requests 1 Packages Projects Releases Wiki Activity

Remove prefetch-npm-deps override #18

Closed
k900 wants to merge 45 commits from k900/nixos-module:prefetch-npm-fix into main
pull from: k900/nixos-module:prefetch-npm-fix
merge into: lix-project:main
Conversation 2 Commits 45 Files changed 11 +21 -22
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1062d3c1ff - Show all commits

39
flake.nix
View file

@ -8,25 +8,24 @@
inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat"; inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat";
inputs.flakey-profile.url = "github:lf-/flakey-profile"; inputs.flakey-profile.url = "github:lf-/flakey-profile";
outputs = inputs@{ self, nixpkgs, lix, flake-utils, flakey-profile, ... }: { outputs = inputs@{ self, nixpkgs, lix, flake-utils, flakey-profile, ... }:
inherit inputs; let versionSuffix = "pre${builtins.substring 0 8 lix.lastModifiedDate}-${lix.shortRev}";
nixosModules.default = import ./module.nix { inherit lix; }; in {
overlays.default = import ./overlay.nix { inherit inputs;
inherit lix; nixosModules.default = import ./module.nix { inherit lix versionSuffix; };
versionSuffix = "pre${builtins.substring 0 8 lix.lastModifiedDate}-${lix.shortRev}"; overlays.default = import ./overlay.nix { inherit lix versionSuffix; };
}; } // flake-utils.lib.eachDefaultSystem (system:
} // flake-utils.lib.eachDefaultSystem (system: let
let pkgs = import nixpkgs {
pkgs = import nixpkgs { inherit system;
inherit system; overlays = [ self.overlays.default ];
overlays = [ self.overlays.default ]; };
}; in
in {
{ inherit pkgs;
inherit pkgs; packages.default = pkgs.nixVersions.nix_2_18;
packages.default = pkgs.nixVersions.nix_2_18; packages.nix-doc = pkgs.nix-doc;
packages.nix-doc = pkgs.nix-doc;
packages.system-profile = import ./system-profile.nix { inherit pkgs flakey-profile; }; packages.system-profile = import ./system-profile.nix { inherit pkgs flakey-profile; };
}); });
} }

4
module.nix
View file

@ -1,5 +1,5 @@
{ lix }: { lix, versionSuffix ? "" }:
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix; }) ]; nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ];
} }