diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-27 12:07:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 12:07:01 +0000 |
| commit | c01456266d66ab608397b709e791901a668297ca (patch) | |
| tree | f45de9083c5c44c6fdbcd68bd1eb9f36a084e6bb /pkgs/top-level/ocaml-packages.nix | |
| parent | 92003c2ff7446e24895d33c12d35a4f2573ed384 (diff) | |
| parent | 9f58b1413a66cf66e028b787c7dda6c640c2a8e8 (diff) | |
| download | nixpkgs-c01456266d66ab608397b709e791901a668297ca.tar nixpkgs-c01456266d66ab608397b709e791901a668297ca.tar.gz nixpkgs-c01456266d66ab608397b709e791901a668297ca.tar.bz2 nixpkgs-c01456266d66ab608397b709e791901a668297ca.tar.lz nixpkgs-c01456266d66ab608397b709e791901a668297ca.tar.xz nixpkgs-c01456266d66ab608397b709e791901a668297ca.tar.zst nixpkgs-c01456266d66ab608397b709e791901a668297ca.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a1b1a099829..a199ae83464 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1283,7 +1283,7 @@ let if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { inherit self; - inherit (pkgs) openssl zstd; + inherit (pkgs) lib openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { @@ -1501,5 +1501,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_12; - ocamlPackages = ocamlPackages_4_10; + ocamlPackages = ocamlPackages_4_12; } |