Skip to content

python311.pkgs.breathe: drop already upstreamed patch#257806

Merged
mweinelt merged 1 commit intoNixOS:staging-nextfrom
trofi:python311.pkgs.breathe-drop-patch
Sep 28, 2023
Merged

python311.pkgs.breathe: drop already upstreamed patch#257806
mweinelt merged 1 commit intoNixOS:staging-nextfrom
trofi:python311.pkgs.breathe-drop-patch

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Sep 28, 2023

Without the change build fails at patch apply phase:

   > applying patch /nix/store/dmbcdrjm61q5i0mndanj4zn8fkw7g5nj-de3504c81c7cefc87c8229743f93232ca00a685d.patch
   > patching file tests/test_renderer.py
   > Reversed (or previously applied) patch detected!  Assume -R? [n]
   > Apply anyway? [n]
   > Skipping patch.
   > 2 out of 2 hunks ignored -- saving rejects to file tests/test_renderer.py.rej

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.05 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.

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. labels Sep 28, 2023
Without the change build fails at patch apply phase:

       > applying patch /nix/store/dmbcdrjm61q5i0mndanj4zn8fkw7g5nj-de3504c81c7cefc87c8229743f93232ca00a685d.patch
       > patching file tests/test_renderer.py
       > Reversed (or previously applied) patch detected!  Assume -R? [n]
       > Apply anyway? [n]
       > Skipping patch.
       > 2 out of 2 hunks ignored -- saving rejects to file tests/test_renderer.py.rej
@trofi trofi force-pushed the python311.pkgs.breathe-drop-patch branch from e688441 to ebdb5f8 Compare September 28, 2023 11:11
@trofi trofi changed the base branch from staging to staging-next September 28, 2023 11:11
@trofi
Copy link
Contributor Author

trofi commented Sep 28, 2023

Rebased against staging-next as it's already failing there.

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Sep 28, 2023
@mweinelt mweinelt merged commit 966dc60 into NixOS:staging-next Sep 28, 2023
@trofi trofi deleted the python311.pkgs.breathe-drop-patch branch September 28, 2023 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants