Skip to content

linbox: backport upstream fixes#101382

Merged
timokau merged 1 commit intoNixOS:masterfrom
omasanori:linbox-fix
Nov 4, 2020
Merged

linbox: backport upstream fixes#101382
timokau merged 1 commit intoNixOS:masterfrom
omasanori:linbox-fix

Conversation

@omasanori
Copy link
Contributor

@omasanori omasanori commented Oct 22, 2020

Motivation for this change

This change backports part of the following upstream commits.

These patches are also backported by SageMath and required to build that.

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"
    • sage still fails to build
    • doCheck = true and passes all tests.
  • 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.

@ofborg ofborg bot requested a review from timokau October 22, 2020 14:35
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 22, 2020
@omasanori
Copy link
Contributor Author

omasanori commented Oct 22, 2020

Clarified TODO comments following @SuperSandro2000's comment. Thank you!
Removed unnecessary fetchpatch that had been used but I decided to patch only relevant files to minimize risks to introduce unintended side-effects.

@omasanori omasanori mentioned this pull request Oct 23, 2020
Closed
10 tasks
timokau
timokau requested changes Oct 26, 2020
View reviewed changes
@omasanori
Copy link
Contributor Author

omasanori commented Oct 26, 2020

Thank you for reviewing, @timokau! I will revise this PR.

@omasanori
linbox: backport upstream fixes
e0fecf4 
References:
linbox-team/linbox@f78117d
linbox-team/linbox@4ff828e

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
@omasanori omasanori requested a review from timokau October 26, 2020 10:29
@omasanori
Copy link
Contributor Author

omasanori commented Nov 4, 2020

Would you mind if I ask to review again and merge this?

timokau
timokau approved these changes Nov 4, 2020
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Thanks for the reminder, I didn't realized that you already made the changes. Got lost in my inbox.

@timokau timokau merged commit 8201f4f into NixOS:master Nov 4, 2020
@omasanori omasanori deleted the linbox-fix branch November 4, 2020 22:06
@omasanori
Copy link
Contributor Author

omasanori commented Nov 4, 2020

Thanks a lot!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@timokau timokau timokau approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@omasanori @timokau