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

Commits on Nov 11, 2019

  1. Revert "python: spyder-kernels: 0.5.2 -> 1.6.0" 

    We should still stick with an older version for spyder 3.3.6. As soon
as 4.0.0 is released we need to upgrade this package.

This reverts commit 757fd1e.
    @FRidh
    FRidh committed Nov 11, 2019
    Copy the full SHA
    a94b6a9 View commit details

  2. pythonPackages.spyder: fix package

    @FRidh
    FRidh committed Nov 11, 2019
    Copy the full SHA
    6e9743f View commit details
Showing with 9 additions and 2 deletions.
  1. +2 −2 pkgs/development/python-modules/spyder-kernels/default.nix
  2. +7 −0 pkgs/development/python-modules/spyder/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/spyder-kernels/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

buildPythonPackage rec {
pname = "spyder-kernels";
version = "1.6.0";
version = "0.5.2";

src = fetchPypi {
inherit pname version;
sha256 = "e374452af89f507b345431338c6655465b5c15d0b5e49f703be8c30bbe1d1202";
sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7";
};

propagatedBuildInputs = [
7 changes: 7 additions & 0 deletions pkgs/development/python-modules/spyder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@ buildPythonPackage rec {
sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1";
};

nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];

propagatedBuildInputs = [
jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
@@ -47,6 +49,11 @@ buildPythonPackage rec {
cp -r $desktopItem/share/applications/ $out/share
'';

dontWrapQtApps = true;
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
];

meta = with stdenv.lib; {
description = "Scientific python development environment";
longDescription = ''