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

pythonPackages.mrbob: fix build #37950

Merged
merged 1 commit into from Mar 31, 2018
Merged

pythonPackages.mrbob: fix build #37950

merged 1 commit into from Mar 31, 2018

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Mar 27, 2018

Motivation for this change

Tests broke on Hydra as the checkPhase wasn't configured properly. By
explicitly relying on nosetests and injecting LC_ALL into the
checkPhase the tests work again.

The license (bsd3) according to LICENSE distributed with the upstream
package wasn't specified in the meta section which could've caused legal
issues.

The expression has been moved into its own file to reduce the length and
complexity of pkgs/top-level/python-packages.nix.

See https://hydra.nixos.org/build/70689499/log
See #36453

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

'';

propagatedBuildInputs = [ argparse jinja2 six ]
++ (lib.optionals isPy26 [ importlib ordereddict ]);
Copy link
Member

Choose a reason for hiding this comment

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

This line can be dropped as Python 2.6 is no longer supported.

sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121";
};

buildInputs = [ glibcLocales mock ];
Copy link
Member

Choose a reason for hiding this comment

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

checkInputs

++ (lib.optionals isPy26 [ importlib ordereddict ]);

meta = with stdenv.lib; {
homepage = https://github.com/domenkozar/mr.bob.git;
Copy link
Member

Choose a reason for hiding this comment

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

Drop the .git suffix here.

Tests broke on Hydra as the `checkPhase` wasn't configured properly. By
explicitly relying on `nosetests` and injecting `LC_ALL` into the
`checkPhase` the tests work again.

The license (bsd3) according to `LICENSE` distributed with the upstream
package wasn't specified in the meta section which could've caused legal
issues.

The expression has been moved into its own file to reduce the length and
complexity of `pkgs/top-level/python-packages.nix`.

See https://hydra.nixos.org/build/70689499/log
See NixOS#36453
@Ma27
Copy link
Member Author

Ma27 commented Mar 31, 2018

@dotlambda fine now?

@dotlambda dotlambda merged commit d3b9cab into NixOS:master Mar 31, 2018
@dotlambda
Copy link
Member

@Ma27 Thanks for fixing so much stuff!

@Ma27 Ma27 deleted the fix-mrbob branch March 31, 2018 14:58
@dotlambda
Copy link
Member

Backported in cde1f31

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

Successfully merging this pull request may close these issues.

None yet

3 participants