diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-17 00:02:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 00:02:14 +0000 |
| commit | 8c62479810b6133768092e96a0fc1bb0d3bebbb9 (patch) | |
| tree | e45245693cc11196689f6d5f49d4d067ffa62291 /pkgs/development/interpreters/python | |
| parent | a53f752568e5474fdad6b17f8648291f223853f3 (diff) | |
| parent | 2dc99487cabf2b485158d8b9e74b855a2ab1052a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 839ac99a7574f..89667f2b1d560 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -58,6 +58,7 @@ , reproducibleBuild ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" , noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch" +, testers } @ inputs: # Note: this package is used for bootstrapping fetchurl, and thus @@ -232,7 +233,7 @@ let ''; execSuffix = stdenv.hostPlatform.extensions.executable; -in with passthru; stdenv.mkDerivation { +in with passthru; stdenv.mkDerivation (finalAttrs: { pname = "python3"; inherit src version; @@ -582,6 +583,8 @@ in with passthru; stdenv.mkDerivation { nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ]; }; + + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; enableParallelBuilding = true; @@ -607,8 +610,9 @@ in with passthru; stdenv.mkDerivation { high level dynamic data types. ''; license = licenses.psfl; + pkgConfigModules = [ "python3" ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; maintainers = with maintainers; [ fridh ]; mainProgram = executable; }; -} +}) |