python312Packages.jaconv + python312Packages.macfsevents: fix data_files conflict (#375046)

Author: Stunkymonkey

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 ];
 

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()),

pkgs/development/python-modules/macfsevents/default.nix

@@ -2,8 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  CoreFoundation,
-  CoreServices,
 }:
 
 buildPythonPackage rec {
@@ -16,10 +14,7 @@ buildPythonPackage rec {
     hash = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs=";
   };
 
-  buildInputs = [
-    CoreFoundation
-    CoreServices
-  ];
+  patches = [ ./fix-packaging.patch ];
 
   # Some tests fail under nix build directory
   doCheck = false;

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 = "[email protected]",
+       url = 'https://github.com/malthe/macfsevents',

pkgs/top-level/python-packages.nix

@@ -8236,9 +8236,7 @@ self: super: with self; {
 
   macaroonbakery = callPackage ../development/python-modules/macaroonbakery { };
 
-  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 { };