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

ocamlPackages.lwt: rename file to “default.nix” and attribute to “lwt”

This commit is contained in:
Vincent Laporte 2020-06-17 07:26:31 +02:00 committed by Vincent Laporte
parent 97c886e2c7
commit 490c75f1ca
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/ocaml-modules/lwt/4.x.nix → pkgs/development/ocaml-modules/lwt/default.nix
View File

36
pkgs/top-level/ocaml-packages.nix
View File

@ -170,11 +170,9 @@ let
cstruct = cstruct =
if lib.versionAtLeast ocaml.version "4.2" if lib.versionAtLeast ocaml.version "4.2"
then callPackage ../development/ocaml-modules/cstruct {} then callPackage ../development/ocaml-modules/cstruct {}
else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { lwt = ocaml_lwt; }; else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { };
cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { };
lwt = ocaml_lwt;
};
cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {}; cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {};
@ -459,35 +457,25 @@ let
llvm = pkgs.llvm_8; llvm = pkgs.llvm_8;
}; };
logs = callPackage ../development/ocaml-modules/logs { logs = callPackage ../development/ocaml-modules/logs { };
lwt = ocaml_lwt;
};
lru = callPackage ../development/ocaml-modules/lru { }; lru = callPackage ../development/ocaml-modules/lru { };
lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; lua-ml = callPackage ../development/ocaml-modules/lua-ml { };
lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { }; lwt = callPackage ../development/ocaml-modules/lwt { };
ocaml_lwt = lwt4; ocaml_lwt = lwt;
lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { };
lwt_log = callPackage ../development/ocaml-modules/lwt_log { lwt_log = callPackage ../development/ocaml-modules/lwt_log { };
lwt = lwt4;
};
lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { };
lwt = ocaml_lwt;
};
lwt_react = callPackage ../development/ocaml-modules/lwt_react { lwt_react = callPackage ../development/ocaml-modules/lwt_react { };
lwt = ocaml_lwt;
};
lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { };
lwt = ocaml_lwt;
};
macaddr = callPackage ../development/ocaml-modules/macaddr { }; macaddr = callPackage ../development/ocaml-modules/macaddr { };
@ -497,7 +485,7 @@ let
magick = callPackage ../development/ocaml-modules/magick { }; magick = callPackage ../development/ocaml-modules/magick { };
markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; markup = callPackage ../development/ocaml-modules/markup { };
mdx = callPackage ../development/ocaml-modules/mdx { }; mdx = callPackage ../development/ocaml-modules/mdx { };
@ -567,9 +555,7 @@ let
nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; nocrypto = callPackage ../development/ocaml-modules/nocrypto { };
notty = callPackage ../development/ocaml-modules/notty { notty = callPackage ../development/ocaml-modules/notty { };
lwt = ocaml_lwt;
};
npy = callPackage ../development/ocaml-modules/npy { npy = callPackage ../development/ocaml-modules/npy {
inherit (pkgs.python3Packages) numpy; inherit (pkgs.python3Packages) numpy;