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.

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

libwacom: 0.29 -> 0.31 #48381

Merged
merged 2 commits into from Oct 19, 2018
Merged

libwacom: 0.29 -> 0.31 #48381

merged 2 commits into from Oct 19, 2018

Conversation

lschuermann
Copy link
Member

@lschuermann lschuermann commented Oct 14, 2018

Motivation for this change

Upgrade libwacom. Also, changed the mirror from SourceForge to GitHub. (As requested in #48209)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

This uses fetchurl and takes the release package (.tar.bz2), as the release-commit differs slightly:

Only in release: aclocal.m4
Only in source: autogen.sh
Only in release: compile
Only in release: config.guess
Only in release: config.h.in
Only in release: config.sub
Only in release: configure
Only in release/data/layouts: Makefile.in
Only in release/data: Makefile.in
Only in release: depcomp
Only in release/doc: html
Only in release/doc: Makefile.in
Only in source: .gitignore
Only in release: install-sh
Only in release/libwacom: Makefile.in
Only in release: ltmain.sh
Only in release: Makefile.in
Only in release: missing
Only in release/test: Makefile.in
Only in release: test-driver
Only in source/tools: clean_svg.py
Only in release/tools: Makefile.in
Only in source: .travis.yml

I'm guessing most of these files could be generated by using the autoreconfHook. Is it better to take the release tarball or try using the source with fetchGitHub?

@lschuermann
Copy link
Member Author

lschuermann commented Oct 15, 2018

Is it better to take the release tarball or try using the source with fetchGitHub?

@infinisil brought up a good argument for building from the repository source instead of using the release tarball. This way, we are not dependent on this exact source.
In addition to that, the Git repo is probably easier to audit and the release author can't do any funny business with the files generated by autotools.

Therefore, I've changed it to use fetchFromGitHubinstead. Seems to work just fine!

@lschuermann
Copy link
Member Author

I guess this is a mass-rebuild with similar impact as #48434. Should it be merged into staging instead?

@xeji
Copy link
Contributor

xeji commented Oct 16, 2018

Should it be merged into staging instead?

Yes, please.

@lschuermann lschuermann changed the base branch from master to staging October 17, 2018 10:34
@lschuermann
Copy link
Member Author

Sorry for the review request @FRidh, @LnL7 and @Mic92. I've first rebased onto staging, then changed the target branch. Seems to be impossible to do both at the same time.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libwacom

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31
shrinking /nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31/bin/libwacom-list-local-devices
shrinking /nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31/lib/libwacom.so.2.6.1
gzipping man pages under /nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31/lib  /nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31/bin
patching script interpreter paths in /nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31
checking for references to /build in /nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31...
/nix/store/89mqs6rfhpl8hghgvx1ihaggm9wn6hlv-libwacom-0.31

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libwacom

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31
shrinking /nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31/bin/libwacom-list-local-devices
shrinking /nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31/lib/libwacom.so.2.6.1
gzipping man pages under /nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31/lib  /nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31/bin
patching script interpreter paths in /nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31
checking for references to /build in /nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31...
/nix/store/jl6c37zwg699lj1p0wih2zwmisvzkr8w-libwacom-0.31

@xeji xeji removed request for Mic92, LnL7 and FRidh October 17, 2018 13:47
@Mic92 Mic92 merged commit 24c0d12 into NixOS:staging Oct 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants