colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python311Packages.recursive-pth-loader: rename from recursivePthLoader

Browse Source
This commit is contained in:
Felix Buehler 2024-01-07 15:29:36 +01:00
parent d3a15f0432
commit d35003e302
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-servers/zope2.nix
View File

@ -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;

2
pkgs/by-name/bl/bluez/package.nix
View File

@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
pythonPath = with python3.pkgs; [
dbus-python
pygobject3
recursivePthLoader
recursive-pth-loader
];
in
''

4
pkgs/development/interpreters/python/python-packages-base.nix
View File

@ -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 { });
}

4
pkgs/tools/typesetting/asciidoc/default.nix
View File

@ -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"

2
pkgs/top-level/all-packages.nix
View File

@ -6583,7 +6583,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;
};

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

@ -425,6 +425,7 @@ mapAliases ({
rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
readme_renderer = readme-renderer; # added 2024-01-07
recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20
recursivePthLoader = recursive-pth-loader; # added 2024-01-07
rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06
repeated_test = repeated-test; # added 2022-11-15
repoze_lru = repoze-lru; # added 2023-11-11

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

@ -12480,6 +12480,8 @@ self: super: with self; {
recurring-ical-events = callPackage ../development/python-modules/recurring-ical-events { };
recursive-pth-loader = toPythonModule (callPackage ../development/python-modules/recursive-pth-loader { });
redbaron = callPackage ../development/python-modules/redbaron { };
redis = callPackage ../development/python-modules/redis { };