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

libxkbcommon: 0.7.2 → 0.8.0 #34429

Merged
merged 1 commit into from Feb 24, 2018
Merged

libxkbcommon: 0.7.2 → 0.8.0 #34429

merged 1 commit into from Feb 24, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Jan 30, 2018

Motivation for this change

Updated, converted to meson and removed flex (not needed since 0.3.1).

https://github.com/xkbcommon/libxkbcommon/blob/b82e3b764e60df337ca695e8f8642e7bf42b0cca/NEWS#L1-L19

cc @garbas @ttuegel

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.

@jtojnar jtojnar changed the base branch from master to staging January 30, 2018 20:37
bluetech
bluetech reviewed Feb 7, 2018
View reviewed changes
pkgs/development/libraries/libxkbcommon/default.nix Outdated

stdenv.mkDerivation rec {
name = "libxkbcommon-0.7.2";
name = "libxkbcommon-0.8.0";

src = fetchurl {
url = "http://xkbcommon.org/download/${name}.tar.xz";
Copy link

Choose a reason for hiding this comment

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

This can be changed to https also.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/gn1zac53zn0kzw058603d0mvn17c5az3-libxkbcommon-0.8.0-dev
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/gn1zac53zn0kzw058603d0mvn17c5az3-libxkbcommon-0.8.0-dev/lib
patching script interpreter paths in /nix/store/gn1zac53zn0kzw058603d0mvn17c5az3-libxkbcommon-0.8.0-dev
checking for references to /build in /nix/store/gn1zac53zn0kzw058603d0mvn17c5az3-libxkbcommon-0.8.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/58p7g49k5jcsp4czs7n69r24651gbk01-libxkbcommon-0.8.0-doc
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/58p7g49k5jcsp4czs7n69r24651gbk01-libxkbcommon-0.8.0-doc
checking for references to /build in /nix/store/58p7g49k5jcsp4czs7n69r24651gbk01-libxkbcommon-0.8.0-doc...
/nix/store/kzkga88g090zdy3qkncl33iwgylkq0np-libxkbcommon-0.8.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/y8b0ibk40r0p3nvsy11fvljn5zmqs0wz-libxkbcommon-0.8.0-dev
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/y8b0ibk40r0p3nvsy11fvljn5zmqs0wz-libxkbcommon-0.8.0-dev/lib 
patching script interpreter paths in /nix/store/y8b0ibk40r0p3nvsy11fvljn5zmqs0wz-libxkbcommon-0.8.0-dev
checking for references to /tmp/nix-build-libxkbcommon-0.8.0.drv-0 in /nix/store/y8b0ibk40r0p3nvsy11fvljn5zmqs0wz-libxkbcommon-0.8.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/hf33mxg8i99vkpv44agg0fskd0ircxjp-libxkbcommon-0.8.0-doc
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/hf33mxg8i99vkpv44agg0fskd0ircxjp-libxkbcommon-0.8.0-doc
checking for references to /tmp/nix-build-libxkbcommon-0.8.0.drv-0 in /nix/store/hf33mxg8i99vkpv44agg0fskd0ircxjp-libxkbcommon-0.8.0-doc...
/nix/store/a3nkw58hx6v98pz5g7dbgw7n66l9w628-libxkbcommon-0.8.0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

[32/94] Compiling C object 'xkbcommon-internal@sta/src_utf8.c.o'.
[33/94] Linking static target libxkbcommon-internal.a.
[34/94] Linking target libxkbcommon.0.dylib.
FAILED: libxkbcommon.0.dylib
clang  -o libxkbcommon.0.dylib  -Wl,-headerpad_max_install_names -shared -install_name @rpath/libxkbcommon.0.dylib -Wl,-force_load libxkbcommon-internal.a -Wl,--version-script=/private/tmp/nix-build-libxkbcommon-0.8.0.drv-0/libxkbcommon-0.8.0/xkbcommon.map
ld: unknown option: --version-script=/private/tmp/nix-build-libxkbcommon-0.8.0.drv-0/libxkbcommon-0.8.0/xkbcommon.map
clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.
builder for '/nix/store/n4jwn13fksg6z945waxslmmxsihf49yz-libxkbcommon-0.8.0.drv' failed with exit code 1
error: build of '/nix/store/n4jwn13fksg6z945waxslmmxsihf49yz-libxkbcommon-0.8.0.drv' failed

@ttuegel
Copy link
Member

ttuegel commented Feb 14, 2018

The failure on x86_64-darwin seems to be an upstream regression.

@bluetech
Copy link

I've committed a fix: xkbcommon/libxkbcommon@edb1c66

I'm not able to test it, but I think it should work. I can prepare a release if necessary.

@jtojnar
libxkbcommon: 0.7.2 → 0.8.0
2c59b40 
Updated, converted to meson and removed flex (not needed since 0.3.1).
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/y65lcichppa9x2yfg92zs7k30n5zvkdk-libxkbcommon-0.8.0-dev
strip is /nix/store/adidfx4pa7vmvby0gjqqmiwg2x49yr27-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/y65lcichppa9x2yfg92zs7k30n5zvkdk-libxkbcommon-0.8.0-dev/lib 
patching script interpreter paths in /nix/store/y65lcichppa9x2yfg92zs7k30n5zvkdk-libxkbcommon-0.8.0-dev
checking for references to /tmp/nix-build-libxkbcommon-0.8.0.drv-0 in /nix/store/y65lcichppa9x2yfg92zs7k30n5zvkdk-libxkbcommon-0.8.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/2lq09aks1a7k2q16j12y8r5xz3gjw469-libxkbcommon-0.8.0-doc
strip is /nix/store/adidfx4pa7vmvby0gjqqmiwg2x49yr27-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/2lq09aks1a7k2q16j12y8r5xz3gjw469-libxkbcommon-0.8.0-doc
checking for references to /tmp/nix-build-libxkbcommon-0.8.0.drv-0 in /nix/store/2lq09aks1a7k2q16j12y8r5xz3gjw469-libxkbcommon-0.8.0-doc...
/nix/store/2qb4ckw5da6m12fif7r0kgrakbkylqdi-libxkbcommon-0.8.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

Patching '/nix/store/7qlac4v8i3khaimf2dp1c4978srsiqll-libxkbcommon-0.8.0-dev/lib/pkgconfig/xkbcommon.pc' includedir to output /nix/store/7qlac4v8i3khaimf2dp1c4978srsiqll-libxkbcommon-0.8.0-dev
strip is /nix/store/v8ifq0hapblpr2z0hx4wvwg02w4aczqy-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/y7jzsxcaw0pv87gqkrw6qjj85v3smjmr-libxkbcommon-0.8.0/lib
patching script interpreter paths in /nix/store/y7jzsxcaw0pv87gqkrw6qjj85v3smjmr-libxkbcommon-0.8.0
strip is /nix/store/v8ifq0hapblpr2z0hx4wvwg02w4aczqy-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/7qlac4v8i3khaimf2dp1c4978srsiqll-libxkbcommon-0.8.0-dev/lib
patching script interpreter paths in /nix/store/7qlac4v8i3khaimf2dp1c4978srsiqll-libxkbcommon-0.8.0-dev
strip is /nix/store/v8ifq0hapblpr2z0hx4wvwg02w4aczqy-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/fyavv7gwsfpcp9bdk9f89nkzc12b067q-libxkbcommon-0.8.0-doc
/nix/store/y7jzsxcaw0pv87gqkrw6qjj85v3smjmr-libxkbcommon-0.8.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/jg8df0apgk9fh2rwlfg83fylv1b66x9l-libxkbcommon-0.8.0-dev
strip is /nix/store/skd6ix5ipkyhxzq7naylj4digawakl4j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/jg8df0apgk9fh2rwlfg83fylv1b66x9l-libxkbcommon-0.8.0-dev/lib
patching script interpreter paths in /nix/store/jg8df0apgk9fh2rwlfg83fylv1b66x9l-libxkbcommon-0.8.0-dev
checking for references to /build in /nix/store/jg8df0apgk9fh2rwlfg83fylv1b66x9l-libxkbcommon-0.8.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/wz2dhki03b7j8pbbadfbn1yx2pzwmh6x-libxkbcommon-0.8.0-doc
strip is /nix/store/skd6ix5ipkyhxzq7naylj4digawakl4j-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/wz2dhki03b7j8pbbadfbn1yx2pzwmh6x-libxkbcommon-0.8.0-doc
checking for references to /build in /nix/store/wz2dhki03b7j8pbbadfbn1yx2pzwmh6x-libxkbcommon-0.8.0-doc...
/nix/store/rrq7f51svyzalh8qrhfy9q7fpkpk98k1-libxkbcommon-0.8.0

@vcunat vcunat merged commit 2c59b40 into NixOS:staging Feb 24, 2018
vcunat added a commit that referenced this pull request Feb 24, 2018
@vcunat
Merge #34429: libxkbcommon: 0.7.2 -> 0.8.0
2358301
@jtojnar jtojnar deleted the libxkbcommon-0.8.0 branch February 24, 2018 21:33
@jtojnar jtojnar mentioned this pull request Feb 27, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bluetech bluetech bluetech left review comments

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
1.severity: mass-rebuild 6.topic: freedesktop 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jtojnar @GrahamcOfBorg @ttuegel @bluetech @vcunat