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

credstash: fix nativeBuildInputs #92561

Merged
merged 1 commit into from Nov 3, 2020
Merged

credstash: fix nativeBuildInputs #92561

merged 1 commit into from Nov 3, 2020

Conversation

DianaOlympos
Copy link
Contributor

Motivation for this change

Version 1.17.0 replaced nose by pytest. You could not build credstash anymore due to that change.

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.

jonringer
jonringer reviewed Jul 8, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

please squash the commits, the git history should look like:

python3Packages.credstash: fix checkInputs

@DianaOlympos DianaOlympos force-pushed the patch-1 branch 2 times, most recently from 2ceb72a to 5d26fd2 Compare July 9, 2020 09:54
@DianaOlympos
Copy link
Contributor Author

Done :) thank you for the time shepherding me on that one.

jonringer
jonringer reviewed Jul 17, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

sorry, what I recommended is typically the normal way to leverage pytest, however upstream has it mis-listed under setup_requires

pkgs/development/python-modules/credstash/default.nix Outdated Show resolved Hide resolved
@jonringer
Copy link
Contributor

also, your portrait reminds me of a character portrait in Eve @DianaOlympos

@DianaOlympos
Copy link
Contributor Author

@jonringer done, back to nativeBuildInputs.

And it is one 😄

@DianaOlympos
Copy link
Contributor Author

fixed, i had lingering rebase error oO

@cole-h
Copy link
Member

cole-h commented Jul 20, 2020

Eval is failing because you need to replace nose with pytest in the inputs at the top of the file.

@DianaOlympos
Copy link
Contributor Author

Again. Hot damn this one has been a pain. Ok this time it should be ok.

@jonringer
Copy link
Contributor

just came back from vacation

jonringer
jonringer reviewed Jul 31, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

otherwise LGTM

https://github.com/NixOS/nixpkgs/pull/92561
1 package failed to build:
python27Packages.credstash

2 packages built:
credstash python37Packages.credstash

python2 packages has pytest v4.x.x, because >=5 doesn't support python2 IIRC

builder for '/nix/store/kmqfg0wgzima22aqbwqv6crxaqkbxkm6-python2.7-credstash-1.17.1.drv' failed with exit code 1; last 10 log lines:
      replace_conflicting=replace_conflicting
    File "/nix/store/hcdzwm3d90p9qa4082il8ja6n6x1q03b-python2.7-setuptools-44.0.0/lib/python2.7/site-packages/pkg_resources/__init__.py", line 1065, in best_match
      return self.obtain(req, installer)
    File "/nix/store/hcdzwm3d90p9qa4082il8ja6n6x1q03b-python2.7-setuptools-44.0.0/lib/python2.7/site-packages/pkg_resources/__init__.py", line 1077, in obtain
      return installer(requirement)
    File "/nix/store/hcdzwm3d90p9qa4082il8ja6n6x1q03b-python2.7-setuptools-44.0.0/lib/python2.7/site-packages/setuptools/dist.py", line 777, in fetch_build_egg
      return fetch_build_egg(self, req)
    File "/nix/store/hcdzwm3d90p9qa4082il8ja6n6x1q03b-python2.7-setuptools-44.0.0/lib/python2.7/site-packages/setuptools/installer.py", line 130, in fetch_build_egg
      raise DistutilsError(str(e))
  distutils.errors.DistutilsError: Command '['/nix/store/984x0xnjaf00ms5nh1r1ki3h6qd5q399-python-2.7.18/bin/python2.7', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/build/tmpKxu9x4', '--quiet', 'pytest>=5.4.1']' returned non-zero exit status 1

pkgs/development/python-modules/credstash/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/credstash/default.nix Show resolved Hide resolved
@jonringer jonringer mentioned this pull request Jul 31, 2020
Open
@DianaOlympos
Copy link
Contributor Author

The py2 problem was solved in the meantime through a patch from upstream. Rebased on master and ready to merge again

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/357

jonringer
jonringer approved these changes Nov 3, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 92561 1

3 packages built:
  • credstash (python38Packages.credstash)
  • python27Packages.credstash
  • python37Packages.credstash

@jonringer jonringer merged commit 3fbb1f7 into NixOS:master Nov 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer 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
5 participants
@DianaOlympos @jonringer @cole-h @nixos-discourse @ryantm