colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coqPackages.stdpp: 1.1 -> 1.2.1; coqPackages.iris: 3.1.0 -> 3.2.0

Browse Source 
Ensures compatibility with Coq ≥ 8.9
This commit is contained in:
Vincent Laporte 2019-08-30 12:36:30 +00:00 committed by Vincent Laporte
parent 79303d4065
commit 5b3dc48f19
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/coq-modules/iris/default.nix
View File

@ -1,15 +1,18 @@
{ stdenv, fetchzip, coq, ssreflect, stdpp }: { stdenv, fetchFromGitLab, coq, stdpp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.1.0"; version = "3.2.0";
name = "coq${coq.coq-version}-iris-${version}"; name = "coq${coq.coq-version}-iris-${version}";
src = fetchzip { src = fetchFromGitLab {
url = "https://gitlab.mpi-sws.org/FP/iris-coq/-/archive/iris-${version}/iris-coq-iris-${version}.tar.gz"; domain = "gitlab.mpi-sws.org";
sha256 = "0ipdb061jj205avxifshxkpyxxqykigmlxk2n5nvxj62gs3rl5j1"; owner = "iris";
repo = "iris";
rev = "iris-${version}";
sha256 = "10dfi7qx6j5w6kbmbrf05xh18jwxr9iz5g7y0f6157msgvl081xs";
}; };
buildInputs = [ coq ]; buildInputs = [ coq ];
propagatedBuildInputs = [ ssreflect stdpp ]; propagatedBuildInputs = [ stdpp ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
}; };
passthru = { passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ];
}; };
} }

20
pkgs/development/coq-modules/stdpp/default.nix
View File

@ -1,10 +1,14 @@
{ stdenv, fetchzip, coq }: { stdenv, fetchFromGitLab, coq }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-stdpp-1.1"; name = "coq${coq.coq-version}-stdpp-${version}";
src = fetchzip { version = "1.2.1";
url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz"; src = fetchFromGitLab {
sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0"; domain = "gitlab.mpi-sws.org";
owner = "iris";
repo = "stdpp";
rev = "coq-stdpp-${version}";
sha256 = "1lczybg1jq9drbi8nzrlb0k199x4n07aawjwfzrl3qqc0w8kmvdz";
}; };
buildInputs = [ coq ]; buildInputs = [ coq ];
@ -14,7 +18,7 @@ stdenv.mkDerivation {
installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = { meta = {
homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp"; inherit (src.meta) homepage;
description = "An extended “Standard Library” for Coq"; description = "An extended “Standard Library” for Coq";
inherit (coq.meta) platforms; inherit (coq.meta) platforms;
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
@ -22,7 +26,7 @@ stdenv.mkDerivation {
}; };
passthru = { passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ];
}; };
} }