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: jackline: switch to mirage-crypto and update dependencies #85142

Merged
merged 5 commits into from Apr 21, 2020
Merged

ocamlPackages: jackline: switch to mirage-crypto and update dependencies #85142

merged 5 commits into from Apr 21, 2020

Conversation

sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Apr 13, 2020 •
edited

Motivation for this change

Jackline and a few of the packages it depends on recently switched to mirage-crypto (a fork of nocrypto integrated with RNG code and using dune), so I figured I add the packages and update the packages that switched. This also lead to quite a long list of packages that had to be added.

For the mirage packages I mostly left out the subpackages that were intended for usage in Xen Unikernel, because we haven't yet packaged the related packages for ocamlPackages yet (i. e. mirage-runtime …). Let me know if I accidentally went something out erroneously.

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.

cc @vbgl

@sternenseemann sternenseemann changed the title ocamlPackages: add mirage-crypto pkgs, randomconv, update eqaf ocamlPackages: add mirage-crypto and update packages that switched to it Apr 13, 2020
@vbgl
Copy link
Contributor

vbgl commented Apr 14, 2020

See #84691

@sternenseemann
Copy link
Member Author

Oh, that's a bit unfortunate! I've rebased all the duplicate addition out of my branch, it should be mergeable again. nixpkgs-review reports no errors.

I added the -unix and -combinators subvariants of mirage-flow and mirage-clock, you didn't add, not sure if you want to keep them. Also I noticed you didn't set minimumOCamlVersion for the packages, have we dropped this approach for ocamlPackages?

@sternenseemann
Copy link
Member Author

sternenseemann commented Apr 14, 2020 •
edited

  • Added update of notty as well, somewhat related due to jackline.
  • Added update of erm_xmpp (also switched to mirage-crypto)

For the latter I'm wondering wether we should switch to a unstable-YYYY-MM-DD-version style?

@sternenseemann sternenseemann force-pushed the mirage-crypto branch 2 times, most recently from 0224952 to 110e22e Compare April 14, 2020 10:17
@sternenseemann
ocamlPackages.ppx_cstruct: propagate dependencies
824d041 
Without propagation some builds of packages requiring ppx_cstruct would
fail.
@sternenseemann
ocamlPackages.x509: 0.7.1 -> 0.11.0
4bf689b 
This update contains the switch from nocrypto to mirage-crypto
@sternenseemann
ocamlPackages.tls: 0.10.4 -> 0.11.1
99ac3ce 
This update contains a switch to the dune build system as well as a
switch from nocrypto to mirage-crypto.
@sternenseemann
ocamlPackages.otr: 0.3.6 -> 0.3.8
b5770e3 
Contains switch from nocrypto to mirage-crypto
@sternenseemann
jackline: 2019-08-08 -> 2020-03-22
0814411
@sternenseemann sternenseemann changed the title ocamlPackages: add mirage-crypto and update packages that switched to it ocamlPackages: jackline: switch to mirage-crypto and update dependencies Apr 16, 2020
@vbgl
Copy link
Contributor

vbgl commented Apr 21, 2020

@GrahamcOfBorg build jackline

@vbgl
Copy link
Contributor

vbgl commented Apr 21, 2020

@GrahamcOfBorg eval

@vbgl vbgl merged commit 22a3bf9 into NixOS:master Apr 21, 2020
@sternenseemann sternenseemann deleted the mirage-crypto branch April 21, 2020 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vbgl vbgl vbgl left review comments

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@sternenseemann @vbgl