Commit 5ca23900 authored by sternenseemann's avatar sternenseemann
Browse files

Merge branch staging-next into haskell-updates

parents 6f8ae8aa ce1a535c

.github/labeler.yml

+1 −14
Original line number Diff line number Diff line 
# NOTE: bsd, darwin and cross-compilation labels are handled by ofborg

"6.topic: agda":

  - any:

    - changed-files:
@@ -8,12 +9,6 @@ 
        - pkgs/development/libraries/agda/**/*

        - pkgs/top-level/agda-packages.nix



"6.topic: bsd":

  - any:

    - changed-files:

      - any-glob-to-any-file:

        - pkgs/os-specific/bsd/**/*



"6.topic: cinnamon":

  - any:

    - changed-files:
@@ -55,14 +50,6 @@ 
        - pkgs/development/cuda-modules/**/*

        - pkgs/top-level/cuda-packages.nix



"6.topic: darwin":

  - any:

    - changed-files:

      - any-glob-to-any-file:

        - pkgs/os-specific/darwin/**/*

        - pkgs/top-level/darwin-aliases.nix

        - pkgs/top-level/darwin-packages.nix



"6.topic: deepin":

  - any:

    - changed-files:

ci/OWNERS

+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

doc/hooks/meson.section.md

+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

doc/languages-frameworks/python.section.md

+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`

doc/languages-frameworks/qt.section.md

+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}