diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:11 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:11 +0200 |
| commit | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (patch) | |
| tree | 4c7212dd0f5244a3f09b8dcd5abca15737cffedf /pkgs/development/coq-modules | |
| parent | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (diff) | |
| parent | 4a1189e0abdbe26e34fc05555cf49c25583dfe3d (diff) | |
| download | nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.gz nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.bz2 nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.lz nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.xz nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.zst nixpkgs-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/coq-modules')
| -rw-r--r-- | pkgs/development/coq-modules/iris/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/coq-modules/stdpp/default.nix | 20 |
2 files changed, 22 insertions, 15 deletions
diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index ea26f3e1ca9..0718e518b35 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchzip, coq, ssreflect, stdpp }: +{ stdenv, fetchFromGitLab, coq, stdpp }: stdenv.mkDerivation rec { - version = "3.1.0"; + version = "3.2.0"; name = "coq${coq.coq-version}-iris-${version}"; - src = fetchzip { - url = "https://gitlab.mpi-sws.org/FP/iris-coq/-/archive/iris-${version}/iris-coq-iris-${version}.tar.gz"; - sha256 = "0ipdb061jj205avxifshxkpyxxqykigmlxk2n5nvxj62gs3rl5j1"; + src = fetchFromGitLab { + domain = "gitlab.mpi-sws.org"; + owner = "iris"; + repo = "iris"; + rev = "iris-${version}"; + sha256 = "10dfi7qx6j5w6kbmbrf05xh18jwxr9iz5g7y0f6157msgvl081xs"; }; buildInputs = [ coq ]; - propagatedBuildInputs = [ ssreflect stdpp ]; + propagatedBuildInputs = [ stdpp ]; enableParallelBuilding = true; @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { }; 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" ]; }; } diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 883ed971b08..3ba99e87ffb 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchzip, coq }: +{ stdenv, fetchFromGitLab, coq }: -stdenv.mkDerivation { - name = "coq${coq.coq-version}-stdpp-1.1"; - src = fetchzip { - url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz"; - sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0"; +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-stdpp-${version}"; + version = "1.2.1"; + src = fetchFromGitLab { + domain = "gitlab.mpi-sws.org"; + owner = "iris"; + repo = "stdpp"; + rev = "coq-stdpp-${version}"; + sha256 = "1lczybg1jq9drbi8nzrlb0k199x4n07aawjwfzrl3qqc0w8kmvdz"; }; buildInputs = [ coq ]; @@ -14,7 +18,7 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { - homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp"; + inherit (src.meta) homepage; description = "An extended “Standard Library” for Coq"; inherit (coq.meta) platforms; license = stdenv.lib.licenses.bsd3; @@ -22,7 +26,7 @@ stdenv.mkDerivation { }; 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" ]; }; } |