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.

Sign up for GitHub

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

git-my: init at 1.1.2 #71378

Merged
merged 4 commits into from
Feb 26, 2020
Merged

git-my: init at 1.1.2 #71378

merged 4 commits into from
Feb 26, 2020

Conversation

bb010g
Copy link
Contributor

@bb010g bb010g commented Oct 19, 2019 •
edited
Loading

Introduces git-my into gitAndTools.

Also takes the luxury beforehand to strongly normalize gitAndTools's naming and sorting. The only package referenced elsewhere in Nixpkgs, git-top, has had its reference updated to not point at the new alias. These are done in separate commits to keep things clean.

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)

    (Which of these are we supposed to post?)

    • 615_240 (derivation)
    • 29_474_872 (output)

  • Ensured that relevant documentation is up to date

  • Fits CONTRIBUTING.md.

This change is Reviewable

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 19, 2019
jonringer
jonringer reviewed Oct 20, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

some small corrections, otherwise LGTM

thank you for organizing the gitAndTools package scope :)

pkgs/applications/version-management/git-and-tools/git-my/default.nix Outdated
description =
"List remote branches if they're merged and/or available locally";
homepage = https://github.com/davidosomething/git-my;
license = lib.licenses.free;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
license = lib.licenses.free;
license = licenses.free;

Copy link
Contributor

Choose a reason for hiding this comment

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

added an issue for him to add a proper license davidosomething/git-my#3

@bb010g
Copy link
Contributor Author

bb010g commented Oct 21, 2019

Ok, reviews incorporated.

@Lassulus
Copy link
Member

Lassulus commented Dec 8, 2019

needs a rebase

jonringer
jonringer reviewed Dec 8, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

apparently forgot to submit a review, sorry if this has already been addressed

@jonringer
Copy link
Contributor

still needs a rebase, i dismissed my comments

@jonringer
Copy link
Contributor

still needs a rebase

@bb010g
Copy link
Contributor Author

bb010g commented Feb 25, 2020

Rebsed.

@jonringer
Copy link
Contributor

hmm, do you mind separating out the git-my: init at 1.1.2 into a separate PR (that looks read). And make this into the name refactor (more controversial).

I don't want to step on the toes of those maintainers who are having their packages forcefully edited without their knowledge.

@bb010g
Copy link
Contributor Author

bb010g commented Feb 26, 2020

darcs-to-git doesn't have a maintainer & hubUnstable is currently throw "use gitAndTools.hub instead".

fast-export is @koral, git-remote-gcrypt is @ellis & @montag451, and top-git is @MarcWeber.

If they're fine with the renames & aliasing, then this shouldn't need to split?

@worldofpeace
Copy link
Contributor

@bb010g I cool merging this after the previous comment is applied.
@jonringer It's good to look out for what other maintainers think about their packages, but this is more of a thing the committers (curators) of the codebase can decide on.

bb010g and others added 4 commits February 25, 2020 23:04
@bb010g @worldofpeace
hub-unstable: remove
9254040 
This has been here for 2 years; we can remove it.

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
@bb010g
git-and-tools: canonicalize hyphenated names
a7cb757 
Old intercaps names are aliased.

darcs-to-git: rename from darcsToGit
git-fast-export: rename from gitFastExport
git-remote-gcrypt: rename from gitRemoteGcrypt
hub-unstable: rename from hubUnstable
top-git: rename from topGit
@bb010g
git-and-tools: strongly alphabetize
846097b
@bb010g
git-my: init at 1.1.2
ddb272b
@bb010g
Copy link
Contributor Author

bb010g commented Feb 26, 2020

(Huh, GitHub is ordering hub-unstable as the last commit in both the conversations & commits views, even though it's topologically before all the other commits, because of its (severely?) newer author date.)

@worldofpeace
Copy link
Contributor

(Huh, GitHub is ordering hub-unstable as the last commit in both the conversations & commits views, even though it's topologically before all the other commits, because of its (severely?) newer author date.)

I've viewed your stuff locally 👍

@worldofpeace worldofpeace merged commit 0babf18 into NixOS:master Feb 26, 2020
@bb010g bb010g deleted the git-my branch February 27, 2020 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@worldofpeace worldofpeace worldofpeace left review comments

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bb010g @Lassulus @jonringer @worldofpeace