diff options
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/git')
4 files changed, 66 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix deleted file mode 100644 index d30884006410..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildDunePackage -, git, mimic, cohttp-mirage, cohttp, cohttp-lwt -, fmt, lwt, result, rresult, uri -}: - -buildDunePackage { - pname = "git-cohttp-mirage"; - - inherit (git) version src minimumOCamlVersion useDune2; - - propagatedBuildInputs = [ - git mimic cohttp-mirage cohttp cohttp-lwt fmt lwt result rresult uri - ]; - - meta = git.meta // { - description = "A package to use HTTP-based ocaml-git with MirageOS backend"; - }; -} diff --git a/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index b8d73178d09b..954e4956c816 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -1,30 +1,35 @@ { stdenv, lib, fetchurl, buildDunePackage , alcotest, mtime, mirage-crypto-rng, tls, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum -, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64 +, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd , result, bigstringaf, optint, mirage-flow, domain-name, emile , mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt }: buildDunePackage rec { pname = "git"; - version = "3.3.3"; + version = "3.4.0"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "0j8pw9w74bfhrjsqr8zm8g7h1az94z9vg7qgc6z6649zm9yjiax3"; + sha256 = "6eef1240c7c85a8e495b82ef863c509ad41d75e0c45cf73c34ed1bdafd03413f"; }; + # remove changelog for the carton package + postPatch = '' + rm CHANGES.carton.md + ''; + buildInputs = [ base64 ]; propagatedBuildInputs = [ angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow - domain-name emile mimic carton carton-lwt carton-git ipaddr psq + domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; checkInputs = [ alcotest alcotest-lwt mtime mirage-crypto-rng tls git-binary crowbar diff --git a/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix b/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix new file mode 100644 index 000000000000..cf0272ddf3b8 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix @@ -0,0 +1,49 @@ +{ lib, buildDunePackage +, git +, mimic +, paf +, ca-certs-nss +, cohttp +, cohttp-lwt +, fmt +, ipaddr +, logs +, lwt +, mirage-clock +, mirage-stack +, mirage-time +, result +, rresult +, tls +, uri +}: + +buildDunePackage { + pname = "git-paf"; + + inherit (git) version src minimumOCamlVersion useDune2; + + propagatedBuildInputs = [ + git + mimic + paf + ca-certs-nss + cohttp + cohttp-lwt + fmt + lwt + result + rresult + ipaddr + logs + mirage-clock + mirage-stack + mirage-time + tls + uri + ]; + + meta = git.meta // { + description = "A package to use HTTP-based ocaml-git with MirageOS backend"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix index f4cea472886d..3e5f464cea06 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix @@ -6,7 +6,8 @@ , tcpip, awa-mirage, mirage-flow , alcotest, alcotest-lwt, base64, cstruct , ke, mirage-crypto-rng, ocurl, git-binary -, ptime +, ptime, mimic, ca-certs-nss, tls, tls-mirage +, cacert }: buildDunePackage { @@ -24,10 +25,14 @@ buildDunePackage { fmt bos fpath uri digestif logs lwt astring cohttp-lwt-unix decompress domain-name ipaddr mtime mirage-flow + cstruct ptime mimic ca-certs-nss + tls tls-mirage ]; checkInputs = [ - alcotest alcotest-lwt base64 cstruct ke - mirage-crypto-rng ocurl git-binary ptime + alcotest alcotest-lwt base64 ke + mirage-crypto-rng git-binary + cohttp-lwt-unix + cacert # sets up NIX_SSL_CERT_FILE ]; doCheck = true; |