summary refs log tree commit diff
path: root/flake.nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-02-05 16:00:27 +0100
committerEelco Dolstra <edolstra@gmail.com>2020-02-05 23:15:18 +0100
commit60330b60655b3fa3a18624bdd7069855bb37af99 (patch)
tree3f3190bf216ad0c2f82748ee2489134c702b50ac /flake.nix
parent2a0cf385d26544d80a29ebf7e34f63e86f397283 (diff)
downloadnixpkgs-60330b60655b3fa3a18624bdd7069855bb37af99.tar
nixpkgs-60330b60655b3fa3a18624bdd7069855bb37af99.tar.gz
nixpkgs-60330b60655b3fa3a18624bdd7069855bb37af99.tar.bz2
nixpkgs-60330b60655b3fa3a18624bdd7069855bb37af99.tar.lz
nixpkgs-60330b60655b3fa3a18624bdd7069855bb37af99.tar.xz
nixpkgs-60330b60655b3fa3a18624bdd7069855bb37af99.tar.zst
nixpkgs-60330b60655b3fa3a18624bdd7069855bb37af99.zip
flake.nix: Handle missing rev attribute
Dirty trees no longer set 'rev', so we need to handle this.
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/flake.nix b/flake.nix
index 3f9e22bdae0..e2346f99c7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,8 +23,8 @@
           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;
+                    ".${lib.substring 0 8 self.lastModified}.${self.shortRev or "dirty"}";
+                  system.nixos.revision = lib.mkIf (self ? rev) self.rev;
                 }
               ];
           });