summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-07-18 00:57:39 +0700
committerGitHub <noreply@github.com>2021-07-18 00:57:39 +0700
commita22cd1991064d383f96a786d915507d237e042a0 (patch)
tree043941a499692c01c7a61cd6c268d169bdc51372 /pkgs
parente5b5d1b4c48e4872fb5b7620af32d4b0c888dcb4 (diff)
parent492e12cd2d0a6d0f7c6f802dd208bb8613d6cb84 (diff)
downloadnixpkgs-a22cd1991064d383f96a786d915507d237e042a0.tar
nixpkgs-a22cd1991064d383f96a786d915507d237e042a0.tar.gz
nixpkgs-a22cd1991064d383f96a786d915507d237e042a0.tar.bz2
nixpkgs-a22cd1991064d383f96a786d915507d237e042a0.tar.lz
nixpkgs-a22cd1991064d383f96a786d915507d237e042a0.tar.xz
nixpkgs-a22cd1991064d383f96a786d915507d237e042a0.tar.zst
nixpkgs-a22cd1991064d383f96a786d915507d237e042a0.zip
Merge pull request #130023 from siraben/hierarchy-builder-update
coqPackages.hierarchy-builder: 1.0.0 -> 1.1.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/coq-modules/hierarchy-builder/default.nix12
-rw-r--r--pkgs/development/coq-modules/mathcomp-analysis/default.nix3
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix
index dabcc44261b..491ff959ece 100644
--- a/pkgs/development/coq-modules/hierarchy-builder/default.nix
+++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -5,9 +5,10 @@ with lib; mkCoqDerivation {
   owner = "math-comp";
   inherit version;
   defaultVersion = with versions; switch coq.coq-version [
-    { case = isGe "8.12";         out = "1.0.0"; }
+    { case = isGe "8.12";         out = "1.1.0"; }
     { case = range "8.11" "8.12"; out = "0.10.0"; }
   ] null;
+  release."1.1.0".sha256  = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q=";
   release."1.0.0".sha256  = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp";
   release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
   releaseRev = v: "v${v}";
@@ -16,11 +17,14 @@ with lib; mkCoqDerivation {
 
   propagatedBuildInputs = [ coq-elpi ];
 
+  mlPlugin = true;
+
+  installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
   extraInstallFlags = [ "VFILES=structures.v" ];
 
   meta = {
-    description = "Coq plugin embedding ELPI.";
-    maintainers = [ maintainers.cohencyril ];
-    license = licenses.lgpl21;
+    description = "High level commands to declare a hierarchy based on packed classes";
+    maintainers = with maintainers; [ cohencyril siraben ];
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index 003727c608f..b06f057f82e 100644
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -8,6 +8,7 @@ let mca = mkCoqDerivation {
   pname = "analysis";
   owner = "math-comp";
 
+  release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4=";
   release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5";
   release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c";
   release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867";
@@ -16,7 +17,7 @@ let mca = mkCoqDerivation {
 
   inherit version;
   defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [
-      { cases = [ (range "8.11" "8.13") "1.12.0" ];             out = "0.3.6"; }
+      { cases = [ (range "8.11" "8.13") "1.12.0" ];             out = "0.3.9"; }
       { cases = [ (range "8.11" "8.13") "1.11.0" ];             out = "0.3.4"; }
       { cases = [ (range "8.10" "8.12") "1.11.0" ];             out = "0.3.3"; }
       { cases = [ (range "8.10" "8.11") "1.11.0" ];             out = "0.3.1"; }