Skip to content

cvise: fix unifdef.patch (crashes otherwise)#452703

Merged
alyssais merged 1 commit intoNixOS:masterfrom
trofi:cvise-fix-startup-crash
Oct 18, 2025
Merged

cvise: fix unifdef.patch (crashes otherwise)#452703
alyssais merged 1 commit intoNixOS:masterfrom
trofi:cvise-fix-startup-crash

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Oct 16, 2025 •
edited
Loading

Without the change cvise does not even parse:

$ cvise --help |& unnix
  File "/<<NIX>>/cvise-2.12.0/bin/.cvise-wrapped", line 96
    programs['unifdef'] = '/<<NIX>>/unifdef-2.12/bin/unifdef'
    ^^^^^^^^
SyntaxError: expected 'except' or 'finally' block

Happens because the patch applies to the unrelated bit of the source.

While at it added minimal cvise --version test.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@trofi
cvise: fix unifdef.patch (crashes otherwise)
de5759e 
Without the change `cvise` does not even parse:

    $ cvise --help |& unnix
      File "/<<NIX>>/cvise-2.12.0/bin/.cvise-wrapped", line 96
        programs['unifdef'] = '/<<NIX>>/unifdef-2.12/bin/unifdef'
        ^^^^^^^^
    SyntaxError: expected 'except' or 'finally' block

Happens because the patch applies to the unrelated bit of the source.

While at it added minimal `cvise --help` test.
@trofi trofi mentioned this pull request Oct 16, 2025
Merged
13 tasks
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. labels Oct 16, 2025
@nix-owners nix-owners bot requested a review from orivej October 16, 2025 20:02
@trofi
Copy link
Contributor Author

trofi commented Oct 16, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 452703
Commit: de5759ecbcb69fc4110be8a76264409202414b24

x86_64-linux

✅ 2 packages built:
  • cvise
  • nixpkgs-manual

@alyssais alyssais added this pull request to the merge queue Oct 18, 2025
Merged via the queue into NixOS:master with commit de2b7b2 Oct 18, 2025
31 checks passed
@trofi trofi deleted the cvise-fix-startup-crash branch October 18, 2025 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@orivej orivej Awaiting requested review from orivej

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@trofi @alyssais