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

ocamlPackages.decompress: 0.6 → 0.9.0

Browse Source 
ocamlPackages.git: 1.11.5 → 2.1.0

ocamlPackages.imagelib: 20171028 → 20191011

ocamlPackages.imagelib-unix: init
This commit is contained in:
Vincent Laporte 2019-10-21 05:36:52 +00:00 committed by Vincent Laporte
parent ea5684b438
commit 8dc2173905
6 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/checkseum/default.nix
View File

@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
inherit (dune) installPhase; inherit (dune) installPhase;
passthru = { inherit hasC; };
meta = { meta = {
homepage = "https://github.com/mirage/checkseum"; homepage = "https://github.com/mirage/checkseum";
description = "ADLER-32 and CRC32C Cyclic Redundancy Check"; description = "ADLER-32 and CRC32C Cyclic Redundancy Check";

37
pkgs/development/ocaml-modules/decompress/default.nix
View File

@ -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" buildDunePackage rec {
then throw "decompress is not available for OCaml ${ocaml.version}" version = "0.9.0";
else pname = "decompress";
stdenv.mkDerivation rec { src = fetchurl {
version = "0.6"; url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
name = "ocaml${ocaml.version}-decompress-${version}"; sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
src = fetchFromGitHub {
owner = "mirage";
repo = "decompress";
rev = "v${version}";
sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ cmdliner ];
propagatedBuildInputs = [ checkseum ];
inherit (topkg) buildPhase installPhase; checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
doCheck = true;
meta = { meta = {
description = "Pure OCaml implementation of Zlib"; description = "Pure OCaml implementation of Zlib";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; homepage = "https://github.com/mirage/decompress";
inherit (ocaml.meta) platforms; broken = !checkseum.hasC;
}; };
} }

19
pkgs/development/ocaml-modules/git/default.nix
View File

@ -1,27 +1,28 @@
{ stdenv, fetchFromGitHub, buildDunePackage { lib, fetchFromGitHub, buildDunePackage
, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri , alcotest, git, mtime, nocrypto
, alcotest, mtime, nocrypto , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt
, fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "git"; pname = "git";
version = "1.11.5"; version = "2.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mirage"; owner = "mirage";
repo = "ocaml-git"; repo = "ocaml-git";
rev = version; rev = version;
sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh"; sha256 = "0v55zkwgml6i5hp0kzynbi58z6j15k3qgzg06b3h8pdbv5fwd1jp";
}; };
buildInputs = [ alcotest mtime nocrypto ]; propagatedBuildInputs = [ angstrom astring cstruct decompress digestif encore duff fmt fpath hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult ];
propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ]; checkInputs = lib.optionals doCheck [ alcotest git mtime nocrypto ];
doCheck = true; doCheck = true;
meta = { meta = {
description = "Git format and protocol in pure OCaml"; description = "Git format and protocol in pure OCaml";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
}; };
} }

25
pkgs/development/ocaml-modules/imagelib/default.nix
View File

@ -1,26 +1,27 @@
{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, decompress }: { lib, fetchFromGitHub, fetchpatch, buildDunePackage, decompress }:
stdenv.mkDerivation rec { buildDunePackage rec {
version = "20171028"; minimumOCamlVersion = "4.07";
name = "ocaml${ocaml.version}-imagelib-${version}"; version = "20191011";
pname = "imagelib";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rlepigre"; owner = "rlepigre";
repo = "ocaml-imagelib"; repo = "ocaml-imagelib";
rev = "ocaml-imagelib_${version}"; rev = "03fed7733825cef7e0465163f398f6af810e2e75";
sha256 = "1frkrgcrv4ybdmqcfxpfsywx0hm1arxgxp32n8kzky6qip1g0zxf"; 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 ]; propagatedBuildInputs = [ decompress ];
createFindlibDestdir = true;
meta = { meta = {
description = "Image formats such as PNG and PPM in OCaml"; description = "Image formats such as PNG and PPM in OCaml";
license = stdenv.lib.licenses.lgpl3; license = lib.licenses.lgpl3;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
}; };
} }

8
pkgs/development/ocaml-modules/imagelib/unix.nix Normal file
View File

@ -0,0 +1,8 @@
{ buildDunePackage, imagelib }:
buildDunePackage {
pname = "imagelib-unix";
inherit (imagelib) version src meta;
propagatedBuildInputs = [ imagelib ];
}

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

@ -289,6 +289,8 @@ let
imagelib = callPackage ../development/ocaml-modules/imagelib { }; imagelib = callPackage ../development/ocaml-modules/imagelib { };
imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { };
inotify = callPackage ../development/ocaml-modules/inotify { }; inotify = callPackage ../development/ocaml-modules/inotify { };
integers = callPackage ../development/ocaml-modules/integers { }; integers = callPackage ../development/ocaml-modules/integers { };
@ -316,7 +318,7 @@ let
gg = callPackage ../development/ocaml-modules/gg { }; gg = callPackage ../development/ocaml-modules/gg { };
git = callPackage ../development/ocaml-modules/git { }; git = callPackage ../development/ocaml-modules/git { inherit (pkgs) git; };
git-http = callPackage ../development/ocaml-modules/git-http { }; git-http = callPackage ../development/ocaml-modules/git-http { };