d51cd34fb7
Subflakes should provide their wares as outputs, so wire up the pkgs flake to reflect that. Due to the unstable nature of flakes, updating the root flake doesn't currently update the subflake lock file. Therefore, add additional logic to flk update script in order to do this behind the scenes. Nix is now pulled in from the "nix" registry flake in order for users to take advantage of improvements to the UI since its last update in nixpkgs.
43 lines
877 B
Nix
43 lines
877 B
Nix
{ self ? (import ../compat).defaultNix
|
|
, system ? builtins.currentSystem
|
|
}:
|
|
let
|
|
pkgs = (self.lib.os.mkPkgs { inherit self; }).${system};
|
|
|
|
inherit (pkgs) lib;
|
|
|
|
installPkgs = (lib.nixosSystem {
|
|
inherit system;
|
|
modules = [ ];
|
|
}).config.system.build;
|
|
|
|
flk = pkgs.callPackage ./flk.nix { };
|
|
|
|
in
|
|
pkgs.devshell.mkShell
|
|
{
|
|
imports = [ (pkgs.devshell.importTOML ./devshell.toml) ];
|
|
|
|
packages = with installPkgs; [
|
|
nixos-install
|
|
nixos-generate-config
|
|
nixos-enter
|
|
pkgs.nixFlakes
|
|
];
|
|
|
|
git.hooks = {
|
|
pre-commit.text = lib.fileContents ./pre-commit.sh;
|
|
};
|
|
|
|
commands = with pkgs; [
|
|
{
|
|
package = flk;
|
|
}
|
|
]
|
|
++ lib.optional (system != "i686-linux") { package = cachix; }
|
|
++ lib.optional (system == "x86_64-linux") {
|
|
name = "deploy";
|
|
package = deploy-rs;
|
|
help = "A simple multi-profile Nix-flake deploy tool.";
|
|
};
|
|
}
|