From f6215cfdafdbbb63f85abeaf5e8948d8ab5717f3 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Fri, 17 Nov 2023 03:39:27 -0600 Subject: [PATCH] nix: include git rev in build (#2688) --- flake.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 0033641aa..627ee3074 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ systems.url = "github:nix-systems/default"; }; - outputs = inputs@{ flake-parts, crane, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { + outputs = inputs@{ flake-parts, crane, nixpkgs, self, ... }: flake-parts.lib.mkFlake { inherit inputs; } { systems = import inputs.systems; imports = [ @@ -72,6 +72,12 @@ ''; GEN_ARTIFACTS = "artifacts"; + TYPST_VERSION = + let + rev = self.shortRev or "dirty"; + version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).workspace.package.version; + in + "${version} (${rev})"; meta.mainProgram = "typst"; });