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

Commits on Mar 13, 2021

  1. python3Packages.packaging: change build system from flit to setuptools 

    With 20.8 upstream reverted buildsystem from flit back to setuptools as
this would make it easier for some distro's.
    @FRidh
    FRidh committed Mar 13, 2021
    Copy the full SHA
    8149718 View commit details

  2. python3Packages.packaging: remove checkPhase 

    because we already have a hook that takes care of it. Note tests were
disabled because of a circular test dependency.
    @FRidh
    FRidh committed Mar 13, 2021
    Copy the full SHA
    1adc69d View commit details
Showing with 2 additions and 6 deletions.
  1. +2 −6 pkgs/development/python-modules/packaging/default.nix
8 changes: 2 additions & 6 deletions pkgs/development/python-modules/packaging/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
, six
, pytestCheckHook
, pretend
, flit-core
, setuptools
}:

buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
};

nativeBuildInputs = [
flit-core
setuptools
];

propagatedBuildInputs = [ pyparsing six ];
@@ -29,10 +29,6 @@ buildPythonPackage rec {
pretend
];

checkPhase = ''
py.test tests
'';

# Prevent circular dependency
doCheck = false;