From 06c74dc086dc4777c8f41cd037aae6a527706715 Mon Sep 17 00:00:00 2001 From: Peter Kling <1018801+pitkling@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:19:11 +0100 Subject: [PATCH 1/3] python312Packages.jaconv: do not include unnecessary files `data_files` installs into Python's installation prefix (not into the directory of the python module), potentially causing collisions if other packages do the same (with such general files). --- pkgs/development/python-modules/jaconv/default.nix | 5 ++++- .../python-modules/jaconv/fix-packaging.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/jaconv/fix-packaging.patch diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index 2ec947be0268..3304ed3e82fe 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -21,7 +21,10 @@ buildPythonPackage rec { hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0="; }; - patches = [ ./use-pytest.patch ]; + patches = [ + ./fix-packaging.patch + ./use-pytest.patch + ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jaconv/fix-packaging.patch b/pkgs/development/python-modules/jaconv/fix-packaging.patch new file mode 100644 index 000000000000..f970b4e6c969 --- /dev/null +++ b/pkgs/development/python-modules/jaconv/fix-packaging.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +index 297357b..12b861f 100644 +--- a/setup.py ++++ b/setup.py +@@ -39,7 +42,6 @@ + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Text Processing' + ], +- data_files=[('', ['README.rst', 'CHANGES.rst'])], + long_description='%s\n\n%s' % + (open('README.rst', encoding='utf8').read(), + open('CHANGES.rst', encoding='utf8').read()), From 8f2084a6d0857e2d69b2bb6bc5eaa4abf5f47966 Mon Sep 17 00:00:00 2001 From: Peter Kling <1018801+pitkling@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:25:07 +0100 Subject: [PATCH 2/3] python312Packages.macfsevents: do not include unnecessary files `data_files` installs into Python's installation prefix (not into the directory of the python module), potentially causing collisions if other packages do the same (with such general files). --- .../python-modules/macfsevents/default.nix | 2 ++ .../macfsevents/fix-packaging.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/python-modules/macfsevents/fix-packaging.patch diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index 77e82746e77d..e240f96929d1 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -16,6 +16,8 @@ buildPythonPackage rec { hash = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; }; + patches = [ ./fix-packaging.patch ]; + buildInputs = [ CoreFoundation CoreServices diff --git a/pkgs/development/python-modules/macfsevents/fix-packaging.patch b/pkgs/development/python-modules/macfsevents/fix-packaging.patch new file mode 100644 index 000000000000..21569c63ade5 --- /dev/null +++ b/pkgs/development/python-modules/macfsevents/fix-packaging.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py b/setup.py +index d7f9bb0..7707e38 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,11 +21,6 @@ def read(fname): + description = "Thread-based interface to file system observation primitives.", + long_description = "\n\n".join((read('README.rst'), read('CHANGES.rst'))), + license = "BSD", +- data_files = [("", [ +- "compat.h", +- "LICENSE.txt", +- "CHANGES.rst" +- ])], + author = "Malthe Borch", + author_email = "mborch@gmail.com", + url = 'https://github.com/malthe/macfsevents', From 11c33d83eacbc79ab2d421b876e6280bad21effe Mon Sep 17 00:00:00 2001 From: Peter Kling <1018801+pitkling@users.noreply.github.com> Date: Mon, 10 Feb 2025 11:56:55 +0100 Subject: [PATCH 3/3] python312Packages.macfsevents: use new apple sdk pattern --- pkgs/development/python-modules/macfsevents/default.nix | 7 ------- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index e240f96929d1..65a086fae242 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchPypi, - CoreFoundation, - CoreServices, }: buildPythonPackage rec { @@ -18,11 +16,6 @@ buildPythonPackage rec { patches = [ ./fix-packaging.patch ]; - buildInputs = [ - CoreFoundation - CoreServices - ]; - # Some tests fail under nix build directory doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad9734cfcfd0..215a204dc88f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7860,9 +7860,7 @@ self: super: with self; { macaddress = callPackage ../development/python-modules/macaddress{ }; - macfsevents = callPackage ../development/python-modules/macfsevents { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; - }; + macfsevents = callPackage ../development/python-modules/macfsevents { }; macholib = callPackage ../development/python-modules/macholib { };