From 9ffd16b3850536094ca36bc31520bb15a6d5a9ef Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Fri, 28 Aug 2020 23:05:46 +0200 Subject: coqPackages: refactor --- pkgs/development/coq-modules/coq-elpi/default.nix | 60 ++++++++++------------- 1 file changed, 25 insertions(+), 35 deletions(-) (limited to 'pkgs/development/coq-modules/coq-elpi/default.nix') diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 230320671a7..18dbeaea201 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -1,43 +1,33 @@ -{ stdenv, fetchFromGitHub, which, coq }: +{ lib, mkCoqDerivation, which, coq, version ? null }: -let params = { - "8.11" = rec { - version = "1.6.0_8.11"; - rev = "v${version}"; - sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; - }; - "8.12" = rec { - version = "1.6.0"; - rev = "v${version}"; - sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; - }; -}; - param = params.${coq.coq-version}; -in - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-elpi-${param.version}"; - - src = fetchFromGitHub { - owner = "LPCIC"; - repo = "coq-elpi"; - inherit (param) rev sha256; - }; +with builtins; with lib; let + elpi = coq.ocamlPackages.elpi.override ( + optionalAttrs (coq.coq-version == "8.11") { version = "1.11.4"; } + ); +in mkCoqDerivation { + pname = "elpi"; + repo = "coq-elpi"; + owner = "LPCIC"; + inherit version; + defaultVersion = lib.switch coq.coq-version [ + { case = "8.13"; out = "1.8.1"; } + { case = "8.12"; out = "1.8.0"; } + { case = "8.11"; out = "1.6.0_8.11"; } + ] null; + release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; + release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; + release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; + release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; + release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; + releaseRev = v: "v${v}"; nativeBuildInputs = [ which ]; - buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]); - - installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + mlPlugin = true; + extraBuildInputs = [ elpi ]; meta = { description = "Coq plugin embedding ELPI."; - maintainers = [ stdenv.lib.maintainers.cohencyril ]; - license = stdenv.lib.licenses.lgpl21; - inherit (coq.meta) platforms; - inherit (src.meta) homepage; - }; - - passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + maintainers = [ maintainers.cohencyril ]; + license = licenses.lgpl21; }; } -- cgit 1.4.1