public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46135 from vbgl/ocaml-re-1.8.0

Browse Source 
ocamlPackages.re: 1.7.3 -> 1.8.0
This commit is contained in:
Jörg Thalheim 2018-09-06 08:24:17 +01:00 committed by GitHub
commit 6e6ef8871b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ocaml-modules/re/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }: { stdenv, fetchzip, ocaml, findlib, jbuilder, ounit, seq }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "re is not available for OCaml ${ocaml.version}" then throw "re is not available for OCaml ${ocaml.version}"
@ -6,14 +6,15 @@ else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-re-${version}"; name = "ocaml${ocaml.version}-re-${version}";
version = "1.7.3"; version = "1.8.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz";
sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr"; sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i";
}; };
buildInputs = [ ocaml findlib jbuilder ounit ]; buildInputs = [ ocaml findlib jbuilder ounit ];
propagatedBuildInputs = [ seq ];
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest"; checkPhase = "jbuilder runtest";

25
pkgs/development/ocaml-modules/seq/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
stdenv.mkDerivation rec {
version = "0.1";
name = "ocaml${ocaml.version}-seq-${version}";
src = fetchFromGitHub {
owner = "c-cube";
repo = "seq";
rev = version;
sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv";
};
buildInputs = [ ocaml findlib ocamlbuild ];
createFindlibDestdir = true;
meta = {
description = "Compatibility package for OCaml’s standard iterator type starting from 4.07";
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}

2
pkgs/top-level/ocaml-packages.nix
View File

@ -564,6 +564,8 @@ let
result = callPackage ../development/ocaml-modules/ocaml-result { }; result = callPackage ../development/ocaml-modules/ocaml-result { };
seq = callPackage ../development/ocaml-modules/seq { };
sequence = callPackage ../development/ocaml-modules/sequence { }; sequence = callPackage ../development/ocaml-modules/sequence { };
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };