summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-11-28 02:26:00 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2022-11-29 01:34:58 +0100
commitdf2d130ee0f9f32ac43a36c40535b731d8b4bf03 (patch)
treefaa5ae8e561e37019c4943c964f5b6ad4dd34402
parent7bf27e562a7847831d45e2f1045b6d9cc44cd998 (diff)
downloadnixpkgs-df2d130ee0f9f32ac43a36c40535b731d8b4bf03.tar
nixpkgs-df2d130ee0f9f32ac43a36c40535b731d8b4bf03.tar.gz
nixpkgs-df2d130ee0f9f32ac43a36c40535b731d8b4bf03.tar.bz2
nixpkgs-df2d130ee0f9f32ac43a36c40535b731d8b4bf03.tar.lz
nixpkgs-df2d130ee0f9f32ac43a36c40535b731d8b4bf03.tar.xz
nixpkgs-df2d130ee0f9f32ac43a36c40535b731d8b4bf03.tar.zst
nixpkgs-df2d130ee0f9f32ac43a36c40535b731d8b4bf03.zip
python3Packages.dataclasses: drop
Only required on python36, which was dropped a while ago.
-rw-r--r--pkgs/applications/science/engineering/strictdoc/default.nix4
-rw-r--r--pkgs/development/python-modules/apache-airflow/default.nix5
-rw-r--r--pkgs/development/python-modules/bellows/default.nix3
-rw-r--r--pkgs/development/python-modules/betterproto/default.nix5
-rw-r--r--pkgs/development/python-modules/bpython/default.nix5
-rw-r--r--pkgs/development/python-modules/dataclasses/default.nix21
-rw-r--r--pkgs/development/python-modules/eyed3/default.nix8
-rw-r--r--pkgs/development/python-modules/gruut/default.nix4
-rw-r--r--pkgs/development/python-modules/ircrobots/default.nix5
-rw-r--r--pkgs/development/python-modules/labelbox/default.nix4
-rw-r--r--pkgs/development/python-modules/pathy/default.nix5
-rw-r--r--pkgs/development/python-modules/pixcat/default.nix3
-rw-r--r--pkgs/development/python-modules/poetry/default.nix1
-rw-r--r--pkgs/development/python-modules/pudb/default.nix5
-rw-r--r--pkgs/development/python-modules/reqif/default.nix4
-rw-r--r--pkgs/development/python-modules/rich/default.nix5
-rw-r--r--pkgs/development/python-modules/screeninfo/default.nix7
-rw-r--r--pkgs/development/python-modules/simple-di/default.nix3
-rw-r--r--pkgs/development/python-modules/spacy-transformers/default.nix5
-rw-r--r--pkgs/development/python-modules/thinc/default.nix2
-rw-r--r--pkgs/development/python-modules/werkzeug/default.nix3
-rw-r--r--pkgs/development/tools/database/sqlfluff/default.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
23 files changed, 15 insertions, 96 deletions
diff --git a/pkgs/applications/science/engineering/strictdoc/default.nix b/pkgs/applications/science/engineering/strictdoc/default.nix
index 3fc61b84515..ce834f7d576 100644
--- a/pkgs/applications/science/engineering/strictdoc/default.nix
+++ b/pkgs/applications/science/engineering/strictdoc/default.nix
@@ -3,14 +3,12 @@
 , buildPythonApplication
 , fetchFromGitHub
 , python3
-, pythonOlder
 , html5lib
 , invoke
 , openpyxl
 , poetry-core
 , tidylib
 , beautifulsoup4
-, dataclasses
 , datauri
 , docutils
 , jinja2
