diff options
| author | sternenseemann <git@lukasepple.de> | 2020-06-25 23:22:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 23:22:21 +0200 |
| commit | 3a0933a030decfc053b612a6a0d4a4ccc0c5f5da (patch) | |
| tree | 35a1b54fe6036d50097749d00b05ba64c3bc0bb9 /pkgs/top-level/ocaml-packages.nix | |
| parent | 3eb4864c8b7c51f050c41fd4fad4a5fb112f6bd1 (diff) | |
| download | nixpkgs-3a0933a030decfc053b612a6a0d4a4ccc0c5f5da.tar nixpkgs-3a0933a030decfc053b612a6a0d4a4ccc0c5f5da.tar.gz nixpkgs-3a0933a030decfc053b612a6a0d4a4ccc0c5f5da.tar.bz2 nixpkgs-3a0933a030decfc053b612a6a0d4a4ccc0c5f5da.tar.lz nixpkgs-3a0933a030decfc053b612a6a0d4a4ccc0c5f5da.tar.xz nixpkgs-3a0933a030decfc053b612a6a0d4a4ccc0c5f5da.tar.zst nixpkgs-3a0933a030decfc053b612a6a0d4a4ccc0c5f5da.zip | |
ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0 and update all affected packages (tuntap, conduit, cohttp, …) (#91350)
* ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0
* ipaddr-cstruct: new package (since 4.0.0)
* ipaddr-sexp: new package (since 4.0.0)
* macaddr-cstruct: new package (since 4.0.0)
* macaddr-sexp: new package (since 4.0.0)
* macaddr: enable tests (don't depend on ipaddr anymore)
* ocamlPackages.tuntap: 1.3.0 → 2.0.0
* ocamlPackages.conduit{,-lwt,-lwt-unix}: 1.4.0 → 2.2.2
* ocamlPackages.cohttp{,-lwt,-lwt-unix}: 2.1.3 → 2.5.1
* ocamlPackages: use dune 2 if pkg (indirectly) depends on cohttp-lwt-unix
dune refuses to build a package if one of its dependencies uses dune 2.Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 194abc496f2..3294099ca5d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -324,6 +324,10 @@ let ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + ipaddr-cstruct = callPackage ../development/ocaml-modules/ipaddr/cstruct.nix { }; + + ipaddr-sexp = callPackage ../development/ocaml-modules/ipaddr/sexp.nix { }; + irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; @@ -477,6 +481,10 @@ let macaddr = callPackage ../development/ocaml-modules/macaddr { }; + macaddr-cstruct = callPackage ../development/ocaml-modules/macaddr/cstruct.nix { }; + + macaddr-sexp = callPackage ../development/ocaml-modules/macaddr/sexp.nix { }; + macaque = callPackage ../development/ocaml-modules/macaque { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; |