nix: optimize caching by delaying setGitRev and other nix fixes

Makefile

@@ -21,7 +21,7 @@ RUN     ?=
 lint hlint: ## Run the CI version of hlint
 	nix build --no-link '.#checks/hlint' --cores 0
 haddock-hoogle haddocks hoogle:
-	if test -z "$$IN_NIX_SHELL"; then nix-shell --run 'cabal haddock all --haddock-hoogle'; else cabal haddock all --haddock-hoogle; fi
+	if test -z "$$IN_NIX_SHELL"; then nix-shell --run 'cabal update && cabal haddock all --haddock-hoogle'; else cabal update && cabal haddock all --haddock-hoogle; fi
 host-hlint: ## Run the system (not Nix) version of hlint
 	hlint bench cardano-{api,cli,client-demo,node,node-capi,node-chairman,submit-api,testnet,tracer}
 

bors.toml

@@ -1,5 +1,5 @@
 status = [
-  "ci/push",
+  "ci/push/required",
 ]
 timeout_sec = 7200
 required_approvals = 1

cabal.project

@@ -13,7 +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: 2022-12-11T00:00:00Z
-index-state: cardano-haskell-packages 2022-12-14T00:40:15Z
+
+index-state:
+  , hackage.haskell.org 2022-12-11T00:00:00Z
+  , cardano-haskell-packages 2022-12-14T00:40:15Z
 
 packages:
     cardano-api

cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs

@@ -865,7 +865,7 @@ writeStakeSnapshots mOutFile qState =
 
     Right (StakeSnapshot snapshot) -> do
       -- Calculate the three pool and active stake values for the given pool
-      liftIO . (maybe LBS.putStrLn (LBS.writeFile . unOutputFile) mOutFile) $ encodePretty snapshot
+      liftIO . maybe LBS.putStrLn (LBS.writeFile . unOutputFile) mOutFile $ encodePretty snapshot
 
 -- | This function obtains the pool parameters, equivalent to the following jq query on the output of query ledger-state
 --   .nesEs.esLState._delegationState._pstate._pParams.<pool_id>