diff options
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/cairo2/default.nix (renamed from pkgs/development/ocaml-modules/ocaml-cairo2/default.nix) | 11 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/cohttp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/curses/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/git-http/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/janestreet/default.nix | 16 |
5 files changed, 13 insertions, 20 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index d9cab2a759da..b37dd413f693 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -6,17 +6,16 @@ let inherit (stdenv.lib) optionals; - pname = "ocaml-cairo2"; - version = "0.4.6"; + version = "0.5"; in stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "ocaml${ocaml.version}-cairo2-${version}"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1279/cairo2-0.4.6.tar.gz"; - sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; + url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz"; + sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj"; }; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +38,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; meta = with stdenv.lib; { - homepage = http://forge.ocamlcore.org/projects/cairo; + homepage = "https://github.com/Chris00/ocaml-cairo"; description = "Binding to Cairo, a 2D Vector Graphics Library"; longDescription = '' This is a binding to Cairo, a 2D graphics library with support for diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 3e571dd791ad..ef92a005c773 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.99.0"; + version = "1.0.0"; name = "ocaml${ocaml.version}-cohttp-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-cohttp"; rev = "v${version}"; - sha256 = "0y8qhzfwrc6486apmp2rsj822cnfhnz4w8rsb52w5wqmsgjxx1bj"; + sha256 = "0h9ak2bvhmcdxickvybpg45il33xszh2ksacpjgqrnnslxnh81ig"; }; buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 834b810183ba..4fd75e7aac53 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; - broken = true; }; } diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index 5b93b9607658..fc5591483d2b 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; inherit (git.meta) homepage license maintainers platforms; + broken = true; }; } diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index a6ebb0079e83..27a65c502753 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -6,19 +6,13 @@ rec { # Jane Street packages, up to ppx_core - sexplib = janePackage ({ + sexplib = janePackage { name = "sexplib"; meta.description = "Automated S-expression conversion"; - } // (if lib.versionAtLeast ocaml.version "4.05" - then { - version = "0.9.3"; - hash = "0a2sqh235ja3qwy7b2k3qym2616dz7369a195qwi6ljy3cnh7s53"; - buildInputs = [ num ]; - } else { - version = "0.9.2"; - hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl"; - } - )); + version = "0.10.0"; + hash = "1agw649n0rnf6h4y2dr1zs1970nncxgjmf90848vbxv8y9im4yy2"; + buildInputs = [ num ]; + }; base = janePackage { name = "base"; |