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.regex: fix darwin build #36742

Merged
merged 1 commit into from
Mar 11, 2018

Conversation

knedlsepp
Copy link
Member

Motivation for this change

18.03 ZHF darwin edition: #36454 (Please backport to 18.03!)
The package works fine on darwin. We run some tests to prove this.

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.

@@ -13,11 +13,16 @@ buildPythonPackage rec {
sha256 = "2353c0e983c4029caf32016f1dddef623c3117ac282a818468c6d2f5d541698d";
};

postCheck = ''
echo "We now run tests ourselves, since the setuptools installer doesn't."
python -c 'import test_regex; test_regex.test_main();'
Copy link
Member

Choose a reason for hiding this comment

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

${python.interpreter}

Copy link
Member Author

Choose a reason for hiding this comment

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

Just tried to fix this, but it seems the python attribute is not in scope. (undefined variable 'python'). Should python be included in the parameter list?

meta = {
description = "Alternative regular expression module, to replace re";
homepage = https://bitbucket.org/mrabarnett/mrab-regex;
license = lib.licenses.psfl;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
Copy link
Member

Choose a reason for hiding this comment

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

this attribute can be dropped

The package works fine on darwin. We run some tests to prove this.
@knedlsepp knedlsepp force-pushed the fix-pythonPackages.regex-on-darwin branch from fb73da9 to d289736 Compare March 10, 2018 19:20
@knedlsepp
Copy link
Member Author

@FRidh Incorporated your suggestions.

@LnL7
Copy link
Member

LnL7 commented Mar 11, 2018

@GrahamcOfBorg build pythonPackages.regex

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin

The following builds were skipped because they don't evaluate on x86_64-darwin: pythonPackages.regex

No log is available.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: pythonPackages.regex

Partial log (click to expand)

test_various (test_regex.RegexTests) ... ok
test_weakref (test_regex.RegexTests) ... ok
test_word_boundary (test_regex.RegexTests) ... ok
test_word_class (test_regex.RegexTests) ... ok
test_zerowidth (test_regex.RegexTests) ... ok

----------------------------------------------------------------------
Ran 95 tests in 0.235s

OK

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: pythonPackages.regex

Partial log (click to expand)

test_weakref (test_regex.RegexTests) ... ok
test_word_boundary (test_regex.RegexTests) ... ok
test_word_class (test_regex.RegexTests) ... ok
test_zerowidth (test_regex.RegexTests) ... ok

----------------------------------------------------------------------
Ran 95 tests in 1.575s

OK
/nix/store/phqrvkh73sjbgb7gh8yw2xc8hyzdhb7q-python2.7-regex-2018.02.08

@LnL7 LnL7 merged commit beff602 into NixOS:master Mar 11, 2018
@knedlsepp knedlsepp deleted the fix-pythonPackages.regex-on-darwin branch March 11, 2018 17:20
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.

4 participants