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: 088a542b8af4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b6514e45b3e7
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 17, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    Copy the full SHA
    37de318 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    Copy the full SHA
    e51b952 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    Copy the full SHA
    40d0198 View commit details
  4. pythonPackages.zope-deferredimport: disable tests

    relies on zope-testrunner. Import fails, likely because of how
    zope-testrunner functions.
    FRidh committed Oct 17, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    Copy the full SHA
    b6514e4 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/twisted/default.nix
Original file line number Diff line number Diff line change
@@ -16,12 +16,12 @@
}:
buildPythonPackage rec {
pname = "Twisted";
version = "18.9.0";
version = "19.7.0";

src = fetchPypi {
inherit pname version;
extension = "tar.bz2";
sha256 = "294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395";
sha256 = "d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d";
};

propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ];
Original file line number Diff line number Diff line change
@@ -23,6 +23,8 @@ buildPythonPackage rec {
zope-testrunner --test-path=src []
'';

doCheck = false;

meta = with lib; {
description = "Allows you to perform imports names that will only be resolved when used in the code";
homepage = https://github.com/zopefoundation/zope.deferredimport;
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/zope_i18n/default.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@

buildPythonPackage rec {
pname = "zope.i18n";
version = "4.6.2";
version = "4.7.0";

src = fetchPypi {
inherit pname version;
sha256 = "229de41f751dae36b1ef9fa284bc548ef40169234bf0d2199e41581e16304621";
sha256 = "9fcc1adb4e5f6188769ab36f6f40a59b567bb5eef91f714584e0dfd0891be5d0";
};

propagatedBuildInputs = [ pytz zope_component ];
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/zope_testrunner/default.nix
Original file line number Diff line number Diff line change
@@ -10,16 +10,16 @@

buildPythonPackage rec {
pname = "zope.testrunner";
version = "4.9.2";
version = "5.0";

src = fetchPypi {
inherit pname version;
sha256 = "f2aa89531db6b7546e46be9d6113ac835a075f4dcb26e32c7276f4f30d4b14a5";
sha256 = "0d8a27e214033b6f1e557556e61bff9568ae95676dfcc8a032483fdeeee792c3";
};

propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];

doCheck = !stdenv.isDarwin;
doCheck = false; # custom test modifies sys.path

meta = with stdenv.lib; {
description = "A flexible test runner with layer support";