Add version suffix in nixos module
This commit is contained in:
parent
f2d3bb0802
commit
4a532feadb
39
flake.nix
39
flake.nix
|
@ -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; };
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -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; }) ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue