Staging next #61657

FRidh · 2019-05-18T06:18:58Z

Motivation for this change

Things done

This allows Mesa to also build on ppc64le.

… is selected

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libgdiplus/versions

https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.2 * patches included, drop * use installCheck to avoid needing to set LD_LIBRARY_PATH

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vim/versions

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gssdp/versions

Even if building a Ruby with documentation, there's no reason for its baseruby to waste time building its own documentation as well.

https://gitlab.gnome.org/GNOME/folks/blob/0.12.1/NEWS

https://gitlab.gnome.org/GNOME/glib-networking/blob/2.60.2/NEWS

https://gitlab.gnome.org/GNOME/tracker/blob/2.2.2/NEWS

https://gitlab.gnome.org/GNOME/tracker-miners/blob/2.2.2/NEWS

https://gitlab.gnome.org/GNOME/glib/blob/2.60.2/NEWS

This allows getting access to Ruby documentation through ri by doing nix-shell -p ruby ruby.devdoc or by installing the ruby.devdoc package. A setup hook will add a shim to LOAD_PATH to point ri to the devdoc output instead of out.

Now that RI docs are installed to a seperate output, we don't need to worry about bloating the main output, so it's reasonable for this to be enabled by default.

FRidh · 2019-05-18T07:53:53Z

@worldofpeace glib seems to fail https://hydra.nixos.org/build/93629754

worldofpeace · 2019-05-18T18:24:11Z

@worldofpeace glib seems to fail https://hydra.nixos.org/build/93629754

Fix for that will be moved here shortly #61598

Also drop six since it was removed in the last release[0] [0]: https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_29/NEWS#L4

Fixes https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 which was breaking the documentation build for glib. The patch was based off an upstream pr [0] but completed with the requested changes. [0]: https://gitlab.gnome.org/GNOME/gtk-doc/merge_requests/27

gtk-doc: build with meson, etc

worldofpeace · 2019-05-20T23:31:11Z

@FRidh For the failing things for the docs in libpsl; it appears that they never were installed even before this so I guess nobody will miss disabling them 😄

@worldofpeace

to unbreak staging-next cc @worldofpeace

FRidh · 2019-05-24T11:10:27Z

@worldofpeace libicalc also fails to build now
https://hydra.nixos.org/build/93852324
We should check what is causing it because this is blocking staging-next.

worldofpeace · 2019-05-24T11:14:52Z

At a glance it failed like

cd /build/source/build/doc/reference/libical-glib && /nix/store/4falj4r8a92r54im5kp6zj86lwm4qxg2-gtk-doc-1.30/bin/gtkdoc-fixxref --module=libical-glib --module-dir=. --extra-dir=.. --html-dir=share/gtk-doc/html/libical-glib
Traceback (most recent call last):
  File "/nix/store/4falj4r8a92r54im5kp6zj86lwm4qxg2-gtk-doc-1.30/bin/gtkdoc-fixxref", line 57, in <module>
    fixxref.Run(options)
  File "/nix/store/4falj4r8a92r54im5kp6zj86lwm4qxg2-gtk-doc-1.30/share/gtk-doc/python/gtkdoc/fixxref.py", line 54, in Run
    highlight.append_style_defs(os.path.join(options.module_dir, 'style.css'))
  File "/nix/store/4falj4r8a92r54im5kp6zj86lwm4qxg2-gtk-doc-1.30/share/gtk-doc/python/gtkdoc/highlight.py", line 50, in append_style_defs
    os.chmod(css_file_name, 0o664)
FileNotFoundError: [Errno 2] No such file or directory: './style.css'

Idk looks like the stuff with the css file which should have been fixed in 0e27680.
See https://gitlab.gnome.org/GNOME/gtk-doc/issues/84

Looks like they might have reverted what was breaking stuff on master https://gitlab.gnome.org/GNOME/gtk-doc/issues/84#note_516043

vcunat · 2019-05-26T08:25:14Z

Anything against reverting the gtk-doc update for now? So far I can only see problems from it and no expected benefits.

FRidh · 2019-05-26T08:27:53Z

I recall just reverting the gtk-doc related changes wasn't sufficient, otherwise, definitely.

This reverts commit 0e27680. Let's revert the gtk-doc update for now; it causes too many problems.

This reverts commit 064ca0a. The previous gtk-doc version won't build with our current meson.

This reverts commit 765079f. Problems, usually around https://gitlab.gnome.org/GNOME/gtk-doc/issues/84

This reverts commit dae72e7. Not needed now.

This reverts commit 7c62ef8. Not needed now.

vcunat · 2019-05-28T15:56:32Z

Hydra:

x86_64-linux seems just fine;
aarch64-linux would need a couple more restarts for timed out stuff, but it does seem fine now already;
x86_64-darwin – probably too early to tell. Periodically restarting aborted jobs is easy and cheap, but there are some bigger time outs (e.g. whole haskell), and also some other failures (e.g. p11-kit not passing some security-related checks).

FRidh · 2019-05-28T16:50:22Z

I intend to merge this later tonight. Darwin on Hydra is quite unreliable.

vcunat · 2019-05-28T21:10:14Z

@grahamc any idea why there are permanently so many aborted jobs for darwin on Hydra? (or whom to ask) Most of these print a message like:

Aborted: cannot connect to ‘root@c6279b03.packethost.net’: Warning: Permanently added the ED25519 host key for IP address '147.75.70.201' to the list of known hosts. root@c6279b03.packethost.net: Permission denied (publickey).

Jona Stubbe and others added 30 commits August 22, 2018 19:27

mesa: restructure driver selection to be more architecture-neutral

a1f5702

This allows Mesa to also build on ppc64le.

