about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2019-05-21 18:31:05 +0200
committerGitHub <noreply@github.com>2019-05-21 18:31:05 +0200
commitc9ff6f76c4b2e28f2a46b93b1d68b8d271d9440e (patch)
tree8795b6c4575742ad898e17de5b2fd7d9d9122c4b /pkgs/top-level
parent74d31d8b1fac3c1795754cf9546f10e235a8c9fe (diff)
parent8f4ae93be3f6ebe91a9b8eadc3f80bcca22cbde8 (diff)
downloadnixlib-c9ff6f76c4b2e28f2a46b93b1d68b8d271d9440e.tar
nixlib-c9ff6f76c4b2e28f2a46b93b1d68b8d271d9440e.tar.gz
nixlib-c9ff6f76c4b2e28f2a46b93b1d68b8d271d9440e.tar.bz2
nixlib-c9ff6f76c4b2e28f2a46b93b1d68b8d271d9440e.tar.lz
nixlib-c9ff6f76c4b2e28f2a46b93b1d68b8d271d9440e.tar.xz
nixlib-c9ff6f76c4b2e28f2a46b93b1d68b8d271d9440e.tar.zst
nixlib-c9ff6f76c4b2e28f2a46b93b1d68b8d271d9440e.zip
Merge pull request #61812 from gebner/spyder334
spyder: 3.3.3 -> 3.3.4, convert to python modules
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix3
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 267930a10aff..59b31d9405e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22873,7 +22873,7 @@ in
 
   simgrid = callPackage ../applications/science/misc/simgrid { };
 
-  spyder = callPackage ../applications/science/spyder { };
+  spyder = with python3.pkgs; toPythonApplication spyder;
 
   openspace = callPackage ../applications/science/astronomy/openspace { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe2fc7eff36e..b106260dbd48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -932,6 +932,9 @@ in {
 
   sniffio = callPackage ../development/python-modules/sniffio { };
 
+  spyder-kernels = callPackage ../development/python-modules/spyder-kernels {};
+  spyder = callPackage ../development/python-modules/spyder {};
+
   tenacity = callPackage ../development/python-modules/tenacity { };
 
   tokenserver = callPackage ../development/python-modules/tokenserver {};