diff options
author | sterni <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-03-16 13:07:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-16 13:07:17 +0100 |
commit | f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549 (patch) | |
tree | 36765bf55b0d24d11f8818ff857f96be1257b092 /pkgs/development/ocaml-modules/git | |
parent | 5fa9e2808fd5556ec36918a260bf27296c9a2fd6 (diff) | |
download | nixpkgs-f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549.tar nixpkgs-f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549.tar.gz nixpkgs-f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549.tar.bz2 nixpkgs-f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549.tar.lz nixpkgs-f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549.tar.xz nixpkgs-f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549.tar.zst nixpkgs-f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549.zip |
ocamlPackages.git: 3.3.0 -> 3.3.2; decompress: 1.2.0 -> 1.3.0; duff: 0.3 -> 0.4; and related updates (#116486)
* ocamlPackages.hxd: 0.2.0 -> 0.3.1 ocamlPackages.hxd: disable lwt by default on OCaml 4.06 (syntax error) * ocamlPackages.duff: 0.3 -> 0.4 * ocamlPackages.decompress: 1.2.0 -> 1.3.0 Keep decompress 1.2.0 around as decompress-1-2 until imagelib supports decompress 1.3.0: https://github.com/rlepigre/ocaml-imagelib/issues/49 * ocamlPackages.carton*: 0.2.0 -> 0.4.0 * ocamlPackages.git: 3.3.0 -> 3.3.2
Diffstat (limited to 'pkgs/development/ocaml-modules/git')
-rw-r--r-- | pkgs/development/ocaml-modules/git/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/git/unix.nix | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 8ef1c3627f0..0fd66226e36 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "git"; - version = "3.3.0"; + version = "3.3.2"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0"; + sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv"; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 58ac0204b4b..f4cea472886 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, fetchpatch, git +{ buildDunePackage, git , mmap, rresult, result, bigstringaf , fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix , mirage-clock, mirage-clock-unix, astring, awa, cmdliner @@ -15,14 +15,6 @@ buildDunePackage { useDune2 = true; - patches = [ - # https://github.com/mirage/ocaml-git/pull/472 - (fetchpatch { - url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch"; - sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my"; - }) - ]; - buildInputs = [ awa awa-mirage cmdliner git-cohttp-unix mirage-clock mirage-clock-unix tcpip |