diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
| commit | fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74 (patch) | |
| tree | fc80390e190e04aeb8330522f475be313feac4b8 /pkgs/development/ocaml-modules | |
| parent | 9dfb0b2db04a42815356e6eabba9fac92ccf4cc4 (diff) | |
| parent | b9565143eaa17b7b7e03612769ebc6ca24eddae0 (diff) | |
| download | nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.gz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.bz2 nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.lz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.xz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.zst nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/functory/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 6d4deac38c47..c8b29759b97c 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -1,14 +1,24 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "0.6"; + sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y"; + } else { + version = "0.5"; + sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3"; + }; +in + stdenv.mkDerivation { - name = "ocaml-functory-0.5"; + name = "ocaml${ocaml.version}-functory-${param.version}"; src = fetchurl { - url = https://www.lri.fr/~filliatr/functory/download/functory-0.5.tar.gz; - sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3"; + url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ]; |