diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-02-28 09:01:03 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-03-18 10:25:58 +0100 |
| commit | f23e6ec166cb90b65fc7b2464d82e4490dd056bf (patch) | |
| tree | e6938c7b992ed8d053eca9b651b44dd0908f9344 /pkgs/development/coq-modules | |
| parent | 2923bd5d0669f1ec6ab03ddce052e9c5efb46d8f (diff) | |
| download | nixpkgs-f23e6ec166cb90b65fc7b2464d82e4490dd056bf.tar nixpkgs-f23e6ec166cb90b65fc7b2464d82e4490dd056bf.tar.gz nixpkgs-f23e6ec166cb90b65fc7b2464d82e4490dd056bf.tar.bz2 nixpkgs-f23e6ec166cb90b65fc7b2464d82e4490dd056bf.tar.lz nixpkgs-f23e6ec166cb90b65fc7b2464d82e4490dd056bf.tar.xz nixpkgs-f23e6ec166cb90b65fc7b2464d82e4490dd056bf.tar.zst nixpkgs-f23e6ec166cb90b65fc7b2464d82e4490dd056bf.zip | |
coqPackages.contribs.containers: enable for Coq 8.9
Diffstat (limited to 'pkgs/development/coq-modules')
| -rw-r--r-- | pkgs/development/coq-modules/contribs/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 596c1cd07d3..faf7db09ff9 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -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" [ ] { |