Skip to content

Nix fixes - 1.35 #4778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jan 24, 2023
Merged

Nix fixes - 1.35 #4778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5190503
nix: optimize caching by delaying setGitRev
jbgi Jan 2, 2023
84969da
bump iohkNix to include libsodium fix for mingwW64
jbgi Jan 4, 2023
1354c69
fix required jobs, rename systemHydraJobs to ciJobs.
jbgi Jan 6, 2023
fb2bd2e
switch bors to use ci/required
jbgi Jan 11, 2023
e6f8db8
haskell.nix: add some TODO regarding unwanted dependencies on `src`.
jbgi Jan 11, 2023
52567bb
Update plutus-apps
jbgi Nov 10, 2022
4563033
node nixos service: fix path of profiled, eventlogged and asserted bi…
jbgi Jan 18, 2023
94fbab4
fix index-state and version of tools to avoid rebuilds and compile er…
jbgi Jan 18, 2023
541b502
flake: move devShell to devShells.default
jbgi Jan 16, 2023
3c14f22
Specify Github token in install-nix-action configuration
newhoggy Jan 4, 2023
d992b72
bump cachix/install-nix-action to v18. fix channel to nixos-22.11. fi…
jbgi Jan 24, 2023
7d64f79
Use hedgehog-extras-0.2.0.0
coot Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/check-mainnet-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/check-nix-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion bors.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
status = [
"ci/push",
"ci/push/required",
]
timeout_sec = 7200
required_approvals = 1
Expand Down
1 change: 1 addition & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cardano-testnet/test/Spec/Cli/Babbage/LeadershipSchedule.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading