From 3e5316cb96635fd2d0c7b6783aa6087bca1470ea Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 29 Sep 2024 19:43:32 -0400 Subject: [PATCH] python3: drop configd configd is an alias for the SystemConfiguration framework, which is now always part of the SDK. Removing this parameter because it effectively does nothing now, which could be misleading to users. --- pkgs/development/interpreters/python/cpython/default.nix | 6 ------ pkgs/development/interpreters/python/default.nix | 7 ------- 2 files changed, 13 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 37764506e296..89ffae4b3d18 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -25,7 +25,6 @@ # platform-specific dependencies , bash -, configd , darwin , windows @@ -181,8 +180,6 @@ let ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads - ] ++ optionals stdenv.hostPlatform.isDarwin [ - configd ] ++ optionals tzdataSupport [ tzdata ] ++ optionals withGdbm [ @@ -362,9 +359,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { (enableFeature enableGIL "gil") ] ++ optionals enableOptimizations [ "--enable-optimizations" - ] ++ optionals (stdenv.hostPlatform.isDarwin && configd == null) [ - # Make conditional on Darwin for now to avoid causing Linux rebuilds. - "py_cv_module__scproxy=n/a" ] ++ optionals (sqlite != null) [ "--enable-loadable-sqlite-extensions" ] ++ optionals (libxcrypt != null) [ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b936ea1e222a..40333fbefd03 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -38,7 +38,6 @@ in { suffix = ".8"; # ActiveState's Python 2 extended support }; hash = "sha256-HUOzu3uJbtd+3GbmGD35KOk/CDlwL4S7hi9jJGRFiqI="; - inherit (darwin) configd; inherit passthruFun; }; @@ -51,7 +50,6 @@ in { suffix = ""; }; hash = "sha256-aygSee/YUpTS1pk+FzmDpXRkwBM5Vvu7VTbslka+rww="; - inherit (darwin) configd; inherit passthruFun; }; @@ -64,7 +62,6 @@ in { suffix = ""; }; hash = "sha256-qrCVCBdzUXJgGHmHLZN8HkkopXxAmuAjaew9kdzOvnk="; - inherit (darwin) configd; inherit passthruFun; }; @@ -77,13 +74,11 @@ in { suffix = ""; }; hash = "sha256-B6Q1bpEpAOYaFcsJSaBsSgUBLiE+zWtOhND2equ+43I="; - inherit (darwin) configd; inherit passthruFun; }; python312 = callPackage ./cpython ({ self = __splicedPackages.python312; - inherit (darwin) configd; inherit passthruFun; } // sources.python312); @@ -96,7 +91,6 @@ in { suffix = ""; }; hash = "sha256-CG3liC48sxDU3KSEV1IuLkgBjs1D2pzfgn9qB1nvsH0="; - inherit (darwin) configd; inherit passthruFun; }; # Minimal versions of Python (built without optional dependencies) @@ -109,7 +103,6 @@ in { readline = null; ncurses = null; gdbm = null; - configd = null; sqlite = null; tzdata = null; libffi = libffiBoot; # without test suite