Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,26 @@ jobs:
ref: ${{ steps.config.outputs.ref }}
submodules: recursive

- name: Install Nix
uses: cachix/install-nix-action@v14.1
- name: 'Install Nix'
uses: cachix/install-nix-action@v15
with:
extra_nix_config: |
substituters = http://cache.nixos.org https://hydra.iohk.io
substituters = http://cache.nixos.org https://cache.iog.io
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
install_url: "https://releases.nixos.org/nix/nix-2.3.16/install"

- name: Install Cachix
- name: 'Install Cachix'
uses: cachix/cachix-action@v10
with:
name: runtimeverification
extraPullNames: kore
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'


- name: Materialize
run: ./nix/rematerialize.sh
run: GC_DONT_GC=1 nix run .#update-cabal
Comment on lines 45 to +46
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we delete the old script then?
But maybe it is useful to keep it so one can run the update locally. Then we would want to have the nix run ... commands in that script.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the old script works with nix <2.4 without flakes. It should be removed if/when we get rid of non flake nix stuff in the repo

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤷‍♂️ OK then we keep it as it is for now.


- name: Materialize GHC 9
run: GC_DONT_GC=1 nix run .#update-cabal-ghc9

- name: Update branch
env:
Expand Down
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
"rematerialize-kore-nix-${compiler-nix-name}" ''
#!/bin/sh
${self.stack-nix.passthru.generateMaterialized} ./nix/kore-${compiler-nix-name}.nix.d
${pkgs.nixfmt}/bin/nixfmt ./nix/kore-${compiler-nix-name}.nix.d/*.nix
'';
};

Expand Down
58 changes: 30 additions & 28 deletions nix/kore-ghc8107.nix.d/default.nix
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
{
extras = hackage:
{
packages = {
"ghc-trace-events" = (((hackage.ghc-trace-events)."0.1.2.1").revisions).default;
"monoidal-containers" = (((hackage.monoidal-containers)."0.6.0.1").revisions).default;
"newtype" = (((hackage.newtype)."0.2.2.0").revisions).default;
"sqlite-simple" = (((hackage.sqlite-simple)."0.4.18.0").revisions).default;
"direct-sqlite" = (((hackage.direct-sqlite)."2.3.26").revisions).default;
"witherable" = (((hackage.witherable)."0.3.5").revisions).default;
"witherable-class" = (((hackage.witherable-class)."0").revisions).default;
"co-log" = (((hackage.co-log)."0.4.0.1").revisions).default;
"tasty-test-reporter" = (((hackage.tasty-test-reporter)."0.1.1.4").revisions).default;
"junit-xml" = (((hackage.junit-xml)."0.1.0.0").revisions).default;
"compact" = (((hackage.compact)."0.2.0.0").revisions).default;
"decision-diagrams" = (((hackage.decision-diagrams)."0.2.0.0").revisions).default;
"ghc-events" = (((hackage.ghc-events)."0.13.0").revisions).default;
kore = ./kore.nix;
eventlog2speedscope = ./.stack-to-nix.cache.0;
pipes-ghc-events = ./.stack-to-nix.cache.1;
pipes-sqlite-simple = ./.stack-to-nix.cache.2;
};
};
extras = hackage: {
packages = {
"ghc-trace-events" =
(((hackage.ghc-trace-events)."0.1.2.1").revisions).default;
"monoidal-containers" =
(((hackage.monoidal-containers)."0.6.0.1").revisions).default;
"newtype" = (((hackage.newtype)."0.2.2.0").revisions).default;
"sqlite-simple" =
(((hackage.sqlite-simple)."0.4.18.0").revisions).default;
"direct-sqlite" = (((hackage.direct-sqlite)."2.3.26").revisions).default;
"witherable" = (((hackage.witherable)."0.3.5").revisions).default;
"witherable-class" = (((hackage.witherable-class)."0").revisions).default;
"co-log" = (((hackage.co-log)."0.4.0.1").revisions).default;
"tasty-test-reporter" =
(((hackage.tasty-test-reporter)."0.1.1.4").revisions).default;
"junit-xml" = (((hackage.junit-xml)."0.1.0.0").revisions).default;
"compact" = (((hackage.compact)."0.2.0.0").revisions).default;
"decision-diagrams" =
(((hackage.decision-diagrams)."0.2.0.0").revisions).default;
"ghc-events" = (((hackage.ghc-events)."0.13.0").revisions).default;
kore = ./kore.nix;
eventlog2speedscope = ./.stack-to-nix.cache.0;
pipes-ghc-events = ./.stack-to-nix.cache.1;
pipes-sqlite-simple = ./.stack-to-nix.cache.2;
};
};
resolver = "lts-18.18";
modules = [
({ lib, ... }:
{ packages = {}; })
({ lib, ... }: { packages = { }; })
{ packages = { "$everything" = { ghcOptions = [ "-haddock" ]; }; }; }
({ lib, ... }:
{ planned = lib.mkOverride 900 true; })
];
}
({ lib, ... }: { planned = lib.mkOverride 900 true; })
];
}
Loading