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

update cursor to 0.44.11, add multi-platform support, modify update s… #371208

Closed
wants to merge 0 commits into from

Conversation

aspauldingcode
Copy link
Contributor

Updated code-cursor to 0.44.11.
Added aarch64-linux and both darwin platforms.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@aspauldingcode
Copy link
Contributor Author

I will need help with this. I do not fully understand git version control. I do not have pull-request experience.

@nix-owners nix-owners bot requested a review from sarahec January 5, 2025 18:19
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jan 5, 2025
@sarahec
Copy link
Contributor

sarahec commented Jan 5, 2025

I will need help with this. I do not fully understand git version control. I do not have pull-request experience.

No worries, I've got your back. Thank you for stepping out and doing this!

Git, (over-)simplified

Git is basically a system where you can make a copy of a group of files and sync your copy to pick up changes in its parent. You can also send changes to the parent by creating a "pull request" that says "I would like to add my files to yours". (Apologies if this is over-simplified! I'm assuming minimal knowledge to start.)

Git uses "branches" to manage individual streams of work. Nixpkgs' master branch holds the latest versions of everything and picks up hundreds of new changes a day.

You may want to work in a branch

Right now, you're sending me a pull request from your master branch. The catch is, if you ever sync in changes from nixpkgs (git pull or the Sync Fork button in Github), you're going to wind up with hundreds of unrelated changes added to your PR.

You might want to move your work onto a new branch then open a new PR on that new branch. That will make your life easier when you need to make any changes. Once this gets approved, it'll be merged into master.

How to move to a new branch

  1. Make a copy of your pkgs/by-name/co/code-cursor/package.nix and stash it somewhere such as on your desktop.
  2. Back out your change from master: git reset --hard HEAD~1 tells git to forget the latest change
  3. Pull in all the latest changes from nixpkgs:master: git fetch upstream
  4. Now create a branch and start using it: git switch --create cursor-add-platforms upstream/master
  5. This will put you in a branch that looks like master but which isolates your changes to the branch (and lets master update independently of your branch)
  6. Now copy your modified package.nix into place.
  7. Create your new PR (if you're using VSCode, the "GitHub Pull Requests" extension helps a lot) and select the platforms you've tested yourself (linux, mac). It's ok to not test everything if you can't; we can get other reviewers to help with that.

If you do this, include the line Supercedes #371208 in your PR description so anyone who looks here knows to look at your new PR instead.

If you don't want to do this, we can continue with your master branch, but you'll have to be careful about pulling changes.

See also

https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#how-to-create-pull-requests

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants