Skip to content

nano: update nixSyntaxHighlight#414380

Merged
Aleksanaa merged 1 commit intoNixOS:masterfrom
deftdawg:nanonix
Jun 25, 2025
Merged

nano: update nixSyntaxHighlight#414380
Aleksanaa merged 1 commit intoNixOS:masterfrom
deftdawg:nanonix

Conversation

@deftdawg
Copy link
Contributor

@deftdawg deftdawg commented Jun 6, 2025

Updates nanonix syntax highlighting for Nano to fix multi-line comments

nanonix provides nix language syntax highlighting for the nano editor. Prior to this update, inline commands such as cp -r ${pkg}/* ${out} where interpreted as the start of a multi-line comment (/*) breaking syntax highlighting through the rest of the file. The update to nanonix fixes that.

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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.

CC maintainers: @joachifm @NeQuissimus @SigmaSquadron


Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jun 6, 2025
Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

Please review our Commit Conventions and reword your commit appropriately. It should say something along the lines of nano: update nixSyntaxHighlight.

The why of the update can be added to the commit description.

@deftdawg deftdawg changed the title Update nanonix syntax highlighting for Nano to fix multi-line comments nano: update nixSyntaxHighlight Jun 7, 2025
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/5585

@deftdawg deftdawg requested a review from SigmaSquadron June 18, 2025 00:55
@SigmaSquadron
Copy link
Contributor

@ofborg build nano nano.tests

Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

Thanks! I tried to run nixpkgs-review on this, but it failed spectacularly after trying to build the C++ hardening tests for some reason.
Since the package tests still pass I see no reason not to approve this.

@github-actions github-actions bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jun 18, 2025
@deftdawg
Copy link
Contributor Author

tried to run nixpkgs-review on this, but it failed spectacularly after trying to build the C++ hardening tests for some reason.

Not sure if it's related, but building on Darwin was failing for me earlier today, had to get the commit from this PR to resolve it.

#417500

@mdaniels5757
Copy link
Member

Despite the problems I had on GitHub Actions (discussed on Matrix), nixpkgs-review works locally (x86_64-linux) for me. But the number of build packages may be wrong? (I got ~90 on GitHub actions, but only 18 here!)

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review
Commit: 971f03a0b9f071fe2dbf61b0db42a4470aa53b98


x86_64-linux

✅ 18 packages built:
  • cabal2nix
  • crip
  • cvs
  • cvs-fast-export
  • cvs2svn
  • cvs2svn.dist
  • cvsps
  • cvsq
  • debian-devscripts
  • ikiwiki-full
  • luarocks-packages-updater
  • luarocks-packages-updater.dist
  • nano
  • nano.info
  • nix-prefetch-cvs
  • nix-prefetch-scripts
  • nix-update-source
  • nix-update-source.dist

@deftdawg
Copy link
Contributor Author

So, like can this be merged?

Copy link
Member

@mdaniels5757 mdaniels5757 left a comment

Choose a reason for hiding this comment

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

Yes, I think so.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jun 24, 2025
@Aleksanaa Aleksanaa merged commit 0f39aee into NixOS:master Jun 25, 2025
23 of 25 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jun 25, 2025

Successfully created backport PR for release-25.05:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants