Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cb4ff927a15a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b744f4cd9ac
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 4, 2018

  1. Python: reduce amount of warnings when building with buildPython* 

    By default all warnings were printed. This occasionally resulted in
a lot of warnings leading to builds being killed.

This commit reduces the amount of warnings printed.
    @FRidh
    FRidh committed Nov 4, 2018
    11
    Copy the full SHA
    c1e003f View commit details

  2. python.pkgs.cffi: disable a test

    @FRidh
    FRidh committed Nov 4, 2018
    Copy the full SHA
    5b744f4 View commit details
4 changes: 4 additions & 0 deletions pkgs/development/interpreters/python/mk-python-derivation.nix
View file
Original file line number Diff line number Diff line change
@@ -101,6 +101,10 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
${python.interpreter} ${./catch_conflicts}/catch_conflicts.py
'' + attrs.postFixup or '''';

# Print fewer warnings so we have less noise in our logs
# The amount of warnings also caused builds to be terminated.
PYTHONWARNINGS="once";

meta = {
# default to python's platforms
platforms = python.meta.platforms;
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/cffi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ if isPyPy then null else buildPythonPackage rec {

doCheck = !stdenv.hostPlatform.isMusl; # TODO: Investigate
checkPhase = ''
py.test
py.test -k "not test_char_pointer_conversion"
'';

meta = with stdenv.lib; {
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/pytest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,8 @@ buildPythonPackage rec {

checkPhase = ''
runHook preCheck
$out/bin/py.test -x testing/
# Re-enable warnings because the test suite relies on it.
PYTHONWARNINGS= $out/bin/py.test -x testing/
runHook postCheck
'';