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

Jump to bottom

nixos/release-notes: fix bad merge of cargo-vendor entry and formatting #63911

Merged
merged 1 commit into from Jul 9, 2019
Merged

nixos/release-notes: fix bad merge of cargo-vendor entry and formatting #63911

merged 1 commit into from Jul 9, 2019

Conversation

lopsided98
Copy link
Contributor

Fixes the bad merge of #62935 and fixes the overall formatting of the release notes. The inconsistent indentation has always annoyed me, so I decided to try and convert it all to single space, which seems to be the prevailing style.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@lopsided98
Copy link
Contributor Author

cc @danieldk @Ma27

@danieldk
Copy link
Contributor

Looks good to me, thanks for fixing this!

Ma27
Ma27 approved these changes Jul 5, 2019
View reviewed changes
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

The change seems fine. But can you please resolve the conflicts?

@lopsided98
Copy link
Contributor Author

I fixed the conflicts.

@Ma27 Ma27 merged commit 51520e7 into NixOS:master Jul 9, 2019
@Ma27
Copy link
Member

Ma27 commented Jul 9, 2019

@lopsided98 thanks!

@lopsided98 lopsided98 deleted the cargo-vendor-fix-changelog branch July 11, 2019 00:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@lopsided98 @danieldk @Ma27