Merge master into staging-next

carlocab · Nov 14, 2024 · b50e753 · b50e753
2 parents b3a71c7 + d41262f
commit b50e753
Show file tree

Hide file tree

Showing 67 changed files with 1,343 additions and 726 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,34 +7,44 @@ assignees: ''
 
 ---
 
-### Describe the bug
-A clear and concise description of what the bug is.
+## Describe the bug
+
+<!-- A clear and concise description of what the bug is. -->
+
+## Steps To Reproduce
 
-### Steps To Reproduce
 Steps to reproduce the behavior:
+
 1. ...
 2. ...
 3. ...
 
-### Expected behavior
-A clear and concise description of what you expected to happen.
+## Expected behavior
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+## Screenshots
+
+<!-- If applicable, add screenshots to help explain your problem: -->
 
-### Screenshots
-If applicable, add screenshots to help explain your problem.
+## Additional context
 
-### Additional context
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->
 
-### Notify maintainers
+## Metadata
+
+<!-- Please insert the output of running `nix-shell -p nix-info --run "nix-info -m"` below this line -->
+
+## Notify maintainers
 
 <!--
 Please @ people who are in the `meta.maintainers` list of the offending package or module.
 If in doubt, check `git blame` for whoever last touched something.
 -->
 
-### Metadata
+---
 
-<!-- Please insert the output of running `nix-shell -p nix-info --run "nix-info -m"` below this line -->
+Note for maintainers: Please tag this issue in your PR.
 
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/build_failure.md b/.github/ISSUE_TEMPLATE/build_failure.md
@@ -7,31 +7,43 @@ assignees: ''
 
 ---
 
-### Steps To Reproduce
+## Steps To Reproduce
 
 Steps to reproduce the behavior:
+
 1. build *X*
 
-### Build log
+## Build log
+
+<!-- insert build log in code block in collapsable section -->
+
+<details>
+
+<summary>Build Log</summary>
 
 ```
-log here if short otherwise a link to a gist
 ```
 
-### Additional context
+</details>
+
+## Additional context
 
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->
 
-### Notify maintainers
+## Metadata
+
+<!-- Please insert the output of running `nix-shell -p nix-info --run "nix-info -m"` below this line -->
+
+## Notify maintainers
 
 <!--
 Please @ people who are in the `meta.maintainers` list of the offending package or module.
 If in doubt, check `git blame` for whoever last touched something.
 -->
 
-### Metadata
+---
 
-<!-- Please insert the output of running `nix-shell -p nix-info --run "nix-info -m"` below this line -->
+Note for maintainers: Please tag this issue in your PR.
 
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md
@@ -23,16 +23,19 @@ assignees: ''
 - [ ] checked [open documentation issues] for possible duplicates
 - [ ] checked [open documentation pull requests] for possible solutions
 
