nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-09 19:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2022-09-19 10:02:39 +02:00
commit 00035c6295
5 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/python/hooks/default.nix
View File

@ -92,8 +92,9 @@ in rec {
pythonCatchConflictsHook = callPackage ({ setuptools }: pythonCatchConflictsHook = callPackage ({ setuptools }:
makeSetupHook { makeSetupHook {
name = "python-catch-conflicts-hook"; name = "python-catch-conflicts-hook";
deps = [ setuptools ];
substitutions = { substitutions = {
inherit pythonInterpreter pythonSitePackages setuptools; inherit pythonInterpreter;
catchConflicts=../catch_conflicts/catch_conflicts.py; catchConflicts=../catch_conflicts/catch_conflicts.py;
}; };
} ./python-catch-conflicts-hook.sh) {}; } ./python-catch-conflicts-hook.sh) {};
@ -114,11 +115,6 @@ in rec {
}; };
} ./python-namespaces-hook.sh) {}; } ./python-namespaces-hook.sh) {};
pythonOutputDistHook = callPackage ({ }:
makeSetupHook {
name = "python-output-dist-hook";
} ./python-output-dist-hook.sh ) {};
pythonRecompileBytecodeHook = callPackage ({ }: pythonRecompileBytecodeHook = callPackage ({ }:
makeSetupHook { makeSetupHook {
name = "python-recompile-bytecode-hook"; name = "python-recompile-bytecode-hook";

2
pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
View File

@ -2,7 +2,7 @@
echo "Sourcing python-catch-conflicts-hook.sh" echo "Sourcing python-catch-conflicts-hook.sh"
pythonCatchConflictsPhase() { pythonCatchConflictsPhase() {
PYTHONPATH="@setuptools@/@pythonSitePackages@:$PYTHONPATH" @pythonInterpreter@ @catchConflicts@ @pythonInterpreter@ @catchConflicts@
} }
if [ -z "${dontUsePythonCatchConflicts-}" ]; then if [ -z "${dontUsePythonCatchConflicts-}" ]; then

10
pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh
View File

@ -1,10 +0,0 @@
# Setup hook for storing dist folder (wheels/sdists) in a separate output
echo "Sourcing python-catch-conflicts-hook.sh"
pythonOutputDistPhase() {
echo "Executing pythonOutputDistPhase"
mv "dist" "$dist"
echo "Finished executing pythonOutputDistPhase"
}
preFixupPhases+=" pythonOutputDistPhase"

13
pkgs/development/interpreters/python/mk-python-derivation.nix
View File

@ -17,7 +17,6 @@
, pythonCatchConflictsHook , pythonCatchConflictsHook
, pythonImportsCheckHook , pythonImportsCheckHook
, pythonNamespacesHook , pythonNamespacesHook
, pythonOutputDistHook
, pythonRemoveBinBytecodeHook , pythonRemoveBinBytecodeHook
, pythonRemoveTestsDirHook , pythonRemoveTestsDirHook
, setuptoolsBuildHook , setuptoolsBuildHook
@ -50,8 +49,6 @@
# Enabled to detect some (native)BuildInputs mistakes # Enabled to detect some (native)BuildInputs mistakes
, strictDeps ? true , strictDeps ? true
, outputs ? [ "out" ]
# used to disable derivation, useful for specific python versions # used to disable derivation, useful for specific python versions
, disabled ? false , disabled ? false
@ -109,13 +106,11 @@ else
let let
inherit (python) stdenv; inherit (python) stdenv;
withDistOutput = lib.elem format ["pyproject" "setuptools" "flit"];
name_ = name; name_ = name;
self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
"disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
"disabledTestPaths" "outputs" "disabledTestPaths"
]) // { ]) // {
name = namePrefix + name_; name = namePrefix + name_;
@ -126,7 +121,7 @@ let
ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
pythonRemoveTestsDirHook pythonRemoveTestsDirHook
] ++ lib.optionals catchConflicts [ ] ++ lib.optionals catchConflicts [
pythonCatchConflictsHook setuptools pythonCatchConflictsHook
] ++ lib.optionals removeBinBytecode [ ] ++ lib.optionals removeBinBytecode [
pythonRemoveBinBytecodeHook pythonRemoveBinBytecodeHook
] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
@ -149,8 +144,6 @@ let
] ++ lib.optionals (python.pythonAtLeast "3.3") [ ] ++ lib.optionals (python.pythonAtLeast "3.3") [
# Optionally enforce PEP420 for python3 # Optionally enforce PEP420 for python3
pythonNamespacesHook pythonNamespacesHook
] ++ lib.optionals withDistOutput [
pythonOutputDistHook
] ++ nativeBuildInputs; ] ++ nativeBuildInputs;
buildInputs = buildInputs ++ pythonPath; buildInputs = buildInputs ++ pythonPath;
@ -184,8 +177,6 @@ let
# Python packages built through cross-compilation are always for the host platform. # Python packages built through cross-compilation are always for the host platform.
disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];
outputs = outputs ++ lib.optional withDistOutput "dist";
meta = { meta = {
# default to python's platforms # default to python's platforms
platforms = python.meta.platforms; platforms = python.meta.platforms;

1
pkgs/top-level/python-packages.nix
View File

@ -119,7 +119,6 @@ in {
pythonCatchConflictsHook pythonCatchConflictsHook
pythonImportsCheckHook pythonImportsCheckHook
pythonNamespacesHook pythonNamespacesHook
pythonOutputDistHook
pythonRecompileBytecodeHook pythonRecompileBytecodeHook
pythonRelaxDepsHook pythonRelaxDepsHook
pythonRemoveBinBytecodeHook pythonRemoveBinBytecodeHook