From b20bc9eeb6d0806569c5b7922c3cbd2857631314 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 4 Mar 2021 22:03:28 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.zarith:=201.11=20=E2=86=92=201.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/zarith/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index bddf2a2448f..eed6b158d4a 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,31 +1,26 @@ -{ lib, stdenv, fetchurl -, ocaml, findlib, pkg-config, perl +{ lib, stdenv, fetchFromGitHub +, ocaml, findlib, pkg-config , gmp }: -let source = - if lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.11"; - url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz"; - sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr"; - } else { - version = "1.3"; - url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; - sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; - }; -in +if !lib.versionAtLeast ocaml.version "4.04" +then throw "zarith is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-zarith-${version}"; - inherit (source) version; - src = fetchurl { inherit (source) url sha256; }; + pname = "ocaml${ocaml.version}-zarith"; + version = "1.12"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "Zarith"; + rev = "release-${version}"; + sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9"; + }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib perl ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ gmp ]; - patchPhase = "patchShebangs ./z_pp.pl"; dontAddPrefix = true; configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ];