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

Staging next #94679

Merged
merged 218 commits into from Aug 11, 2020
Merged

Staging next #94679

merged 218 commits into from Aug 11, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Aug 4, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Mic92 and others added 30 commits June 8, 2020 11:54
@Mic92
stdenv: set SOURCE_DATE_EPOCH to a value python supports
bc4927a 
in nix-shell this value breaks the build because python's
packaging refuses to build timestamps that date before 1980.
@jtojnar
meson: clean up
c192221
@jtojnar
meson: 0.54.2 → 0.55.0
d8ac41f 
https://mesonbuild.com/Release-notes-for-0-55-0.html
https://github.com/mesonbuild/meson/releases/tag/0.55.0
mesonbuild/meson@0.54.2...0.55.0
qt5: 5.12.7 -> 5.14.2
d4c607a 
This includes contributions by @ttuegel and @DIzFer. Thanks!
quassel: fix build with qt5 5.14.x
ae358bc
falkon: fix build with qt5 5.14.x
a40ec61
chatterino2: unstable-2019-05-11 -> 2.1.7
a11a629
boomerang: use libsForQt512
b53c55a 
Boomerang doesn't build with Qt 5.14.x and there is no release that does.
qlcplus: use libsForQt512
0143a1f 
qlcplus doesn't build with Qt 5.14.x and there is no release that does.
@ttuegel
exiv2: fix CMake export paths
f1a58ab
@ttuegel
digikam: remove libqtav dependency
5194e7c 
The optional dependency on libqtav is removed because libqtav does not have a
stable release supporting Qt 5.14 (or any recent stable release at all).
@ttuegel
digikam: 6.2.0 -> 6.4.0
347ef4f 
digikam is updated to the latest stable release, which supports Qt 5.14. The
package is now built from the official tarball, instead of GitHub.
@ttuegel
libqtav: mark broken with qtbase.version >= 5.13
819bb63
@gebner
python3Packages.pyside2: 5.12.6 -> 5.14.2
684ad2f
sdrangel: use libsForQt512
cb1b535
pyqtwebengine: add patch to fix build with Qt 5.14
ae66138
golden-cheetah: use libsForQt512
b1d838e
@Mic92
iana-etc: 20200407 -> 20200729
9cb6894
@Mic92
Merge pull request #89794 from Mic92/source-date-epoch
f6a30fc
@vcunat
Merge #94425: iana-etc: 20200407 -> 20200729 (to staging)
e60478a
@FRidh
Merge staging-next into staging
67af42e
@Ericson2314
treewide: Get rid of cc.gcc
92f96f4 
Instead, we have a new `gccForLibs`, which has the appropriate
definition for e.g. avoiding `x86_32` linking problems.
@ehmry
gnu-config: 2019-04-15 -> 2020-05-04
f5ef00a 
Update gnu-config (config.sub, config.guess) to suport the Genode
platform and apply the updateAutotoolsGnuConfigScriptsHook to Genode
cross-compilation.
@r-ryantm @ehmry
unbound: 1.10.1 -> 1.11.0
73cd1ef
@Ericson2314
Merge pull request #87234 from ehmry/staging
c0b06ef 
gnu-config: 2019-04-15 -> 2020-05-04
@Ericson2314
Merge pull request #91293 from Ericson2314/cxx-wrapper-debt-part-2
b5f7ed6 
treewide: Get rid of `cc.gcc`
@jtojnar
Merge pull request #93011 from jtojnar/meson-0.55.0
5b543ef
@ehmry
Define a i686-genode system double
ccedb29
@vcunat
Merge branch 'staging-next' into staging
01c2ba8
@FRidh
Merge master into staging-next
7ae4bdc
@FRidh
Copy link
Member Author

FRidh commented Aug 7, 2020 •
edited

gettext is failing on darwin due to a patch that does not apply, cc @NixOS/darwin-maintainers
https://hydra.nixos.org/build/124823023

@zowoq zowoq mentioned this pull request Aug 9, 2020
Merged
@FRidh FRidh merged commit de1c8a0 into master Aug 11, 2020
@flokli
Copy link
Contributor

flokli commented Aug 11, 2020

This currently break assembling the initrd:

output '/nix/store/1jrw092qwwgw5wkf4sqf3qmn9f2y7jbl-extra-utils' is not allowed to refer to the following paths:
  /nix/store/v589pqjhvxrj73g3r0xb41yr84z5pwb7-gcc-9.3.0-lib

