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

OCaml Package Updates #24393

Closed
wants to merge 8 commits into from
Closed

OCaml Package Updates #24393

wants to merge 8 commits into from

Conversation

maurer
Copy link
Member

@maurer maurer commented Mar 27, 2017

Motivation for this change
  • Keep our OCaml ecosystem up to date
  • Pave the way for release of BAP on NixOS (this brings all its dependencies up to date for my branch which will introduce it)
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

This is a batch update of OCaml packages. If you want I can split it up, but most of it is fairly straightforward version bumps/bugfixes.

};

patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ];
patches = [ ./camlp4-git.patch ];

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The srcdir patch seems still needed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you tell me the environment in which this fails? It builds locally for me, and I'd like to know how to observe the build failure to avoid this in the future. (I've added srcdir.patch back in locally, and it'll be in a changed PR in a few minutes after I finish doing a clean rebase on master.)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On darwin, I get the following trace:

building
make flags: SHELL=/nix/store/rafidkx85sv66c1q9iplq6zkjhs2136a-bash-4.4-p12/bin/bash
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
  cat /byteswap.in.h; \
} > byteswap.h-t
cat: /byteswap.in.h: No such file or directory
make: *** [Makefile:127: byteswap.h] Error 1
builder for ‘/nix/store/mgjnwki5lpknbi3c3fczm0fr5nmlj79j-ocaml-bitstring-2.1.0.drv’ failed with exit code 2

Wild guess: the issue does not show up on Linux since the byteswap.h file is found in the libc.

You may remove the patch, if you prefer something like: makeFlags = "srcdir=.";.

@maurer
Copy link
Member Author

maurer commented Mar 28, 2017

@vbgl I'm fine with leaving the patch in there, I was just curious. The Travis Darwin builder failed for other reasons before it got there so I didn't know that was the issue.

@vbgl
Copy link
Contributor

vbgl commented Mar 29, 2017

Cherry-picked the bitstring update in 750dca5.
It seemed that there was no reason to keep version 2.0.4 of bitstring, so I dropped it.

Also cherry-picked the camlzip update as b4716ea, and the fileutils one as 03568b3, and the ocamlgraph one as 3c7b0d3, and the piqi stuff as 4e47e85.

@maurer
Copy link
Member Author

maurer commented Mar 29, 2017

That just leaves ctypes that I have a personal care about - async_ssl and functoria fixes were to get nox-review wip to report all changes clean. async_ssl because it needs to be bumped to use the new ctypes (which forces it onto ppx infrastructure as well), and functoria because it never actually built without 4.03 due to a missing API, so I just masked it off with an if.

@vbgl
Copy link
Contributor

vbgl commented Mar 30, 2017

Cherry-picked the ctypes update as 24c616c, and the new async_ssl package as 401c284.

@maurer
Copy link
Member Author

maurer commented Mar 31, 2017

Everything I'm concerned with has been merged, I'll leave appropriately masking the compiler on functoria to others I suppose.

@maurer maurer closed this Mar 31, 2017
@maurer maurer reopened this Mar 31, 2017
@maurer
Copy link
Member Author

maurer commented Mar 31, 2017

Nevermind, I'm clumsy and missed that ocamlgraph has not yet been bumped, still need that one.

@maurer
Copy link
Member Author

maurer commented Mar 31, 2017

aaand I was looking at a stale copy, we're actually good here, sorry about the noise

@maurer maurer closed this Mar 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants