Skip to content

Compile with coq 8.12 & coq elpi 1.8 #128

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 1 commit into from
Dec 15, 2020
Merged

Compile with coq 8.12 & coq elpi 1.8 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,18 @@ on:
branches: [ master ]

jobs:
# nix:
# runs-on: ubuntu-latest
#
# steps:
# - uses: actions/checkout@v2
# - uses: cachix/install-nix-action@v10
# - run: nix-build
nix:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: cachix/install-nix-action@v12
- uses: cachix/cachix-action@v8
with:
name: coq
- run: nix-build

opam:
runs-on: ubuntu-latest
Expand Down
30 changes: 19 additions & 11 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
{withEmacs ? false,
nixpkgs ? (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/4aa5466cbc741097218a1c494a7b832a17d1967d.tar.gz),
coq-version ? "8.11",
coq-version ? "8.12",
print-env ? false
}:
with import nixpkgs {
# overlays = [ (super: self: {
# coqPackages = { "8.11" = super.coqPackages_8_11; }."${coq-version}".overrideScope' (self: super: {
# # Coq package override example:
# coq-elpi = super.coq-elpi.overrideAttrs (old: {
# name = "coq8.11-elpi-1.5.0";
# src = fetchTarball https://github.com/LPCIC/coq-elpi/archive/v1.5.0.tar.gz;
# });
# });
# coq = self.coqPackages.coq;
# })];
overlays = [ (super: self: {
coqPackages = { "8.12" = super.coqPackages_8_12; }."${coq-version}".overrideScope' (self: super: {
coq = super.coq.override {
ocamlPackages = super.coq.ocamlPackages.overrideScope' (self: super: {
elpi = super.elpi.overrideAttrs (old: {
name = "elpi-1.12.0";
src = fetchTarball https://github.com/LPCIC/elpi/archive/v1.12.0.tar.gz;
});
});
};
# Coq package override example:
coq-elpi = super.coq-elpi.overrideAttrs (old: {
name = "coq8.12-elpi-1.8.0";
src = fetchTarball https://github.com/LPCIC/coq-elpi/archive/v1.8.0.tar.gz;
});
});
coq = self.coqPackages.coq;
})];
};
let pgEmacs = emacsWithPackages (epkgs: with epkgs.melpaStablePackages; [proof-general]); in
coqPackages.hierarchy-builder.overrideAttrs (old: {
Expand Down