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.

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

Staging next #83618

Merged
merged 326 commits into from Apr 5, 2020
Merged

Staging next #83618

merged 326 commits into from Apr 5, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Mar 28, 2020

Motivation for this change

https://hydra.nixos.org/jobset/nixpkgs/staging-next#tabs-evaluations

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.

matthewbauer and others added 30 commits March 16, 2020 18:51
…-10393.

Fixes #57159.

Signed-off-by: David Anderson <dave@natulte.net>
rpm5.org no longer exists as a domain
patch-shebangs.sh: fix error messages to go to stderr, not '0' file
libusb-compat: fix up the .so so it can find libusb1
wafHook: allow overriding phases and disabling of cross flags
nixos/rdma-core: 27.0 -> 28.0, update RXE module
Also remove the second copy of lrdf from gstreamer/bad inputs.
Now uses spidermonkey_68
Now depends on wayland-protocols and pipewire-0.3

The auto detection of this feature fails with a false positive.
Resulting in broken wayland sessions.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
buildRustPackage enabled strictDeps, which broke the build due to glib not being available in the build environment any more.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

While at it, also move cmake to nativeBuildInputs.
We were passing libusb-compat instead of libusb1, and the former no longer propagates the latter, so Dolphin built its vendored libusb.
The configure script checks for an old version of neon. Let's bump the bounds since neon 0.31 is API compatible.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
It requires Python2 scons.

But after fixing this, it fails with a different error.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

While at it, also move cmake to nativeBuildInputs and format the expression.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
Neither libusb or pcre is needed. udev is used instead.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

Also move cmake and gettext to nativeBuildInputs.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
jtojnar and others added 9 commits April 5, 2020 00:19
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
This was forgotten during GNOME 3.36 update so the upstreamed patches were not removed.
Also needed to add libportal and could remove some old cruft.
	CMake Error at /nix/store/cmriqbxnpcgmbll06pnl1h3va08x2xvr-cmake-3.16.5/share/cmake-3.16/Modules/FindPackageHandleStandardArgs.cmake:146 (message):
	  Could NOT find SharedMimeInfo (missing: UPDATE_MIME_DATABASE_EXECUTABLE)
	  (Required is at least version "1.3")
	Call Stack (most recent call first):
	  /nix/store/cmriqbxnpcgmbll06pnl1h3va08x2xvr-cmake-3.16.5/share/cmake-3.16/Modules/FindPackageHandleStandardArgs.cmake:393 (_FPHSA_FAILURE_MESSAGE)
	  /nix/store/hxvvgjkvpp22g1rykzcb734649sgzjz0-extra-cmake-modules-5.66.0/share/ECM/find-modules/FindSharedMimeInfo.cmake:74 (find_package_handle_standard_args)
	  CMakeLists.txt:32 (find_package)
Need to reference through `config` when checking what other modules have set.
Attempt to fix the following issue:

	Running custom install script '/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/bin/meson --internal yelphelper install --subdir=help --id=modem-manager-gui --installdir=share/help --sources=about.page@@contrib-code.page@@contrib-translations.page@@index.page@@license.page@@report-bugs.page@@usage-config.page@@usage-contacts.page@@usage-getinfo.page@@usage-modem.page@@usage-netsearch.page@@usage-sms.page@@usage-traffic.page@@usage-ussd.page --symlinks=true --media=figures/contacts-window.png@@figures/modem-manager-gui-logo.png@@figures/network-info.png@@figures/scan-window.png@@figures/sms-window.png@@figures/traffic-window.png@@figures/ussd-window.png@@figures/startup-window.png'
	Traceback (most recent call last):
	  File "/nix/store/0jg6lgd7i6c3y4jjms8j0b0cigij94hn-itstool-2.0.6/bin/itstool", line 1598, in <module>
	    doc.merge_translations(translations, opts.lang, strict=opts.strict)
	  File "/nix/store/0jg6lgd7i6c3y4jjms8j0b0cigij94hn-itstool-2.0.6/bin/itstool", line 984, in merge_translations
	    lcpar = lcpar.parent
	  File "/nix/store/cp1g6m360dky1baz3x5q5gm92basj7rv-python3-3.7.7-env/lib/python3.7/site-packages/libxml2.py", line 296, in get_parent
	    return nodeWrap(ret)
	  File "/nix/store/cp1g6m360dky1baz3x5q5gm92basj7rv-python3-3.7.7-env/lib/python3.7/site-packages/libxml2.py", line 580, in nodeWrap
	    if name[0:8] == "document":
	TypeError: 'NoneType' object is not subscriptable
	[...]
	Installing /build/hg-archive/build/help/uk/usage-ussd.page to /nix/store/8miw71zkfjqd8z3v5zzp8ybv6pxmc33y-modem-manager-gui-0.0.19.1/share/help/uk/modem-manager-gui/usage-ussd.page
	Traceback (most recent call last):
	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/bin/meson", line 9, in <module>
	    sys.exit(main())
	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/mesonmain.py", line 226, in main
	    return run(sys.argv[1:], launcher)
	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/mesonmain.py", line 215, in run
	    return run_script_command(args[1], args[2:])
	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/mesonmain.py", line 163, in run_script_command
	    return module.run(script_args)
	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/scripts/yelphelper.py", line 132, in run
	    destdir, options.project_id, options.symlinks)
	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/scripts/yelphelper.py", line 71, in install_help
	    shutil.copyfile(infile, outfile)
	  File "/nix/store/vs4vj1yzqj1bkcqkf3b6sxm6jfy1gb4j-python3-3.7.7/lib/python3.7/shutil.py", line 120, in copyfile
	    with open(src, 'rb') as fsrc:
	FileNotFoundError: [Errno 2] No such file or directory: '/build/hg-archive/build/help/uk/usage-ussd.page'
	FAILED: meson-install
@FRidh FRidh merged commit e50c67a into master Apr 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet