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

appstream: 0.10.6 -> 0.11.8 (and add appstream-qt) #35308

Merged
merged 2 commits into from
Feb 22, 2018
Merged

appstream: 0.10.6 -> 0.11.8 (and add appstream-qt) #35308

merged 2 commits into from
Feb 22, 2018

Conversation

peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Feb 22, 2018 •
edited
Loading

Motivation for this change

appstream-qt is needed for KDE discover and possibly others

The appstream upgrade causes a very large rebuild.

Another option is of course to use an override for the -qt version.

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.

@peterhoeg peterhoeg requested a review from nckx February 22, 2018 03:07
@GrahamcOfBorg GrahamcOfBorg added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 22, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/45fq6f0w2s0yvi01mpdkj7596jygn1v3-appstream-qt-0.11.8/lib/libappstream.so.0.11.8
gzipping man pages under /nix/store/45fq6f0w2s0yvi01mpdkj7596jygn1v3-appstream-qt-0.11.8/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/45fq6f0w2s0yvi01mpdkj7596jygn1v3-appstream-qt-0.11.8/lib  /nix/store/45fq6f0w2s0yvi01mpdkj7596jygn1v3-appstream-qt-0.11.8/bin 
patching script interpreter paths in /nix/store/45fq6f0w2s0yvi01mpdkj7596jygn1v3-appstream-qt-0.11.8
checking for references to /tmp/nix-build-appstream-qt-0.11.8.drv-0 in /nix/store/45fq6f0w2s0yvi01mpdkj7596jygn1v3-appstream-qt-0.11.8...
postPatchMkspecs
postPatchMkspecs
/nix/store/myhavkgb90bbvncibw4jkvbr30zqflyc-appstream-0.11.8
/nix/store/45fq6f0w2s0yvi01mpdkj7596jygn1v3-appstream-qt-0.11.8

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/56k9ra3v02mhas1slbaxjsrizg20xpml-appstream-qt-0.11.8/lib/libappstream.so.0.11.8
gzipping man pages under /nix/store/56k9ra3v02mhas1slbaxjsrizg20xpml-appstream-qt-0.11.8/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/56k9ra3v02mhas1slbaxjsrizg20xpml-appstream-qt-0.11.8/lib  /nix/store/56k9ra3v02mhas1slbaxjsrizg20xpml-appstream-qt-0.11.8/bin
patching script interpreter paths in /nix/store/56k9ra3v02mhas1slbaxjsrizg20xpml-appstream-qt-0.11.8
checking for references to /build in /nix/store/56k9ra3v02mhas1slbaxjsrizg20xpml-appstream-qt-0.11.8...
postPatchMkspecs
postPatchMkspecs
/nix/store/fjfi3cnz7asxz9x9jdcsldg6rh4s2q36-appstream-0.11.8
/nix/store/56k9ra3v02mhas1slbaxjsrizg20xpml-appstream-qt-0.11.8

@peterhoeg peterhoeg mentioned this pull request Feb 22, 2018
Merged
8 tasks
@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/zpnhc075dqwrbc7zxnjx0j8w9j59iz7k-appstream-qt-0.11.8
shrinking /nix/store/zpnhc075dqwrbc7zxnjx0j8w9j59iz7k-appstream-qt-0.11.8/lib/libAppStreamQt.so.0.11.8
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zpnhc075dqwrbc7zxnjx0j8w9j59iz7k-appstream-qt-0.11.8/lib 
patching script interpreter paths in /nix/store/zpnhc075dqwrbc7zxnjx0j8w9j59iz7k-appstream-qt-0.11.8
/nix/store/myhavkgb90bbvncibw4jkvbr30zqflyc-appstream-0.11.8
checking for references to /tmp/nix-build-appstream-qt-0.11.8.drv-0 in /nix/store/zpnhc075dqwrbc7zxnjx0j8w9j59iz7k-appstream-qt-0.11.8...
/nix/store/zpnhc075dqwrbc7zxnjx0j8w9j59iz7k-appstream-qt-0.11.8
postPatchMkspecs
postPatchMkspecs

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/rzrk5gjlbmpzc1k3hyppywl6c1f7wcvs-appstream-qt-0.11.8
shrinking /nix/store/rzrk5gjlbmpzc1k3hyppywl6c1f7wcvs-appstream-qt-0.11.8/lib/libAppStreamQt.so.0.11.8
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/rzrk5gjlbmpzc1k3hyppywl6c1f7wcvs-appstream-qt-0.11.8/lib
patching script interpreter paths in /nix/store/rzrk5gjlbmpzc1k3hyppywl6c1f7wcvs-appstream-qt-0.11.8
checking for references to /build in /nix/store/rzrk5gjlbmpzc1k3hyppywl6c1f7wcvs-appstream-qt-0.11.8...
postPatchMkspecs
postPatchMkspecs
/nix/store/fjfi3cnz7asxz9x9jdcsldg6rh4s2q36-appstream-0.11.8
/nix/store/rzrk5gjlbmpzc1k3hyppywl6c1f7wcvs-appstream-qt-0.11.8

jtojnar
jtojnar reviewed Feb 22, 2018
View reviewed changes
pkgs/development/libraries/appstream/default.nix Outdated
nativeBuildInputs = [
cmake pkgconfig gettext intltool
xmlto docbook_xsl docbook_xml_dtd_45
meson ninja pkgconfig gettext intltool
Copy link
Member

Choose a reason for hiding this comment

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

intltool should not be needed https://github.com/ximion/appstream/blob/d0286cb4ccba233f74668954040ae42948b3aeda/NEWS#L498

Copy link
Member 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/1msy05g0zyn4khmjzkfnpjk6ks29yf1s-appstream-qt-0.11.8
shrinking /nix/store/1msy05g0zyn4khmjzkfnpjk6ks29yf1s-appstream-qt-0.11.8/lib/libAppStreamQt.so.0.11.8
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/1msy05g0zyn4khmjzkfnpjk6ks29yf1s-appstream-qt-0.11.8/lib
patching script interpreter paths in /nix/store/1msy05g0zyn4khmjzkfnpjk6ks29yf1s-appstream-qt-0.11.8
checking for references to /build in /nix/store/1msy05g0zyn4khmjzkfnpjk6ks29yf1s-appstream-qt-0.11.8...
postPatchMkspecs
postPatchMkspecs
/nix/store/97kb89am3fvv4vh2v4jx0xmv3cay0gg2-appstream-0.11.8
/nix/store/1msy05g0zyn4khmjzkfnpjk6ks29yf1s-appstream-qt-0.11.8

@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/k6sn1p0riskcxj76sp3i6ls3p7vac82w-appstream-qt-0.11.8
shrinking /nix/store/k6sn1p0riskcxj76sp3i6ls3p7vac82w-appstream-qt-0.11.8/lib/libAppStreamQt.so.0.11.8
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/k6sn1p0riskcxj76sp3i6ls3p7vac82w-appstream-qt-0.11.8/lib 
patching script interpreter paths in /nix/store/k6sn1p0riskcxj76sp3i6ls3p7vac82w-appstream-qt-0.11.8
checking for references to /tmp/nix-build-appstream-qt-0.11.8.drv-0 in /nix/store/k6sn1p0riskcxj76sp3i6ls3p7vac82w-appstream-qt-0.11.8...
postPatchMkspecs
postPatchMkspecs
/nix/store/fhfxd8q2zn8xxpb7k4051khh8whwyl6v-appstream-0.11.8
/nix/store/k6sn1p0riskcxj76sp3i6ls3p7vac82w-appstream-qt-0.11.8

@peterhoeg
Copy link
Member Author

I have no idea why nox-review wanted to rebuild the world. According to @GrahamcOfBorg there's very little changing as a consequence so I'm going to merge this.

@peterhoeg peterhoeg merged commit cdaedbf into NixOS:master Feb 22, 2018
@peterhoeg peterhoeg deleted the u/as branch February 22, 2018 08:04
@peterhoeg peterhoeg restored the u/as branch February 23, 2018 02:28
@peterhoeg peterhoeg deleted the u/as branch March 5, 2018 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@nckx nckx Awaiting requested review from nckx

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@peterhoeg @GrahamcOfBorg @jtojnar