-[latest Nixpkgs manual]: https://nixos.org/manual/nixpkgs/unstable/
-[latest NixOS manual]: https://nixos.org/manual/nixos/unstable/
-[nixpkgs-source]: https://github.com/NixOS/nixpkgs/tree/master/doc
-[nixos-source]: https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual
-[open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22
-[open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22
+---
+
+Note for maintainers: Please tag this issue in your PR.
 
 ---
 
 Add a :+1: [reaction] to [issues you find important].
 
 [reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
 [issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc
+[latest Nixpkgs manual]: https://nixos.org/manual/nixpkgs/unstable/
+[latest NixOS manual]: https://nixos.org/manual/nixos/unstable/
+[nixpkgs-source]: https://github.com/NixOS/nixpkgs/tree/master/doc
+[nixos-source]: https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual
+[open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22
+[open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22
diff --git a/.github/ISSUE_TEMPLATE/module_request.md b/.github/ISSUE_TEMPLATE/module_request.md
@@ -7,11 +7,11 @@ assignees: ''
 
 ---
 
-### Description
+## Description
 
 <!-- Describe what the module should accomplish: -->
 
-### Notify maintainers
+## Notify maintainers
 
 <!-- If applicable, tag the maintainers of the package that corresponds to the module. If the search.nixos.org result shows no maintainers, tag the person that last updated the package. -->
 

diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
@@ -7,23 +7,30 @@ assignees: ''
 
 ---
 
+## Package Information
+
+<!-- Search for the package here: https://search.nixos.org/packages?channel=unstable -->
+
 - Package name:
 - Latest released version:
-<!-- Search your package here: https://search.nixos.org/packages?channel=unstable -->
 - Current version on the unstable channel:
 - Current version on the stable/release channel:
+
+## Checklist
+
 <!--
 Type the name of your package and try to find an open pull request for the package
 If you find an open pull request, you can review it!
 There's a high chance that you'll have the new version right away while helping the community!
 -->
+
 - [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls)
 
-**Notify maintainers**
+## Notify maintainers
 
 <!-- If the search.nixos.org result shows no maintainers, tag the person that last updated the package. -->
 
------
+---
 
 Note for maintainers: Please tag this issue in your PR.
 

diff --git a/.github/ISSUE_TEMPLATE/packaging_request.md b/.github/ISSUE_TEMPLATE/packaging_request.md
@@ -7,11 +7,11 @@ assignees: ''
 
 ---
 
-**Project description**
+## Project description
 
 <!-- Describe the project a little: -->
 
-**Metadata**
+## Metadata
 
 * homepage URL:
 * source URL:
@@ -20,6 +20,10 @@ assignees: ''
 
 ---
 
+Note for maintainers: Please tag this issue in your PR.
+
+---
+
 Add a :+1: [reaction] to [issues you find important].
 
 [reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/

diff --git a/.github/ISSUE_TEMPLATE/unreproducible_package.md b/.github/ISSUE_TEMPLATE/unreproducible_package.md
@@ -31,12 +31,12 @@ Fixing bit-by-bit reproducibility also has additional advantages, such as
 avoiding hard-to-reproduce bugs, making content-addressed storage more effective
 and reducing rebuilds in such systems.
 
-### Steps To Reproduce
+## Steps To Reproduce
 
 In the following steps, replace `<package>` with the canonical name of the
 package.
 
-#### 1. Build the package
+### 1. Build the package
 
 This step will build the package. Specific arguments are passed to the command
 to keep the build artifacts so we can compare them in case of differences.
@@ -53,7 +53,7 @@ Or using the new command line style:
 nix build nixpkgs#<package> && nix build nixpkgs#<package> --rebuild --keep-failed
 ```
 
-#### 2. Compare the build artifacts
+### 2. Compare the build artifacts
 
 If the previous command completes successfully, no differences were found and
 there's nothing to do, builds are reproducible.
@@ -67,7 +67,7 @@ metadata (*e.g. timestamp*) differences.
 nix run nixpkgs#diffoscopeMinimal -- --exclude-directory-metadata recursive <Y> <Z>
 ```
 
-#### 3. Examine the build log
+### 3. Examine the build log
 
 To examine the build log, use:
 
@@ -81,10 +81,20 @@ Or with the new command line style:
 nix log $(nix path-info --derivation nixpkgs#<package>)
 ```
 
-### Additional context
+## Additional context
 
-(please share the relevant fragment of the diffoscope output here, and any
-additional analysis you may have done)
+(please share the relevant fragment of the diffoscope output here, and any additional analysis you may have done)
+
+## Notify maintainers
+
+<!--
+Please @ people who are in the `meta.maintainers` list of the offending package or module.
+If in doubt, check `git blame` for whoever last touched something.
+-->
+
+---
+
+Note for maintainers: Please tag this issue in your PR.
 
 ---
 

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -358,8 +358,9 @@
     - changed-files:
       - any-glob-to-any-file:
         - doc/languages-frameworks/php.section.md
+        - nixos/tests/php/**/*
         - pkgs/build-support/php/**/*
-        - pkgs/development/interpreters/php/*
+        - pkgs/development/interpreters/php/**/*
         - pkgs/development/php-packages/**/*
         - pkgs/test/php/default.nix
         - pkgs/top-level/php-packages.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -11483,6 +11483,13 @@
     name = "Khushraj Rathod";
     keys = [ { fingerprint = "1988 3FD8 EA2E B4EC 0A93  1E22 B77B 2A40 E770 2F19"; } ];
   };
+  kiara = {
+    name = "kiara";
+    email = "[email protected]";
+    github = "KiaraGrouwstra";
+    githubId = 3059397;
+    matrix = "@cinerealkiara:matrix.org";
+  };
   KibaFox = {
     email = "[email protected]";
     github = "KibaFox";
@@ -14556,12 +14563,6 @@
     githubId = 16974598;
     name = "Mike Playle";
   };
-  mkaito = {
-    email = "[email protected]";
-    github = "mkaito";
-    githubId = 20434;
-    name = "Christian Höppner";
-  };
   mkazulak = {
     email = "[email protected]";
     github = "mulderr";

diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix
@@ -12,7 +12,7 @@ let
     name = "oci-containers-${backend}";
 
     meta.maintainers = lib.teams.serokell.members
-                       ++ (with lib.maintainers; [ benley mkaito ]);
+                       ++ (with lib.maintainers; [ benley ]);
 
     nodes = {
       ${backend} = { pkgs, ... }: {

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.86";
+  version = "1.88";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    hash = "sha256-/sdMBRCZvuKTp8ygCrLmIy0DiWJC6lLWdsY+ZxRY+pY=";
+    hash = "sha256-3ylzroIp3d5u6meP7guu+NlYGTqy9UUjIi9box7NbXI=";
   };
 
   nativeBuildInputs = [ cmake ];

diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix
@@ -16,6 +16,8 @@
   wasm-pack,
 }:
 
+# TODO: package python bindings
+
 let
 
   wasm-bindgen-92 = wasm-bindgen-cli.override {
@@ -36,16 +38,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "pagefind";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "cloudcannon";
     repo = "pagefind";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4NfosDp5Wwz2lnqaFNcaIbWpjWiaQ4WCL6TcKEkfPck=";
+    hash = "sha256-OKZYy+Mm9xOEBBD/tI2GwP2+Myt5aELosRP8Tbi5bqY=";
   };
 
-  cargoHash = "sha256-hnT9w3j8/YuN00x0LBPr75BKGWSnIYUNFTWIgtghJP4";
+  cargoHash = "sha256-k50RyGuS66r+wWIij7yOOSlDxXYY1y+lTJgCkMREllc=";
 
   env.npmDeps_web_js = fetchNpmDeps {
     name = "npm-deps-web-js";