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

.editorconfig: Format .bash files like .sh #354885

Merged
merged 2 commits into from
Nov 29, 2024
Merged

.editorconfig: Format .bash files like .sh #354885

merged 2 commits into from
Nov 29, 2024

Conversation

l0b0
Copy link
Contributor

@l0b0 l0b0 commented Nov 10, 2024 •
edited
Loading

Done under the assumption that disabling the indent size check is a temporary workaround (based on a quick skim of the original discussion). If maintainers disagree I could just remove the formatting commit.

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.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@nix-owners nix-owners bot requested review from corngood, drupol, Mic92 and zowoq November 10, 2024 01:07
@l0b0 l0b0 mentioned this pull request Nov 10, 2024
Merged
15 tasks
@l0b0 l0b0 force-pushed the editorconfig-bash branch from 48c5b8c to 160d3eb Compare November 10, 2024 01:13
@corngood
Copy link
Contributor

This looks good to me, but I'm curious about the rebuild count. If it's primarily dotnet stuff, it can probably go in master. If it's more than that maybe staging.

@l0b0 l0b0 force-pushed the editorconfig-bash branch from 160d3eb to 6f4b55f Compare November 10, 2024 01:45
@github-actions github-actions bot added 6.topic: haskell 6.topic: qt/kde 8.has: documentation This PR adds or changes documentation 6.topic: emacs Text editor 6.topic: rust 6.topic: golang 6.topic: ruby 6.topic: vim 6.topic: stdenv Standard environment 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: lib The Nixpkgs function library 6.topic: deepin Desktop environment and its components 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: flutter 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Nov 10, 2024
@l0b0 l0b0 changed the base branch from master to staging November 10, 2024 01:45
@github-actions github-actions bot removed 6.topic: haskell 6.topic: qt/kde 8.has: documentation This PR adds or changes documentation labels Nov 10, 2024
@github-actions github-actions bot removed 6.topic: emacs Text editor 6.topic: rust 6.topic: golang 6.topic: ruby 6.topic: vim 6.topic: stdenv Standard environment 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: lib The Nixpkgs function library 6.topic: deepin Desktop environment and its components 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: flutter 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Nov 10, 2024
@l0b0
Copy link
Contributor Author

l0b0 commented Nov 10, 2024

This looks good to me, but I'm curious about the rebuild count. If it's primarily dotnet stuff, it can probably go in master. If it's more than that maybe staging.

Good catch! nixpkgs-review got to 1,000 packages before coming to a standstill. I've rebased onto staging instead.

@l0b0 l0b0 force-pushed the editorconfig-bash branch from 6f4b55f to 9181756 Compare November 10, 2024 01:52
@emilazy
Copy link
Member

emilazy commented Nov 10, 2024 •
edited
Loading

See (the related) #353490.

@l0b0
Copy link
Contributor Author

l0b0 commented Nov 10, 2024

See (the related) #353490.

Thanks! I've added a comment about the only part of it which I have an opinion about (other than saying that we absolutely should enforce things like indentation for sanity).

@Scrumplex Scrumplex merged commit 2115f02 into NixOS:staging Nov 29, 2024
26 checks passed
@l0b0 l0b0 deleted the editorconfig-bash branch November 30, 2024 04:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Scrumplex Scrumplex Scrumplex approved these changes

@corngood corngood corngood approved these changes

@drupol drupol Awaiting requested review from drupol

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

Assignees
No one assigned
Labels
6.topic: dotnet Language: .NET 6.topic: php 6.topic: python 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@l0b0 @corngood @emilazy @Scrumplex