gitAndTools.gitFastExport: (old) -> v190107 #60653
Merged
+26
−25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
symphorien
reviewed
May 1, 2019
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
Outdated
Show resolved
Hide resolved
symphorien
reviewed
May 1, 2019
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
Outdated
Show resolved
Hide resolved
|
Oh, cool, didn't know of those attributes. Will amend the pull request when
I'm back at my computer.
…On Wed, May 1, 2019, 17:57 symphorien ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
<#60653 (comment)>:
> installPhase = ''
- sed -i "s@/usr/bin/env.*@$(type -p python)@" *.py
- l=$out/libexec/git-fast-export
- mkdir -p $out/{bin,doc/git-fast-export} $l
- sed -i ***@***.******@***.***=$l@" *.sh
- mv *.sh $out/bin
- mv *.py $l
- for p in $out/bin/*.sh; do
- wrapProgram $p \
- --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" \
- --prefix PATH : "$(dirname $(type -p python))":$l
+ binPath=$out/bin
+ libexecPath=$out/libexec/${pname}
+ sitepackagesPath=$out/lib/python2.7/site-packages
⬇️ Suggested change
- sitepackagesPath=$out/lib/python2.7/site-packages
+ sitepackagesPath=$out/${mercurial.python.sitePackages}
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#60653 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAAF5APIMGHGPUYKDDRTUUTPTHDXLANCNFSM4HJUYKFQ>
.
|
callahad
force-pushed
the
fast-export-v190107
branch
from
2a2a940 to
262135d
Compare
nlewo
requested changes
May 11, 2019
There was a problem hiding this comment.
Otherwise, LGTM.
@GrahamcOfBorg build gitAndTools.gitFastExport
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
Outdated
Show resolved
Hide resolved
callahad
force-pushed
the
fast-export-v190107
branch
from
262135d to
1d13eb1
Compare
|
@nlewo Thanks for the review! I've updated the commit with your suggested changes. |
|
@GrahamcOfBorg build gitAndTools.gitFastExport |
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The version in nixpkgs is 4 years old. It is unable to read and export from recent Mercurial repositories.
Updating it fixes that, and it can now successfully convert the repos that I need.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)