Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 31e45c2fbcc3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ad400e6eb09
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 11, 2019

  1. arrow-cpp: fix on i686-linux 

    (cherry picked from commit 03e7849)
    @veprbl
    veprbl committed Nov 11, 2019
    Copy the full SHA
    100ee02 View commit details

  2. pythonPackages.spyder: fix package 

    (cherry picked from commit 6e9743f)
    @FRidh
    FRidh committed Nov 11, 2019
    Copy the full SHA
    8f19b28 View commit details

  3. python: spyder-kernels: 0.5.1 -> 0.5.2 

    (cherry picked from commit 5531222)
    @FRidh
    FRidh committed Nov 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2ad400e View commit details
Showing with 13 additions and 4 deletions.
  1. +2 −2 pkgs/development/python-modules/spyder-kernels/default.nix
  2. +7 −0 pkgs/development/python-modules/spyder/default.nix
  3. +4 −2 pkgs/top-level/all-packages.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 = "0.5.1";
version = "0.5.2";

src = fetchPypi {
inherit pname version;
sha256 = "7e124fad5203b748005e952cf33b44695dbb9d92f5e0dc5443e7ca0db817f400";
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 = ''
6 changes: 4 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10260,9 +10260,11 @@ in

armadillo = callPackage ../development/libraries/armadillo {};

arrow-cpp = callPackage ../development/libraries/arrow-cpp {
arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
gtest = gtest.override { static = true; };
};
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
});

assimp = callPackage ../development/libraries/assimp { };