diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 94ff0c97dfa8..46a283bd5b2c 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -87,6 +87,10 @@ let pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; pythonOnHostForHost = pkgsHostHost.${pythonAttr}; pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or { }; + pythonABITags = [ + "none" + "cp${sourceVersion.major}${sourceVersion.minor}" + ]; } // { inherit ucsEncoding; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 47c372fbd3b6..58a2a5c4e2e6 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -195,6 +195,12 @@ let pythonOnHostForHost pythonOnTargetForTarget ; + + pythonABITags = [ + "abi3" + "none" + "cp${sourceVersion.major}${sourceVersion.minor}${lib.optionalString (!enableGIL) "t"}" + ]; }; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index be5d8a11add5..451292d198e9 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -23,6 +23,7 @@ pythonOnHostForHost, pythonOnTargetForTarget, pythonAttr ? null, + pythonABITags ? [ "none" ], self, # is pythonOnHostForTarget }: let @@ -141,6 +142,7 @@ rec { pythonOlder = lib.versionOlder pythonVersion; inherit hasDistutilsCxxPatch; inherit pythonOnBuildForHost; + inherit pythonABITags; tests = callPackage ./tests.nix { python = self; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index aa6a58ca3184..c030a464e133 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -67,6 +67,11 @@ let pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; pythonOnHostForHost = pkgsHostHost.${pythonAttr}; pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or { }; + + pythonABITags = [ + "none" + "pypy${lib.concatStrings (lib.take 2 (lib.splitString "." pythonVersion))}_pp${sourceVersion.major}${sourceVersion.minor}" + ]; }; pname = passthru.executable; version = with sourceVersion; "${major}.${minor}.${patch}"; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 02c7b39ad754..ef0350d93818 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -48,6 +48,11 @@ let pythonOnBuildForTarget = throw "${pname} does not support cross compilation"; pythonOnHostForHost = throw "${pname} does not support cross compilation"; pythonOnTargetForTarget = throw "${pname} does not support cross compilation"; + + pythonABITags = [ + "none" + "pypy${lib.concatStrings (lib.take 2 (lib.splitString "." pythonVersion))}_pp${sourceVersion.major}${sourceVersion.minor}" + ]; }; pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}"; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 4419485b3db6..fc8fdf79208c 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -48,6 +48,11 @@ let pythonOnBuildForTarget = throw "${pname} does not support cross compilation"; pythonOnHostForHost = throw "${pname} does not support cross compilation"; pythonOnTargetForTarget = throw "${pname} does not support cross compilation"; + + pythonABITags = [ + "none" + "pypy${lib.concatStrings (lib.take 2 (lib.splitString "." pythonVersion))}_pp${sourceVersion.major}${sourceVersion.minor}" + ]; }; pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}";