From cac000d73a81e400e9e49cd14fb6070bea34df5a Mon Sep 17 00:00:00 2001 From: Eric Merritt Date: Sun, 24 May 2015 10:48:40 -0700 Subject: [PATCH] ocaml-sexplib: upgrade to 112.24.01 --- .../sexplib/{default.nix => 111.25.00.nix} | 4 ++-- .../ocaml-modules/sexplib/112.24.01.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++++-- 3 files changed, 29 insertions(+), 4 deletions(-) rename pkgs/development/ocaml-modules/sexplib/{default.nix => 111.25.00.nix} (87%) create mode 100644 pkgs/development/ocaml-modules/sexplib/112.24.01.nix diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix similarity index 87% rename from pkgs/development/ocaml-modules/sexplib/default.nix rename to pkgs/development/ocaml-modules/sexplib/111.25.00.nix index f816f80e51e..61d46e205fa 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "4.00" ocaml_version; stdenv.mkDerivation { - name = "ocaml-sexplib-111.25.0"; + name = "ocaml-sexplib-111.25.00"; src = fetchurl { url = https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz; @@ -23,7 +23,7 @@ stdenv.mkDerivation { homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; - maintainers = [ maintainers.vbgl ]; + maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix new file mode 100644 index 00000000000..b63b5af05e8 --- /dev/null +++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix @@ -0,0 +1,21 @@ +{stdenv, buildOcaml, fetchurl, type_conv, camlp4}: + +buildOcaml rec { + minimumSupportedOcamlVersion = "4.02"; + name = "sexplib"; + version = "112.24.01"; + + src = fetchurl { + url = "https://github.com/janestreet/sexplib/archive/${version}.tar.gz"; + sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073"; + }; + + propagatedBuildInputs = [ type_conv camlp4 ]; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "Library for serializing OCaml values to and from S-expressions"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87bb768d4e6..5abd701501b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4304,10 +4304,14 @@ let else null; sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { }; + sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; + sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; ocaml_sexplib = - if lib.versionOlder "4.00" ocaml_version - then callPackage ../development/ocaml-modules/sexplib { } + if lib.versionOlder "4.02" ocaml_version + then sexplib_112_24_01 + else if lib.versionOlder "4.00" ocaml_version + then sexplib_111_25_00 else if lib.versionOlder "3.12" ocaml_version then sexplib_108_08_00 else null;