Skip to content
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

Jump to bottom

pythonPackages.django_5: remove failing patch #299861

Closed
wants to merge 1 commit into from
Closed

pythonPackages.django_5: remove failing patch #299861

wants to merge 1 commit into from

Conversation

phaer
Copy link
Member

@phaer phaer commented Mar 28, 2024 •
edited

...because it was upstreamed and is included in 5.0.3, so that ´patch´ fails with

Reversed (or previously applied) patch detected!

which means that django_5 does not build on current master. Tests do pass on 3.12 without this error.

Comments in #293227 suggests that another error during the test run might have shadowed this on.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@phaer phaer requested a review from mweinelt March 28, 2024 23:03
@phaer phaer mentioned this pull request Mar 28, 2024
Merged
13 tasks
@mweinelt
Copy link
Member

mweinelt commented Mar 28, 2024 •
edited

Duplicate of #299212. But also, Django 5.0.3 is cached on cache.nixos.org, so it did build at the time I merged the PR.

$ git log --oneline pkgs/development/python-modules/django/5.nix
[...]
a4c561970fa9 python312Packages.django_5: 5.0.2 -> 5.0.3
$ git checkout a4c561970fa9
$ nix-build -A python311Packages.django_5
[...]
copying path '/nix/store/li22yckwxslwx7agk1pkrn5563lbi6x4-python3.11-Django-5.0.3' from 'https://cache.nixos.org'
/nix/store/li22yckwxslwx7agk1pkrn5563lbi6x4-python3.11-Django-5.0.3

@mweinelt
Copy link
Member

Looks like a bad merge between python-updates (via staging-next) and master.

@mweinelt mweinelt closed this Mar 28, 2024
@phaer phaer deleted the django_5-patch branch March 28, 2024 23:20
@phaer
Copy link
Member Author

phaer commented Mar 28, 2024

Thanks for the quick response & sorry for the noise. Had somehow missed that PR in the files history.

@phaer
pythonPackages.django_5: remove failing patch...
36fc0a4 
...because it was upstreamed and is included in 5.0.3,
so that ´patch´ fails with
> Reversed (or previously applied) patch detected!
which means that django_5 does not build on current master.

Comments in NixOS#293227
suggests that another error during the test run might have
shadowed this on.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mweinelt mweinelt Awaiting requested review from mweinelt

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@phaer @mweinelt