Commit ea28d03e authored by Yueh-Shun Li's avatar Yueh-Shun Li
Browse files

python2Packages.buildPytonPackage: restructure with lib.extendMkDerivation 

Port to python2/mk-python-derivation.nix commit 0969c662
(buildPython*: support fixed-point arguments via lib.extendMkDerivation")

Postpone formatting to minimize diff.
parent 66e45249

pkgs/development/interpreters/python/python2/mk-python-derivation.nix

+27 −22
Original line number Diff line number Diff line
@@ -27,7 +27,24 @@ 
  eggBuildHook,

  eggInstallHook,

}:

lib.extendMkDerivation {

  constructDrv = stdenv.mkDerivation;



  excludeDrvArgNames = [

        "disabled"

        "checkPhase"

        "checkInputs"

        "nativeCheckInputs"

        "doCheck"

        "doInstallCheck"

        "dontWrapPythonPrograms"

        "catchConflicts"

        "format"

        "disabledTestPaths"

  ];



  extendDrvArgs =

    finalAttrs:

{

  name ? "${attrs.pname}-${attrs.version}",
@@ -173,22 +190,8 @@ let 
    in

    inputs: map checkDrv inputs;



  # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.

  self = toPythonModule (

    stdenv.mkDerivation (

      (removeAttrs attrs [

        "disabled"

        "checkPhase"

        "checkInputs"

        "nativeCheckInputs"

        "doCheck"

        "doInstallCheck"

        "dontWrapPythonPrograms"

        "catchConflicts"

        "format"

        "disabledTestPaths"

      ])

      // {

in

      {



        name = namePrefix + name_;
@@ -277,7 +280,7 @@ let 
            ;

          updateScript =

            let

              filename = builtins.head (lib.splitString ":" self.meta.position);

              filename = builtins.head (lib.splitString ":" finalAttrs.finalPackage.meta.position);

            in

            [

              update-python-libraries
@@ -300,10 +303,10 @@ let 
      }

      // lib.optionalAttrs (disabledTestPaths != [ ]) {

        disabledTestPaths = lib.escapeShellArgs disabledTestPaths;

      }

    )

  );

      };



  transformDrv =

    let

  # Workaround to make the `lib.extendDerivation`-based disabled functionality

  # respect `<pkg>.overrideAttrs`

  # It doesn't cover `<pkg>.<output>.overrideAttrs`.
@@ -317,4 +320,6 @@ let 
      overrideAttrs = fdrv: disablePythonPackage (drv.overrideAttrs fdrv);

    };

    in

disablePythonPackage self
 
    drv:

    disablePythonPackage (toPythonModule drv);

}