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

python38Packages.clifford: fix broken hash #108083

Closed
wants to merge 1 commit into from
Closed

python38Packages.clifford: fix broken hash #108083

wants to merge 1 commit into from

Conversation

rmcgibbo
Copy link
Contributor

Motivation for this change

It looks like I accidentally messed this hash up.

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.

@ofborg ofborg bot requested a review from costrouc December 31, 2020 23:42
@rmcgibbo
Copy link
Contributor Author

rmcgibbo commented Jan 6, 2021

/marvin opt-in
/status needs_reviewer

This should be a simple merge. The hash is just wrong, because of a mistake on my end in a previous PR.

@marvin-mk2 marvin-mk2 bot added the marvin label Jan 6, 2021
@marvin-mk2
Copy link

marvin-mk2 bot commented Jan 6, 2021

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

cole-h
cole-h requested changes Jan 10, 2021
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

(I didn't notice that the builds failed until after I approved... Oops.)

Though this is covered in #108799, I feel that it's better to get this in sooner rather than later.

That said, could you also add the stuff from cc6bd03 (#108799) that fixes the tests and credits @SuperSandro2000 (by adding Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>)?

@SuperSandro2000
Copy link
Member

Though this is covered in #108799, I feel that it's better to get this in sooner rather than later.

Those PRs are just collections of things I noticed over several days because I am to lazy to create a PR for each of those.

That said, could you also add the stuff from cc6bd03 (#108799) that fixes the tests and credits @SuperSandro2000 (by adding Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>)?

Not necessary if you cherry-pick them but this can also wait until the PR gets merged.

@rmcgibbo @SuperSandro2000
python38Packages.clifford: fix broken hash
c540a40 
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
@rmcgibbo
Copy link
Contributor Author

Okay, I added your improvements to disabledTests, Sandro, and force-pushed.

cole-h
cole-h approved these changes Jan 10, 2021
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Diff LGTM.

Result of nixpkgs-review pr 108083 run on x86_64-linux 1

2 packages built:
  • python37Packages.clifford
  • python38Packages.clifford

@SuperSandro2000
Copy link
Member

@rmcgibbo please solve the merge conflict.

@rmcgibbo
Copy link
Contributor Author

You already fixed the issue by merging #108799, so closing.

@rmcgibbo rmcgibbo closed this Jan 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@costrouc costrouc Awaiting requested review from costrouc

Assignees
No one assigned
Labels
2.status: merge conflict 6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 awaiting_reviewer marvin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@rmcgibbo @SuperSandro2000 @cole-h