From 524b7fe178e7ff909d9eef1e8fab78e227076de7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 28 May 2015 16:09:05 +0200 Subject: coq-ssreflect: refactor --- pkgs/development/coq-modules/ssreflect/default.nix | 47 ++++++---------------- 1 file changed, 13 insertions(+), 34 deletions(-) (limited to 'pkgs/development/coq-modules/ssreflect/default.nix') diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index bb91c3e270b6..a0b0d951c0df 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,48 +1,27 @@ -{ stdenv, fetchurl, coq -, graphviz, withDoc ? true -}: +{ callPackage, fetchurl, coq }: -assert coq.coq-version == "8.4"; +if coq.coq-version == "8.4" then -stdenv.mkDerivation { - - name = "coq-ssreflect-1.5"; +callPackage ./generic.nix { src = fetchurl { url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.tar.gz; sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds"; }; - nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; - 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 - ''; - - buildFlags = stdenv.lib.optionalString withDoc "doc"; +} - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; +else if coq.coq-version == "8.5" then - postInstall = '' - mkdir -p $out/bin - cp -p bin/ssrcoq $out/bin - cp -p bin/ssrcoq.byte $out/bin - '' + stdenv.lib.optionalString withDoc '' - mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/ - cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/ - ''; +callPackage ./generic.nix { - meta = with stdenv.lib; { - homepage = http://ssr.msr-inria.inria.fr/; - license = licenses.cecill-b; - maintainers = with maintainers; [ vbgl jwiegley ]; - platforms = coq.meta.platforms; + src = fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.coq85beta2.tar.gz; + sha256 = "084l9xd5vgb8jml0dkm66g8cil5rsf04w821pjhn2qk9mdbwaagf"; }; + patches = [ ./threads.patch ]; + } + +else throw "No ssreflect package for Coq version ${coq.coq-version}" -- cgit 1.4.1