diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-12-02 12:53:55 +0100 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-12-02 15:56:54 +0100 |
commit | b0c181bc9d1d86928192cc87f97c743b444f35a5 (patch) | |
tree | 03a6595f52d09e7872ecc8e043c3fbd185be130a /pkgs/development | |
parent | acae9f16a9ca0f2041ebd438359a46c1c3dc05b1 (diff) |
ocamlPackages.astring: 0.8.3 -> 0.8.5
Since astring is a common dependency and the maintainance effort is
minimal (package dependencies and build system didn't change) we keep
the old 0.8.3 version around for OCaml < 4.05, since 0.8.4 requires a
minimum of OCaml 4.05.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/ocaml-modules/astring/default.nix | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index b63601608919..f790a87e22c5 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,12 +1,25 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -stdenv.mkDerivation rec { - version = "0.8.3"; - name = "ocaml${ocaml.version}-astring-${version}"; +let + # Use astring 0.8.3 for OCaml < 4.05 + param = + if stdenv.lib.versionAtLeast ocaml.version "4.05" + then { + version = "0.8.5"; + sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"; + } else { + version = "0.8.3"; + sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; + }; +in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-astring-${param.version}"; + inherit (param) version; src = fetchurl { - url = "https://erratique.ch/software/astring/releases/astring-${version}.tbz"; - sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; + url = "https://erratique.ch/software/astring/releases/astring-${param.version}.tbz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; |