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

cppclean: 2018-05-12 -> 0.13 #66373

Merged
merged 1 commit into from Aug 18, 2019
Merged

cppclean: 2018-05-12 -> 0.13 #66373

merged 1 commit into from Aug 18, 2019

Conversation

nthorne
Copy link
Contributor

@nthorne nthorne commented Aug 9, 2019

Motivation for this change
Things done
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

name = "cppclean-unstable-${version}";
version = "2018-05-12";
name = "cppclean-${version}";
version = "v0.13";
Copy link
Member

Choose a reason for hiding this comment

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

Please move the v prefix to rev and also consider using pname.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done (thanks, @jonringer::) )

pkgs/development/tools/cppclean/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/cppclean/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/cppclean/default.nix Outdated Show resolved Hide resolved
@mmahut
Copy link
Member

mmahut commented Aug 10, 2019

Thank you! Can you please squash your commits into just one?

@GrahamcOfBorg build cppclean

@nthorne
Copy link
Contributor Author

nthorne commented Aug 11, 2019

@mmahut I do not have write access to master afaik, so squash merging will need to be done by someone who has the correct permissions, right?

@jonringer
Copy link
Contributor

jonringer commented Aug 11, 2019

@nthorne you don't need access to NixOS:master, this PR is merging a branch you control into a branch from NixOS. So just edit the branch you made the PR from to see the changes reflected here.

The changes you want to squash the commits:

# start from current cppclean_0_13 branch
git reset HEAD^^^ --soft      # pop off last 3 commits, move changes to staged
git commit --amend --no-edit  # take staged changes, and add them to previous commit (which would be the first one you did)
git push <fork repo> cppclean_0_13 --force # force is needed because you're "changing history"

if you need to do more significant git history changes, something like git rebase -i will be really helpful, good example on how to use interactive rebase is here

@nthorne
Copy link
Contributor Author

nthorne commented Aug 14, 2019

Updated according to instructions from @jonringer (thanks!)

@mmahut
Copy link
Member

mmahut commented Aug 18, 2019

@GrahamcOfBorg build cppclean

@lsix lsix merged commit 7b578d4 into NixOS:master Aug 18, 2019
@lsix
Copy link
Member

lsix commented Aug 18, 2019

Built and tested.

Thanks.

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

4 participants