From e036b0ebbc31e011a545f24c85547df13b74d1d6 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 5 Jul 2024 15:15:37 +0900
Subject: [PATCH 1/2] python311Packages.nbmerge: remove nose

---
 .../python-modules/nbmerge/default.nix        | 13 +++++--------
 .../nbmerge/pytest-compatibility.patch        | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/python-modules/nbmerge/pytest-compatibility.patch

diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix
index 5b825fa91a513ae..c7445394aa9bef3 100644
--- a/pkgs/development/python-modules/nbmerge/default.nix
+++ b/pkgs/development/python-modules/nbmerge/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   setuptools,
   nbformat,
-  nose,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -19,20 +19,17 @@ buildPythonPackage rec {
     hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM=";
   };
 
+  patches = [ ./pytest-compatibility.patch ];
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [ nbformat ];
 
-  nativeCheckInputs = [ nose ];
-
-  checkPhase = ''
-    runHook preCheck
+  nativeCheckInputs = [ pytestCheckHook ];
 
+  postCheck = ''
     patchShebangs .
-    nosetests -v
     PATH=$PATH:$out/bin ./cli_tests.sh
-
-    runHook postCheck
   '';
 
   pythonImportsCheck = [ "nbmerge" ];
diff --git a/pkgs/development/python-modules/nbmerge/pytest-compatibility.patch b/pkgs/development/python-modules/nbmerge/pytest-compatibility.patch
new file mode 100644
index 000000000000000..81ea4c4218f83e0
--- /dev/null
+++ b/pkgs/development/python-modules/nbmerge/pytest-compatibility.patch
@@ -0,0 +1,19 @@
+diff --git a/tests/test_merge.py b/tests/test_merge.py
+index 06ee559..9d7b1af 100644
+--- a/tests/test_merge.py
++++ b/tests/test_merge.py
+@@ -1,3 +1,4 @@
++import io
+ import os
+ import sys
+ import unittest
+@@ -21,8 +22,7 @@ def file_names_from(file_paths):
+ 
+ class TestMerge(unittest.TestCase):
+     def setUp(self):
+-        if not hasattr(sys.stdout, "getvalue"):
+-            self.fail("need to run in buffered mode")
++        sys.stdout = io.StringIO()
+ 
+     def _validate_merged_three(self, merged):
+         self.assertEqual(len(merged.cells), 6)

From befdba673017a553a9e7611fdaa157c46ef5906e Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 5 Jul 2024 15:46:09 +0900
Subject: [PATCH 2/2] python311Packages.nbmerge: move to top-level attribute

---
 .../nb/nbmerge/package.nix}                       | 15 ++++++---------
 .../nb}/nbmerge/pytest-compatibility.patch        |  0
 pkgs/top-level/python-aliases.nix                 |  1 +
 pkgs/top-level/python-packages.nix                |  2 --
 4 files changed, 7 insertions(+), 11 deletions(-)
 rename pkgs/{development/python-modules/nbmerge/default.nix => by-name/nb/nbmerge/package.nix} (72%)
 rename pkgs/{development/python-modules => by-name/nb}/nbmerge/pytest-compatibility.patch (100%)

diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/by-name/nb/nbmerge/package.nix
similarity index 72%
rename from pkgs/development/python-modules/nbmerge/default.nix
rename to pkgs/by-name/nb/nbmerge/package.nix
index c7445394aa9bef3..b6dc642c9687875 100644
--- a/pkgs/development/python-modules/nbmerge/default.nix
+++ b/pkgs/by-name/nb/nbmerge/package.nix
@@ -1,31 +1,28 @@
 {
   lib,
-  buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
-  nbformat,
-  pytestCheckHook,
+  python3Packages,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "nbmerge";
   version = "0.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jbn";
-    repo = pname;
+    repo = "nbmerge";
     rev = "refs/tags/v${version}";
     hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM=";
   };
 
   patches = [ ./pytest-compatibility.patch ];
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 
-  propagatedBuildInputs = [ nbformat ];
+  dependencies = [ python3Packages.nbformat ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
 
   postCheck = ''
     patchShebangs .
diff --git a/pkgs/development/python-modules/nbmerge/pytest-compatibility.patch b/pkgs/by-name/nb/nbmerge/pytest-compatibility.patch
similarity index 100%
rename from pkgs/development/python-modules/nbmerge/pytest-compatibility.patch
rename to pkgs/by-name/nb/nbmerge/pytest-compatibility.patch
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 2a126eec998730d..1d539d225c4ee17 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -308,6 +308,7 @@ mapAliases ({
   mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01
   multi_key_dict = multi-key-dict; # added 2023-11-05
   mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02
+  nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05
   net2grid = gridnet; # add 2022-04-22
   nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08
   ninja-python = ninja; # add 2022-08-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5fab3b99fce5ea2..3626466423c3d95 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8790,8 +8790,6 @@ self: super: with self; {
 
   nbmake = callPackage ../development/python-modules/nbmake { };
 
-  nbmerge = callPackage ../development/python-modules/nbmerge { };
-
   nbsmoke = callPackage ../development/python-modules/nbsmoke { };
 
   nbsphinx = callPackage ../development/python-modules/nbsphinx { };