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

Update git dit #30425

Merged
merged 3 commits into from Oct 15, 2017
Merged

Update git dit #30425

merged 3 commits into from Oct 15, 2017

Conversation

matthiasbeyer
Copy link
Contributor

Closes #29735
(and invalidates it)

Need help though.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@matthiasbeyer
Copy link
Contributor Author

Pinging other maintainer @Profpatsch

Mic92
Mic92 reviewed Oct 15, 2017
View reviewed changes
pkgs/applications/version-management/git-and-tools/git-dit/default.nix Outdated
'';
depsSha256 = "1z2n3z5wkh5z5vc976yscq77fgjszwzwlrp7g17hmsbhzx6x170h";

buildInputs = with pkgs; [
Copy link
Member

Choose a reason for hiding this comment

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

we do never import pkgs directly. Otherwise we loose the ability to override single dependencies.

@Mic92 Mic92 merged commit 5a21efd into NixOS:master Oct 15, 2017
@matthiasbeyer matthiasbeyer deleted the update-git-dit branch October 15, 2017 11:14
@Profpatsch
Copy link
Member

How did you work around the missing cargo.lock?

@matthiasbeyer
Copy link
Contributor Author

See #29735 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@matthiasbeyer @Profpatsch @Mic92