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

Add protoc-go-inject-tag to nixpkgs #292481

Closed
wants to merge 0 commits into from
Closed

Conversation

ElrohirGT
Copy link
Contributor

@ElrohirGT ElrohirGT commented Mar 1, 2024

Description of changes

This is a new package used for go-tags and protobuffers: Homepage

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

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Mar 1, 2024
@lolbinarycat
Copy link
Contributor

all the files look good, one last step, you need to squash the last two commits together so you have:

  1. one commit adding yourself to maintainers
  2. a second commit adding the file

i believe git rebase -i is the reccomended method for this.

@ElrohirGT
Copy link
Contributor Author

Nice! I don't have my PC with me right now, I'll do it later

@ElrohirGT
Copy link
Contributor Author

Done!

@ElrohirGT
Copy link
Contributor Author

It builds on M1 too!

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 5, 2024
@RaghavSood
Copy link
Member

@ElrohirGT are you able to clear the merge conflicts? PR looks good otherwise

@ElrohirGT
Copy link
Contributor Author

Sure! I'll clean them up this afternoon. It should still only contain two commits right? The one that adds me as maintainer and the one that adds the package.

@RaghavSood
Copy link
Member

Yes, should still be only two - you should be able to replay the commits over the current master and then fix the conflict in the maintainers file - rebase and squash as before if needed

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 8, 2024
@ElrohirGT ElrohirGT closed this Apr 8, 2024
@ElrohirGT
Copy link
Contributor Author

Sorry! I think I messed up a little and closed this PR on accident while updating my fork. I don't really know how that happened probably by force pushing. Anyways, here's the fixed PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants