From b91803bf135ce583a3115e5b7e4feb0333d96af1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Sep 2019 18:26:38 +0200 Subject: [PATCH] nixosSystem: Automatically set version suffix from flake E.g. $ nixos-version 19.03.20190913.af5eb77 (Koi) --- flake.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index f3bd9c8611b..b3903f3ae3d 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,19 @@ jobs = import ./pkgs/top-level/release.nix { nixpkgs = self; }; + lib = import ./lib; in { - lib = (import ./lib) // { - nixosSystem = import ./nixos/lib/eval-config.nix; + lib = lib // { + nixosSystem = { modules, ... } @ args: + import ./nixos/lib/eval-config.nix (args // { + modules = modules ++ + [ { system.nixos.versionSuffix = + ".${lib.substring 0 8 self.lastModified}.${self.shortRev}"; + system.nixos.revision = self.rev; + } + ]; + }); }; checks.tarball = jobs.tarball;