JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build for python3Packages.spyder

Browse Source 
pylint (using Python 2.7) got propagated into python3Packages.spyder
so Python 2.7 setup-hook was used instead of python34.

Now that pylint is part of pythonPackages attribute set, pylint is
used with python3.4 as a base.
This commit is contained in:
Domen Kožar 2015-12-02 19:07:46 +01:00
parent 787be7b80e
commit 6cf4e29c4f
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/pylint/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pythonPackages }: { stdenv, fetchurl, astroid, buildPythonPackage }:
pythonPackages.buildPythonPackage rec { buildPythonPackage rec {
name = "pylint-1.4.1"; name = "pylint-1.4.1";
namePrefix = ""; namePrefix = "";
@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec {
sha256 = "0c7hw1pcp5sqmc0v86zygw21isfgzbsqdmlb1sywncnlxmh30f1y"; sha256 = "0c7hw1pcp5sqmc0v86zygw21isfgzbsqdmlb1sywncnlxmh30f1y";
}; };
propagatedBuildInputs = with pythonPackages; [ astroid ]; propagatedBuildInputs = [ astroid ];
postInstall = '' postInstall = ''
mkdir -p $out/share/emacs/site-lisp mkdir -p $out/share/emacs/site-lisp

7
pkgs/top-level/all-packages.nix
View File

@ -9000,7 +9000,7 @@ let
pyGtkGlade = pythonPackages.pyGtkGlade; pyGtkGlade = pythonPackages.pyGtkGlade;
pylint = callPackage ../development/python-modules/pylint { }; pylint = pythonPackages.pylint;
pyopenssl = pythonPackages.pyopenssl; pyopenssl = pythonPackages.pyopenssl;
@ -15033,10 +15033,7 @@ let
simgrid = callPackage ../applications/science/misc/simgrid { }; simgrid = callPackage ../applications/science/misc/simgrid { };
spyder = callPackage ../applications/science/spyder { spyder = pythonPackages.spyder;
inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended
inherit (pythonPackages) ipython pep8; # optional
};
stellarium = callPackage ../applications/science/astronomy/stellarium { }; stellarium = callPackage ../applications/science/astronomy/stellarium { };

2
pkgs/top-level/python-packages.nix
View File

@ -85,6 +85,8 @@ in modules // {
blivet = callPackage ../development/python-modules/blivet { }; blivet = callPackage ../development/python-modules/blivet { };
pylint = callPackage ../development/python-modules/pylint { };
dbus = callPackage ../development/python-modules/dbus { dbus = callPackage ../development/python-modules/dbus {
dbus = pkgs.dbus; dbus = pkgs.dbus;
}; };