Skip to content

Commit

Permalink
python312Packages.watchdog: fix x64 darwin
Browse files Browse the repository at this point in the history
drop sdk 10.12 patch that no longer applies and use sdk 11
  • Loading branch information
paparodeo committed Oct 26, 2024
1 parent 193adc7 commit 16facae
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 37 deletions.
10 changes: 2 additions & 8 deletions pkgs/development/python-modules/watchdog/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
lib,
stdenv,
buildPythonPackage,
CoreServices,
eventlet,
fetchPypi,
flaky,
Expand All @@ -11,6 +10,7 @@
pytestCheckHook,
pythonOlder,
pyyaml,
apple-sdk_11,
}:

buildPythonPackage rec {
Expand All @@ -25,13 +25,7 @@ buildPythonPackage rec {
hash = "sha256-tN+7bEkiG+RTViPqRHSk1u4KnO9KgLIMKNtNhYtk4nA=";
};

# force kqueue on x86_64-darwin, because our api version does
# not support fsevents
patches = lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
./force-kqueue.patch
];

buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;

optional-dependencies.watchmedo = [ pyyaml ];

Expand Down
26 changes: 0 additions & 26 deletions pkgs/development/python-modules/watchdog/force-kqueue.patch

This file was deleted.

4 changes: 1 addition & 3 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17406,9 +17406,7 @@ self: super: with self; {

wat = callPackage ../development/python-modules/wat { };

watchdog = callPackage ../development/python-modules/watchdog {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
};
watchdog = callPackage ../development/python-modules/watchdog { };

watchdog-gevent = callPackage ../development/python-modules/watchdog-gevent { };

Expand Down

0 comments on commit 16facae

Please sign in to comment.