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

Backport #41213: gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12 #41214

Merged
merged 1 commit into from May 30, 2018
Merged

Backport #41213: gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12 #41214

merged 1 commit into from May 30, 2018

Conversation

flokli
Copy link
Contributor

@flokli flokli commented May 29, 2018

patch for svn-all-fast-export/svn2git#40 is
contained in this release, so we can drop it here.

Motivation for this change
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.

@flokli
gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12
f6b37b2 
patch for svn-all-fast-export/svn2git#40 is
contained in this release, so we can drop it here.

(cherry picked from commit 01f9126)
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gitAndTools.svn-all-fast-export

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/0r6amay180g0qrq0ryrhy4k91qdx6wrf-svn-all-fast-export-1.0.12
shrinking /nix/store/0r6amay180g0qrq0ryrhy4k91qdx6wrf-svn-all-fast-export-1.0.12/bin/svn-all-fast-export
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/0r6amay180g0qrq0ryrhy4k91qdx6wrf-svn-all-fast-export-1.0.12/bin
patching script interpreter paths in /nix/store/0r6amay180g0qrq0ryrhy4k91qdx6wrf-svn-all-fast-export-1.0.12
checking for references to /build in /nix/store/0r6amay180g0qrq0ryrhy4k91qdx6wrf-svn-all-fast-export-1.0.12...
postPatchMkspecs
postPatchMkspecs
/nix/store/0r6amay180g0qrq0ryrhy4k91qdx6wrf-svn-all-fast-export-1.0.12

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gitAndTools.svn-all-fast-export

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/6pf219c8sklgl8d8xagxlczxaxk489zy-svn-all-fast-export-1.0.12
shrinking /nix/store/6pf219c8sklgl8d8xagxlczxaxk489zy-svn-all-fast-export-1.0.12/bin/svn-all-fast-export
strip is /nix/store/ppn001bfygzlqx4h50n9zgxc3kqv2d6k-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/6pf219c8sklgl8d8xagxlczxaxk489zy-svn-all-fast-export-1.0.12/bin
patching script interpreter paths in /nix/store/6pf219c8sklgl8d8xagxlczxaxk489zy-svn-all-fast-export-1.0.12
checking for references to /build in /nix/store/6pf219c8sklgl8d8xagxlczxaxk489zy-svn-all-fast-export-1.0.12...
postPatchMkspecs
postPatchMkspecs
/nix/store/6pf219c8sklgl8d8xagxlczxaxk489zy-svn-all-fast-export-1.0.12

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gitAndTools.svn-all-fast-export

Partial log (click to expand)

/nix/store/i2kqv4a8hqz4mi86d2wh34y70v3cdskr-qtbase-5.10.1-dev/bin/qmake -install qinstall ../svn-all-fast-export.app /nix/store/3zigy0m65325fsjx22ikbisc7my0rs79-svn-all-fast-export-1.0.12/bin/svn-all-fast-export.app
strip /nix/store/3zigy0m65325fsjx22ikbisc7my0rs79-svn-all-fast-export-1.0.12/bin/svn-all-fast-export.app/Contents/MacOS/svn-all-fast-export
make[1]: Leaving directory '/private/tmp/nix-build-svn-all-fast-export-1.0.12.drv-0/source/src'
post-installation fixup
strip is /nix/store/wpnjl52wixb6jln26c9n3mfwq63pv8g4-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/3zigy0m65325fsjx22ikbisc7my0rs79-svn-all-fast-export-1.0.12/bin
patching script interpreter paths in /nix/store/3zigy0m65325fsjx22ikbisc7my0rs79-svn-all-fast-export-1.0.12
postPatchMkspecs
postPatchMkspecs
/nix/store/3zigy0m65325fsjx22ikbisc7my0rs79-svn-all-fast-export-1.0.12

@xeji
Copy link
Contributor

xeji commented May 30, 2018

Why does this need backporting?

@flokli
Copy link
Contributor Author

flokli commented May 30, 2018

I doesn't necessarily needs to.
I just thought it was cleaner to bump to a newer version.

But considering the other fixes regarding svn:global-ignores, ignoring of subpaths and timeouts, the bump might be a good idea anyways:

3ad67d2 src.pro: add target.path and INSTALLS
0a71ed4 src.pro: only use git to get version if VERSION is not set before
6d0b8a6 src/src.pro: allow overriding SVN_INCLUDE, APR_INCLUDE
024b6b5 src/repository: remove absolute path to cat binary
496fd52 Make git fast-import timeout configurable (#39)
f00d5a5 Do not output the generated .gitignore contents in dry-run mode or it ends up in the log
5e1038a Make sure the fast import process is started before writing to it, otherwise Qt 5 will warn about the not running process
51dab7f Fix inconsistent whitespacing
d9faf96 Do not set the working directory of the fast import processes in dry-run or create-dump mode, as the directory will not exist there and Qt 5 does not quite like that
f3cc079 Do not try to recursively dump a file
e910002 Also consider svn:global-ignores when generating .gitignore files and fix wrong patterns not correctly migrated from svn:ignore (#34)
61ebde7 Do not warn about svn:mergeinfo, it is usually taken care about already by creating merge commits or cherry-pick commits
7085d41 Fix a type in debug output
cf94ee3 Fixed ignoring of subpaths inside a repository (implemented rule matching for recursiveDumpDir) (#33)
efba961 Add LICENSE file containing GPLv3 to the source tree. (#32)
6b1ed63 Fixed package install command for Ubuntu into README file. (#31)
c7864da Always mark repositories case-sensitive (#21)
abc0951 Add package install command for Ubuntu to README.md (#25)

@xeji
Copy link
Contributor

xeji commented May 30, 2018

Fine.

@xeji xeji merged commit c40fdcd into NixOS:release-18.03 May 30, 2018
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
@flokli @GrahamcOfBorg @xeji