···1212superherointj <5861043+superherointj@users.noreply.github.com>
1313Vladimír Čunát <v@cunat.cz> <vcunat@gmail.com>
1414Vladimír Čunát <v@cunat.cz> <vladimir.cunat@nic.cz>
1515+Yifei Sun <ysun@hey.com> StepBroBD <Hi@StepBroBD.com>
1616+Yifei Sun <ysun@hey.com> <ysun+git@stepbrobd.com>
+10-9
CONTRIBUTING.md
···26262727This section describes in some detail how changes can be made and proposed with pull requests.
28282929-> **Note**
2929+> [!Note]
3030> Be aware that contributing implies licensing those contributions under the terms of [COPYING](./COPYING), an MIT-like license.
313132320. Set up a local version of Nixpkgs to work with using GitHub and Git
···273273274274### Automatically backporting changes
275275276276-> **Note**
276276+> [!Note]
277277> You have to be a [Nixpkgs maintainer](./maintainers) to automatically create a backport pull request.
278278279279Add the [`backport release-YY.MM` label](https://github.com/NixOS/nixpkgs/labels?q=backport) to the pull request on the `master` branch.
···285285To manually create a backport pull request, follow [the standard pull request process][pr-create], with these notable differences:
286286287287- Use `release-YY.MM` for the base branch, both for the local branch and the pull request.
288288- > **Warning**
289289- > Do not use the `nixos-YY.MM` branch, that is a branch pointing to the tested release channel commit
288288+289289+> [!Warning]
290290+> Do not use the `nixos-YY.MM` branch, that is a branch pointing to the tested release channel commit
290291291292- Instead of manually making and committing the changes, use [`git cherry-pick -x`](https://git-scm.com/docs/git-cherry-pick) for each commit from the pull request you'd like to backport.
292293 Either `git cherry-pick -x <commit>` when the reason for the backport is obvious (such as minor versions, fixes, etc.), otherwise use `git cherry-pick -xe <commit>` to add a reason for the backport to the commit message.
293294 Here is [an example](https://github.com/nixos/nixpkgs/commit/5688c39af5a6c5f3d646343443683da880eaefb8) of this.
294295295295- > **Warning**
296296- > Ensure the commits exists on the master branch.
297297- > In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
296296+> [!Warning]
297297+> Ensure the commits exists on the master branch.
298298+> In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
298299299300- In the pull request description, link to the original pull request to `master`.
300301 The pull request title should include `[YY.MM]` matching the release you're backporting to.
···305306## How to review pull requests
306307[pr-review]: #how-to-review-pull-requests
307308308308-> **Warning**
309309+> [!Warning]
309310> The following section is a draft, and the policy for reviewing is still being discussed in issues such as [#11166](https://github.com/NixOS/nixpkgs/issues/11166) and [#20836](https://github.com/NixOS/nixpkgs/issues/20836).
310311311312The Nixpkgs project receives a fairly high number of contributions via GitHub pull requests. Reviewing and approving these is an important task and a way to contribute to the project.
···384385In order for the `staging` and `staging-next` branches to be up-to-date with the latest commits on `master`, there are regular _automated_ merges from `master` into `staging-next` and `staging`.
385386This is implemented using GitHub workflows [here](.github/workflows/periodic-merge-6h.yml) and [here](.github/workflows/periodic-merge-24h.yml).
386387387387-> **Note**
388388+> [!Note]
388389> Changes must be sufficiently tested before being merged into any branch.
389390> Hydra builds should not be used as testing platform.
390391
+1-1
doc/README.md
···4848## Syntax {#sec-contributing-markup}
4949```
50505151-> **Note**
5151+> [!Note]
5252> NixOS option documentation does not support headings in general.
53535454#### Inline Anchors
···1818in {
1919 name = "lxd-virtual-machine";
20202121- meta = with pkgs.lib.maintainers; {
2222- maintainers = [adamcstephens];
2121+ meta = {
2222+ maintainers = lib.teams.lxc.members;
2323 };
24242525 nodes.machine = {lib, ...}: {
+1-1
pkgs/README.md
···470470471471 in the package expression, attempt build and extract correct hash from error messages.
472472473473- > **Warning**
473473+ > [!Warning]
474474 > You must use one of these four fake hashes and not some arbitrarily-chosen hash.
475475 > See [here][secure-hashes]
476476
···246246 # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
247247 # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
248248 ./patches/angle-wayland-include-protocol.patch
249249+ ] ++ lib.optionals (!chromiumVersionAtLeast "120") [
249250 # We need to revert this patch to build M114+ with LLVM 16:
250251 (githubPatch {
251252 # Reland [clang] Disable autoupgrading debug info in ThinLTO builds
···253254 hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M=";
254255 revert = true;
255256 })
257257+ ] ++ lib.optionals (chromiumVersionAtLeast "120") [
258258+ # We need to revert this patch to build M120+ with LLVM 16:
259259+ ./chromium-120-llvm-16.patch
256260 ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [
257261 # Fix build with at-spi2-core ≥ 2.49
258262 # This version is still needed for electron.
···11-diff --git a/electron/BUILD.gn b/electron/BUILD.gn
22-index c905891eb8..f2cf11fe88 100644
33---- a/electron/BUILD.gn
44-+++ b/electron/BUILD.gn
55-@@ -111,8 +111,6 @@ electron_version = exec_script("script/print-version.py",
66- [],
77- "trim string",
88- [
99-- ".git/packed-refs",
1010-- ".git/HEAD",
1111- "script/lib/get-version.js",
1212- ])
1313-1414-diff --git a/electron/script/lib/get-version.js b/electron/script/lib/get-version.js
1515-index 45a120482b..ddaf8ab60e 100644
1616---- a/electron/script/lib/get-version.js
1717-+++ b/electron/script/lib/get-version.js
1818-@@ -1,22 +1 @@
1919--const { spawnSync } = require('child_process');
2020--const path = require('path');
2121--
2222--module.exports.getElectronVersion = () => {
2323-- // Find the nearest tag to the current HEAD
2424-- // This is equivilant to our old logic of "use a value in package.json" for the following reasons
2525-- //
2626-- // 1. Whenever we updated the package.json we ALSO pushed a tag with the same version
2727-- // 2. Whenever we _reverted_ a bump all we actually did was push a commit that deleted the tag and changed the version number back
2828-- //
2929-- // The only difference in the "git describe" technique is that technically a commit can "change" it's version
3030-- // number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3
3131-- // and after the tag is made rebuilding the same commit will result in it being 1.2.4
3232-- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], {
3333-- cwd: path.resolve(__dirname, '..', '..')
3434-- });
3535-- if (output.status !== 0) {
3636-- console.error(output.stderr);
3737-- throw new Error('Failed to get current electron version');
3838-- }
3939-- return output.stdout.toString().trim().replace(/^v/g, '');
4040--};
4141-+module.exports.getElectronVersion = () => "@version@";
4242-
+2-2
pkgs/development/tools/electron/version.patch
···1616--- a/electron/script/lib/get-version.js
1717+++ b/electron/script/lib/get-version.js
1818@@ -1,22 +1 @@
1919--const { spawnSync } = require('node:child_process');
2020--const path = require('node:path');
1919+-const { spawnSync } = require('child_process');
2020+-const path = require('path');
2121-
2222-module.exports.getElectronVersion = () => {
2323- // Find the nearest tag to the current HEAD
···5566rustPlatform.buildRustPackage rec {
77 pname = "swaysome";
88- version = "2.0.0";
88+ version = "2.1.0";
991010 src = fetchFromGitLab {
1111 owner = "hyask";
1212 repo = pname;
1313 rev = version;
1414- sha256 = "sha256-KmGAp0EPnnM+hPRpUGsbt+NU2v5mcPaRUqo0pqUr1L8=";
1414+ sha256 = "sha256-U5W/9VL1t1/R4ADPxseBV6CMKx04I4vbp7sFmSqRZXk=";
1515 };
16161717- cargoHash = "sha256-9sOR99CaTyMQoGMKP2Cag6YNxmgEqNPE/kiJPziqB9U=";
1717+ cargoHash = "sha256-QA3EQsYgjwx8QX50yaxiJyAPDlpYYqiqLiXco1kJmw0=";
18181919 meta = with lib; {
2020 description = "Helper to make sway behave more like awesomewm";
+1
pkgs/top-level/aliases.nix
···7070 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06
7171 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16
7272 antimicroX = antimicrox; # Added 2021-10-31
7373+ arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26
7374 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13
7475 aseprite-unfree = aseprite; # Added 2023-08-26
7576 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16