restructure driver selection to show conditions for which each driver…

4688f40

… is selected

libgdiplus: 5.6 -> 5.6.1

8d98e64

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libgdiplus/versions

libjpeg-turbo: 2.0.1 -> 2.0.2, cleanup

6491346

https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.2 * patches included, drop * use installCheck to avoid needing to set LD_LIBRARY_PATH

openblas: 0.3.5 -> 0.3.6

a7b673a

Merge branch 'staging' into mesa_3

296e8fe

vim: 8.1.0675 -> 8.1.1234

a529bc7

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vim/versions

perlPackages: fix build packages for non-default perl

120398a

networkmanager: sed from gnused, not coreutils! fix bad path

5ce6bfe

gssdp: 1.2.0 -> 1.2.1

458f586

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gssdp/versions

ruby: disable docSupport for baseruby

9b39be3

Even if building a Ruby with documentation, there's no reason for its baseruby to waste time building its own documentation as well.

slang: respect TERMINFO_DIRS

8bf5d3a

gst_all_1: fix cross

ffb09e0

cdparanoia: fix cross

4490234

gstreamer: add patches to fix cross

8c06639

jnettop: fix cross

62e6e13

isocodes: fix cross

1bdae8f

libnl: disable pythonSupport for cross

d8a74e9

xorg.libXi: fix cross

abb10fe

dbus-glib: fix cross

c2800a2

dmenu: fix cross

5fd31ae

btrfs-progs: fix cross

5448f6c

xorg.*: fix cross m4 handling

4a246ce

folks: 0.11.4 -> 0.12.1

1f1a964

https://gitlab.gnome.org/GNOME/folks/blob/0.12.1/NEWS

glib-networking: 2.60.1 -> 2.60.2

0a12272

https://gitlab.gnome.org/GNOME/glib-networking/blob/2.60.2/NEWS

gnome3.tracker: 2.2.1 -> 2.2.2

280d209

https://gitlab.gnome.org/GNOME/tracker/blob/2.2.2/NEWS

gnome3.tracker-miners: 2.2.1 -> 2.2.2

91e3c04

https://gitlab.gnome.org/GNOME/tracker-miners/blob/2.2.2/NEWS

glib: 2.60.1 -> 2.60.2

a6ca1a8

https://gitlab.gnome.org/GNOME/glib/blob/2.60.2/NEWS

ruby: install ri docs to devdoc output

6ffb507

This allows getting access to Ruby documentation through ri by doing nix-shell -p ruby ruby.devdoc or by installing the ruby.devdoc package. A setup hook will add a shim to LOAD_PATH to point ri to the devdoc output instead of out.

ruby: enable docSupport by default

b34608d

Now that RI docs are installed to a seperate output, we don't need to worry about bloating the main output, so it's reasonable for this to be enabled by default.

ofborg bot added 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels May 18, 2019

worldofpeace added 4 commits May 18, 2019 15:05

gtk-doc: add missing pygments

f73ffce

Also drop six since it was removed in the last release[0] [0]: https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_29/NEWS#L4

gtk-doc: build with meson

064ca0a

Merge pull request #61598 from worldofpeace/gtk-doc/meson

8e2fe5c

gtk-doc: build with meson, etc

FRidh added 2 commits May 24, 2019 12:38

libpsl: don't build docs

7c62ef8

to unbreak staging-next cc @worldofpeace

Merge master into staging-next

6e4e7c5

FRidh added 2 commits May 25, 2019 12:37

libical: temporarily don't build docs to unblock staging-next

dae72e7

Merge master into staging-next

b2ab860

vcunat mentioned this pull request May 26, 2019

gtk-doc: 1.30 -> 1.29 #62079

Merged

vcunat and others added 6 commits May 26, 2019 11:03

Revert "gtk-doc: fix css file permissions"

451be59

This reverts commit 0e27680. Let's revert the gtk-doc update for now; it causes too many problems.

Revert "gtk-doc: build with meson"

7c15686

This reverts commit 064ca0a. The previous gtk-doc version won't build with our current meson.

Revert "gtk-doc: 1.29 -> 1.30"

b41ef4c

This reverts commit 765079f. Problems, usually around https://gitlab.gnome.org/GNOME/gtk-doc/issues/84

Revert "libical: temporarily don't build docs to unblock staging-next"

ea01202

This reverts commit dae72e7. Not needed now.

Revert "libpsl: don't build docs"

8809ebe

This reverts commit 7c62ef8. Not needed now.

Merge master into staging-next

36a6746

FRidh merged commit 97aba37 into master May 29, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Staging next #61657

Staging next #61657

FRidh commented May 18, 2019

FRidh commented May 18, 2019 •

edited

worldofpeace commented May 18, 2019

worldofpeace commented May 20, 2019

FRidh commented May 24, 2019

worldofpeace commented May 24, 2019 •

edited

vcunat commented May 26, 2019

FRidh commented May 26, 2019

vcunat commented May 28, 2019

FRidh commented May 28, 2019

vcunat commented May 28, 2019 •

edited

Staging next #61657

Staging next #61657

Conversation

FRidh commented May 18, 2019

Motivation for this change

Things done

FRidh commented May 18, 2019 • edited

worldofpeace commented May 18, 2019

worldofpeace commented May 20, 2019

FRidh commented May 24, 2019

worldofpeace commented May 24, 2019 • edited

vcunat commented May 26, 2019

FRidh commented May 26, 2019

vcunat commented May 28, 2019

FRidh commented May 28, 2019

vcunat commented May 28, 2019 • edited

FRidh commented May 18, 2019 •

edited

worldofpeace commented May 24, 2019 •

edited

vcunat commented May 28, 2019 •

edited