about summary refs log tree commit diff
path: root/flake.nix
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2023-10-20 12:12:48 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2023-12-09 11:45:45 +0100
commitbb7921d1d6a0df8ebdc36b8ee745fe704b93b846 (patch)
treeae30b577d6654f1bde59788a5159ac3d24ffc5fb /flake.nix
parent039f73f134546e59ec6f1b56b4aff5b81d889f64 (diff)
downloadnixlib-bb7921d1d6a0df8ebdc36b8ee745fe704b93b846.tar
nixlib-bb7921d1d6a0df8ebdc36b8ee745fe704b93b846.tar.gz
nixlib-bb7921d1d6a0df8ebdc36b8ee745fe704b93b846.tar.bz2
nixlib-bb7921d1d6a0df8ebdc36b8ee745fe704b93b846.tar.lz
nixlib-bb7921d1d6a0df8ebdc36b8ee745fe704b93b846.tar.xz
nixlib-bb7921d1d6a0df8ebdc36b8ee745fe704b93b846.tar.zst
nixlib-bb7921d1d6a0df8ebdc36b8ee745fe704b93b846.zip
flake: also provide proper version info for lib's flake
This effectively means that

    nixpkgs$ nix eval ./lib#lib.trivial.version
    "23.11.20231020.ee0d6b5"

now gives meaningful results as well.

See https://github.com/NixOS/nixpkgs/pull/257100#discussion_r1352075369
for the discussion around this.
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix10
1 files changed, 1 insertions, 9 deletions
diff --git a/flake.nix b/flake.nix
index bf7480a6db2d..23c9f09a174b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,17 +9,9 @@
         nixpkgs = self;
       };
 
+      libVersionInfoOverlay = import ./lib/__flake-version-info.nix self;
       lib = (import ./lib).extend libVersionInfoOverlay;
 
-      libVersionInfoOverlay = finalLib: prevLib: {
-        trivial = prevLib.trivial // {
-          versionSuffix =
-            ".${finalLib.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
-          version = finalLib.trivial.release + finalLib.trivial.versionSuffix;
-          revisionWithDefault = default: self.rev or default;
-        };
-      };
-
       forAllSystems = lib.genAttrs lib.systems.flakeExposed;
     in
     {