Skip to content

Commit acdda75

Browse files
[nix] Rematerialize GHC9 in the CI (#3174)
Updated the `Update/ Nix` CI script to re-materialize both the current GHC8.10.* and the GHC9 expressions in the `nix/` folder.
1 parent f2aad03 commit acdda75

File tree

6 files changed

+1938
-1857
lines changed

6 files changed

+1938
-1857
lines changed

.github/workflows/update.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,26 @@ jobs:
2727
ref: ${{ steps.config.outputs.ref }}
2828
submodules: recursive
2929

30-
- name: Install Nix
31-
uses: cachix/install-nix-action@v14.1
30+
- name: 'Install Nix'
31+
uses: cachix/install-nix-action@v15
3232
with:
3333
extra_nix_config: |
34-
substituters = http://cache.nixos.org https://hydra.iohk.io
34+
substituters = http://cache.nixos.org https://cache.iog.io
3535
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
36-
install_url: "https://releases.nixos.org/nix/nix-2.3.16/install"
3736
38-
- name: Install Cachix
37+
- name: 'Install Cachix'
3938
uses: cachix/cachix-action@v10
4039
with:
4140
name: runtimeverification
41+
extraPullNames: kore
4242
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
4343

44+
4445
- name: Materialize
45-
run: ./nix/rematerialize.sh
46+
run: GC_DONT_GC=1 nix run .#update-cabal
47+
48+
- name: Materialize GHC 9
49+
run: GC_DONT_GC=1 nix run .#update-cabal-ghc9
4650

4751
- name: Update branch
4852
env:

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
"rematerialize-kore-nix-${compiler-nix-name}" ''
105105
#!/bin/sh
106106
${self.stack-nix.passthru.generateMaterialized} ./nix/kore-${compiler-nix-name}.nix.d
107+
${pkgs.nixfmt}/bin/nixfmt ./nix/kore-${compiler-nix-name}.nix.d/*.nix
107108
'';
108109
};
109110

nix/kore-ghc8107.nix.d/default.nix

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
{
2-
extras = hackage:
3-
{
4-
packages = {
5-
"ghc-trace-events" = (((hackage.ghc-trace-events)."0.1.2.1").revisions).default;
6-
"monoidal-containers" = (((hackage.monoidal-containers)."0.6.0.1").revisions).default;
7-
"newtype" = (((hackage.newtype)."0.2.2.0").revisions).default;
8-
"sqlite-simple" = (((hackage.sqlite-simple)."0.4.18.0").revisions).default;
9-
"direct-sqlite" = (((hackage.direct-sqlite)."2.3.26").revisions).default;
10-
"witherable" = (((hackage.witherable)."0.3.5").revisions).default;
11-
"witherable-class" = (((hackage.witherable-class)."0").revisions).default;
12-
"co-log" = (((hackage.co-log)."0.4.0.1").revisions).default;
13-
"tasty-test-reporter" = (((hackage.tasty-test-reporter)."0.1.1.4").revisions).default;
14-
"junit-xml" = (((hackage.junit-xml)."0.1.0.0").revisions).default;
15-
"compact" = (((hackage.compact)."0.2.0.0").revisions).default;
16-
"decision-diagrams" = (((hackage.decision-diagrams)."0.2.0.0").revisions).default;
17-
"ghc-events" = (((hackage.ghc-events)."0.13.0").revisions).default;
18-
kore = ./kore.nix;
19-
eventlog2speedscope = ./.stack-to-nix.cache.0;
20-
pipes-ghc-events = ./.stack-to-nix.cache.1;
21-
pipes-sqlite-simple = ./.stack-to-nix.cache.2;
22-
};
23-
};
2+
extras = hackage: {
3+
packages = {
4+
"ghc-trace-events" =
5+
(((hackage.ghc-trace-events)."0.1.2.1").revisions).default;
6+
"monoidal-containers" =
7+
(((hackage.monoidal-containers)."0.6.0.1").revisions).default;
8+
"newtype" = (((hackage.newtype)."0.2.2.0").revisions).default;
9+
"sqlite-simple" =
10+
(((hackage.sqlite-simple)."0.4.18.0").revisions).default;
11+
"direct-sqlite" = (((hackage.direct-sqlite)."2.3.26").revisions).default;
12+
"witherable" = (((hackage.witherable)."0.3.5").revisions).default;
13+
"witherable-class" = (((hackage.witherable-class)."0").revisions).default;
14+
"co-log" = (((hackage.co-log)."0.4.0.1").revisions).default;
15+
"tasty-test-reporter" =
16+
(((hackage.tasty-test-reporter)."0.1.1.4").revisions).default;
17+
"junit-xml" = (((hackage.junit-xml)."0.1.0.0").revisions).default;
18+
"compact" = (((hackage.compact)."0.2.0.0").revisions).default;
19+
"decision-diagrams" =
20+
(((hackage.decision-diagrams)."0.2.0.0").revisions).default;
21+
"ghc-events" = (((hackage.ghc-events)."0.13.0").revisions).default;
22+
kore = ./kore.nix;
23+
eventlog2speedscope = ./.stack-to-nix.cache.0;
24+
pipes-ghc-events = ./.stack-to-nix.cache.1;
25+
pipes-sqlite-simple = ./.stack-to-nix.cache.2;
26+
};
27+
};
2428
resolver = "lts-18.18";
2529
modules = [
26-
({ lib, ... }:
27-
{ packages = {}; })
30+
({ lib, ... }: { packages = { }; })
2831
{ packages = { "$everything" = { ghcOptions = [ "-haddock" ]; }; }; }
29-
({ lib, ... }:
30-
{ planned = lib.mkOverride 900 true; })
31-
];
32-
}
32+
({ lib, ... }: { planned = lib.mkOverride 900 true; })
33+
];
34+
}

0 commit comments

Comments
 (0)