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

Merge pull request #39961 from vbgl/ocaml-git-1.11.5

Browse Source 
ocamlPackages.git: 1.11.4 -> 1.11.5
This commit is contained in:
xeji 2018-05-05 21:13:53 +02:00 committed by GitHub
commit ae148ea89c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,12 @@
{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt }:
{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt
, alcotest, mtime, nocrypto
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-git-http-${version}";
inherit (git) version src;
buildInputs = [ ocaml findlib jbuilder ];
buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ];
propagatedBuildInputs = [ git cohttp-lwt ];
@ -12,6 +14,9 @@ stdenv.mkDerivation rec {
inherit (jbuilder) installPhase;
doCheck = true;
checkPhase = "jbuilder runtest -p git-http";
meta = {
description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
inherit (git.meta) homepage license maintainers platforms;

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

@ -1,19 +1,20 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam
, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri
, alcotest, mtime, nocrypto
}:
stdenv.mkDerivation rec {
version = "1.11.4";
version = "1.11.5";
name = "ocaml${ocaml.version}-git-${version}";
src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-git";
rev = version;
sha256 = "182b6shcfcq50r5snm01hwalnmck43x1xgdd4fvjb6q78pbwag2x";
sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh";
};
buildInputs = [ ocaml findlib jbuilder ];
buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ];
propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ];
@ -21,6 +22,9 @@ stdenv.mkDerivation rec {
inherit (jbuilder) installPhase;
doCheck = true;
checkPhase = "jbuilder runtest -p git";
meta = {
description = "Git format and protocol in pure OCaml";
license = stdenv.lib.licenses.isc;