Merge #4778

4778: Nix fixes - 1.35 r=disassembler a=jbgi

this is a backport of #4748.

Co-authored-by: Jean-Baptiste Giraudeau <[email protected]>
Co-authored-by: John Ky <[email protected]>
Co-authored-by: Marcin Szamotulski <[email protected]>

Author: 4 people

.github/workflows/check-mainnet-config.yml

@@ -14,13 +14,18 @@ jobs:
     steps:
 
     - name: Install Nix
-      uses: cachix/install-nix-action@v16
+      uses: cachix/install-nix-action@v18
       with:
+        # Use last stable nixos channel and the same nix as in channel:
+        install_url: https://releases.nixos.org/nix/nix-2.11.1/install
+        nix_path: nixpkgs=channel:nixos-22.11
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
         extra_nix_config: |
+          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
           experimental-features = nix-command flakes
           allow-import-from-derivation = true
           substituters = https://cache.nixos.org https://hydra.iohk.io
-          trusted-public-keys = iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+          trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
 
     - uses: actions/checkout@v2
 

.github/workflows/check-nix-config.yml

@@ -14,13 +14,18 @@ jobs:
     steps:
 
     - name: Install Nix
-      uses: cachix/install-nix-action@v16
+      uses: cachix/install-nix-action@v18
       with:
+        # Use last stable nixos channel and the same nix as in channel:
+        install_url: https://releases.nixos.org/nix/nix-2.11.1/install
+        nix_path: nixpkgs=channel:nixos-22.11
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
         extra_nix_config: |
+          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
           experimental-features = nix-command flakes
           allow-import-from-derivation = true
-          substituters = https://cache.nixos.org https://hydra.iohk.io
-          trusted-public-keys = iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+          substituters = https://cache.nixos.org https://cache.iog.io
+          trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
 
     - uses: actions/checkout@v2
 

bors.toml

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

cabal.project

@@ -77,6 +77,7 @@ test-show-details: direct
 
 constraints:
     hedgehog >= 1.0
+  , hedgehog-extras == 0.2.0.0
   , bimap >= 0.4.0
   , libsystemd-journal >= 1.4.4
   , systemd >= 2.3.0

cardano-testnet/test/Spec/Cli/Babbage/LeadershipSchedule.hs

@@ -116,7 +116,7 @@ hprop_leadershipSchedule = H.integration . H.runFinallies . H.workspace "alonzo"
 
     leadershipScheduleDeadline <- H.noteShowM $ DTC.addUTCTime 180 <$> H.noteShowIO DTC.getCurrentTime
 
-    H.byDeadlineM 5 leadershipScheduleDeadline "leadershipSchedule:current:error" $ do
+    H.byDeadlineM 5 leadershipScheduleDeadline $ do
       void $ H.execCli' execConfig
         [ "query", "leadership-schedule"
         , "--testnet-magic", show @Int testnetMagic
@@ -157,7 +157,7 @@ hprop_leadershipSchedule = H.integration . H.runFinallies . H.workspace "alonzo"
 
     leadershipScheduleDeadline <- H.noteShowM $ DTC.addUTCTime 180 <$> H.noteShowIO DTC.getCurrentTime
 
-    H.byDeadlineM 5 leadershipScheduleDeadline "leadershipSchedule:next:error" $ do
+    H.byDeadlineM 5 leadershipScheduleDeadline $ do
       void $ H.execCli' execConfig
         [ "query", "leadership-schedule"
         , "--testnet-magic", show @Int testnetMagic