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

Staging next #118312

Merged
merged 188 commits into from
Apr 9, 2021
Merged

Staging next #118312

merged 188 commits into from
Apr 9, 2021

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Apr 2, 2021

Motivation for this change

https://hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents

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.

Luflosi and others added 30 commits February 3, 2021 18:41
This regex should match files ending in `.git`, not any character and `git` after that.
The build wanted to create a Cargo.lock in the top-level source
directory (presumably because it is also a Cargo project), since we
were crating the lock file in sourceRoot (which was set to the example
project). This failed because the sources are read-only. Change the
test to create the lock file in the top-level crate directory, which
is Cargo's default behavior.
The passthru test used python3Packages, mixing different Python
version when testing on a Python version different that the python3
alias.
[staging] python3Packages.django_2: 2.2.18 -> 2.2.19
When, after patching, `configure.ac` is newer than `configure`, the
Makefile will try to regenerate `configure` from `configure.ac`.

While that might usually be desirable, in this case we want to keep
bootstrapping simple and directly use the `configure` from the package
so we can avoid a dependency on automake.

Previously, we used the `-T` parameter to automake to make sure the
timestamps were okay. However, this is brittle when we update: when the
timestamp of the original file changes, and no longer matches the
timestamp of the original file in the patch, `patch` will show a warning
but otherwise continue without updating the timestamp.

This PR changes things so we only patch `configure`, so that will always
have a newer timestamp.

Refs #115177
The applied patch contains the changes from this PR:
OpenMathLib/OpenBLAS#3060

This patch prevents gcc from reordering instructions in a way
that can cause crashes with SIGILL on aarch64.

This issue crashes python when importing numpy on aarch64:
numpy/numpy#18131
Get rid of non-absolute RPATH reference to CoreFoundation
@FRidh FRidh mentioned this pull request Apr 4, 2021
10 tasks
@LeSuisse
Copy link
Member

LeSuisse commented Apr 4, 2021

I'm taking a look to fix pandas and vigra.

@zowoq zowoq mentioned this pull request Apr 7, 2021
10 tasks
@github-actions github-actions bot requested a review from marsam as a code owner April 8, 2021 18:14
@marsam marsam mentioned this pull request Apr 9, 2021
2 tasks
@FRidh FRidh merged commit 0656d54 into master Apr 9, 2021
@vcunat
Copy link
Member

vcunat commented Apr 14, 2021

Next iteration: #119398

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: fetch 6.topic: kernel The Linux kernel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml 6.topic: python 6.topic: ruby 6.topic: rust 6.topic: systemd 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.