Merge pull request #610 from IntersectMBO/bug-all-zeros-git-revision

Fix git revision reported by --version on nix build
IntersectMBO · Feb 14, 2024 · 7da4f5b · 7da4f5b
2 parents 646baf4 + d2994eb
commit 7da4f5b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/IO/GitRev.hs b/cardano-cli/src/Cardano/CLI/IO/GitRev.hs
@@ -11,17 +11,18 @@ import           Data.Text (Text)
 import qualified Data.Text as T
 
 import           Cardano.Git.RevFromGit (gitRevFromGit)
-import           GHC.Foreign (peekCStringLen)
+import           GHC.Foreign (peekCStringLen) 
 import           Foreign.C.String (CString)
 import           System.IO (utf8)
 import           System.IO.Unsafe (unsafeDupablePerformIO)
 
 foreign import ccall "&_cardano_git_rev" c_gitrev :: CString
 
 gitRev :: Text
-gitRev | gitRevEmbed /= zeroRev = gitRevEmbed
-       | T.null fromGit         = zeroRev
-       | otherwise              = fromGit
+gitRev | gitRevEmbed /= zeroRev      = gitRevEmbed
+       | not (T.null fromGit)        = fromGit
+       | not (T.null gitRevFromEnv)  = gitRevFromEnv
+       | otherwise                   = zeroRev
  where
   -- Git revision embedded after compilation using
   -- Data.FileEmbed.injectWith. If nothing has been injected,
@@ -38,5 +39,12 @@ gitRev | gitRevEmbed /= zeroRev = gitRevEmbed
   fromGit = T.strip (T.pack $(gitRevFromGit))
 #endif
 
+  gitRevFromEnv :: Text
+#if defined(__GIT_REV__)
+  gitRevFromEnv = T.pack __GIT_REV__
+#else
+  gitRevFromEnv = ""
+#endif
+
 zeroRev :: Text
 zeroRev = "0000000000000000000000000000000000000000"
diff --git a/flake.nix b/flake.nix
@@ -40,6 +40,10 @@
         };
         inherit (nixpkgs) lib;
 
+        gitRevFlag = if inputs.self ? rev
+                     then [ ("--ghc-option=-D__GIT_REV__=\\\"" + inputs.self.rev + "\\\"") ]
+                     else [];
+
         # see flake `variants` below for alternative compilers
         defaultCompiler = "ghc963";
         # We use cabalProject' to ensure we don't build the plan for
@@ -85,7 +89,7 @@
           # specific enough, or doesn't allow setting these.
           modules = [
             ({pkgs, ...}: {
-              packages.cardano-cli.configureFlags = ["--ghc-option=-Werror"];
+              packages.cardano-cli.configureFlags = [ "--ghc-option=-Werror" ] ++ gitRevFlag;
               packages.cardano-cli.components.tests.cardano-cli-test.build-tools =
                 with pkgs.buildPackages; [ jq coreutils shellcheck ];
               packages.cardano-cli.components.tests.cardano-cli-golden.build-tools =