From 5c0cce1e92d903f43099f45f722d1ef245bd78ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A1dudvari=20=C3=81kos?=
<nadudvari.akos@hallgato.ppke.hu>
Date: Wed, 5 Mar 2025 19:32:09 +0100
Subject: [PATCH] fix: correctly display revision in document
---
flake.nix | 4 ++--
nix/flake-module.nix | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/flake.nix b/flake.nix
index bd8888d..5fc7bdb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,10 +13,10 @@
};
};
- outputs = inputs@{ flake-parts, ... }:
+ outputs = inputs @ { self, flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
imports = [
- ./nix/flake-module.nix
+ ((import ./nix/flake-module.nix) self)
inputs.treefmt-nix.flakeModule
];
systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
diff --git a/nix/flake-module.nix b/nix/flake-module.nix
index b807bec..09b02ee 100644
--- a/nix/flake-module.nix
+++ b/nix/flake-module.nix
@@ -1,4 +1,4 @@
-{ lib, flake-parts-lib, ... }:
+self: { lib, flake-parts-lib, ... }:
let
inherit (flake-parts-lib) mkPerSystemOption;
inherit (lib) types mkOption;
@@ -42,7 +42,7 @@ in
mainFile = config.document.mainFile;
buildCommand = lib.getExe (pkgs.writeShellScriptBin "build-document" ''
BUILDDATE="$(TZ='Europe/Budapest' LC_TIME='hu_HU.UTF-8' date +'%Y. %b. %d. %T')"
- BUILDCOMMIT="$(git rev-parse --short HEAD || echo '${ if (self' ? rev) then self'.rev else "<ismeretlen>"}')"
+ BUILDCOMMIT="$(git rev-parse --short HEAD || echo '${ if (self ? shortRev) then self.shortRev else "<ismeretlen>"}')"
VARS="\\def\\builddate{$BUILDDATE} \\def\\buildcommit{$BUILDCOMMIT}"
latexmk -interaction=nonstopmode -pdf -lualatex \
-outdir="./build" -synctex=1 \
--
GitLab