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

atom: 1.21.2->1.22.0; 1.22.0-beta1->1.23.0-beta0 #31649

Merged
merged 2 commits into from Nov 14, 2017
Merged

Conversation

fusion809
Copy link
Contributor

@fusion809 fusion809 commented Nov 14, 2017

Motivation for this change

Atom is outdated, so should be updated.

Things done

Bumped Atom to 1.22.0 (stable) and 1.23.0-beta0 (beta branch).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Thanks for your time,
Brenton

@fusion809
Copy link
Contributor Author

Just built and tested on NixOS 17.09 too, both packages passed with flying colours.

@Mic92
Copy link
Member

Mic92 commented Nov 14, 2017

Can you rename both commits the following way:

  • atom: 1.21.2->1.22.0
  • atom-beta: 1.22.0-beta1->1.23.0-beta0

@fusion809
Copy link
Contributor Author

I shall if you teach me how to. My knowledge of git is fairly rudimentary.

@Mic92
Copy link
Member

Mic92 commented Nov 14, 2017

$ git clone git@github.com:fusion809/nixpkgs
$ git checkout patch-3
$ git rebase -i HEAD~2 # opens an editor
  • replace pick with reword in front of each commit line; save & close your editor
  • Now git will start for both commits your editor with the title and gives you the opportunity to edit message
  • since you have changed history, you need to use the --force flag when pushing changes:
git push --force origin patch-3

@fusion809
Copy link
Contributor Author

I did this in GitHub, this repo is over 600 MB in size so I'd rather not have to git clone it.

@Mic92
Copy link
Member

Mic92 commented Nov 14, 2017

Github does not offer rebasing yet in its. I can also do the rewording. But people are sometimes offended, if I change there commits.

@fusion809
Copy link
Contributor Author

I suppose I'm likely to request a bump again sometime in the future. So I cloned it and pushed it.

@Mic92 Mic92 merged commit 309ce56 into NixOS:master Nov 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants