Unverified Commit da47763c authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

Merge pull request #279384 from Stunkymonkey/recursive-pth-loader-normalize 

python311Packages.recursive-pth-loader: rename from recursivePthLoader
parents 5deb782b d35003e3

nixos/modules/services/web-servers/zope2.nix

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ in 
              name = "zope2-${name}-env";

              paths = [

                pkgs.python27

                pkgs.python27Packages.recursivePthLoader

                pkgs.python27Packages.recursive-pth-loader

                pkgs.python27Packages."plone.recipe.zope2instance"

              ] ++ attrValues pkgs.python27.modules

                ++ opts.packages;

pkgs/by-name/bl/bluez/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { 
    pythonPath = with python3.pkgs; [

      dbus-python

      pygobject3

      recursivePthLoader

      recursive-pth-loader

    ];

  in

  ''

pkgs/development/interpreters/python/python-packages-base.nix

+0 −4
Original line number Diff line number Diff line
@@ -98,8 +98,4 @@ in { 
  python = toPythonModule python;

  # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions

  pythonPackages = self;



  # Remove?

  recursivePthLoader = toPythonModule (callPackage ../../../development/python-modules/recursive-pth-loader { });



}

pkgs/tools/typesetting/asciidoc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
, enableDiagFilter ? false, blockdiag, seqdiag, actdiag, nwdiag

, enableQrcodeFilter ? false, qrencode

, enableMatplotlibFilter ? false, matplotlib, numpy

, enableAafigureFilter ? false, aafigure, recursivePthLoader

, enableAafigureFilter ? false, aafigure, recursive-pth-loader

# backends

, enableDeckjsBackend ? false

, enableOdfBackend ? false
@@ -180,7 +180,7 @@ in python3.pkgs.buildPythonApplication rec { 
    echo "Extracting aafigure filter"

    unzip -d "$out/etc/asciidoc/filters/aafigure" "${aafigureFilterSrc}"

    # Add aafigure to sys.path (and it needs recursive-pth-loader)

    pth_loader_path="$(toPythonPath ${recursivePthLoader})"

    pth_loader_path="$(toPythonPath ${recursive-pth-loader})"

    aafigure_path="$(toPythonPath ${aafigure})"

    sed -i "/^import.*sys/asys.path.append(\"$pth_loader_path\"); sys.path.append(\"$aafigure_path\"); import sitecustomize" \

        "$out/etc/asciidoc/filters/aafigure/aafig2img.py"

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -6580,7 +6580,7 @@ with pkgs; 
  arpoison = callPackage ../tools/networking/arpoison { };















  asciidoc = callPackage ../tools/typesetting/asciidoc {













    inherit (python3.pkgs) pygments matplotlib numpy aafigure recursivePthLoader;













    inherit (python3.pkgs) pygments matplotlib numpy aafigure recursive-pth-loader;















    w3m = w3m-batch;















    enableStandardFeatures = false;















  };