@@ -73,8 +71,6 @@ buildPythonApplication rec {
     textx
     xlrd
     XlsxWriter
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index d3911f37016..a916ac01144 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -16,7 +16,6 @@
 , cron-descriptor
 , croniter
 , cryptography
-, dataclasses
 , deprecated
 , dill
 , flask
@@ -137,7 +136,7 @@ buildPythonPackage rec {
   inherit version;
   src = airflow-src;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   propagatedBuildInputs = [
     alembic
@@ -203,8 +202,6 @@ buildPythonPackage rec {
     typing-extensions
     unicodecsv
     werkzeug
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ] ++ lib.optionals (pythonOlder "3.9") [
     importlib-metadata
   ] ++ providerDependencies;
diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index dde3a12480c..54f5a1b0f16 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , click
 , click-log
-, dataclasses
 , pure-pcapy3
 , pyserial-asyncio
 , voluptuous
@@ -34,8 +33,6 @@ buildPythonPackage rec {
     pyserial-asyncio
     voluptuous
     zigpy
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index b49204ee8c4..e8b49dd839a 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -5,7 +5,6 @@
 , poetry-core
 , grpclib
 , python-dateutil
-, dataclasses
 , black
 , jinja2
 , isort
@@ -21,7 +20,7 @@ buildPythonPackage rec {
   pname = "betterproto";
   version = "2.0.0b5";
   format = "pyproject";
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "danielgtaylor";
@@ -35,8 +34,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     grpclib
     python-dateutil
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   passthru.optional-dependencies.compiler = [
diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
index f919d5cabe2..56c30df15ee 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -3,7 +3,6 @@
 , fetchPypi
 , curtsies
 , cwcwidth
-, dataclasses
 , greenlet
 , jedi
 , pygments
@@ -23,7 +22,7 @@ buildPythonPackage rec {
   version = "0.23";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
@@ -42,8 +41,6 @@ buildPythonPackage rec {
     typing-extensions
     urwid
     watchdog
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   postInstall = ''
diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix
deleted file mode 100644
index c276e9d000b..00000000000
--- a/pkgs/development/python-modules/dataclasses/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy36 }:
-
-buildPythonPackage rec {
-  pname = "dataclasses";
-  version = "0.8";
-
-  # backport only works on Python 3.6, and is in the standard library in Python 3.7
-  disabled = !isPy36;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97";
-  };
-
-  meta = with lib; {
-    description = "An implementation of PEP 557: Data Classes";
-    homepage = "https://github.com/ericvsmith/dataclasses";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ catern ];
-  };
-}
diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix
index 7adbba522e9..2b5cc5afba7 100644
--- a/pkgs/development/python-modules/eyed3/default.nix
+++ b/pkgs/development/python-modules/eyed3/default.nix
@@ -1,13 +1,11 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pythonOlder
 , python
 , isPyPy
 , six
 , filetype
 , deprecation
-, dataclasses
 }:
 
 buildPythonPackage rec {
@@ -25,8 +23,10 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [
-    six filetype deprecation
-  ] ++ lib.optional (pythonOlder "3.7") dataclasses;
+    deprecation
+    filetype
+    six
+  ];
 
   postInstall = ''
     for prog in "$out/bin/"*; do
diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix
index f36c9daa12d..f9c04258233 100644
--- a/pkgs/development/python-modules/gruut/default.nix
+++ b/pkgs/development/python-modules/gruut/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , callPackage
-, pythonOlder
 , fetchFromGitHub
 , babel
 , gruut-ipa
@@ -9,7 +8,6 @@
 , jsonlines
 , num2words
 , python-crfsuite
-, dataclasses
 , python
 , networkx
 , glibcLocales
@@ -61,8 +59,6 @@ buildPythonPackage rec {
     python-crfsuite
     dateparser
     networkx
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ] ++ (map (lang: callPackage ./language-pack.nix {
     inherit lang version format src;
   }) langPkgs);
diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix
index e16ac2449a7..8351ff3d86b 100644
--- a/pkgs/development/python-modules/ircrobots/default.nix
+++ b/pkgs/development/python-modules/ircrobots/default.nix
@@ -5,7 +5,6 @@
 , anyio
 , asyncio-rlock
 , asyncio-throttle
-, dataclasses
 , ircstates
 , async_stagger
 , async-timeout
@@ -15,7 +14,7 @@
 buildPythonPackage rec {
   pname = "ircrobots";
   version = "0.4.6";
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jesopo";
@@ -38,8 +37,6 @@ buildPythonPackage rec {
     ircstates
     async_stagger
     async-timeout
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index 9b0b241c5ed..08a1fa5ca5e 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -2,7 +2,6 @@
 , backoff
 , backports-datetime-fromisoformat
 , buildPythonPackage
-, dataclasses
 , fetchFromGitHub
 , google-api-core
 , jinja2
@@ -20,7 +19,7 @@
 buildPythonPackage rec {
   pname = "labelbox";
   version = "3.24.1";
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Labelbox";
@@ -32,7 +31,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     backoff
     backports-datetime-fromisoformat
-    dataclasses
     google-api-core
     jinja2
     ndjson
diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix
index 30cdd782df2..d937c0a4312 100644
--- a/pkgs/development/python-modules/pathy/default.nix
+++ b/pkgs/development/python-modules/pathy/default.nix
@@ -1,6 +1,5 @@
 { lib
 , buildPythonPackage
-, dataclasses
 , fetchPypi
 , fetchpatch
 , google-cloud-storage
@@ -16,7 +15,7 @@ buildPythonPackage rec {
   version = "0.6.1";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
@@ -27,8 +26,6 @@ buildPythonPackage rec {
     smart-open
     typer
     google-cloud-storage
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/pixcat/default.nix b/pkgs/development/python-modules/pixcat/default.nix
index 026685cd634..90fdae5dcf0 100644
--- a/pkgs/development/python-modules/pixcat/default.nix
+++ b/pkgs/development/python-modules/pixcat/default.nix
@@ -5,7 +5,6 @@
 , docopt
 , pillow
 , requests
-, dataclasses
 , pythonOlder
 }:
 
@@ -13,7 +12,7 @@ buildPythonPackage rec {
   pname = "pixcat";
   version = "0.1.4";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 8f62c3e6eb1..2e81f7e5531 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -5,7 +5,6 @@
 , cachy
 , cleo
 , crashtest
-, dataclasses
 , deepdiff
 , dulwich
 , fetchFromGitHub
diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix
index c135b0b5ccf..9976d602491 100644
--- a/pkgs/development/python-modules/pudb/default.nix
+++ b/pkgs/development/python-modules/pudb/default.nix
@@ -1,6 +1,5 @@
 { lib
 , buildPythonPackage
-, dataclasses
 , fetchPypi
 , jedi
 , pygments
@@ -16,7 +15,7 @@ buildPythonPackage rec {
   version = "2022.1.2";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
@@ -28,8 +27,6 @@ buildPythonPackage rec {
     pygments
     urwid
     urwid-readline
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix
index ace3052e5a9..1e5ecc718d9 100644
--- a/pkgs/development/python-modules/reqif/default.nix
+++ b/pkgs/development/python-modules/reqif/default.nix
@@ -1,13 +1,11 @@
 { lib
 , buildPythonPackage
 , python
-, pythonOlder
 , fetchFromGitHub
 , poetry-core
 , beautifulsoup4
 , lxml
 , jinja2
-, dataclasses
 , pytestCheckHook
 }:
 
@@ -39,8 +37,6 @@ buildPythonPackage rec {
     beautifulsoup4
     lxml
     jinja2
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 4f87364cfe2..5d9c1f45c3b 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , pythonOlder
 , CommonMark
-, dataclasses
 , poetry-core
 , pygments
 , typing-extensions
@@ -20,7 +19,7 @@ buildPythonPackage rec {
   pname = "rich";
   version = "12.6.0";
   format = "pyproject";
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Textualize";
@@ -34,8 +33,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     CommonMark
     pygments
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ] ++ lib.optionals (pythonOlder "3.9") [
     typing-extensions
   ];
diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index 574d3159494..6789c6b76c4 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , buildPythonPackage
-, dataclasses
 , fetchFromGitHub
 , libX11
 , libXinerama
@@ -16,7 +15,7 @@ buildPythonPackage rec {
   version = "0.8.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "rr-";
@@ -29,10 +28,6 @@ buildPythonPackage rec {
     poetry-core
   ];
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
-    dataclasses
-  ];
-
   postPatch = ''
     substituteInPlace screeninfo/enumerators/xinerama.py \
       --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \
diff --git a/pkgs/development/python-modules/simple-di/default.nix b/pkgs/development/python-modules/simple-di/default.nix
index 150eb52f8d4..79437c4a0b3 100644
--- a/pkgs/development/python-modules/simple-di/default.nix
+++ b/pkgs/development/python-modules/simple-di/default.nix
@@ -4,7 +4,6 @@
 , fetchPypi
 , setuptools
 , typing-extensions
-, dataclasses
 }:
 
 buildPythonPackage rec {
@@ -23,8 +22,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     setuptools
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix
index 914e2cb5153..14969a61b10 100644
--- a/pkgs/development/python-modules/spacy-transformers/default.nix
+++ b/pkgs/development/python-modules/spacy-transformers/default.nix
@@ -2,7 +2,6 @@
 , callPackage
 , fetchPypi
 , buildPythonPackage
-, dataclasses
 , torch
 , pythonOlder
 , spacy
@@ -16,7 +15,7 @@ buildPythonPackage rec {
   version = "1.1.8";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
@@ -29,8 +28,6 @@ buildPythonPackage rec {
     spacy-alignments
     srsly
     transformers
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 334411fe26c..2ef4fe86c2f 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -11,7 +11,6 @@
 , CoreVideo
 , cymem
 , cython
-, dataclasses
 , fetchPypi
 , hypothesis
 , mock
@@ -67,7 +66,6 @@ buildPythonPackage rec {
     typing-extensions
   ] ++ lib.optionals (pythonOlder "3.7") [
     contextvars
-    dataclasses
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index 8d3e0769786..5562fd13b97 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -4,7 +4,6 @@
 , pythonOlder
 , fetchPypi
 , watchdog
-, dataclasses
 , ephemeral-port-reserve
 , pytest-timeout
 , pytest-xprocess
@@ -32,8 +31,6 @@ buildPythonPackage rec {
   ] ++ lib.optionals (!stdenv.isDarwin) [
     # watchdog requires macos-sdk 10.13+
     watchdog
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ];
 
   checkInputs = [
diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix
index 340c471c272..7015050e2d6 100644
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@@ -31,8 +31,6 @@ python3.pkgs.buildPythonApplication rec {
     toml
     tqdm
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
   ] ++ lib.optionals (pythonOlder "3.8") [
     backports.cached-property
     importlib_metadata
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45f99ffc035..58ed1ce9999 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2173,8 +2173,6 @@ self: super: with self; {
 
   databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { };
 
-  dataclasses = callPackage ../development/python-modules/dataclasses { };
-
   dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };
 
   dataclasses-serialization = callPackage ../development/python-modules/dataclasses-serialization { };