(reproducible by running any nixos test)

libudev.so (coming from ${systemd.lib}) seems to have gotten a reference to gcc-9.3.0-lib - I don't know yet what introduced it.

@flokli
Copy link
Contributor

flokli commented Aug 11, 2020 •
edited

Bisecting reveals this might be due to a meson bump:

❯ git bisect log
git bisect start
# good: [8a78890a08dfa697be21891619f799738b956aa5] Merge pull request #94296 from NixOS/staging-next
git bisect good 8a78890a08dfa697be21891619f799738b956aa5
# bad: [a93340d651aac4512efa395a3925c08372a709ee] Merge pull request #94933 from danieldk/amdvlk-2020.Q3.3
git bisect bad a93340d651aac4512efa395a3925c08372a709ee
# good: [e449d07a26787e3b373815e412981e107bd0d31c] pythonPackages.hdlparse: init at 1.0.4
git bisect good e449d07a26787e3b373815e412981e107bd0d31c
# good: [eac5ef8aa9c0ddd948b20e83d9d7b37cd0132a81] Merge pull request #95145 from samuelgrf/update/pcsx2-1.6.0
git bisect good eac5ef8aa9c0ddd948b20e83d9d7b37cd0132a81
# bad: [d94f97ae98180c483dd39b62aeace7ec5be845de] python: loguru: 0.5.0 -> 0.5.1
git bisect bad d94f97ae98180c483dd39b62aeace7ec5be845de
# bad: [53c6004d661d0fc897ff840e911cdaa944543285] python: base58: 2.0.0 -> 2.0.1
git bisect bad 53c6004d661d0fc897ff840e911cdaa944543285
# bad: [ccedb29f4b0b3a02f28be0a06cae480da2be432b] Define a i686-genode system double
git bisect bad ccedb29f4b0b3a02f28be0a06cae480da2be432b
# skip: [b1d838e20efe3ec594b76f0d33b9b318fb5fa74b] golden-cheetah: use libsForQt512
git bisect skip b1d838e20efe3ec594b76f0d33b9b318fb5fa74b
# bad: [5b543ef2148eb704beeb1db1d103add89eb29c90] Merge pull request #93011 from jtojnar/meson-0.55.0
git bisect bad 5b543ef2148eb704beeb1db1d103add89eb29c90
# skip: [ae661388c6fdbdaa206fab8684f6a603201cf78f] pyqtwebengine: add patch to fix build with Qt 5.14
git bisect skip ae661388c6fdbdaa206fab8684f6a603201cf78f
# bad: [d8ac41f86394365f8319d8b37fd25e6a7ba7d904] meson: 0.54.2 → 0.55.0
git bisect bad d8ac41f86394365f8319d8b37fd25e6a7ba7d904
# good: [c19222143e79bf8e58e1791ac1125cba34069c3c] meson: clean up
git bisect good c19222143e79bf8e58e1791ac1125cba34069c3c
# first bad commit: [d8ac41f86394365f8319d8b37fd25e6a7ba7d904] meson: 0.54.2 → 0.55.0

d8ac41f86394365f8319d8b37fd25e6a7ba7d904 is the first bad commit
commit d8ac41f86394365f8319d8b37fd25e6a7ba7d904
Author: Jan Tojnar <jtojnar@gmail.com>
Date:   Sun Jul 12 18:19:10 2020 +0200

    meson: 0.54.2 → 0.55.0
    
    https://mesonbuild.com/Release-notes-for-0-55-0.html
    https://github.com/mesonbuild/meson/releases/tag/0.55.0
    https://github.com/mesonbuild/meson/compare/0.54.2...0.55.0

 .../tools/build-managers/meson/default.nix         |  8 ++-
 .../tools/build-managers/meson/fix-rpath.patch     | 76 +++++++---------------
 2 files changed, 28 insertions(+), 56 deletions(-)

@jtojnar, any ideas?

@FRidh
Copy link
Member Author

FRidh commented Aug 11, 2020

and @Ericson2314

@flokli flokli mentioned this pull request Aug 11, 2020
Closed
@flokli
Copy link
Contributor

flokli commented Aug 11, 2020

Spun off into #95163.

@flokli flokli mentioned this pull request Aug 12, 2020
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

@jonringer jonringer Awaiting requested review from jonringer

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@nbp nbp Awaiting requested review from nbp

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: python 6.topic: qt/kde 6.topic: stdenv Standard environment 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet