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: 2.25.1 -> 2.26.0 #83210

Closed
wants to merge 2 commits into from
Closed

git: 2.25.1 -> 2.26.0 #83210

wants to merge 2 commits into from

Conversation

matthiasbeyer
Copy link
Contributor

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from wmertens, globin, the-kenny and peti March 23, 2020 13:04
@veprbl veprbl added this to WIP in Staging via automation Mar 24, 2020
@veprbl veprbl moved this from WIP to Needs review in Staging Mar 24, 2020
@globin
Copy link
Member

globin commented Mar 28, 2020

Please test updates before pull requesting

Builder called die: Cannot wrap '/nix/store/axaaff3b0lh56ilvqmh2k7zf9yawflna-git-2.26.0/share/git/contrib/credential/netrc/git-credential-netrc' because it is not an executable file
Backtrace:
7 assertExecutable /nix/store/am1bk5wlgz4i5x5vpcmb26lscd2z9gwh-hook/nix-support/setup-hook
36 makeWrapper /nix/store/am1bk5wlgz4i5x5vpcmb26lscd2z9gwh-hook/nix-support/setup-hook
133 _callImplicitHook /nix/store/h1fh4y7vkhh46x6z6g032jrmv71bx8km-stdenv-linux/setup
98 _eval /nix/store/h1fh4y7vkhh46x6z6g032jrmv71bx8km-stdenv-linux/setup
41 runHook /nix/store/h1fh4y7vkhh46x6z6g032jrmv71bx8km-stdenv-linux/setup
1109 installPhase /nix/store/h1fh4y7vkhh46x6z6g032jrmv71bx8km-stdenv-linux/setup
1299 genericBuild /nix/store/h1fh4y7vkhh46x6z6g032jrmv71bx8km-stdenv-linux/setup
2 main /nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25b-default-builder.sh

builder for '/nix/store/dw1yldxiwkf2gcbzk01vb159lhrradp8-git-2.26.0.drv' failed with exit code 1

gnprice
gnprice reviewed Apr 4, 2020
View reviewed changes
pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation {
ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
'' + stdenv.lib.optionalString perlSupport ''
# wrap perl commands
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like the relevant upstream commit is this one: git/git@1c78c78d2

This script now requires a make step -- git-credential-netrc.perl is just a source file (which is why it was renamed), and the ultimate executable is still named git-credential-netrc.

The existing make steps in postBuild may provide a useful model.

@davidak
Copy link
Member

davidak commented Apr 16, 2020

superseded by #85263

@vcunat vcunat closed this Apr 16, 2020
Staging automation moved this from Needs review to Done Apr 16, 2020
@matthiasbeyer matthiasbeyer deleted the update-git branch April 16, 2020 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gnprice gnprice gnprice left review comments

@wmertens wmertens Awaiting requested review from wmertens

@globin globin Awaiting requested review from globin

@the-kenny the-kenny Awaiting requested review from the-kenny

@peti peti Awaiting requested review from peti

Assignees
No one assigned
Labels
10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
Staging
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@matthiasbeyer @globin @davidak @gnprice @vcunat