archivebox: fix build and add singlefile #358588
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dotlambda
reviewed
Nov 24, 2024
dotlambda
reviewed
Nov 24, 2024
james-atkins
force-pushed
the
pr/fix-archivebox-24.11
branch
from
e61b23c to
5a426ea
Compare
|
Fixed the commit message. We need |
james-atkins
changed the title
Use |
Fixes NixOS#358580. Override any django-extensions patches. Add distutils dependency for Python 3.12 and above. Convert buildPythonApplication to use build-system and dependencies. Fix a scoping error with yt-dlp. Note: if neither python.pkgs.yt-dlp nor pkgs.yt-dlp are in archivebox's dependencies, then there is a missing runtime dependency error. If pkgs.yt-dlp is in dependencies instead of python.pkgs.yt-dlp, (as was the case) there is a cryptic error about 'pdm.backend' not being available. Fix this by just using `python.pkgs.yt-dlp` everywhere.
james-atkins
force-pushed
the
pr/fix-archivebox-24.11
branch
from
5a426ea to
018bd5d
Compare
james-atkins
changed the title
dotlambda
approved these changes
Nov 24, 2024
wegank
added
the
12.approvals: 1
|
|
dotlambda
reviewed
Dec 2, 2024
| @@ -34,6 +34,7 @@ let | |||
| "CVE-2022-28346" | |||
| ]; | |||
| }; | |||
| dependencies = (old.dependencies or [ ]) ++ (lib.optionals (python.pythonAtLeast "3.12") [ python.pkgs.distutils ]); | |||
There was a problem hiding this comment.
Why is distutils in dependencies rather than build-system?
There was a problem hiding this comment.
This version of django uses distutils for parsing version strings. https://github.com/django/django/blob/stable/3.1.x/django/utils/version.py#L6
dotlambda
reviewed
Dec 2, 2024
| @@ -34,6 +34,7 @@ let | |||
| "CVE-2022-28346" | |||
| ]; | |||
| }; | |||
| dependencies = (old.dependencies or [ ]) ++ (lib.optionals (python.pythonAtLeast "3.12") [ python.pkgs.distutils ]); | |||
There was a problem hiding this comment.
Suggested change
| dependencies = (old.dependencies or [ ]) ++ (lib.optionals (python.pythonAtLeast "3.12") [ python.pkgs.distutils ]); | |
| build-system = (old.build-system or [ ]) ++ (lib.optionals (self.pythonAtLeast "3.12") [ self.distutils ]); |
wegank
removed
the
12.approvals: 1
|
Successfully created backport PR for |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #358580.
Override any django-extensions patches.
Downgrade to Python 3.11 as django needs distutils.Avoid a scoping error with yt-dlp. If
pkgs.yt-dlpis in dependencies instead ofpython.pkgs.yt-dlp, there isa cryptic error about 'pdm.backend' not being available. Change to just using
python.pkgs.yt-dlpeverywhere.Also update
buildPythonApplicationto usebuild-systemanddependencies.Add SingleFile support too.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.