-
Notifications
You must be signed in to change notification settings - Fork 23
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
Update sources #242
Merged
Merged
Update sources #242
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
ulrikstrid
force-pushed
the
auto-update-sources-2148209298
branch
from
April 19, 2022 14:18
a51f7fa
to
b15ea91
Compare
ulrikstrid
force-pushed
the
auto-update-sources-2148209298
branch
from
April 19, 2022 14:23
b15ea91
to
7bf6cb8
Compare
…o/nix-overlays into auto-update-sources-2148209298
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
:robot_face: Updating sources to the latest version.
Commits touching OCaml packages:
ChangeLog: https://hydra.nixos.org/build/154122673](https://github.com/NixOS/nixpkgs/commit/917b7e5fd2e29346040dc95a39cae17f92eae0dc)
Failing Hydra build: https://hydra.nixos.org/build/155189331
Applied a smaller patch from Fedora's fork[1] as it also applies on
older versions.
That said, these versions seem unmaintained anyways, so we should
probably drop them entirely.
[1] https://pagure.io/fedora-ocaml/c/dfb5e954a04f59b0456cc4c0ddf3acaf22e0ff07?branch=fedora-35-4.12.0](https://github.com/NixOS/nixpkgs/commit/bcf8aeff3c7fbf92d576f89dad6a21913f7eb37a)
Enable parallel building for ocaml-4.08 and above. tested as:
ocaml build system supports parallel building, but but for multiple
top-level targets at the same time as it usually spawns subprocess
that occasionally conflict with one another. To work it around
we use tiny Makefile with a single rule that calls top-level targets
sequentially as makefile calls:
On a 16-core machine ocaml-4.12 build speeds up from 6m55s to 1m35s.
Releases 4_00_1, 4_01_0, 4_04 and 4_05 still have some race in them.
Thus this change enables parallel builds only for ocaml-4.06 and above.
Adapted from #142723
upstreams's CI tests the parallel makefile: ocaml/ocaml#10235 (comment)
The limit was chosen to be 4.08 because it was released in 2019, not too
long before the above link.](NixOS/nixpkgs@238d634)
Reported in Z3Prover/z3#5776 and fixed in https://github.com/Z3Prover/z3/commit/4f6fcf8ea78492e1d90398bcd3a663f8517f2a66.](https://github.com/NixOS/nixpkgs/commit/9c83a461e5789eb22c8a6f4c28f632e058cc8410)
With support for SQLite and PostgreSQL](NixOS/nixpkgs@994b21d)
Broken by a13cdfe520d87db401dd000fbd67cad728162a60](NixOS/nixpkgs@9bf2804)
Fixes build failures introduced by fbac0f4a6d367974be3a8ee015fd403a679a3402](NixOS/nixpkgs@ed1bc6d)
ocamlPackages.torch: Mark as broken with pytorch >= 1.11
ocaml 4.00 – 4.09: make compatible with glibc-2.34
ocamlPackages.findlib: 1.9.1 → 1.9.3
[ocamlPackages.cmdliner: Use the upstream Makefile build rules (#166150)
ocamlPackages.cmdliner: remove at 1.0.2
Remove a legacy version.
According to
dbuenzli/cmdliner#147 (comment),
the topkg build is deprecated. Switch to the new recommended build instructions.](NixOS/nixpkgs@05fe9b5)
Co-authored-by: sternenseemann sternenseemann@systemli.org](NixOS/nixpkgs@6dd377e)
Diff URL: NixOS/nixpkgs@1063244...1693e55