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

gitAndTools.gitstatus: init at 20190506 #61116

Merged
merged 1 commit into from May 30, 2019
Merged

gitAndTools.gitstatus: init at 20190506 #61116

merged 1 commit into from May 30, 2019

Conversation

mmlb
Copy link
Contributor

@mmlb mmlb commented May 8, 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

teto
teto reviewed May 8, 2019
View reviewed changes
pkgs/applications/version-management/git-and-tools/default.nix Outdated
@@ -127,6 +127,8 @@ let

gitflow = callPackage ./gitflow { };

gitflow = callPackage ./gitstatus { };
Copy link
Member

Choose a reason for hiding this comment

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

gitstatus I think :p

Copy link
Contributor Author

Choose a reason for hiding this comment

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

derp :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thats what I get for not cherry-picking from my other branch :|

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

teto
teto reviewed May 8, 2019
View reviewed changes
pkgs/applications/version-management/git-and-tools/gitstatus/default.nix Outdated
{callPackage, stdenv, fetchFromGitHub, ...}:

stdenv.mkDerivation rec {
name = "gitstatus-${version}";
Copy link
Member

Choose a reason for hiding this comment

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

use pname = "gistatus" instead, mkDerivation will generate the same name automatically.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oic!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@nlewo
Copy link
Member

nlewo commented May 12, 2019

@GrahamcOfBorg gitAndTools.gitstatus

@mmlb
Copy link
Contributor Author

mmlb commented May 14, 2019

@nlewo pinging, requested changes are in

@mmlb
Copy link
Contributor Author

mmlb commented May 28, 2019

@nlewo @teto ping

nlewo
nlewo requested changes May 28, 2019
View reviewed changes
Copy link
Member

@nlewo nlewo left a comment

Choose a reason for hiding this comment

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

Oups! Sorry ;)
Still minor review, otherwise LGTM.

pkgs/applications/version-management/git-and-tools/gitstatus/default.nix Outdated

stdenv.mkDerivation rec {
pname = "gitstatus";
version = "20190506";
Copy link
Member

Choose a reason for hiding this comment

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

According to the manual:

Suggested change
version = "20190506";
version = "unstable-2019-05-06";

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@nlewo done

@nlewo
Copy link
Member

nlewo commented May 29, 2019 •
edited

@GrahamcOfBorg build gitAndTools.gitstatus

@nlewo
Copy link
Member

nlewo commented May 29, 2019

This doesn't build on darwin. Could you please either fix the build for darwin or restrict the supported platforms (see meta.platforms in the nixpkgs manual).

@mmlb
Copy link
Contributor Author

mmlb commented May 29, 2019

@nlewo the build log indicates an issue with clang not being able to build a binary... which indicates ci env issues? I'd rather not just blacklist darwin, but don't really know how to proceed.

@nlewo
Copy link
Member

nlewo commented May 30, 2019

Ok. I don't think we can do more on this darwin error. So, let's merge it as it is currently.
Thx!

@nlewo nlewo merged commit 3213c6c into NixOS:master May 30, 2019
@mmlb
Copy link
Contributor Author

mmlb commented May 30, 2019

:toot:

@mmlb mmlb deleted the add-gitstatus branch May 30, 2019 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teto teto teto left review comments

@nlewo nlewo nlewo requested changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mmlb @nlewo @teto