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

xorg.xkeyboardconfig: 2.23.1 -> 2.24, Fixes issue with polish symbols syntax #43232

Merged
merged 1 commit into from Jul 11, 2018
Merged

xorg.xkeyboardconfig: 2.23.1 -> 2.24, Fixes issue with polish symbols syntax #43232

merged 1 commit into from Jul 11, 2018

Conversation

infinisil
Copy link
Member

Motivation for this change

Reported by @spinus on IRC (is that GitHub user you?), the polish symbols file had a syntax error in it, making X unable to load them:

...
       include "sun_vndr/pl(sun_type6)"
};

------------------------------  <- This isn't supposed to be here
//Glagolica
partial alphanumeric_keys
...

Apparently this was fixed in the latest xkeyboardconfig version

@GrahamcOfBorg test keymap

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.

@spinus
Copy link
Member

spinus commented Jul 8, 2018

@infinisil thank you very much for PR!

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: xorg.xkeyboardconfig

Partial log (click to expand)

make[2]: Leaving directory '/build/xkeyboard-config-2.24'
make[1]: Leaving directory '/build/xkeyboard-config-2.24'
propagating requisites
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/pj92fh27h5jy2shfcx8gg3agiz87z0v5-xkeyboard-config-2.23.1
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/pj92fh27h5jy2shfcx8gg3agiz87z0v5-xkeyboard-config-2.23.1/lib
patching script interpreter paths in /nix/store/pj92fh27h5jy2shfcx8gg3agiz87z0v5-xkeyboard-config-2.23.1
checking for references to /build in /nix/store/pj92fh27h5jy2shfcx8gg3agiz87z0v5-xkeyboard-config-2.23.1...
/nix/store/pj92fh27h5jy2shfcx8gg3agiz87z0v5-xkeyboard-config-2.23.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: xorg.xkeyboardconfig

Partial log (click to expand)

 /nix/store/n7qp8pffvcb5ff52l2nrc3g2wvxfrk75-coreutils-8.29/bin/install -c -m 644 xkeyboard-config.pc '/nix/store/lasbcgihxqrlpbmy2gkyjqz999cq7pwk-xkeyboard-config-2.23.1/share/pkgconfig'
make[2]: Leaving directory '/build/xkeyboard-config-2.24'
make[1]: Leaving directory '/build/xkeyboard-config-2.24'
propagating requisites
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/lasbcgihxqrlpbmy2gkyjqz999cq7pwk-xkeyboard-config-2.23.1
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/lasbcgihxqrlpbmy2gkyjqz999cq7pwk-xkeyboard-config-2.23.1/lib
patching script interpreter paths in /nix/store/lasbcgihxqrlpbmy2gkyjqz999cq7pwk-xkeyboard-config-2.23.1
checking for references to /build in /nix/store/lasbcgihxqrlpbmy2gkyjqz999cq7pwk-xkeyboard-config-2.23.1...

@infinisil
Copy link
Member Author

@GrahamcOfBorg test keymap

@GrahamcOfBorg
Copy link

Success on aarch64-linux

Attempted: tests.keymap

No partial log is available.

@GrahamcOfBorg
Copy link

Success on x86_64-linux

Attempted: tests.keymap

No partial log is available.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: xorg.xkeyboardconfig

Partial log (click to expand)

make[2]: Leaving directory '/build/xkeyboard-config-2.24'
make[1]: Leaving directory '/build/xkeyboard-config-2.24'
propagating requisites
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/b4ayqf1f2fvw454vzhcrk42dhm61b5pq-xkeyboard-config-2.24
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/b4ayqf1f2fvw454vzhcrk42dhm61b5pq-xkeyboard-config-2.24/lib
patching script interpreter paths in /nix/store/b4ayqf1f2fvw454vzhcrk42dhm61b5pq-xkeyboard-config-2.24
checking for references to /build in /nix/store/b4ayqf1f2fvw454vzhcrk42dhm61b5pq-xkeyboard-config-2.24...
/nix/store/b4ayqf1f2fvw454vzhcrk42dhm61b5pq-xkeyboard-config-2.24

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: xorg.xkeyboardconfig

Partial log (click to expand)

make[2]: Leaving directory '/build/xkeyboard-config-2.24'
make[1]: Leaving directory '/build/xkeyboard-config-2.24'
propagating requisites
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/241b6gnwgm3h00bh52v058v3nwlwxjyb-xkeyboard-config-2.24
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/241b6gnwgm3h00bh52v058v3nwlwxjyb-xkeyboard-config-2.24/lib
patching script interpreter paths in /nix/store/241b6gnwgm3h00bh52v058v3nwlwxjyb-xkeyboard-config-2.24
checking for references to /build in /nix/store/241b6gnwgm3h00bh52v058v3nwlwxjyb-xkeyboard-config-2.24...
/nix/store/241b6gnwgm3h00bh52v058v3nwlwxjyb-xkeyboard-config-2.24

@jtojnar
Copy link
Contributor

jtojnar commented Jul 9, 2018

Closes: #42987

@spinus
Copy link
Member

spinus commented Jul 11, 2018

possible to merge this?

@infinisil infinisil merged commit b84e951 into NixOS:master Jul 11, 2018
@infinisil infinisil deleted the update/xkeyboardconfig branch July 11, 2018 22:14
@spinus
Copy link
Member

spinus commented Jul 12, 2018

Thank you

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: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@infinisil @spinus @GrahamcOfBorg @jtojnar