diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix index 5205b6d8a56c..4d38926996d1 100644 --- a/pkgs/by-name/ed/edgetx/package.nix +++ b/pkgs/by-name/ed/edgetx/package.nix @@ -34,7 +34,7 @@ let pillow lz4 jinja2 - libclang + clang ] ); diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 341a839549ca..b2a097ef2b8f 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (enableCxx || enablePython) [ (python3.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools - ps.libclang + ps.clang ])) ] ++ lib.optionals enablePython [ diff --git a/pkgs/development/python-modules/libclang/default.nix b/pkgs/development/python-modules/clang/default.nix similarity index 98% rename from pkgs/development/python-modules/libclang/default.nix rename to pkgs/development/python-modules/clang/default.nix index 4657515963e7..1f6e2103034f 100644 --- a/pkgs/development/python-modules/libclang/default.nix +++ b/pkgs/development/python-modules/clang/default.nix @@ -25,7 +25,7 @@ let ''; in buildPythonPackage { - pname = "libclang"; + pname = "clang"; pyproject = true; inherit (libclang) version src; diff --git a/pkgs/development/python-modules/hawkmoth/default.nix b/pkgs/development/python-modules/hawkmoth/default.nix index aedd7da24c45..782d88abbf56 100644 --- a/pkgs/development/python-modules/hawkmoth/default.nix +++ b/pkgs/development/python-modules/hawkmoth/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, fetchFromGitHub, hatchling, - libclang, - sphinx, clang, + sphinx, + llvmPackages, pytestCheckHook, strictyaml, }: @@ -25,13 +25,13 @@ buildPythonPackage rec { build-system = [ hatchling ]; dependencies = [ - libclang + clang sphinx ]; propagatedBuildInputs = [ clang ]; nativeCheckInputs = [ - clang + llvmPackages.clang pytestCheckHook strictyaml ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index a087c6442d91..a879125bd8e7 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -7,7 +7,7 @@ toPythonModule, # build-system - libclang, + clang, pipcl, psutil, setuptools, @@ -75,7 +75,7 @@ buildPythonPackage (finalAttrs: { ''; build-system = [ - libclang + clang pipcl swig setuptools diff --git a/pkgs/development/python-modules/pywebtransport/default.nix b/pkgs/development/python-modules/pywebtransport/default.nix index c8116561b720..d1e93433fe5e 100644 --- a/pkgs/development/python-modules/pywebtransport/default.nix +++ b/pkgs/development/python-modules/pywebtransport/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, clang, fetchFromGitHub, - libclang, llvmPackages, msgpack, pkg-config, @@ -42,13 +41,13 @@ buildPythonPackage (finalAttrs: { ]; nativeBuildInputs = [ - clang + llvmPackages.clang llvmPackages.libclang.lib pkg-config ]; env.LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - env.LD_LIBRARY_PATH = "${llvmPackages.libclang.lib}/lib:${lib.getLib libclang}/lib"; + env.LD_LIBRARY_PATH = "${llvmPackages.libclang.lib}/lib:${lib.getLib clang}/lib"; prePatch = '' # maturin can't find the file diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index da07cc04b6ad..4edddcbf0d99 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -19,7 +19,7 @@ google-pasta, grpcio, h5py, - libclang, + clang, numpy, opt-einsum, packaging, @@ -95,7 +95,7 @@ buildPythonPackage (finalAttrs: { google-pasta grpcio h5py - libclang + clang ml-dtypes numpy opt-einsum diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39c48cbcf876..c51cd3bf8929 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -321,6 +321,7 @@ mapAliases { ledger-agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11 ledger_agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11 libarcus = throw "'libarcus' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22 + libclang = clang; # added 2026-06-18 libgpiod = gpiod; # added 2026-03-30 libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03 line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b46df1489f11..539f123d5921 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2793,7 +2793,11 @@ self: super: with self; { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; - ckzg = callPackage ../development/python-modules/ckzg { }; + ckzg = callPackage ../development/python-modules/ckzg { + inherit (pkgs) clang; + }; + + clang = callPackage ../development/python-modules/clang { }; clarabel = callPackage ../development/python-modules/clarabel { }; @@ -8828,8 +8832,6 @@ self: super: with self; { libbs = callPackage ../development/python-modules/libbs { }; - libclang = callPackage ../development/python-modules/libclang { }; - libcloud = callPackage ../development/python-modules/libcloud { }; libcomps = lib.pipe pkgs.libcomps [ @@ -14786,7 +14788,9 @@ self: super: with self; { callPackage ../development/python-modules/pyobjc-framework-libdispatch { }; - pyobjus = callPackage ../development/python-modules/pyobjus { }; + pyobjus = callPackage ../development/python-modules/pyobjus { + inherit (pkgs) clang; + }; pyocd = callPackage ../development/python-modules/pyocd { };