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.

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

jujutsu: refactor, add emily to maintainers #339702

Merged
merged 16 commits into from
Sep 5, 2024

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Sep 5, 2024

Description of changes

This is critical to my workflow, so let’s step up to help out.

Probably these commits didn’t have to be so thoroughly factored out, but when Jujutsu makes it this easy, why not?

cc @bbigras – did you want to co‐maintain this?

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.

@bbigras
Copy link
Contributor

bbigras commented Sep 5, 2024

cc @bbigras – did you want to co‐maintain this?

Yeah, you can add me as a maintainer too. :)

@ofborg ofborg bot requested review from 0x4A6F and thoughtpolice September 5, 2024 03:58
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Sep 5, 2024
@ofborg ofborg bot requested a review from bbigras September 5, 2024 04:27
libgit2
libssh2
]
++ lib.optional (!stdenv.hostPlatform.isDarwin) [ openssl ]
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
++ lib.optional (!stdenv.hostPlatform.isDarwin) [ openssl ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) openssl
Suggested change
++ lib.optional (!stdenv.hostPlatform.isDarwin) [ openssl ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, typo 🫠 Fixed!

We need to lint for this…

@samueltardieu
Copy link
Contributor

Result of nixpkgs-review pr 339702 run on x86_64-linux 1

2 packages built:
  • jujutsu
  • lazyjj

@samueltardieu
Copy link
Contributor

Probably these commits didn’t have to be so thoroughly factored out, but when Jujutsu makes it this easy, why not?

Indeed!

Copy link
Member

@thoughtpolice thoughtpolice left a comment

Choose a reason for hiding this comment

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

I absolutely despise every aesthetic choice made by nixfmt and absolutely reject it everywhere on my own codebases. But I'll live with it here I guess.

@emilazy
Copy link
Member Author

emilazy commented Sep 5, 2024

I have plenty of bones to pick with the style, but it’ll get swept up in the treewide before 24.11 anyway, so might as well bite the bullet now :)

(I think the “new files must be formatted” CI lint would complain if I hadn’t done it, anyway, given the pkgs/by-name move.)

@emilazy emilazy merged commit 9a73513 into NixOS:master Sep 5, 2024
24 of 26 checks passed
@emilazy emilazy deleted the push-olnrxsxluqwv branch September 5, 2024 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants