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

gitAndTools.git-imerge: 1.0.0 -> 1.1.0 #46281

Merged
merged 1 commit into from Sep 12, 2018
Merged

gitAndTools.git-imerge: 1.0.0 -> 1.1.0 #46281

merged 1 commit into from Sep 12, 2018

Conversation

r-ryantm
Copy link
Contributor

@r-ryantm r-ryantm commented Sep 7, 2018

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-imerge/versions.

meta.description for gitAndTools.git-imerge is: '"Perform a merge between two branches incrementally"'.

Release on GitHub

Compare changes on GitHub

Checks done (click to expand)
Instructions to test this update (click to expand)

One-time optional setup to skip building using Cachix:

  1. Install cachix from https://cachix.org/
  2. Use r-ryantm's cache: 
    cachix use r-ryantm

Test this update by entering a nix shell, seeing what is inside the
result, and if applicable, running some binaries:

nix-shell --pure -I nixpkgs=https://github.com/r-ryantm/nixpkgs/archive/435acbd7cd3a08b1dd1ed9308bad57eb5e0f3a65.tar.gz -p gitAndTools.git-imerge
ls -la /nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0

cc @spwhitt for testing.

gitAndTools.git-imerge: 1.0.0 -> 1.1.0
435acbd 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-imerge/versions
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gitAndTools.git-imerge

Partial log (click to expand)

install git-imerge /nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0/bin
cp -f git-imerge.bashcomplete /nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0/etc/bash_completion.d/git-imerge
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0/bin
patching script interpreter paths in /nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0
/nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0/bin/git-imerge: interpreter directive changed from " /usr/bin/env python" to "/nix/store/6b6lzbq74g95j8qlbrdjzkn2ghh81mgy-python-2.7.15/bin/python"
checking for references to /build in /nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0...
/nix/store/fcmrm9qylbcn4q88jk9y154hfk7dvlhi-git-imerge-1.1.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gitAndTools.git-imerge

Partial log (click to expand)

installing
install flags: SHELL=/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/bash PREFIX= DESTDIR=\$\(out\) install
install git-imerge /nix/store/nvcmgvhh3z0ykz2i8dfvm1kiy5n0mr0y-git-imerge-1.1.0/bin
cp -f git-imerge.bashcomplete /nix/store/nvcmgvhh3z0ykz2i8dfvm1kiy5n0mr0y-git-imerge-1.1.0/etc/bash_completion.d/git-imerge
post-installation fixup
strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/nvcmgvhh3z0ykz2i8dfvm1kiy5n0mr0y-git-imerge-1.1.0/bin
patching script interpreter paths in /nix/store/nvcmgvhh3z0ykz2i8dfvm1kiy5n0mr0y-git-imerge-1.1.0
/nix/store/nvcmgvhh3z0ykz2i8dfvm1kiy5n0mr0y-git-imerge-1.1.0/bin/git-imerge: interpreter directive changed from " /usr/bin/env python" to "/nix/store/s9mj8zzg7b0zj7s0k4rx3hdsiayr3ckn-python-2.7.15/bin/python"
/nix/store/nvcmgvhh3z0ykz2i8dfvm1kiy5n0mr0y-git-imerge-1.1.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gitAndTools.git-imerge

Partial log (click to expand)

install git-imerge /nix/store/gx5izz6rxk6z2gwpy2zmpk4dqnyanqmc-git-imerge-1.1.0/bin
cp -f git-imerge.bashcomplete /nix/store/gx5izz6rxk6z2gwpy2zmpk4dqnyanqmc-git-imerge-1.1.0/etc/bash_completion.d/git-imerge
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/gx5izz6rxk6z2gwpy2zmpk4dqnyanqmc-git-imerge-1.1.0
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/gx5izz6rxk6z2gwpy2zmpk4dqnyanqmc-git-imerge-1.1.0/bin
patching script interpreter paths in /nix/store/gx5izz6rxk6z2gwpy2zmpk4dqnyanqmc-git-imerge-1.1.0
/nix/store/gx5izz6rxk6z2gwpy2zmpk4dqnyanqmc-git-imerge-1.1.0/bin/git-imerge: interpreter directive changed from " /usr/bin/env python" to "/nix/store/imv54r70hay2sjrbjiw9l5hhmq3zdkkx-python-2.7.15/bin/python"
checking for references to /build in /nix/store/gx5izz6rxk6z2gwpy2zmpk4dqnyanqmc-git-imerge-1.1.0...
/nix/store/gx5izz6rxk6z2gwpy2zmpk4dqnyanqmc-git-imerge-1.1.0

@xeji xeji merged commit 7f40c3a into NixOS:master Sep 12, 2018
@r-ryantm r-ryantm deleted the auto-update/git-imerge branch September 20, 2018 04:29
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: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@r-ryantm @GrahamcOfBorg @xeji