Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2923bd5d0669
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f23e6ec166cb
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 18, 2019

  1. coqPackages.contribs.containers: enable for Coq 8.9

    @vbgl
    vbgl committed Mar 18, 2019
    Copy the full SHA
    f23e6ec View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/development/coq-modules/contribs/default.nix
11 changes: 9 additions & 2 deletions pkgs/development/coq-modules/contribs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,9 @@ let mkContrib = repo: revs: param:

buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];

installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
installFlags =
stdenv.lib.optional (stdenv.lib.versionAtLeast coq.coq-version "8.9") "-f Makefile.coq"
++ [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];

passthru = {
compatibleCoqVersions = v: builtins.elem v revs;
@@ -196,7 +198,7 @@ let mkContrib = repo: revs: param:
sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33";
};

containers = mkContrib "containers" [ "8.6" "8.7" "8.8" ] {
containers = mkContrib "containers" [ "8.6" "8.7" "8.8" "8.9" ] {
"8.6" = {
version = "8.6.0";
rev = "fa1fec7";
@@ -212,6 +214,11 @@ let mkContrib = repo: revs: param:
rev = "52b86bed1671321b25fe4d7495558f9f221b12aa";
sha256 = "0hbnrwdgryr52170cfrlbiymr88jsyxilnpr343vnprqq3zk1xz0";
};
"8.9" = {
version = "20190222";
rev = "aa33052c1edfc5a65885942a67c2773b5d96f8cc";
sha256 = "0mjgfdr9bzsch0dlk4vq1frkaig14dqh46r54cv0l15flxapg0iw";
};
}."${coq.coq-version}";

continuations = mkContrib "continuations" [ ] {