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.

Sign up for GitHub

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

python{2,3}Packages.pytest-repeat: fix build #53360

Merged
merged 1 commit into from Jan 4, 2019
Merged

python{2,3}Packages.pytest-repeat: fix build #53360

merged 1 commit into from Jan 4, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jan 3, 2019 •
edited

Motivation for this change

Test suite and build environment had several issues with Pytest >3.6
which can be fixed by applying the (yet unreleased) upstream patch from
https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ma27 Ma27 requested a review from FRidh as a code owner January 3, 2019 23:59
@worldofpeace
Copy link
Contributor

I trust that this builds now 😄
But just to check FTR

@GrahamcOfBorg build python2Packages.pytest-repeat python3Packages.pytest-repeat

@worldofpeace
Copy link
Contributor

fetchpatch at it again normalizing those patches and resulting in a different hash than tooling provides.
Correct hash in the output.

@Ma27
python{2,3}Packages.pytest-repeat: fix build
536e8af 
Test suite and build environment had several issues with Pytest >3.6
which can be fixed by applying the (yet unreleased) upstream patch from
https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch
@Ma27
Copy link
Member Author

Ma27 commented Jan 4, 2019

Thanks a lot for the hint! I guess I missed that since the patch with the previous hash was already in my local store after obtaining the sha sum via nix-prefetch-url. I should switch back to simply altering the hash and using the hash, the broken nix-build provides me then 😄

@worldofpeace
Copy link
Contributor

Thanks a lot for the hint! I guess I missed that since the patch with the previous hash was already in my local store after obtaining the sha sum via nix-prefetch-url. I should switch back to simply altering the hash and using the hash, the broken nix-build provides me then smile

I've had that happen so much that I just have a sha256 snippet in my text editor like

"sha256": {
  "prefix": "sha256",
  "body": "sha256 = \"${0:0000000000000000000000000000000000000000000000000000}\";",
  "description": "sha256"
}

@Ma27
Copy link
Member Author

Ma27 commented Jan 4, 2019

@GrahamcOfBorg build python2Packages.pytest-repeat python3Packages.pytest-repeat

@worldofpeace worldofpeace merged commit 0f6cf5f into NixOS:master Jan 4, 2019
@Ma27 Ma27 deleted the fix-pytest-repeat branch January 4, 2019 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ma27 @worldofpeace @GrahamcOfBorg