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

atom: fix git integration #40163

Merged
merged 1 commit into from May 9, 2018
Merged

atom: fix git integration #40163

merged 1 commit into from May 9, 2018

Conversation

ysndr
Copy link
Member

@ysndr ysndr commented May 8, 2018

Motivation for this change

fixes #32794

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.

@matthewbauer
Copy link
Member

IIRC there are slight difference between git in bin and git in libexec/git-core. If dugite is set up like it looks, we may want to just symlink the whole directory. BTW it would be really nice to build node-modules here with nixpkgs.nodePackages so we could share hacks like these with other packages dugite.

@ysndr
Copy link
Member Author

ysndr commented May 9, 2018

the files git/bin/git and git/libexec/git-core/git are actually the same (same sha[256]sum) at least in an npm installation of dugite

@matthewbauer matthewbauer merged commit 58ab75c into NixOS:master May 9, 2018
@ysndr ysndr deleted the fix/atom-git-integration branch May 10, 2018 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

atom: problems with git integration
3 participants
@ysndr @matthewbauer @GrahamcOfBorg