From 7d4a0668d26c39bfcd1b40b21b7d169cedbfe9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Dec 2022 08:31:03 -0800 Subject: [PATCH] python2Packages.scandir: remove --- .../scandir/add-aarch64-darwin-dirent.patch | 28 ------------------- .../python2-modules/scandir/default.nix | 24 ---------------- pkgs/top-level/python2-packages.nix | 2 -- 3 files changed, 54 deletions(-) delete mode 100644 pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch delete mode 100644 pkgs/development/python2-modules/scandir/default.nix diff --git a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch b/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch deleted file mode 100644 index 1b35a0b950c..00000000000 --- a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/scandir.py b/scandir.py -index 3f602fb..40af3e5 100644 ---- a/scandir.py -+++ b/scandir.py -@@ -23,6 +23,7 @@ from os import listdir, lstat, stat, strerror - from os.path import join, islink - from stat import S_IFDIR, S_IFLNK, S_IFREG - import collections -+import platform - import sys - - try: -@@ -432,6 +433,15 @@ elif sys.platform.startswith(('linux', 'darwin', 'sunos5')) or 'bsd' in sys.plat - ('__d_padding', ctypes.c_uint8 * 4), - ('d_name', ctypes.c_char * 256), - ) -+ elif 'darwin' in sys.platform and 'arm64' in platform.machine(): -+ _fields_ = ( -+ ('d_ino', ctypes.c_uint64), -+ ('d_off', ctypes.c_uint64), -+ ('d_reclen', ctypes.c_uint16), -+ ('d_namlen', ctypes.c_uint16), -+ ('d_type', ctypes.c_uint8), -+ ('d_name', ctypes.c_char * 1024), -+ ) - else: - _fields_ = ( - ('d_ino', ctypes.c_uint32), # must be uint32, not ulong diff --git a/pkgs/development/python2-modules/scandir/default.nix b/pkgs/development/python2-modules/scandir/default.nix deleted file mode 100644 index e712cca8348..00000000000 --- a/pkgs/development/python2-modules/scandir/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, python, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "scandir"; - version = "1.10.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; - }; - - patches = [ - ./add-aarch64-darwin-dirent.patch - ]; - - checkPhase = "${python.interpreter} test/run_tests.py"; - - meta = with lib; { - description = "A better directory iterator and faster os.walk()"; - homepage = "https://github.com/benhoyt/scandir"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 9f62f03645c..8e22a787dad 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -73,8 +73,6 @@ with self; with super; { rpm = disabled super.rpm; - scandir = callPackage ../development/python2-modules/scandir { }; - sequoia = disabled super.sequoia; setuptools = callPackage ../development/python2-modules/setuptools { };