From 7cc369c9d5fa9d37783a1b0f217da7848d855f1e Mon Sep 17 00:00:00 2001 From: Théo Zimmermann Date: Mon, 5 Nov 2018 14:19:16 +0100 Subject: coqPackages.ssreflect: refactor choice of source version --- pkgs/development/coq-modules/mathcomp/default.nix | 30 +++++++++------------- pkgs/development/coq-modules/ssreflect/default.nix | 26 ++++++++----------- 2 files changed, 22 insertions(+), 34 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 99a6fe311a01..c99744168dbc 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -2,26 +2,20 @@ , graphviz, withDoc ? false }: -let params = - - let param_1_7 = { - version = "1.7.0"; - sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; - }; in +let param = + if stdenv.lib.versionAtLeast coq.coq-version "8.6" then { - "8.5" = { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - - "8.6" = param_1_7; - "8.7" = param_1_7; - "8.8" = param_1_7; - "8.9" = param_1_7; + version = "1.7.0"; + sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; + } + else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then + { + version = "1.6.1"; + sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + } + else throw "No version of math-comp is available for Coq ${coq.coq-version}"; - }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation { @@ -59,7 +53,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; } diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 840189e347a5..300b00afce1e 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -2,26 +2,20 @@ , graphviz, withDoc ? false }: -let params = +let param = - let param_1_7 = { + if stdenv.lib.versionAtLeast coq.coq-version "8.6" then + { version = "1.7.0"; sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; - }; in - + } + else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then { - "8.5" = { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; + version = "1.6.1"; + sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + } + else throw "No version of SSReflect is available for Coq ${coq.coq-version}"; - "8.6" = param_1_7; - "8.7" = param_1_7; - "8.8" = param_1_7; - "8.9" = param_1_7; - - }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation { @@ -60,7 +54,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; } -- cgit 1.4.1 From 993bd5df2240ef9223dd0b969ccd5f5fc7495526 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 6 Nov 2018 13:45:14 +0000 Subject: coqPackages.mathcomp: use fetchFromGitHub --- pkgs/development/coq-modules/mathcomp/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index c99744168dbc..0a6ba2ca08c8 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ncurses, which +{ stdenv, fetchFromGitHub, coq, ncurses, which , graphviz, withDoc ? false }: @@ -7,12 +7,12 @@ let param = if stdenv.lib.versionAtLeast coq.coq-version "8.6" then { version = "1.7.0"; - sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; + sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; } else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then { version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + sha256 = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; } else throw "No version of math-comp is available for Coq ${coq.coq-version}"; @@ -21,8 +21,10 @@ in stdenv.mkDerivation { name = "coq${coq.coq-version}-mathcomp-${param.version}"; - src = fetchurl { - url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; + src = fetchFromGitHub { + owner = "math-comp"; + repo = "math-comp"; + rev = "mathcomp-${param.version}"; inherit (param) sha256; }; -- cgit 1.4.1 From 5b813ebbc40a3da6560594276eda08af74ce31b0 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 6 Nov 2018 15:00:45 +0000 Subject: coqPackages.ssreflect: inherit mathcomp's source/meta attributes --- pkgs/development/coq-modules/mathcomp/default.nix | 10 +++-- pkgs/development/coq-modules/ssreflect/default.nix | 44 ++++------------------ 2 files changed, 15 insertions(+), 39 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 0a6ba2ca08c8..1e5b6b7bf666 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -18,8 +18,11 @@ let param = in -stdenv.mkDerivation { - name = "coq${coq.coq-version}-mathcomp-${param.version}"; +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-mathcomp-${version}"; + + # used in ssreflect + inherit (param) version; src = fetchFromGitHub { owner = "math-comp"; @@ -35,10 +38,11 @@ stdenv.mkDerivation { buildFlags = stdenv.lib.optionalString withDoc "doc"; + COQBIN = "${coq}/bin/"; + preBuild = '' patchShebangs etc/utils/ssrcoqdep || true cd mathcomp - export COQBIN=${coq}/bin/ ''; installPhase = '' diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 300b00afce1e..1fcb7e2da8ae 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,40 +1,22 @@ -{ stdenv, fetchurl, coq, ncurses, which -, graphviz, withDoc ? false +{ stdenv, fetchFromGitHub, coq, ncurses, which +, graphviz, mathcomp, withDoc ? false }: -let param = +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-ssreflect-${version}"; - if stdenv.lib.versionAtLeast coq.coq-version "8.6" then - { - version = "1.7.0"; - sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; - } - else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then - { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - } - else throw "No version of SSReflect is available for Coq ${coq.coq-version}"; - -in - -stdenv.mkDerivation { - - name = "coq${coq.coq-version}-ssreflect-${param.version}"; - src = fetchurl { - url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; - inherit (param) sha256; - }; + inherit (mathcomp) src version meta; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); enableParallelBuilding = true; + COQBIN = "${coq}/bin/"; + preBuild = '' patchShebangs etc/utils/ssrcoqdep || true cd mathcomp/ssreflect - export COQBIN=${coq}/bin/ ''; installPhase = '' @@ -46,15 +28,5 @@ stdenv.mkDerivation { cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/ ''; - meta = with stdenv.lib; { - homepage = http://ssr.msr-inria.inria.fr/; - license = licenses.cecill-b; - maintainers = with maintainers; [ vbgl jwiegley ]; - inherit (coq.meta) platforms; - }; - - passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; - }; - + passthru.compatibleCoqVersions = mathcomp.compatibleCoqVersions; } -- cgit 1.4.1