Merge pull request 'devshell: get pkgs from nixpkgs to avoid constant rebuilds' (#97) from fix/get-deploy-rs-nvfetcher-from-nixpkgs into main

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/97
This commit is contained in:
Benjamin Bädorf 2022-08-12 18:22:37 +00:00
commit 1f1384a65e
2 changed files with 4 additions and 5 deletions

View file

@ -76,7 +76,6 @@
overlays = [ overlays = [
nur.overlay nur.overlay
agenix.overlay agenix.overlay
nvfetcher.overlay
./pkgs/default.nix ./pkgs/default.nix
]; ];
}; };

View file

@ -38,15 +38,15 @@ in
(devos agenix) (devos agenix)
{ {
category = "devos"; category = "devos";
name = pkgs.nvfetcher-bin.pname; name = pkgs.nvfetcher.pname;
help = pkgs.nvfetcher-bin.meta.description; help = pkgs.nvfetcher.meta.description;
command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@"; command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher}/bin/nvfetcher -c ./sources.toml $@";
} }
(linter nixpkgs-fmt) (linter nixpkgs-fmt)
(linter editorconfig-checker) (linter editorconfig-checker)
# (docs python3Packages.grip) too many deps # (docs python3Packages.grip) too many deps
(docs mdbook) (docs mdbook)
(devos inputs.deploy.packages.${pkgs.system}.deploy-rs) (devos deploy-rs)
] ]
++ lib.optional ++ lib.optional
(system != "i686-linux") (system != "i686-linux")