diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index dba6a3abbea5..a80c934c6c19 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,20 +1,11 @@ { callPackage, fetchurl, coq }: let param = - let v16 = { - version = "1.6"; - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - }; v161 = { + { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }; in -{ - "8.4" = v16; - "8.5" = v16; - "8.6" = v161; -}."${coq.coq-version}"; in callPackage ./generic.nix { name = "coq${coq.coq-version}-mathcomp-${param.version}"; diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 1c150c9e69fa..564cb6f65717 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ssreflect, ncurses, which +{ stdenv, fetchurl, coq, ncurses, which , graphviz, withDoc ? false , src, name }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ]; - propagatedBuildInputs = [ coq ssreflect ]; + propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; @@ -24,9 +24,6 @@ stdenv.mkDerivation { installPhase = '' make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect* - rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/ssrmatching.cmi - rm -fr $out/share/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect* '' + stdenv.lib.optionalString withDoc '' make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/ ''; diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 18eafe5e9c2c..352b98ab88b9 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,20 +1,11 @@ { callPackage, fetchurl, coq }: let param = - let v16 = { - version = "1.6"; - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - }; v161 = { + { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }; in -{ - "8.4" = v16; - "8.5" = v16; - "8.6" = v161; -}."${coq.coq-version}"; in callPackage ./generic.nix { name = "coq${coq.coq-version}-ssreflect-${param.version}";