use flakes' revCount as part of the system version
also disabled dirty rebuilds
This commit is contained in:
parent
835b7895dc
commit
112011f766
1 changed files with 7 additions and 4 deletions
11
flake.nix
11
flake.nix
|
|
@ -32,13 +32,16 @@
|
||||||
) ++ [(self: super: customPackages super)]
|
) ++ [(self: super: customPackages super)]
|
||||||
++ [inputs.neovim-nightly.overlay];
|
++ [inputs.neovim-nightly.overlay];
|
||||||
|
|
||||||
revCount = "301044";
|
|
||||||
base = { config, ... }: {
|
base = { config, ... }: {
|
||||||
system = {
|
system = rec {
|
||||||
configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
|
configurationRevision =
|
||||||
|
if self ? rev
|
||||||
|
then self.rev
|
||||||
|
else throw "Refusing to build from a dirty Git tree!";
|
||||||
nixos = rec {
|
nixos = rec {
|
||||||
version = config.system.nixos.release + versionSuffix;
|
version = config.system.nixos.release + versionSuffix;
|
||||||
versionSuffix = ".${nixpkgs.lib.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified or "19700101")}.r${revCount}-${nixpkgs.lib.substring 0 11 (nixpkgs.rev or "dirty")}";
|
versionSuffix = "-${config.system.name}.r${builtins.toString self.revCount}.${self.shortRev}";
|
||||||
|
#versionSuffix = ".${nixpkgs.lib.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified or "19700101")}.r${revCount}-${nixpkgs.lib.substring 0 11 (nixpkgs.rev or "dirty")}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
nix.registry.nixpkgs.flake = nixpkgs;
|
nix.registry.nixpkgs.flake = nixpkgs;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue