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

Commits on Jun 6, 2019

  1. pythonPackages.asttokens: fix python3 build

    @marsam
    marsam committed Jun 6, 2019
    Copy the full SHA
    c091347 View commit details

Commits on Jun 7, 2019

  1. Merge pull request #62788 from marsam/fix-build-python3-asttokens 

    pythonPackages.asttokens: fix python3 build
    @worldofpeace
    worldofpeace authored Jun 7, 2019
    Copy the full SHA
    7fe8e51 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/python-modules/asttokens/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/python-modules/asttokens/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, astroid, six, coverage
{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage
, lazy-object-proxy, nose, wrapt
}:

@@ -11,6 +11,14 @@ buildPythonPackage rec {
sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m";
};

patches = [
# Fix tests for astroid 2.2 in python 3. Remove with the next release
(fetchpatch {
url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch";
sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv";
})
];

propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ];

checkInputs = [ coverage nose ];