Skip to content

python311Packages.recursive-pth-loader: rename from recursivePthLoader #279384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stunkymonkey merged 1 commit into from
Jan 28, 2024
Merged

python311Packages.recursive-pth-loader: rename from recursivePthLoader #279384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/web-servers/zope2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/bl/bluez/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
pythonPath = with python3.pkgs; [
dbus-python
pygobject3
recursivePthLoader
recursive-pth-loader
];
in
''
Expand Down
4 changes: 0 additions & 4 deletions pkgs/development/interpreters/python/python-packages-base.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { });
Copy link
Contributor

@jfly jfly Jan 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the record, I don't understand the consequences of moving this.

Copy link
Contributor Author

@Stunkymonkey Stunkymonkey Jan 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why it was there in the first place...

Copy link
Contributor

@jfly jfly Jan 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, well, seems reasonable to try to move it and see what happens. Either it's safe and good, or we learn something =)


}
4 changes: 2 additions & 2 deletions pkgs/tools/typesetting/asciidoc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down