From 1d5059c5e65e3a1b952885aabb0b9ea02290aebb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Dec 2018 10:52:25 +0000 Subject: [PATCH] coqPackages.InfSeqExt: fix build --- .../coq-modules/InfSeqExt/default.nix | 41 ++++--------------- 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 355b9e43927..6b908f5a09a 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -1,38 +1,11 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp }: +{ stdenv, fetchFromGitHub, coq }: -let params = +let param = { - "8.5" = { version = "20180918"; rev = "243d6be45666da73a9da6c37d451327165275798"; sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; - - "8.6" = { - version = "20180918"; - rev = "243d6be45666da73a9da6c37d451327165275798"; - sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; - - "8.7" = { - version = "20180918"; - rev = "243d6be45666da73a9da6c37d451327165275798"; - sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; - - "8.8" = { - version = "20180918"; - rev = "243d6be45666da73a9da6c37d451327165275798"; - sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; - - "8.9" = { - version = "20180918"; - rev = "243d6be45666da73a9da6c37d451327165275798"; - sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { @@ -44,15 +17,15 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; - buildInputs = [ - coq coq.ocaml coq.camlp5 coq.findlib mathcomp - ]; + buildInputs = [ coq ]; + enableParallelBuilding = true; - buildPhase = "make -j$NIX_BUILD_CORES"; + preConfigure = "patchShebangs ./configure"; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; }