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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-11 06:20:33 +00:00
committed by GitHub
parent 49b8e6f7d4 06f7b90cd4
commit 10e16ec9ab
57 changed files with 533 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/ocaml-packages.nix
+3 -1
View File
@@ -82,6 +82,8 @@ let
ca-certs = callPackage ../development/ocaml-modules/ca-certs { };
ca-certs-nss = callPackage ../development/ocaml-modules/ca-certs-nss { };
carton = callPackage ../development/ocaml-modules/carton { };
carton-git = callPackage ../development/ocaml-modules/carton/git.nix { };
@@ -456,7 +458,7 @@ let
git-cohttp-unix = callPackage ../development/ocaml-modules/git/cohttp-unix.nix { };
git-cohttp-mirage = callPackage ../development/ocaml-modules/git/cohttp-mirage.nix { };
git-paf = callPackage ../development/ocaml-modules/git/paf.nix { };
git-unix = callPackage ../development/ocaml-modules/git/unix.nix {
git-binary = pkgs.git;