Unverified Commit 33ef85c0 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents aaeb0eaa 54904ad7

ci/README.md

+42 −0
Original line number Diff line number Diff line
@@ -18,6 +18,41 @@ The goal is to eventually have all GitHub specific code in `ci/github-script` an 
A lot of code has already been migrated, but some Bash code still remains.

New CI features need to be introduced in JavaScript, not Bash.



## Nixpkgs merge bot



The Nixpkgs merge bot empowers package maintainers by enabling them to merge PRs related to their own packages.

It serves as a bridge for maintainers to quickly respond to user feedback, facilitating a more self-reliant approach.

Especially when considering there are roughly 20 maintainers for every committer, this bot is a game-changer.



Following [RFC 172] the merge bot was originally implemented as a [python webapp](https://github.com/NixOS/nixpkgs-merge-bot), which has now been integrated into [`ci/github-script/bot.js`](./github-script/bot.js) and [`ci/github-script/merge.js`](./github-script/merge.js).



### Using the merge bot



To merge a PR, maintainers can simply comment:

```gfm

@NixOS/nixpkgs-merge-bot merge

```



The next time the bot runs it will verify the below constraints, then (if satisfied) merge the PR.



The merge bot will reference [#306934](https://github.com/NixOS/nixpkgs/issues/306934) on PRs it merges successfully, [#305350](https://github.com/NixOS/nixpkgs/issues/305350) for unsuccessful attempts, or [#371492](https://github.com/NixOS/nixpkgs/issues/371492) if an error occurs.

These issues effectively list PRs the merge bot has interacted with.



### Merge bot constraints



To ensure security and a focused utility, the bot adheres to specific limitations:



- The PR targets `master`, `staging`, or `staging-next`.

- The PR only touches files located under `pkgs/by-name/*`.

- The PR is authored by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/) or a [committer][@NixOS/nixpkgs-committers].

- The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].

- The user attempting to merge is a maintainer of all packages touched by the PR.



### Approving merge bot changes



Changes to the bot can usually be approved by the [@NixOS/nixpkgs-ci] team, as with other CI changes.

However, additional acknowledgement from the [@NixOS/nixpkgs-core] team is required for changes to what the merge bot will merge, who is eligible to use the merge bot, or similar changes in scope.



## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`



Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does.
@@ -58,3 +93,10 @@ Some branches also have a version component, which is either `unstable` or `YY.M 
`ci/supportedBranches.js` is a script imported by CI to classify the base and head branches of a Pull Request.

This classification will then be used to skip certain jobs.

This script can also be run locally to print basic test cases.





[@NixOS/nixpkgs-maintainers]: https://github.com/orgs/NixOS/teams/nixpkgs-maintainers

[@NixOS/nixpkgs-committers]: https://github.com/orgs/NixOS/teams/nixpkgs-committers

[@NixOS/nixpkgs-ci]: https://github.com/orgs/NixOS/teams/nixpkgs-ci

[@NixOS/nixpkgs-core]: https://github.com/orgs/NixOS/teams/nixpkgs-core

[RFC 172]: https://github.com/NixOS/rfcs/pull/172

nixos/modules/services/printing/cupsd.nix

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ let 
      cups-filters

      pkgs.ghostscript

    ]

    ++ lib.optional cfg.browsed.enable cfg.browsed.package

    ++ cfg.drivers;

    pathsToLink = [

      "/lib"

pkgs/applications/audio/quodlibet/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ python3.pkgs.buildPythonApplication rec { 
    "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station"

    # upstream does actually not enforce source code linting

    "--ignore=tests/quality"

    # marked as flaky, breaks in sandbox

    "--deselect=tests/test_library_file.py::TWatchedFileLibrary::test_watched_adding"

  ]

  ++ lib.optionals (withXineBackend || !withGstPlugins) [

    "--ignore=tests/plugin/test_replaygain.py"

pkgs/applications/editors/texmaker/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec { 
    hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=";

  };



  patches = [

    # Check if the patch can be removed next release

    ./fix-build-with-qt-6-10.patch

  ];



  buildInputs = [

    poppler

    qtbase

pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index ef6a4e6..b564be8 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -386,7 +386,7 @@ set(CMAKE_CXX_STANDARD 17)

 set(CMAKE_CXX_STANDARD_REQUIRED ON)

 set(CMAKE_AUTORCC ON)

 

-find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools)

+find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core CorePrivate Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools)

 

 qt_standard_project_setup()