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: e78177e55e84
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 92a391c20be6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 2, 2021

  1. python3Packages.pyro4: Fix tests on darwin

    @SuperSandro2000
    SuperSandro2000 committed Jan 2, 2021
    Copy the full SHA
    724abf2 View commit details

  2. Merge pull request #108253 from SuperSandro2000/pyro3-darwin 

    python3Packages.Pyro4: Fix tests on darwin
    @bhipple
    bhipple authored Jan 2, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    92a391c View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/development/python-modules/pyro4/default.nix
9 changes: 7 additions & 2 deletions pkgs/development/python-modules/pyro4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,10 +32,15 @@ buildPythonPackage rec {
];

checkInputs = [ pytestCheckHook ];

# add testsupport.py to PATH
preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH";

# ignore network related tests, which fail in sandbox
pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ];
pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ]
# test hangs on darwin with sandbox enabled
++ lib.optionals stdenv.isDarwin [ "--ignore=tests/PyroTests/test_daemon.py" ];

disabledTests = [
"StartNSfunc"
"Broadcast"
@@ -47,5 +52,5 @@ buildPythonPackage rec {
homepage = "https://github.com/irmen/Pyro4";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
};
};
}