From 71c787b1f79076100f7b942c1c0e593e6d4f10d7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 23 Apr 2025 11:40:26 +0200
Subject: [PATCH] spyder: 6.1.0a1 -> 6.1.0a2

Diff: https://github.com/spyder-ide/spyder/compare/v6.1.0a1...v6.1.0a2

Changelog:
https://github.com/spyder-ide/spyder/blob/v6.1.0a2/changelogs/Spyder-6.md
---
 .../python-modules/spyder-kernels/default.nix      |  4 ++++
 pkgs/development/python-modules/spyder/default.nix | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 4f0a0c211bf4..556f21fba780 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -30,6 +30,10 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "ipython"
+  ];
+
   dependencies = [
     cloudpickle
     ipykernel
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index df8fa28d2ca4..057a3e17600e 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -13,6 +13,7 @@
   aiohttp,
   asyncssh,
   atomicwrites,
+  bcrypt,
   chardet,
   cloudpickle,
   cookiecutter,
@@ -27,6 +28,7 @@
   nbconvert,
   numpy,
   numpydoc,
+  packaging,
   pickleshare,
   psutil,
   pygithub,
@@ -56,12 +58,12 @@
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "6.1.0a1";
+  version = "6.1.0a2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Yjii1YUmdWdrrSLe3trAoATJXt2bfjc0JX5CBMVIEq8=";
+    hash = "sha256-KbGfG9T3XkYXntIQx325mYb0Bh8c0idb+25awFlWD9s=";
   };
 
   patches = [ ./dont-clear-pythonpath.patch ];
@@ -70,10 +72,15 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "ipython"
+  ];
+
   dependencies = [
     aiohttp
     asyncssh
     atomicwrites
+    bcrypt
     chardet
     cloudpickle
     cookiecutter
@@ -88,6 +95,7 @@ buildPythonPackage rec {
     nbconvert
     numpy
     numpydoc
+    packaging
     pickleshare
     psutil
     pygithub
@@ -141,7 +149,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://www.spyder-ide.org/";
     downloadPage = "https://github.com/spyder-ide/spyder/releases";
-    changelog = "https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md";
+    changelog = "https://github.com/spyder-ide/spyder/blob/v${version}/changelogs/Spyder-6.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;