python310Packages.cchardet: Drop in favor of faust-cchardet

The former packages has seen its last release in 2020-10 and can be
considered abandoned. Meanwhile a new fork has appeared in
faust-cchardet, that we're going to use in its place.

Co-Authored-By: Robert Schütz <nix@dotlambda.de>

12 files changed, 15 insertions, 73 deletions

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 8a031a22006..a6ea6472405 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -99,11 +99,11 @@ stdenv.mkDerivation rec {
         setupPyBuildFlags = [ "--enable=load_extension" ];
       }))
       beautifulsoup4
-      cchardet
       css-parser
       cssselect
       python-dateutil
       dnspython
+      faust-cchardet
       feedparser
       html2text
       html5-parser
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 45273078eb5..9fcca373c38 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -14,7 +14,7 @@
 , aiosignal
 , aiodns
 , brotli
-, cchardet
+, faust-cchardet
 , asynctest
 , typing-extensions
 , idna-ssl
@@ -66,7 +66,7 @@ buildPythonPackage rec {
     aiosignal
     aiodns
     brotli
-    cchardet
+    faust-cchardet
   ] ++ lib.optionals (pythonOlder "3.8") [
     asynctest
     typing-extensions
diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix
deleted file mode 100644
index dbb83946346..00000000000
--- a/pkgs/development/python-modules/cchardet/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, fetchPypi
-, cython
-, nose
-}:
-
-buildPythonPackage rec {
-  pname = "cchardet";
-  version = "2.1.7";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf";
-  };
-
-  nativeBuildInputs = [
-    cython # pending https://github.com/PyYoshi/cChardet/pull/78 being released to PyPI
-  ];
-
-  pythonImportsCheck = [
-    "cchardet"
-  ];
-
-  nativeCheckInputs = [ nose ];
-
-  # on non x86-64 some charsets are identified as their superset, so we skip these tests (last checked with version 2.1.7)
-  preCheck = ''
-    cp -R src/tests $TMPDIR
-    pushd $TMPDIR
-  '' + lib.optionalString (stdenv.hostPlatform.system != "x86_64-linux") ''
-    rm $TMPDIR/tests/testdata/th/tis-620.txt  # identified as iso-8859-11, which is fine for all practical purposes
-    rm $TMPDIR/tests/testdata/ga/iso-8859-1.txt  # identified as windows-1252, which is fine for all practical purposes
-    rm $TMPDIR/tests/testdata/fi/iso-8859-1.txt  # identified as windows-1252, which is fine for all practical purposes
-  '';
-
-  checkPhase = ''
-    runHook preCheck
-
-    nosetests
-
-    runHook postCheck
-  '';
-
-  postCheck = ''
-    popd
-  '';
-
-  meta = {
-    description = "High-speed universal character encoding detector";
-    homepage = "https://github.com/PyYoshi/cChardet";
-    license = lib.licenses.mpl11;
-    maintainers = with lib.maintainers; [ ivan ];
-  };
-}
diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index d657e55b713..963f81827fc 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -1,8 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, cchardet
 , chardet
+, faust-cchardet
 , pandas
 , regex
 , tabview
@@ -28,8 +28,8 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [
-    cchardet
     chardet
+    faust-cchardet
     pandas
     regex
     tabview
diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix
index f2a6137faed..e234674aecd 100644
--- a/pkgs/development/python-modules/nextcord/default.nix
+++ b/pkgs/development/python-modules/nextcord/default.nix
@@ -9,7 +9,7 @@
 , aiohttp
 , aiodns
 , brotli
-, cchardet
+, faust-cchardet
 , orjson
 , pynacl
 }:
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     aiodns
     aiohttp
     brotli
-    cchardet
+    faust-cchardet
     orjson
     pynacl
   ];
diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix
index dcd23aadb15..c1249228516 100644
--- a/pkgs/development/python-modules/surepy/default.nix
+++ b/pkgs/development/python-modules/surepy/default.nix
@@ -5,7 +5,7 @@
 , attrs
 , brotlipy
 , buildPythonPackage
-, cchardet
+, faust-cchardet
 , click
 , colorama
 , fetchFromGitHub
@@ -47,9 +47,9 @@ buildPythonPackage rec {
     async-timeout
     attrs
     brotlipy
-    cchardet
     click
     colorama
+    faust-cchardet
     halo
     requests
     rich
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index d44145dfecc..b104bb15997 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
     azure-mgmt-storage
     azure-storage-blob
     bcrypt
-    cchardet
+    faust-cchardet
     deepdiff
     feedparser
     iso8601
diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix
index c904a49cd40..f4e65ddbcd5 100644
--- a/pkgs/tools/backup/grab-site/default.nix
+++ b/pkgs/tools/backup/grab-site/default.nix
@@ -40,7 +40,7 @@ with python.pkgs; buildPythonApplication rec {
     autobahn
     fb-re2
     websockets
-    cchardet
+    faust-cchardet
   ];
 
   checkPhase = ''
diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index 92405c20bb8..c8a72a88429 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -18,7 +18,7 @@
   # aiohttp[speedups]
 , aiodns
 , brotlipy
-, cchardet
+, faust-cchardet
 , pillow
 , pytestCheckHook
 , xmlschema
@@ -57,7 +57,7 @@ buildPythonApplication rec {
     # aiohttp[speedups]
     aiodns
     brotlipy
-    cchardet
+    faust-cchardet
     # needed by brotlipy
     pillow
     setuptools
diff --git a/pkgs/tools/security/xcat/default.nix b/pkgs/tools/security/xcat/default.nix
index f5fa23d1900..ea3390b38c7 100644
--- a/pkgs/tools/security/xcat/default.nix
+++ b/pkgs/tools/security/xcat/default.nix
@@ -24,9 +24,9 @@ python3.pkgs.buildPythonApplication rec {
     aiodns
     aiohttp
     appdirs
-    cchardet
     click
     colorama
+    faust-cchardet
     prompt-toolkit
     xpath-expressions
   ];
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 4d8041448fa..73be69094c3 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -50,6 +50,7 @@ mapAliases ({
   bt_proximity = bt-proximity; # added 2021-07-02
   BTrees = btrees; # added 2023-02-19
   carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
+  cchardet = faust-cchardet; # added 2023-03-02
   class-registry = phx-class-registry; # added 2021-10-05
   codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02
   ColanderAlchemy = colanderalchemy; # added 2023-02-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c0dba77b3b..bfeec810f58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1621,8 +1621,6 @@ self: super: with self; {
 
   cccolutils = callPackage ../development/python-modules/cccolutils { };
 
-  cchardet = callPackage ../development/python-modules/cchardet { };
-
   cdcs = callPackage ../development/python-modules/cdcs { };
 
   celery = callPackage ../development/python-modules/celery { };