Unverified Commit 7f2d3d2f authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

staging-next 2024-11-07 - the last one for 24.11 (#354201)

parents 3400d5e9 3a06a0e1
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza

# Python-related code and docs
/doc/languages-frameworks/python.section.md   @mweinelt @natsukium
/maintainers/scripts/update-python-libraries            @natsukium
/pkgs/development/interpreters/python                   @natsukium
/maintainers/scripts/update-python-libraries  @mweinelt @natsukium
/pkgs/development/interpreters/python         @mweinelt @natsukium
/pkgs/top-level/python-packages.nix                     @natsukium
/pkgs/top-level/release-python.nix                      @natsukium

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,16 @@ setup hook registering ninja-based build and install phases.

Controls the flags passed to `meson setup` during configure phase.

#### `mesonBuildDir` {#meson-build-dir}

Directory where Meson will put intermediate files.

Setting this can be useful for debugging multiple Meson builds while in the same source directory, for example, when building for different platforms.
Different values for each build will prevent build artefacts from interefering with each other.
This setting has no tangible effect when running the build in a sandboxed derivation.

The default value is `build`.

#### `mesonWrapMode` {#meson-wrap-mode}

Which value is passed as
+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ Available compilers are collected under `haskell.compiler`.
Each of those compiler versions has a corresponding attribute set `packages` built with
it. However, the non-standard package sets are not tested regularly and, as a
result, contain fewer working packages. The corresponding package set for GHC
9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias
for `haskell.packages.ghc964`:
9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias
for `haskell.packages.ghc966`:

Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ sets are
* `pkgs.python311Packages`
* `pkgs.python312Packages`
* `pkgs.python313Packages`
* `pkgs.python314Packages`
* `pkgs.pypy27Packages`
* `pkgs.pypy39Packages`
* `pkgs.pypy310Packages`
+5 −3
Original line number Diff line number Diff line
@@ -25,12 +25,14 @@ stdenv.mkDerivation {

The same goes for Qt 5 where libraries and tools are under `libsForQt5`.

Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers.
Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers.

::: {.note}
Qt 6 graphical applications should also include `qtwayland` in `buildInputs` on Linux (but not on platforms e.g. Darwin, where `qtwayland` is not available), to ensure the Wayland platform plugin is available.

This may become default in the future, see [NixOS/nixpkgs#269674](https://github.com/NixOS/nixpkgs/pull/269674).
`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` on platforms that support it, to allow applications to act as native Wayland clients. It should be used for all graphical applications.

`wrapQtAppsNoGuiHook` does not propagate `qtwayland` to reduce closure size for purely command-line applications.

:::

## Packages supporting multiple Qt versions {#qt-versions}
Loading