Skip to content

staging-next 2023-02-15#216499

Merged
vcunat merged 385 commits intomasterfrom
staging-next
Feb 26, 2023
Merged

staging-next 2023-02-15#216499
vcunat merged 385 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Feb 15, 2023


Mass breakages

(will be edited in future)

Current regression list (detailed):
https://hydra.nixos.org/eval/1791068?compare=1791059#tabs-now-fail

alyssais and others added 30 commits February 4, 2023 18:45
Since b2f9cd3 ("gobject-introspection: use wrapper.nix for the
native package too so we can propagate the dev output"),
gobject-introspection doesn't need to be included in buildInputs when
it's in nativeBuildInputs, as it's propagated from the setup hook.

Removing the build input fixes evaluation in buildPackages when
cross-compiling to platforms that gobject-introspection is unsupported
on, like ghcjs.

Tested building natively on x86_64-linux, in
pkgsCross.aarch64-multiplatform, and in pkgsCross.ghcjs.buildPackages.
Since b2f9cd3 ("gobject-introspection: use wrapper.nix for the
native package too so we can propagate the dev output"),
gobject-introspection doesn't need to be included in buildInputs when
it's in nativeBuildInputs, as it's propagated from the setup hook.

Removing the build input fixes evaluation in buildPackages when
cross-compiling to platforms that gobject-introspection is unsupported
on, like ghcjs.

Tested building natively on x86_64-linux, in
pkgsCross.aarch64-multiplatform, and in pkgsCross.ghcjs.buildPackages.
…nput

Since b2f9cd3 ("gobject-introspection: use wrapper.nix for the
native package too so we can propagate the dev output"),
gobject-introspection doesn't need to be included in buildInputs when
it's in nativeBuildInputs, as it's propagated from the setup hook.

Removing the build input fixes evaluation in buildPackages when
cross-compiling to platforms that gobject-introspection is unsupported
on, like ghcjs.

Tested building natively on x86_64-linux, in
pkgsCross.aarch64-multiplatform, and in pkgsCross.ghcjs.buildPackages.
While at it added trivial updater.
gobject-introspection is now usable when cross-compiling, but only if
we can emulate the host platform, which is not the case in general.
For example, when cross-compiling from Linux to BSD.

Fixes: 1bd8727 ("various: enable gobject-introspection when cross-compiling")
Builds for FreeBSD.
gobject-introspection is now usable when cross-compiling, but only if
we can emulate the host platform, which is not the case in general.
For example, when cross-compiling from Linux to BSD.

Fixes: 1bd8727 ("various: enable gobject-introspection when cross-compiling")
Builds for FreeBSD.
python310Packages.types-toml: 0.10.8.1 -> 0.10.8.2
libiconv is already defined per-platform.  The actual libiconv library
won't be built on platforms like Linux where it doesn't need to be, so
there's no need to maintain a separate platform list here.

Required to build for FreeBSD.
I split out architecture and operating system, since the values don't
depend on each other, and this saves a lot of repetition.
libiconv is already defined per-platform.  The actual libiconv library
won't be built on platforms like Linux where it doesn't need to be, so
there's no need to maintain a separate platform list here.

Required to build for FreeBSD.
This is useful when cross-compiling to platforms that we can't build
Python for (and also just more semantically correct).
I've changed etnaviv from being explicitly enabled on ARM to using
its auto value, as it is now enabled by default on appropriate
architectures (including ARM).

Make omap and etnaviv Linux-only as they both include Linux headers.
They're disabled in FreeBSD Ports too.
doxygen: depend on libiconv unconditionally
openjpeg: move jpylizer to nativeCheckInputs
chez-racket: support many more platforms
Remove lots more obsolete gobject-introspection build inputs
It seems that in the few weeks between me writing the previous patch
and submitting it for review, I had forgotten I hadn't tested the
non-cross case yet, and so hadn't caught that the tests didn't
actually work any more.  Oops!

Fixes: 3404d6b ("openjpeg: move jpylizer to nativeCheckInputs")
@alyssais alyssais added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 23, 2023
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 23, 2023
@vcunat vcunat mentioned this pull request Feb 25, 2023
13 tasks
K900 and others added 4 commits February 25, 2023 19:33
- add vulkan-headers as a dependency
- hack around ffmpeg using unstable VK_EXT names for extensions
- drive-by cleanup: remove unused inherit
[staging-next] ffmpeg-5: fix Vulkan builds
The build used to fail with

    Found duplicated packages in closure for dependency 'docutils':
      docutils 0.19 (/nix/store/y1ifaaf1pfh8pz4qfqvc5gdk3a7s1563-python3.10-docutils-0.19/lib/python3.10/site-packages)
      docutils 0.16 (/nix/store/f2rd8fjdjzy0kpqd2x0gw5lwbxwmzzm6-python3.10-docutils-0.16/lib/python3.10/site-packages)
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Feb 25, 2023
github-actions bot and others added 3 commits February 26, 2023 00:02
Just manually updating the generated nix file, so that .gi-harfbuzz
builds until a proper update is done.  Upstream cross-ref:
haskell-gi/haskell-gi#396 (comment)
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Feb 26, 2023
@vcunat vcunat merged commit 30e272b into master Feb 26, 2023
@mweinelt mweinelt mentioned this pull request Mar 4, 2023
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: kernel The Linux kernel 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: vim Advanced text editor 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.