diff options
author | Théo Zimmermann <theo.zimmermann@inria.fr> | 2021-08-22 16:11:42 +0200 |
---|---|---|
committer | Théo Zimmermann <theo.zimmermann@inria.fr> | 2021-08-22 16:11:42 +0200 |
commit | a864b59ef1a807586f2bccbca46ac1478d04138c (patch) | |
tree | bd2de7755409786810868a48502a1134990f23af | |
parent | b25f2c01e8633fde8ee5cab3ff52ad6414bdc4e5 (diff) |
coqPackage.topology: 8.12.0 -> 9.0.0
First release with Zorns-lemma and Topology in a monorepo. Each individual package is built with Dune.
-rw-r--r-- | pkgs/development/coq-modules/topology/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/coq-modules/zorns-lemma/default.nix | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index b4367f0a8fcc7..37585eea8c79f 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation rec { releaseRev = v: "v${v}"; + release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c"; release."8.12.0".sha256 = "sha256-ypHmHwzwZ6MQPYwuS3QyZmVOEPUCSbO2lhVaA6TypgQ="; release."8.10.0".sha256 = "sha256-mCLF3JYIiO3AEW9yvlcLeF7zN4SjW3LG+Y5vYB0l55A="; release."8.9.0".sha256 = "sha256-ZJh1BM34iZOQ75zqLIA+KtBjO2y33y0UpAw/ydCWQYc="; @@ -15,16 +16,16 @@ mkCoqDerivation rec { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.12"; out = "8.12.0"; } - { case = "8.11"; out = "8.12.0"; } - { case = "8.10"; out = "8.10.0"; } + { case = isGe "8.10"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } { case = "8.6"; out = "8.6.0"; } ] null; - propagatedBuildInputs = optional (versions.isLe "8.12" defaultVersion) zorns-lemma; + propagatedBuildInputs = [ zorns-lemma ]; + + useDune2ifVersion = versions.isGe "9.0"; meta = { description = "General topology in Coq"; diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index 84c3fd805197d..cf3e9ca15db8c 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -3,9 +3,11 @@ with lib; mkCoqDerivation { pname = "zorns-lemma"; + repo = "topology"; releaseRev = v: "v${v}"; + release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c"; release."8.11.0".sha256 = "sha256-2Hf7YwRcFmP/DqwFtF1p78MCNV50qUWfMVQtZbwKd0k="; release."8.10.0".sha256 = "sha256-qLPLK2ZLJQ4SmJX2ADqFiP4kgHuQFJTeNXkBbjiFS+4="; release."8.9.0".sha256 = "sha256-lEh978cXehglFX9D92RVltEuvN8umfPo/hvmFZm2NGo="; @@ -16,8 +18,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "8.11.0"; } - { case = "8.10"; out = "8.10.0"; } + { case = isGe "8.10"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } @@ -25,6 +26,8 @@ mkCoqDerivation { { case = "8.5"; out = "8.5.0"; } ] null; + useDune2ifVersion = versions.isGe "9.0"; + meta = { description = "Development of basic set theory"; longDescription = '' |