Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0 and update all affected packages (tuntap, conduit, cohttp, …) #91350

Merged
merged 5 commits into from Jun 25, 2020
Merged

ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0 and update all affected packages (tuntap, conduit, cohttp, …) #91350

merged 5 commits into from Jun 25, 2020

Conversation

sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Jun 23, 2020 •
edited

Motivation for this change

https://github.com/mirage/ocaml-ipaddr/releases/tag/v5.0.0 etc.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@sternenseemann sternenseemann marked this pull request as draft June 23, 2020 12:06
@sternenseemann sternenseemann marked this pull request as ready for review June 23, 2020 12:12
@sternenseemann
Copy link
Member Author

cohttp-lwt-unix now requires dune 2 to build, unfortunately now every package which (indirectly?!) depends on that package willl also require dune 2. I tried to fix every instance of that, lmk if I missed one.

@sternenseemann
Copy link
Member Author

@GrahamcOfBorg build jackline ocamlPackages.eliom ocamlPackages.cohttp-lwt-unix ocamlPackages.irmin-unix ocamlPackages.mirage-runtime ocamlPackages.tuntap ocamlPackages.opium ocamlPackages.ocsigen-start ocamlPackages.curly

@vbgl
Copy link
Contributor

vbgl commented Jun 24, 2020

@GrahamcOfBorg build ocaml-ng.ocamlPackages_4_07.cohttp-lwt

@vbgl
Copy link
Contributor

vbgl commented Jun 24, 2020

The update of mirage-runtime has been merged into master as 324c353

@sternenseemann
ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0
e863dd9 
* 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)
@sternenseemann
ocamlPackages.tuntap: 1.3.0 → 2.0.0
b915514
@sternenseemann
ocamlPackages.conduit{,-lwt,-lwt-unix}: 1.4.0 → 2.2.2
ce689d6
@sternenseemann
Copy link
Member Author

A bit puzzled by the build error in cohttp-lwt. Is there a difference between 4.07 lwt and 4.08 and later lwt?

@vbgl
Copy link
Contributor

vbgl commented Jun 24, 2020

In nixpkgs OCaml 4.07 and 4.08 have identical versions of lwt. However, they have different versions of ppx_sexp_conv.

@sternenseemann
Copy link
Member Author

Best fix is probably to add a check for the version of ppx_sexp_conv then? cohttp-lwt depends on ppx_sexp_conv >= 0.13.0, but the latter doesn't build on OCaml 4.07.

@vbgl
Copy link
Contributor

vbgl commented Jun 25, 2020

Why not. Or just raise the minimumOCamlVersion attribute of cohttp-lwt.

@sternenseemann
Copy link
Member Author

Added a check for the version of ppx_sexp_conv in 8e368f7.

@vbgl vbgl merged commit 3a0933a into NixOS:master Jun 25, 2020
@sternenseemann sternenseemann deleted the ipaddr-macaddr-5.0.0 branch June 25, 2020 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vbgl vbgl Awaiting requested review from vbgl

@alexfmpe alexfmpe Awaiting requested review from alexfmpe

@ericbmerritt ericbmerritt Awaiting requested review from ericbmerritt

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sternenseemann @vbgl