ocamlPackages.git: 1.11.5 → 2.1.0 ocamlPackages.imagelib: 20171028 → 20191011 ocamlPackages.imagelib-unix: initwip/yesman
parent
ea5684b438
commit
8dc2173905
@ -1,30 +1,27 @@ |
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg |
||||
{ lib, fetchurl, buildDunePackage |
||||
, checkseum, cmdliner |
||||
, alcotest, bos, camlzip, mmap, re |
||||
}: |
||||
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4.03" |
||||
then throw "decompress is not available for OCaml ${ocaml.version}" |
||||
else |
||||
buildDunePackage rec { |
||||
version = "0.9.0"; |
||||
pname = "decompress"; |
||||
|
||||
stdenv.mkDerivation rec { |
||||
version = "0.6"; |
||||
name = "ocaml${ocaml.version}-decompress-${version}"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "mirage"; |
||||
repo = "decompress"; |
||||
rev = "v${version}"; |
||||
sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08"; |
||||
src = fetchurl { |
||||
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; |
||||
sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh"; |
||||
}; |
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild topkg ]; |
||||
|
||||
inherit (topkg) buildPhase installPhase; |
||||
buildInputs = [ cmdliner ]; |
||||
propagatedBuildInputs = [ checkseum ]; |
||||
checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ]; |
||||
doCheck = true; |
||||
|
||||
meta = { |
||||
description = "Pure OCaml implementation of Zlib"; |
||||
license = stdenv.lib.licenses.mit; |
||||
maintainers = [ stdenv.lib.maintainers.vbgl ]; |
||||
inherit (src.meta) homepage; |
||||
inherit (ocaml.meta) platforms; |
||||
license = lib.licenses.mit; |
||||
maintainers = [ lib.maintainers.vbgl ]; |
||||
homepage = "https://github.com/mirage/decompress"; |
||||
broken = !checkseum.hasC; |
||||
}; |
||||
} |
||||
|
@ -1,27 +1,28 @@ |
||||
{ stdenv, fetchFromGitHub, buildDunePackage |
||||
, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri |
||||
, alcotest, mtime, nocrypto |
||||
{ lib, fetchFromGitHub, buildDunePackage |
||||
, alcotest, git, mtime, nocrypto |
||||
, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt |
||||
, fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult |
||||
}: |
||||
|
||||
buildDunePackage rec { |
||||
pname = "git"; |
||||
version = "1.11.5"; |
||||
version = "2.1.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "mirage"; |
||||
repo = "ocaml-git"; |
||||
rev = version; |
||||
sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh"; |
||||
sha256 = "0v55zkwgml6i5hp0kzynbi58z6j15k3qgzg06b3h8pdbv5fwd1jp"; |
||||
}; |
||||
|
||||
buildInputs = [ alcotest mtime nocrypto ]; |
||||
propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ]; |
||||
propagatedBuildInputs = [ angstrom astring cstruct decompress digestif encore duff fmt fpath hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult ]; |
||||
checkInputs = lib.optionals doCheck [ alcotest git mtime nocrypto ]; |
||||
doCheck = true; |
||||
|
||||
meta = { |
||||
description = "Git format and protocol in pure OCaml"; |
||||
license = stdenv.lib.licenses.isc; |
||||
maintainers = [ stdenv.lib.maintainers.vbgl ]; |
||||
license = lib.licenses.isc; |
||||
maintainers = [ lib.maintainers.vbgl ]; |
||||
inherit (src.meta) homepage; |
||||
}; |
||||
} |
||||
|
@ -1,26 +1,27 @@ |
||||
{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, decompress }: |
||||
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, decompress }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
version = "20171028"; |
||||
name = "ocaml${ocaml.version}-imagelib-${version}"; |
||||
buildDunePackage rec { |
||||
minimumOCamlVersion = "4.07"; |
||||
version = "20191011"; |
||||
pname = "imagelib"; |
||||
src = fetchFromGitHub { |
||||
owner = "rlepigre"; |
||||
repo = "ocaml-imagelib"; |
||||
rev = "ocaml-imagelib_${version}"; |
||||
sha256 = "1frkrgcrv4ybdmqcfxpfsywx0hm1arxgxp32n8kzky6qip1g0zxf"; |
||||
rev = "03fed7733825cef7e0465163f398f6af810e2e75"; |
||||
sha256 = "0h7vgyss42nhlfqpbdnb54nxq86rskqi2ilx8b87r0hi19hqx463"; |
||||
}; |
||||
|
||||
buildInputs = [ which ocaml findlib ocamlbuild ]; |
||||
patches = [ (fetchpatch { |
||||
url = "https://github.com/rlepigre/ocaml-imagelib/pull/24/commits/4704fd44adcda62e0d96ea5b1927071326aa6111.patch"; |
||||
sha256 = "0ipjab1hfa2v2pnd8g1k3q2ia0plgiw7crm3fa4w2aqpzdyabkb9"; |
||||
}) ]; |
||||
|
||||
propagatedBuildInputs = [ decompress ]; |
||||
|
||||
createFindlibDestdir = true; |
||||
|
||||
meta = { |
||||
description = "Image formats such as PNG and PPM in OCaml"; |
||||
license = stdenv.lib.licenses.lgpl3; |
||||
maintainers = [ stdenv.lib.maintainers.vbgl ]; |
||||
license = lib.licenses.lgpl3; |
||||
maintainers = [ lib.maintainers.vbgl ]; |
||||
inherit (src.meta) homepage; |
||||
inherit (ocaml.meta) platforms; |
||||
}; |
||||
} |
||||
|
@ -0,0 +1,8 @@ |
||||
{ buildDunePackage, imagelib }: |
||||
|
||||
buildDunePackage { |
||||
pname = "imagelib-unix"; |
||||
inherit (imagelib) version src meta; |
||||
|
||||
propagatedBuildInputs = [ imagelib ]; |
||||
} |
Loading…
Reference in new issue