alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

coqPackages.{ssreflect,mathcomp}: 1.6 -> 1.6.1

Browse source
This commit is contained in:
Vincent Laporte 2017-01-28 06:35:57 +00:00 committed by vbgl
parent 4464199779
commit 5712ac6a72
3 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/coq-modules/mathcomp/default.nix
View file

@ -1,20 +1,11 @@
{ callPackage, fetchurl, coq }: { callPackage, fetchurl, coq }:
let param = 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"; version = "1.6.1";
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
}; in }; in
{
"8.4" = v16;
"8.5" = v16;
"8.6" = v161;
}."${coq.coq-version}"; in
callPackage ./generic.nix { callPackage ./generic.nix {
name = "coq${coq.coq-version}-mathcomp-${param.version}"; name = "coq${coq.coq-version}-mathcomp-${param.version}";

7
pkgs/development/coq-modules/mathcomp/generic.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, coq, ssreflect, ncurses, which { stdenv, fetchurl, coq, ncurses, which
, graphviz, withDoc ? false , graphviz, withDoc ? false
, src, name , src, name
}: }:
@ -10,7 +10,7 @@ stdenv.mkDerivation {
nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ]; buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
propagatedBuildInputs = [ coq ssreflect ]; propagatedBuildInputs = [ coq ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -24,9 +24,6 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install 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 '' '' + stdenv.lib.optionalString withDoc ''
make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/ make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
''; '';

11
pkgs/development/coq-modules/ssreflect/default.nix
View file

@ -1,20 +1,11 @@
{ callPackage, fetchurl, coq }: { callPackage, fetchurl, coq }:
let param = 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"; version = "1.6.1";
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
}; in }; in
{
"8.4" = v16;
"8.5" = v16;
"8.6" = v161;
}."${coq.coq-version}"; in
callPackage ./generic.nix { callPackage ./generic.nix {
name = "coq${coq.coq-version}-ssreflect-${param.version}"; name = "coq${coq.coq-version}-ssreflect-${param.version}";