From 2b1cad4389ae5ac7da707c2d5ad7a2f2eaedcb7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 5 Jan 2024 01:48:37 +0100
Subject: [PATCH] python311Packages.zipstream-new: remove

Was an octoprint dependency, but not anymore.
---
 .../python-modules/zipstream-new/default.nix  | 39 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 pkgs/development/python-modules/zipstream-new/default.nix

diff --git a/pkgs/development/python-modules/zipstream-new/default.nix b/pkgs/development/python-modules/zipstream-new/default.nix
deleted file mode 100644
index 143f4040cce8..000000000000
--- a/pkgs/development/python-modules/zipstream-new/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, nose
-}:
-
-buildPythonPackage rec {
-  pname = "zipstream-new";
-  version = "1.1.8";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "arjan-s";
-    repo = "python-zipstream";
-    rev = "v${version}";
-    sha256 = "14vhgg8mcjqi8cpzrw8qzbij2fr2a63l2a8fhil21k2r8vzv92cv";
-  };
-
-  pythonImportsCheck = [
-    "zipstream"
-  ];
-
-  nativeCheckInputs = [
-    nose
-  ];
-
-  checkPhase = ''
-    runHook preCheck
-    nosetests
-    runHook postCheck
-  '';
-
-  meta = with lib; {
-    description = "Like Python's ZipFile module, except it works as a generator that provides the file in many small chunks";
-    homepage = "https://github.com/arjan-s/python-zipstream";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ hexa ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index a21ed3ee6be0..31174bfa1f1a 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -485,6 +485,7 @@ mapAliases ({
   zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20
   zc-buildout221 = zc-buildout; # added 2021-07-21
   zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules";
+  zipstream-new = throw "zipstream-new has been removed, because it  was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05
   zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26
   zope_component = zope-component; # added 2023-07-28
   zope_configuration = zope-configuration; # added 2023-11-12
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae0d9865be74..251b24fa315a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16423,8 +16423,6 @@ self: super: with self; {
 
   zipstream = callPackage ../development/python-modules/zipstream { };
 
-  zipstream-new = callPackage ../development/python-modules/zipstream-new { };
-
   zipstream-ng = callPackage ../development/python-modules/zipstream-ng { };
 
   zlib-ng = callPackage ../development/python-modules/zlib-ng {