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

Commits on Oct 18, 2019

  1. pythonPackages.astor: fix packaging

    Jonathan Ringer committed Oct 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    GPG key ID: 36F7711F3FC0F225
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2917e8b View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/development/python-modules/astor/default.nix
11 changes: 9 additions & 2 deletions pkgs/development/python-modules/astor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest }:
{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, fetchpatch }:

buildPythonPackage rec {
pname = "astor";
version = "0.8.0";
disabled = isPy27; # setup.py is no longer valid with setuptools>=41.4

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

# fix packaging for setuptools>=41.4
patches = [
( fetchpatch {
url = "https://github.com/berkerpeksag/astor/pull/163/commits/c908d1136cdfb058f5e9d81b4d3687931aa1ebfb.patch";
sha256 = "06mrx3qxfjyx9v76kxsj2b7zyqwrwlyd5z1fh77jbb8yl6m0nacd";
})
];

# disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89
checkInputs = [ pytest ];
checkPhase = ''