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

git-privacy: init at 2.0.0 #98773

Closed
wants to merge 4 commits into from
Closed

Conversation

@ajs124
Copy link
Member

@ajs124 ajs124 commented Sep 25, 2020

Motivation for this change

Closes #83692

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.
@ajs124 ajs124 requested review from FRidh and jonringer as code owners Sep 25, 2020
@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 25, 2020

1 similar comment
@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 25, 2020

Copy link
Contributor

@jonringer jonringer left a comment

  NameError: name 'FileExistsError' is not defined
cannot build derivation '/nix/store/j8awllcjjpqhkvfwv52wv39vak3w3aqc-env.drv': 1 dependencies couldn't be built
[0 built (1 failed), 0.0 MiB DL]
error: build of '/nix/store/j8awllcjjpqhkvfwv52wv39vak3w3aqc-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/98773
1 package failed to build:
python27Packages.git-filter-repo

3 packages built:
git-privacy python37Packages.git-filter-repo python38Packages.git-filter-repo

ajs124 and others added 2 commits Sep 28, 2020
Co-authored-by: Jon <jonringer@users.noreply.github.com>
Co-authored-by: Jon <jonringer@users.noreply.github.com>
@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 28, 2020

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

I would use git rebase -i, I created a small video demonstrating it's use here. A more indepth text tutorial can be found here

@ajs124
Copy link
Member Author

@ajs124 ajs124 commented Sep 29, 2020

I could also just squash them when merging, if you approve of the diff.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 29, 2020

you have two package additions, they should be two separate commits. squash and merge will just make it into one

@ajs124 ajs124 closed this Sep 29, 2020
@ajs124 ajs124 deleted the init/git-privacy branch Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants