diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal index c7418a99fb0..7f5a306cc90 100644 --- a/bench/locli/locli.cabal +++ b/bench/locli/locli.cabal @@ -101,7 +101,7 @@ library , attoparsec , attoparsec-iso8601 , bytestring - , cardano-git-rev + , cardano-git-rev ^>= 0.2.2 , cardano-ledger-core , cardano-prelude , cardano-slotting diff --git a/bench/locli/src/Cardano/Analysis/API/LocliVersion.hs b/bench/locli/src/Cardano/Analysis/API/LocliVersion.hs index 1d7729543b8..58c85855a98 100644 --- a/bench/locli/src/Cardano/Analysis/API/LocliVersion.hs +++ b/bench/locli/src/Cardano/Analysis/API/LocliVersion.hs @@ -1,4 +1,5 @@ {-# LANGUAGE DeriveAnyClass #-} +{-# LANGUAGE TemplateHaskell #-} module Cardano.Analysis.API.LocliVersion (module Cardano.Analysis.API.LocliVersion) where import Cardano.Prelude (NFData, mconcat) @@ -22,7 +23,7 @@ data LocliVersion = getLocliVersion :: LocliVersion getLocliVersion = LocliVersion - Cardano.Git.Rev.gitRev + $(Cardano.Git.Rev.gitRev) (pack (showVersion Paths_locli.version)) renderProgramAndVersion :: LocliVersion -> Text diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index 29bf628c290..89014168778 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -106,7 +106,7 @@ library , cardano-crypto-class , cardano-crypto-wrapper , cardano-data - , cardano-git-rev + , cardano-git-rev ^>= 0.2.2 , cardano-ledger-alonzo , cardano-ledger-api , cardano-ledger-byron diff --git a/cabal.project b/cabal.project index 302529aa9ac..855ad8121e4 100644 --- a/cabal.project +++ b/cabal.project @@ -13,11 +13,10 @@ repository cardano-haskell-packages -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them index-state: - , hackage.haskell.org 2024-03-22T11:04:03Z - , cardano-haskell-packages 2024-03-18T16:52:28Z + , hackage.haskell.org 2024-03-26T06:28:59Z + , cardano-haskell-packages 2024-03-25T11:11:00Z packages: - cardano-git-rev cardano-node cardano-node-capi cardano-node-chairman diff --git a/cardano-git-rev/LICENSE b/cardano-git-rev/LICENSE deleted file mode 100644 index f433b1a53f5..00000000000 --- a/cardano-git-rev/LICENSE +++ /dev/null @@ -1,177 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS diff --git a/cardano-git-rev/NOTICE b/cardano-git-rev/NOTICE deleted file mode 100644 index 3444d4dd12f..00000000000 --- a/cardano-git-rev/NOTICE +++ /dev/null @@ -1,14 +0,0 @@ -Copyright 2022-2023 Input Output Global Inc (IOG). - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - diff --git a/cardano-git-rev/README.md b/cardano-git-rev/README.md deleted file mode 100644 index 03c5dfb1b02..00000000000 --- a/cardano-git-rev/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Cardano Git Rev - -This package exposes functions to provide git information for `cardano-node`. - -`cardano-node` support building via `nix` and `cabal` - -When building with `nix` the git executable and git metadata isn't available so the -git revision is embedded as a series of 40 zeros during the build. After the nix build -is finished the executable is patched with the correct git sha. See [set-git-rev.hs][set-git-rev.hs] - -For `cabal` the Template Haskell function `gitRev` executes in the context of the current git checkout, -requiring the `git` executable and git metadata is available at compile time. - -To use this library copy reference `Cardano.Git.Rev` module into the desired cli project and setup `nix` -to use [set-git-rev.hs][set-git-rev.hs]. - -[set-git-rev.hs]: https://github.com/input-output-hk/iohk-nix/blob/master/overlays/haskell-nix-extra/utils/set-git-rev.hs \ No newline at end of file diff --git a/cardano-git-rev/Setup.hs b/cardano-git-rev/Setup.hs deleted file mode 100644 index 44671092b28..00000000000 --- a/cardano-git-rev/Setup.hs +++ /dev/null @@ -1,2 +0,0 @@ -import Distribution.Simple -main = defaultMain diff --git a/cardano-git-rev/cardano-git-rev.cabal b/cardano-git-rev/cardano-git-rev.cabal deleted file mode 100644 index 2731de02540..00000000000 --- a/cardano-git-rev/cardano-git-rev.cabal +++ /dev/null @@ -1,41 +0,0 @@ -cabal-version: 3.0 - -name: cardano-git-rev -version: 0.1.3.0 -synopsis: Git revisioning -description: Embeds git revision into Haskell packages. -category: Cardano, - Versioning, -copyright: 2022-2023 Input Output Global Inc (IOG). -author: IOHK -maintainer: operations@iohk.io -license: Apache-2.0 -license-files: LICENSE - NOTICE -build-type: Simple -extra-source-files: README.md - -common project-config - default-language: Haskell2010 - build-depends: base >= 4.14 && < 5 - - ghc-options: -Wall - -Wcompat - -Wincomplete-record-updates - -Wincomplete-uni-patterns - -Wpartial-fields - -Wredundant-constraints - -Wunused-packages - -library - import: project-config - - hs-source-dirs: src - c-sources: cbits/rev.c - - exposed-modules: Cardano.Git.Rev - Cardano.Git.RevFromGit - - build-depends: process - , template-haskell - , text diff --git a/cardano-git-rev/cbits/rev.c b/cardano-git-rev/cbits/rev.c deleted file mode 100644 index 9278983888d..00000000000 --- a/cardano-git-rev/cbits/rev.c +++ /dev/null @@ -1,11 +0,0 @@ -// -char _cardano_git_rev[68] - = "fe" - "gitrev" - "0000000000" - "0000000040" - "0000000000" - "0000000000" - "0000000000" - "0000000000" - ; \ No newline at end of file diff --git a/cardano-git-rev/src/Cardano/Git/Rev.hs b/cardano-git-rev/src/Cardano/Git/Rev.hs deleted file mode 100644 index 7d8972465af..00000000000 --- a/cardano-git-rev/src/Cardano/Git/Rev.hs +++ /dev/null @@ -1,44 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE ForeignFunctionInterface #-} - -module Cardano.Git.Rev - ( gitRev - ) where - -import Data.Text (Text) -import qualified Data.Text as T - -#if !defined(arm_HOST_ARCH) -import Cardano.Git.RevFromGit (gitRevFromGit) -#endif -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 - where - -- Git revision embedded after compilation using - -- Data.FileEmbed.injectWith. If nothing has been injected, - -- this will be filled with 0 characters. - gitRevEmbed :: Text - gitRevEmbed = T.pack $ drop 28 $ unsafeDupablePerformIO (peekCStringLen utf8 (c_gitrev, 68)) - - -- Git revision found during compilation by running git. If - -- git could not be run, then this will be empty. -#if defined(arm_HOST_ARCH) - -- cross compiling to arm fails; due to a linker bug - fromGit = "" -#else - fromGit = T.strip (T.pack $(gitRevFromGit)) -#endif - -zeroRev :: Text -zeroRev = "0000000000000000000000000000000000000000" diff --git a/cardano-git-rev/src/Cardano/Git/RevFromGit.hs b/cardano-git-rev/src/Cardano/Git/RevFromGit.hs deleted file mode 100644 index b60314ff236..00000000000 --- a/cardano-git-rev/src/Cardano/Git/RevFromGit.hs +++ /dev/null @@ -1,33 +0,0 @@ -module Cardano.Git.RevFromGit - ( gitRevFromGit - ) where - -import Control.Exception (catch) -import System.Exit (ExitCode (..)) -import qualified System.IO as IO -import System.IO.Error (isDoesNotExistError) -import System.Process (readProcessWithExitCode) - -import qualified Language.Haskell.TH as TH - --- | Git revision found by running git rev-parse. If git could not be --- executed, then this will be an empty string. -gitRevFromGit :: TH.Q TH.Exp -gitRevFromGit = - TH.LitE . TH.StringL <$> TH.runIO runGitRevParse - where - runGitRevParse :: IO String - runGitRevParse = do - (exitCode, output, errorMessage) <- readProcessWithExitCode_ "git" ["rev-parse", "--verify", "HEAD"] "" - case exitCode of - ExitSuccess -> pure output - ExitFailure _ -> do - IO.hPutStrLn IO.stderr $ "WARNING: " ++ errorMessage - pure "" - - readProcessWithExitCode_ :: FilePath -> [String] -> String -> IO (ExitCode, String, String) - readProcessWithExitCode_ cmd args input = - catch (readProcessWithExitCode cmd args input) $ \e -> - if isDoesNotExistError e - then return (ExitFailure 127, "", show e) - else return (ExitFailure 999, "", show e) diff --git a/cardano-node-chairman/app/Cardano/Chairman/Commands/Version.hs b/cardano-node-chairman/app/Cardano/Chairman/Commands/Version.hs index 38f59a37497..3085fae88b4 100644 --- a/cardano-node-chairman/app/Cardano/Chairman/Commands/Version.hs +++ b/cardano-node-chairman/app/Cardano/Chairman/Commands/Version.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE TemplateHaskell #-} module Cardano.Chairman.Commands.Version ( VersionOptions(..) , cmdVersion @@ -25,7 +26,7 @@ runVersionOptions VersionOptions = do [ "cardano-node ", showVersion version , " - ", os, "-", arch , " - ", compilerName, "-", showVersion compilerVersion - , "\ngit rev ", T.unpack gitRev + , "\ngit rev ", T.unpack $(gitRev) ] cmdVersion :: Mod CommandFields (IO ()) diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal index 7142e606c37..3bacec41c54 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/cardano-node-chairman/cardano-node-chairman.cabal @@ -43,7 +43,7 @@ executable cardano-node-chairman "-with-rtsopts=-T" build-depends: cardano-api , cardano-crypto-class - , cardano-git-rev + , cardano-git-rev ^>=0.2.2 , cardano-node ^>= 8.9 , cardano-prelude , containers diff --git a/cardano-node/app/cardano-node.hs b/cardano-node/app/cardano-node.hs index 9d10aa509ec..2056232b0f3 100644 --- a/cardano-node/app/cardano-node.hs +++ b/cardano-node/app/cardano-node.hs @@ -1,5 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RankNTypes #-} +{-# LANGUAGE TemplateHaskell #-} import qualified Cardano.Crypto.Init as Crypto import Cardano.Git.Rev (gitRev) @@ -89,7 +90,7 @@ runVersionCommand = [ "cardano-node ", renderVersion version , " - ", Text.pack os, "-", Text.pack arch , " - ", Text.pack compilerName, "-", renderVersion compilerVersion - , "\ngit rev ", gitRev + , "\ngit rev ", $(gitRev) ] where renderVersion = Text.pack . showVersion diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index c92f706a1f9..991d9c0322c 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -147,7 +147,7 @@ library , cardano-api ^>= 8.39.3.0 , cardano-crypto-class , cardano-crypto-wrapper - , cardano-git-rev + , cardano-git-rev ^>=0.2.2 , cardano-ledger-alonzo , cardano-ledger-allegra , cardano-ledger-api diff --git a/cardano-node/src/Cardano/Node/Configuration/Logging.hs b/cardano-node/src/Cardano/Node/Configuration/Logging.hs index b522004c7be..cad45ea0495 100644 --- a/cardano-node/src/Cardano/Node/Configuration/Logging.hs +++ b/cardano-node/src/Cardano/Node/Configuration/Logging.hs @@ -5,6 +5,7 @@ {-# LANGUAGE PackageImports #-} {-# LANGUAGE Rank2Types #-} {-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeApplications #-} module Cardano.Node.Configuration.Logging @@ -173,7 +174,7 @@ createLoggingLayer ver nodeConfig' p = do -- These have to be set before the switchboard is set up. liftIO $ do Config.setTextOption logConfig "appversion" ver - Config.setTextOption logConfig "appcommit" gitRev + Config.setTextOption logConfig "appcommit" $(gitRev) (baseTrace', switchBoard) <- liftIO $ setupTrace_ logConfig "cardano" @@ -352,7 +353,7 @@ nodeBasicInfo nc (SomeConsensusProtocol whichP pForInfo) nodeStartTime' = do items = nub $ [ ("protocol", pack . show $ ncProtocol nc) , ("version", pack . showVersion $ version) - , ("commit", gitRev) + , ("commit", $(gitRev)) , ("nodeStartTime", textShow nodeStartTime') ] ++ protocolDependentItems logObjects = diff --git a/cardano-node/src/Cardano/Node/Startup.hs b/cardano-node/src/Cardano/Node/Startup.hs index 6b2289caaa9..d290b8b460b 100644 --- a/cardano-node/src/Cardano/Node/Startup.hs +++ b/cardano-node/src/Cardano/Node/Startup.hs @@ -4,6 +4,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE StandaloneDeriving #-} +{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE UndecidableInstances #-} @@ -213,7 +214,7 @@ prepareNodeInfo nc (SomeConsensusProtocol whichP pForInfo) tc nodeStartTime = do { niName = nodeName , niProtocol = pack . show . ncProtocol $ nc , niVersion = pack . showVersion $ version - , niCommit = gitRev + , niCommit = $(gitRev) , niStartTime = nodeStartTime , niSystemStartTime = systemStartTime } diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs index 341ab3dac10..5ff68f54bb1 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs @@ -3,6 +3,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-name-shadowing -Wno-orphans #-} @@ -69,7 +70,7 @@ getStartupInfo nc (SomeConsensusProtocol whichP pForInfo) fp = do basicInfoCommon = BICommon $ BasicInfoCommon { biProtocol = pack . show $ ncProtocol nc , biVersion = pack . showVersion $ version - , biCommit = gitRev + , biCommit = $(gitRev) , biNodeStartTime = nodeStartTime , biConfigPath = fp , biNetworkMagic = getNetworkMagic $ Consensus.configBlock cfg diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index e181e6c13f1..45a9c7e8e0b 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -38,7 +38,7 @@ library , cardano-cli ^>= 8.20.3.0 , cardano-crypto-class , cardano-crypto-wrapper - , cardano-git-rev + , cardano-git-rev ^>= 0.2.2 , cardano-ledger-alonzo , cardano-ledger-binary , cardano-ledger-byron diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal index e2904cff589..81e4b18f821 100644 --- a/cardano-tracer/cardano-tracer.cabal +++ b/cardano-tracer/cardano-tracer.cabal @@ -137,7 +137,7 @@ library , bimap >= 0.4.0 , blaze-html , bytestring - , cardano-git-rev + , cardano-git-rev ^>=0.2.2 , cardano-node , cassava , cborg diff --git a/cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/HTML/About.hs b/cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/HTML/About.hs index 4fa483f9f07..06f0689e9b6 100644 --- a/cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/HTML/About.hs +++ b/cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/HTML/About.hs @@ -1,4 +1,5 @@ {-# LANGUAGE LambdaCase #-} +{-# LANGUAGE TemplateHaskell #-} module Cardano.Tracer.Handlers.RTView.UI.HTML.About ( mkAboutInfo @@ -106,7 +107,7 @@ mkAboutInfo = do on UI.click closeIt . const $ element info #. "modal" return info where - commit = T.unpack . T.take 7 $ gitRev + commit = T.unpack . T.take 7 $ $(gitRev) currentOS :: String currentOS = diff --git a/flake.lock b/flake.lock index ba533ab7146..0bba46c01a3 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1711044046, - "narHash": "sha256-EdcE43LQtfzNFiwQfQp9RGqZizpfMR7fAT4XG3M9iO8=", + "lastModified": 1711365846, + "narHash": "sha256-sM0Z4WL/Xu+WCuxoM3rSt/lX+tgS/0fKLsiuYXePaJo=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "50ff95f584e05c942c9fabdd1b176996a0fb0cc5", + "rev": "ba421ee9ce54533f5953a9468cdcf5ab33c36599", "type": "github" }, "original": { @@ -624,11 +624,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1711066960, - "narHash": "sha256-KJtft6ryg++1PfwbbBkFZedOv4xeuge6IV5FBRa0f7s=", + "lastModified": 1711412520, + "narHash": "sha256-48Aw1X7IuXZR6Wi2WOlvj9HpoUHty/JW1MqAehgnoHo=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "dca16b7a7eb69d9c0fdf5a4f205b347c19eb80bb", + "rev": "fc84d1170ccc83d50db7b71a6edd090b2cef7657", "type": "github" }, "original": {