1 # Contributing to Nixpkgs
3 This document is for people wanting to contribute to the implementation of Nixpkgs.
4 This involves interacting with implementation changes that are proposed using [GitHub](https://github.com/) [pull requests](https://docs.github.com/pull-requests) to the [Nixpkgs](https://github.com/nixos/nixpkgs/) repository (which you're in right now).
6 As such, a GitHub account is recommended, which you can sign up for [here](https://github.com/signup).
7 See [here](https://discourse.nixos.org/t/about-the-patches-category/477) for how to contribute without a GitHub account.
9 Additionally this document assumes that you already know how to use GitHub and Git.
10 If that's not the case, we recommend learning about it first [here](https://docs.github.com/en/get-started/quickstart/hello-world).
15 This file contains general contributing information, but individual parts also have more specific information to them in their respective `README.md` files, linked here:
16 - [`lib`](./lib/README.md): Sources and documentation of the [library functions](https://nixos.org/manual/nixpkgs/stable/#chap-functions)
17 - [`maintainers`](./maintainers/README.md): Nixpkgs maintainer and team listings, maintainer scripts
18 - [`pkgs`](./pkgs/README.md): Package and [builder](https://nixos.org/manual/nixpkgs/stable/#part-builders) definitions
19 - [`doc`](./doc/README.md): Sources and infrastructure for the [Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/)
20 - [`nixos`](./nixos/README.md): Implementation of [NixOS](https://nixos.org/manual/nixos/stable/)
24 ## How to create pull requests
25 [pr-create]: #how-to-create-pull-requests
27 This section describes in some detail how changes can be made and proposed with pull requests.
30 > Be aware that contributing implies licensing those contributions under the terms of [COPYING](./COPYING), an MIT-like license.
32 0. Set up a local version of Nixpkgs to work with using GitHub and Git
33 1. [Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo#forking-a-repository) the [Nixpkgs repository](https://github.com/nixos/nixpkgs/).
34 1. [Clone the forked repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo#cloning-your-forked-repository) into a local `nixpkgs` directory.
35 1. [Configure the upstream Nixpkgs repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo#configuring-git-to-sync-your-fork-with-the-upstream-repository).
37 1. Figure out the branch that should be used for this change by going through [this section][branch].
38 If in doubt use `master`, that's where most changes should go.
39 This can be changed later by [rebasing][rebase].
41 2. Create and switch to a new Git branch, ideally such that:
42 - The name of the branch hints at the change you'd like to implement, e.g. `update-hello`.
43 - The base of the branch includes the most recent changes on the base branch from step 1, we'll assume `master` here.
46 # Make sure you have the latest changes from upstream Nixpkgs
49 # Create and switch to a new branch based off the master branch in Nixpkgs
50 git switch --create update-hello upstream/master
53 To avoid having to download and build potentially many derivations, at the expense of using a potentially outdated version, you can base the branch off a specific [Git commit](https://www.git-scm.com/docs/gitglossary#def_commit) instead:
54 - The commit of the latest `nixpkgs-unstable` channel, available [here](https://channels.nixos.org/nixpkgs-unstable/git-revision).
55 - The commit of a local Nixpkgs downloaded using [nix-channel](https://nixos.org/manual/nix/stable/command-ref/nix-channel), available using `nix-instantiate --eval --expr '(import <nixpkgs/lib>).trivial.revisionWithDefault null'`
56 - If you're using NixOS, the commit of your NixOS installation, available with `nixos-version --revision`.
58 Once you have an appropriate commit you can use it instead of `upstream/master` in the above command:
60 git switch --create update-hello <the desired base commit>
63 3. Make the desired changes in the local Nixpkgs repository using an editor of your choice.
65 - Adhere to both the [general code conventions][code-conventions], and the code conventions specific to the part you're making changes to.
66 See the [overview section][overview] for more specific information.
68 See the [overview section][overview] for more specific information.
69 - If necessary, document the change.
70 See the [overview section][overview] for more specific information.
72 4. Commit your changes using `git commit`.
73 Make sure to adhere to the [commit conventions](#commit-conventions).
75 Repeat the steps 3-4 as many times as necessary.
76 Advance to the next step if all the commits (viewable with `git log`) make sense together.
78 5. Push your commits to your fork of Nixpkgs.
80 git push --set-upstream origin HEAD
83 The above command will output a link that allows you to directly quickly do the next step:
85 remote: Create a pull request for 'update-hello' on GitHub by visiting:
86 remote: https://github.com/myUser/nixpkgs/pull/new/update-hello
89 6. [Create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request#creating-the-pull-request) from the new branch in your Nixpkgs fork to the upstream Nixpkgs repository.
90 Use the branch from step 2 as the pull requests base branch.
91 Go through the [pull request template](#pull-request-template) in the pre-filled default description.
93 7. Respond to review comments, potential CI failures and potential merge conflicts by updating the pull request.
94 Always keep the pull request in a mergeable state.
96 The custom [OfBorg](https://github.com/NixOS/ofborg) CI system will perform various checks to help ensure code quality, whose results you can see at the bottom of the pull request.
97 See [the OfBorg Readme](https://github.com/NixOS/ofborg#readme) for more details.
99 - To add new commits, repeat steps 3-4 and push the result using
104 - To change existing commits you will have to [rewrite Git history](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History).
105 Useful Git commands that can help a lot with this are `git commit --patch --amend` and `git rebase --interactive`.
106 With a rewritten history you need to force-push the commits using
108 git push --force-with-lease
111 - In case of merge conflicts you will also have to [rebase the branch](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) on top of current `master`.
112 Sometimes this can be done [on GitHub directly](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch#updating-your-pull-request-branch), but if not you will have to rebase locally using
115 git rebase upstream/master
116 git push --force-with-lease
119 - If you need to change the base branch of the pull request, you can do so by [rebasing][rebase].
121 8. If your pull request is merged and [acceptable for releases][release-acceptable] you may [backport][pr-backport] the pull request.
123 ### Pull request template
124 [pr-template]: #pull-request-template
126 The pull request template helps determine what steps have been made for a contribution so far, and will help guide maintainers on the status of a change. The motivation section of the PR should include any extra details the title does not address and link any existing issues related to the pull request.
128 When a PR is created, it will be pre-populated with some checkboxes detailed below:
130 #### Tested using sandboxing
132 When sandbox builds are enabled, Nix will set up an isolated environment for each build process.
133 It is used to remove further hidden dependencies set by the build environment to improve reproducibility.
134 This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store.
135 Depending on the operating system, access to other resources is blocked as well (e.g., inter-process communication is isolated on Linux); see [sandbox](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-sandbox) in the Nix manual for details.
137 In pull requests for [nixpkgs](https://github.com/NixOS/nixpkgs/) people are asked to test builds with sandboxing enabled (see `Tested using sandboxing` in the pull request template) because in [Hydra](https://nixos.org/hydra/) sandboxing is also used.
139 If you are on Linux, sandboxing is enabled by default.
140 On other platforms, sandboxing is disabled by default due to a small performance hit on each build.
142 Please enable sandboxing **before** building the package by adding the following to: `/etc/nix/nix.conf`:
148 #### Built on platform(s)
150 Many Nix packages are designed to run on multiple platforms. As such, it’s important to let the maintainer know which platforms your changes have been tested on. It’s not always practical to test a change on all platforms, and is not required for a pull request to be merged. Only check the systems you tested the build on in this section.
152 #### Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
154 Packages with automated tests are much more likely to be merged in a timely fashion because it doesn’t require as much manual testing by the maintainer to verify the functionality of the package. If there are existing tests for the package, they should be run to verify your changes do not break the tests. Tests can only be run on Linux. For more details on writing and running tests, see the [section in the NixOS manual](https://nixos.org/nixos/manual/index.html#sec-nixos-tests).
156 #### Tested compilation of all pkgs that depend on this change using `nixpkgs-review`
158 If you are modifying a package, you can use `nixpkgs-review` to make sure all packages that depend on the updated package still compile correctly. The `nixpkgs-review` utility can look for and build all dependencies either based on uncommitted changes with the `wip` option or specifying a GitHub pull request number.
160 Review changes from pull request number 12345:
163 nix-shell -p nixpkgs-review --run "nixpkgs-review pr 12345"
166 Alternatively, with flakes (and analogously for the other commands below):
169 nix run nixpkgs#nixpkgs-review -- pr 12345
172 Review uncommitted changes:
175 nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
178 Review changes from last commit:
181 nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
184 #### Tested execution of all binary files (usually in `./result/bin/`)
186 It’s important to test any executables generated by a build when you change or create a package in nixpkgs. This can be done by looking in `./result/bin` and running any files in there, or at a minimum, the main executable for the package. For example, if you make a change to texlive, you probably would only check the binaries associated with the change you made rather than testing all of them.
188 #### Meets Nixpkgs contribution standards
190 The last checkbox is about whether it fits the guidelines in this `CONTRIBUTING.md` file. This document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc... Everyone should read and understand the standards the community has for contributing before submitting a pull request.
192 ### Rebasing between branches (i.e. from master to staging)
193 [rebase]: #rebasing-between-branches-ie-from-master-to-staging
195 From time to time, changes between branches must be rebased, for example, if the
196 number of new rebuilds they would cause is too large for the target branch. When
197 rebasing, care must be taken to include only the intended changes, otherwise
198 many CODEOWNERS will be inadvertently requested for review. To achieve this,
199 rebasing should not be performed directly on the target branch, but on the merge
200 base between the current and target branch. As an additional precautionary measure,
201 you should temporarily mark the PR as draft for the duration of the operation.
202 This reduces the probability of mass-pinging people. (OfBorg might still
203 request a couple of persons for reviews though.)
205 In the following example, we assume that the current branch, called `feature`,
206 is based on `master`, and we rebase it onto the merge base between
207 `master` and `staging` so that the PR can eventually be retargeted to
208 `staging` without causing a mess. The example uses `upstream` as the remote for `NixOS/nixpkgs.git`
209 while `origin` is the remote you are pushing to.
213 # Rebase your commits onto the common merge base
214 git rebase --onto upstream/staging... upstream/master
215 # Force push your changes
216 git push origin feature --force-with-lease
219 The syntax `upstream/staging...` is equivalent to `upstream/staging...HEAD` and
220 stands for the merge base between `upstream/staging` and `HEAD` (hence between
221 `upstream/staging` and `upstream/master`).
223 Then change the base branch in the GitHub PR using the *Edit* button in the upper
224 right corner, and switch from `master` to `staging`. *After* the PR has been
225 retargeted it might be necessary to do a final rebase onto the target branch, to
226 resolve any outstanding merge conflicts.
229 # Rebase onto target branch
230 git rebase upstream/staging
231 # Review and fixup possible conflicts
233 # Force push your changes
234 git push origin feature --force-with-lease
237 #### Something went wrong and a lot of people were pinged
239 It happens. Remember to be kind, especially to new contributors.
240 There is no way back, so the pull request should be closed and locked
241 (if possible). The changes should be re-submitted in a new PR, in which the people
242 originally involved in the conversation need to manually be pinged again.
243 No further discussion should happen on the original PR, as a lot of people
244 are now subscribed to it.
246 The following message (or a version thereof) might be left when closing to
247 describe the situation, since closing and locking without any explanation
251 It looks like you accidentally mass-pinged a bunch of people, which are now subscribed
252 and getting notifications for everything in this pull request. Unfortunately, they
253 cannot be automatically unsubscribed from the issue (removing review request does not
254 unsubscribe), therefore development cannot continue in this pull request anymore.
256 Please open a new pull request with your changes, link back to this one and ping the
257 people actually involved in here over there.
259 In order to avoid this in the future, there are instructions for how to properly
260 rebase between branches in our [contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging).
261 Setting your pull request to draft prior to rebasing is strongly recommended.
262 In draft status, you can preview the list of people that are about to be requested
263 for review, which allows you to sidestep this issue.
264 This is not a bulletproof method though, as OfBorg still does review requests even on draft PRs.
267 ## How to backport pull requests
268 [pr-backport]: #how-to-backport-pull-requests
270 Once a pull request has been merged into `master`, a backport pull request to the corresponding `release-YY.MM` branch can be created either automatically or manually.
272 ### Automatically backporting changes
275 > You have to be a [Nixpkgs maintainer](./maintainers) to automatically create a backport pull request.
277 Add the [`backport release-YY.MM` label](https://github.com/NixOS/nixpkgs/labels?q=backport) to the pull request on the `master` branch.
278 This will cause [a GitHub Action](.github/workflows/backport.yml) to open a pull request to the `release-YY.MM` branch a few minutes later.
279 This can be done on both open or already merged pull requests.
281 ### Manually backporting changes
283 To manually create a backport pull request, follow [the standard pull request process][pr-create], with these notable differences:
285 - Use `release-YY.MM` for the base branch, both for the local branch and the pull request.
288 > Do not use the `nixos-YY.MM` branch, that is a branch pointing to the tested release channel commit
290 - 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.
291 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.
292 Here is [an example](https://github.com/nixos/nixpkgs/commit/5688c39af5a6c5f3d646343443683da880eaefb8) of this.
295 > Ensure the commits exists on the master branch.
296 > 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.
298 - In the pull request description, link to the original pull request to `master`.
299 The pull request title should include `[YY.MM]` matching the release you're backporting to.
301 - When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request.
302 This way maintainers can keep track of missing backports easier.
304 ## How to review pull requests
305 [pr-review]: #how-to-review-pull-requests
308 > 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).
310 The 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.
312 The high change rate of Nixpkgs makes any pull request that remains open for too long subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being responsive to the comments is the key to avoid this issue. GitHub provides sort filters that can be used to see the [most recently](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) and the [least recently](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc) updated pull requests. We highly encourage looking at [this list of ready to merge, unreviewed pull requests](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone).
314 When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important to respect every community member and their work.
316 GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution.
318 Pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
320 All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking.
322 To get more information about how to review specific parts of Nixpkgs, refer to the documents linked to in the [overview section][overview].
324 If a pull request contains documentation changes that might require feedback from the documentation team, ping [@NixOS/documentation-team](https://github.com/orgs/nixos/teams/documentation-team) on the pull request.
326 If you consider having enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic. They will give you information about the reviewing process. The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints.
328 Container system, boot system and library changes are some examples of the pull requests fitting this category.
330 ## How to merge pull requests
331 [pr-merge]: #how-to-merge-pull-requests
333 To streamline automated updates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge`. The bot will verify if the following conditions are met, refusing to merge otherwise:
335 - the commenter that issued the command should be among the package maintainers;
336 - the package should reside in `pkgs/by-name`.
338 Further, nixpkgs-merge-bot will ensure all ofBorg checks (except the Darwin-related ones) are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofBorg to finish before attempting the merge again.
340 For other pull requests, the *Nixpkgs committers* are people who have been given
343 It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests.
345 In case the PR is stuck waiting for the original author to apply a trivial
346 change (a typo, capitalisation change, etc.) and the author allowed the members
347 to modify the PR, consider applying it yourself (or commit the existing review
348 suggestion). You should pay extra attention to make sure the addition doesn't go
349 against the idea of the original PR and would not be opposed by the author.
352 The following paragraphs about how to deal with unactive contributors is just a proposition and should be modified to what the community agrees to be the right policy.
354 Please note that contributors with commit rights unactive for more than three months will have their commit rights revoked.
357 Please see the discussion in [GitHub nixpkgs issue #50105](https://github.com/NixOS/nixpkgs/issues/50105) for information on how to proceed to be granted this level of access.
359 In a case a contributor definitively leaves the Nix community, they should create an issue or post on [Discourse](https://discourse.nixos.org) with references of packages and modules they maintain so the maintainership can be taken over by other contributors.
361 # Flow of merged pull requests
363 After a pull request is merged, it eventually makes it to the [official Hydra CI](https://hydra.nixos.org/).
364 Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](https://channels.nixos.org/) when specific Hydra jobs succeeded.
365 See [Nix Channel Status](https://status.nixos.org/) for the current channels and their state.
366 Here's a brief overview of the main Git branches and what channels they're used for:
368 - `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`.
369 - `release-YY.MM` (e.g. `release-24.05`): The NixOS release branches, used for the stable channels such as `nixos-24.05`, `nixos-24.05-small` and `nixpkgs-24.05-darwin`.
371 When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit.
372 So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable).
374 Nixpkgs in its entirety is tied to the NixOS release process, which is documented in the [NixOS Release Wiki](https://nixos.github.io/release-wiki/).
376 See [this section][branch] to know when to use the release branches.
381 The staging workflow exists to batch Hydra builds of many packages together.
382 It is coordinated in the [Staging room](https://matrix.to/#/#staging:nixos.org) on Matrix.
384 It works by directing commits that cause [mass rebuilds][mass-rebuild] to a separate `staging` branch that isn't directly built by Hydra.
385 Regularly, the `staging` branch is _manually_ merged into a `staging-next` branch to be built by Hydra using the [`nixpkgs:staging-next` jobset](https://hydra.nixos.org/jobset/nixpkgs/staging-next).
386 The `staging-next` branch should then only receive changes that fix Hydra builds;
387 **for anything else, ask the [Staging room](https://matrix.to/#/#staging:nixos.org) first**.
388 Once it is verified that there are no major regressions, it is merged into `master` using [a pull request](https://github.com/NixOS/nixpkgs/pulls?q=head%3Astaging-next).
389 This is done manually in order to ensure it's a good use of Hydra's computing resources.
390 By keeping the `staging-next` branch separate from `staging`, this batching does not block developers from merging changes into `staging`.
392 In 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`.
393 This is implemented using GitHub workflows [here](.github/workflows/periodic-merge-6h.yml) and [here](.github/workflows/periodic-merge-24h.yml).
396 > Changes must be sufficiently tested before being merged into any branch.
397 > Hydra builds should not be used as testing platform.
399 Here is a Git history diagram showing the flow of commits between the three branches:
404 'gitInv0': '#ff0000',
405 'gitInv1': '#ff0000',
407 'commitLabelFontSize': '15px'
410 'showCommitLabel':true,
411 'mainBranchName': 'master',
412 'rotateCommitLabel': true
424 checkout staging-next
425 merge master id:"automatic"
427 merge staging-next id:"automatic "
429 checkout staging-next
430 merge staging type:HIGHLIGHT id:"manual"
437 checkout staging-next
438 merge master id:"automatic "
440 merge staging-next id:"automatic "
442 checkout staging-next
445 merge staging-next type:HIGHLIGHT id:"manual (PR)"
449 Here's an overview of the different branches:
451 | branch | `master` | `staging-next` | `staging` |
452 | --- | --- | --- | --- |
453 | Used for development | ✔️ | ❌ | ✔️ |
454 | Built by Hydra | ✔️ | ✔️ | ❌ |
455 | [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ |
456 | Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ |
457 | Automatically merged into | `staging-next` | `staging` | - |
458 | Manually merged into | - | `master` | `staging-next` |
460 The staging workflow is used for all main branches, `master` and `release-YY.MM`, with corresponding names:
461 - `master`/`release-YY.MM`
462 - `staging`/`staging-YY.MM`
463 - `staging-next`/`staging-next-YY.MM`
467 ## Branch conventions
468 <!-- This section is relevant to both contributors and reviewers -->
469 [branch]: #branch-conventions
471 Most changes should go to the `master` branch, but sometimes other branches should be used instead.
472 Use the following decision process to figure out which one it should be:
474 Is the change [acceptable for releases][release-acceptable] and do you wish to have the change in the release?
475 - No: Use the `master` branch, do not backport the pull request.
476 - Yes: Can the change be implemented the same way on the `master` and release branches?
477 For example, a packages major version might differ between the `master` and release branches, such that separate security patches are required.
478 - Yes: Use the `master` branch and [backport the pull request](#how-to-backport-pull-requests).
479 - No: Create separate pull requests to the `master` and `release-XX.YY` branches.
481 Furthermore, if the change causes a [mass rebuild][mass-rebuild], use the appropriate staging branch instead:
482 - Mass rebuilds to `master` should go to `staging` instead.
483 - Mass rebuilds to `release-XX.YY` should go to `staging-XX.YY` instead.
485 See [this section][staging] for more details about such changes propagate between the branches.
487 ### Changes acceptable for releases
488 [release-acceptable]: #changes-acceptable-for-releases
490 Only changes to supported releases may be accepted.
491 The oldest supported release (`YYMM`) can be found using
493 nix-instantiate --eval -A lib.trivial.oldestSupportedRelease
496 The release branches should generally only receive backwards-compatible changes, both for the Nix expressions and derivations.
497 Here are some examples of backwards-compatible changes that are okay to backport:
498 - ✔️ New packages, modules and functions
500 - ✔️ Package version updates
501 - ✔️ Patch versions with fixes
502 - ✔️ Minor versions with new functionality, but no breaking changes
504 In addition, major package version updates with breaking changes are also acceptable for:
505 - ✔️ Services that would fail without up-to-date client software, such as `spotify`, `steam`, and `discord`
506 - ✔️ Security critical applications, such as `firefox` and `chromium`
508 ### Changes causing mass rebuilds
509 [mass-rebuild]: #changes-causing-mass-rebuilds
511 Which changes cause mass rebuilds is not formally defined.
512 In order to help the decision, CI automatically assigns [`rebuild` labels](https://github.com/NixOS/nixpkgs/labels?q=rebuild) to pull requests based on the number of packages they cause rebuilds for.
513 As a rule of thumb, if the number of rebuilds is **over 500**, it can be considered a mass rebuild.
514 To get a sense for what changes are considered mass rebuilds, see [previously merged pull requests to the staging branches](https://github.com/NixOS/nixpkgs/issues?q=base%3Astaging+-base%3Astaging-next+is%3Amerged).
516 ## Commit conventions
517 [commit-conventions]: #commit-conventions
519 - Create a commit for each logical unit.
521 - Check for unnecessary whitespace with `git diff --check` before committing.
523 - If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`.
524 See [Squashing Commits](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#_squashing) for additional information.
526 - For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message).
528 - When adding yourself as maintainer in the same pull request, make a separate
529 commit with the message `maintainers: add <handle>`.
530 Add the commit before those making changes to the package or module.
531 See [Nixpkgs Maintainers](./maintainers/README.md) for details.
533 - Make sure you read about any commit conventions specific to the area you're touching. See:
534 - [Commit conventions](./pkgs/README.md#commit-conventions) for changes to `pkgs`.
535 - [Commit conventions](./lib/README.md#commit-conventions) for changes to `lib`.
536 - [Commit conventions](./nixos/README.md#commit-conventions) for changes to `nixos`.
537 - [Commit conventions](./doc/README.md#commit-conventions) for changes to `doc`, the Nixpkgs manual.
539 ### Writing good commit messages
541 In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work.
543 Package version upgrades usually allow for simpler commit messages, including attribute name, old and new version, as well as a reference to the relevant release notes/changelog. Every once in a while a package upgrade requires more extensive changes, and that subsequently warrants a more verbose message.
545 Pull requests should not be squash merged in order to keep complete commit messages and GPG signatures intact and must not be when the change doesn't make sense as a single commit.
548 [code-conventions]: #code-conventions
552 If you removed packages or made some major NixOS changes, write about it in the release notes for the next stable release in [`nixos/doc/manual/release-notes`](./nixos/doc/manual/release-notes).
554 ### File naming and organisation
556 Names of files and directories should be in lowercase, with dashes between words — not in camel case. For instance, it should be `all-packages.nix`, not `allPackages.nix` or `AllPackages.nix`.
560 - Use 2 spaces of indentation per indentation level in Nix expressions, 4 spaces in shell scripts.
562 - Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use `(setq-default indent-tabs-mode nil)` in Emacs. Everybody has different tab settings so it’s asking for trouble.
564 - Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [package naming](./pkgs/README.md#package-naming).
566 - Function calls with attribute set arguments are written as
589 if it's a short call.
591 - In attribute sets or lists that span multiple lines, the attribute names or list elements should be aligned:
602 # A long attribute set.
606 if true then big_expr else big_expr;
623 - Short lists or attribute sets can be written on one line:
628 list = [ elem1 elem2 elem3 ];
631 attrs = { x = 1280; y = 1024; };
635 - Breaking in the middle of a function argument can give hard-to-read code, like
638 someFunction { x = 1280;
643 (especially if the argument is very large, spanning multiple lines).
649 { x = 1280; y = 1024; }
657 let res = { x = 1280; y = 1024; };
658 in someFunction res otherArg yetAnotherArg
661 - The bodies of functions, asserts, and withs are not indented to prevent a lot of superfluous indentation levels, i.e.
665 assert system == "i686-linux";
666 stdenv.mkDerivation { /* ... */ }
673 assert system == "i686-linux";
674 stdenv.mkDerivation { /* ... */ }
677 - Function formal arguments are written as:
680 { arg1, arg2, arg3 }: { /* ... */ }
683 but if they don't fit on one line they're written as:
693 - Functions should list their expected arguments as precisely as possible. That is, write
696 { stdenv, fetchurl, perl }: <...>
702 args: with args; <...>
708 { stdenv, fetchurl, perl, ... }: <...>
711 For functions that are truly generic in the number of arguments (such as wrappers around `mkDerivation`) that have some required arguments, you should write them using an `@`-pattern:
714 { stdenv, doCoverageAnalysis ? false, ... } @ args:
716 stdenv.mkDerivation (args // {
717 foo = if doCoverageAnalysis then "bla" else "";
726 args.stdenv.mkDerivation (args // {
727 foo = if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "";
731 - Unnecessary string conversions should be avoided. Do
747 - Building lists conditionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`.
751 buildInputs = lib.optional stdenv.isDarwin iconv;
759 buildInputs = if stdenv.isDarwin then [ iconv ] else null;
763 As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
764 If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.