summary refs log tree commit diff
path: root/pkgs/development/coq-modules
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-10-13 16:10:19 -0500
committerJohn Wiegley <johnw@newartisans.com>2014-10-13 16:11:33 -0500
commitf78f2a90d664fb7e142fb6e4e64b9273516be4d8 (patch)
tree7a415dbf651c25c5e622c41ba20aeff033110f6f /pkgs/development/coq-modules
parentb9c2fe5fd8d1ebad8aead54616e80358058b39cb (diff)
downloadnixpkgs-f78f2a90d664fb7e142fb6e4e64b9273516be4d8.tar
nixpkgs-f78f2a90d664fb7e142fb6e4e64b9273516be4d8.tar.gz
nixpkgs-f78f2a90d664fb7e142fb6e4e64b9273516be4d8.tar.bz2
nixpkgs-f78f2a90d664fb7e142fb6e4e64b9273516be4d8.tar.lz
nixpkgs-f78f2a90d664fb7e142fb6e4e64b9273516be4d8.tar.xz
nixpkgs-f78f2a90d664fb7e142fb6e4e64b9273516be4d8.tar.zst
nixpkgs-f78f2a90d664fb7e142fb6e4e64b9273516be4d8.zip
coqPackages.ssreflect, more: build ssrcoq binary, add maintainer
Diffstat (limited to 'pkgs/development/coq-modules')
-rw-r--r--pkgs/development/coq-modules/containers/default.nix2
-rw-r--r--pkgs/development/coq-modules/coq-ext-lib/default.nix4
-rw-r--r--pkgs/development/coq-modules/mathcomp/default.nix4
-rw-r--r--pkgs/development/coq-modules/ssreflect/default.nix16
4 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix
index 92ac9d16cf6..5c5681f6010 100644
--- a/pkgs/development/coq-modules/containers/default.nix
+++ b/pkgs/development/coq-modules/containers/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://coq.inria.fr/pylons/pylons/contribs/view/Containers/v8.4;
     description = "A typeclass-based Coq library of finite sets/maps";
-    maintainers = with maintainers; [ vbgl ];
+    maintainers = with maintainers; [ vbgl jwiegley ];
     platforms = coq.meta.platforms;
   };
 
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 44173843033..b9939a2e7f4 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ coq.ocaml coq.camlp5 ];
   propagatedBuildInputs = [ coq ];
 
-  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}";
+  enableParallelBuilding = true;
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/coq-ext-lib/coq-ext-lib;
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index ca8bd6481ef..02d06edd538 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -11,12 +11,14 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ coq ssreflect ];
 
+  enableParallelBuilding = true;
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
   meta = with stdenv.lib; {
     homepage = http://ssr.msr-inria.inria.fr/;
     license = licenses.cecill-b;
-    maintainers = [ maintainers.vbgl ];
+    maintainers = [ maintainers.vbgl maintainers.jwiegley ];
     platforms = coq.meta.platforms;
     hydraPlatforms = [];
   };
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 912ff7071f8..75112ec9663 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -14,12 +14,26 @@ stdenv.mkDerivation {
   buildInputs = [ coq.ocaml coq.camlp5 ];
   propagatedBuildInputs = [ coq ];
 
+  enableParallelBuilding = true;
+
+  patchPhase = ''
+    # Permit building of the ssrcoq statically-bound executable
+    sed -i 's/^#-custom/-custom/' Make
+    sed -i 's/^#SSRCOQ/SSRCOQ/' Make
+  '';
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
+  postInstall = ''
+    mkdir -p $out/bin
+    cp -p bin/ssrcoq $out/bin
+    cp -p bin/ssrcoq.byte $out/bin
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://ssr.msr-inria.inria.fr/;
     license = licenses.cecill-b;
-    maintainers = with maintainers; [ vbgl ];
+    maintainers = with maintainers; [ vbgl jwiegley ];
     platforms = coq.meta.platforms;
   };