22412 files changed+520864−1037084
19412 more files changed are not listed.
.editorconfig+14−5
@@ -55,23 +55,25 @@ trim_trailing_whitespace = unset
5555[*.lock]
5656indent_size = unset
5757
58−# trailing whitespace is an actual syntax element of classic Markdown/
59−# CommonMark to enforce a line break
60−[*.md]
61−trim_trailing_whitespace = unset
62−
6358[eggs.nix]
6459trim_trailing_whitespace = unset
6560
6661[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
6762trim_trailing_whitespace = unset
6863
64+[nixos/tests/systemd-networkd-vrf.nix]
65+trim_trailing_whitespace = unset
66+
6967[pkgs/build-support/dotnetenv/Wrapper/**]
7068end_of_line = unset
7169indent_style = unset
7270insert_final_newline = unset
7371trim_trailing_whitespace = unset
7472
73+[pkgs/build-support/upstream-updater/**]
74+indent_style = unset
75+trim_trailing_whitespace = unset
76+
7577[pkgs/development/compilers/elm/registry.dat]
7678end_of_line = unset
7779insert_final_newline = unset
@@ -85,3 +87,10 @@ trim_trailing_whitespace = unset
8587
8688[pkgs/tools/misc/timidity/timidity.cfg]
8789trim_trailing_whitespace = unset
90+
91+[pkgs/tools/security/enpass/data.json]
92+insert_final_newline = unset
93+trim_trailing_whitespace = unset
94+
95+[pkgs/top-level/emscripten-packages.nix]
96+trim_trailing_whitespace = unset
.git-blame-ignore-revsdeleted−32
@@ -1,32 +0,0 @@
1−# This file contains a list of commits that are not likely what you
2−# are looking for in a blame, such as mass reformatting or renaming.
3−# You can set this file as a default ignore file for blame by running
4−# the following command.
5−#
6−# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
7−#
8−# To temporarily not use this file add
9−# --ignore-revs-file=""
10−# to your blame command.
11−#
12−# The ignoreRevsFile can't be set globally due to blame failing if the file isn't present.
13−# To not have to set the option in every repository it is needed in,
14−# save the following script in your path with the name "git-bblame"
15−# now you can run
16−# $ git bblame $FILE
17−# to use the .git-blame-ignore-revs file if it is present.
18−#
19−# #!/usr/bin/env bash
20−# repo_root=$(git rev-parse --show-toplevel)
21−# if [[ -e $repo_root/.git-blame-ignore-revs ]]; then
22−# git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@
23−# else
24−# git blame $@
25−# fi
26−
27−
28−# nixos/modules/rename: Sort alphabetically
29−1f71224fe86605ef4cd23ed327b3da7882dad382
30−
31−# nixos: fix module paths in rename.nix
32−d08ede042b74b8199dc748323768227b88efcf7c
.github/CODEOWNERS+53−116
@@ -6,10 +6,6 @@
66#
77# For documentation on this file, see https://help.github.com/articles/about-codeowners/
88# Mentioned users will get code review requests.
9−#
10−# IMPORTANT NOTE: in order to actually get pinged, commit access is required.
11−# This also holds true for GitHub teams. Since almost none of our teams have write
12−# permissions, you need to list all members of the team with commit access individually.
139
1410# This file
1511/.github/CODEOWNERS @edolstra
@@ -23,7 +19,7 @@
2319
2420# Libraries
2521/lib @edolstra @nbp @infinisil
26−/lib/systems @alyssais @nbp @ericson2314 @matthewbauer
22+/lib/systems @nbp @ericson2314 @matthewbauer
2723/lib/generators.nix @edolstra @nbp @Profpatsch
2824/lib/cli.nix @edolstra @nbp @Profpatsch
2925/lib/debug.nix @edolstra @nbp @Profpatsch
@@ -38,25 +34,19 @@
3834/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
3935/pkgs/stdenv/generic @Ericson2314 @matthewbauer
4036/pkgs/stdenv/cross @Ericson2314 @matthewbauer
41−/pkgs/build-support/cc-wrapper @Ericson2314
42−/pkgs/build-support/bintools-wrapper @Ericson2314
37+/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
38+/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
4339/pkgs/build-support/setup-hooks @Ericson2314
44−/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
45−/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
40+/pkgs/build-support/setup-hooks/auto-patchelf.sh @aszlig
4641
4742# Nixpkgs build-support
4843/pkgs/build-support/writers @lassulus @Profpatsch
4944
50−# Nixpkgs documentation
51−/maintainers/scripts/db-to-md.sh @jtojnar @ryantm
52−/maintainers/scripts/doc @jtojnar @ryantm
53−/doc/build-aux/pandoc-filters @jtojnar
54−/doc/contributing/contributing-to-documentation.chapter.md @jtojnar
55−
5645# NixOS Internals
5746/nixos/default.nix @nbp @infinisil
5847/nixos/lib/from-env.nix @nbp @infinisil
5948/nixos/lib/eval-config.nix @nbp @infinisil
49+/nixos/doc @ryantm
6050/nixos/doc/manual/configuration/abstractions.xml @nbp
6151/nixos/doc/manual/configuration/config-file.xml @nbp
6252/nixos/doc/manual/configuration/config-syntax.xml @nbp
@@ -70,17 +60,10 @@
7060/nixos/doc/manual/development/writing-modules.xml @nbp
7161/nixos/doc/manual/man-nixos-option.xml @nbp
7262/nixos/modules/installer/tools/nixos-option.sh @nbp
73−/nixos/modules/system @dasJ
7463
7564# NixOS integration test driver
7665/nixos/lib/test-driver @tfc
7766
78−# Systemd
79−/nixos/modules/system/boot/systemd.nix @NixOS/systemd
80−/nixos/modules/system/boot/systemd @NixOS/systemd
81−/nixos/lib/systemd-*.nix @NixOS/systemd
82−/pkgs/os-specific/linux/systemd @NixOS/systemd
83−
8467# Updaters
8568## update.nix
8669/maintainers/scripts/update.nix @jtojnar
@@ -95,25 +78,26 @@
9578/pkgs/development/python-modules @FRidh @jonringer
9679/doc/languages-frameworks/python.section.md @FRidh
9780/pkgs/development/tools/poetry2nix @adisbladis
98−/pkgs/development/interpreters/python/hooks @FRidh @jonringer
81+/pkgs/development/interpreters/python/hooks @FRidh @jonringer @DavHau
82+/pkgs/development/interpreters/python/conda @DavHau
9983
10084# Haskell
101−/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @expipiplus1
102−/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn @expipiplus1
103−/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn @expipiplus1
104−/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn @expipiplus1
105−/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn @expipiplus1
106−/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn @expipiplus1
107−/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1
85+/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn
86+/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn
87+/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn
88+/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn
89+/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn
90+/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn
91+/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn
10892
10993# Perl
110−/pkgs/development/interpreters/perl @stigtsp @zakame
111−/pkgs/top-level/perl-packages.nix @stigtsp @zakame
112−/pkgs/development/perl-modules @stigtsp @zakame
94+/pkgs/development/interpreters/perl @volth @stigtsp
95+/pkgs/top-level/perl-packages.nix @volth @stigtsp
96+/pkgs/development/perl-modules @volth @stigtsp
11397
11498# R
115−/pkgs/applications/science/math/R @jbedo
116−/pkgs/development/r-modules @jbedo
99+/pkgs/applications/science/math/R @peti
100+/pkgs/development/r-modules @peti
117101
118102# Ruby
119103/pkgs/development/interpreters/ruby @marsam
@@ -121,8 +105,11 @@
121105
122106# Rust
123107/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq
124−/pkgs/build-support/rust @zowoq
125−/doc/languages-frameworks/rust.section.md @zowoq
108+/pkgs/build-support/rust @andir @danieldk @zowoq
109+
110+# Darwin-related
111+/pkgs/stdenv/darwin @NixOS/darwin-maintainers
112+/pkgs/os-specific/darwin @NixOS/darwin-maintainers
126113
127114# C compilers
128115/pkgs/development/compilers/gcc @matthewbauer
@@ -132,14 +119,14 @@
132119/pkgs/top-level/unix-tools.nix @matthewbauer
133120/pkgs/development/tools/xcbuild @matthewbauer
134121
135−# Audio
136−/nixos/modules/services/audio/botamusique.nix @mweinelt
137−/nixos/modules/services/audio/snapserver.nix @mweinelt
138−/nixos/tests/modules/services/audio/botamusique.nix @mweinelt
139−/nixos/tests/snapcast.nix @mweinelt
140−
141−# Browsers
142−/pkgs/applications/networking/browsers/firefox @mweinelt
122+# Beam-related (Erlang, Elixir, LFE, etc)
123+/pkgs/development/beam-modules @gleber
124+/pkgs/development/interpreters/erlang @gleber
125+/pkgs/development/interpreters/lfe @gleber
126+/pkgs/development/interpreters/elixir @gleber
127+/pkgs/development/tools/build-managers/rebar @gleber
128+/pkgs/development/tools/build-managers/rebar3 @gleber
129+/pkgs/development/tools/erlang @gleber
143130
144131# Jetbrains
145132/pkgs/applications/editors/jetbrains @edwtjo
@@ -167,30 +154,12 @@
167154/nixos/tests/hardened.nix @joachifm
168155/pkgs/os-specific/linux/kernel/hardened-config.nix @joachifm
169156
170−# Home Automation
171−/nixos/modules/services/misc/home-assistant.nix @mweinelt
172−/nixos/modules/services/misc/zigbee2mqtt.nix @mweinelt
173−/nixos/tests/home-assistant.nix @mweinelt
174−/nixos/tests/zigbee2mqtt.nix @mweinelt
175−/pkgs/servers/home-assistant @mweinelt
176−/pkgs/tools/misc/esphome @mweinelt
177−
178157# Network Time Daemons
179158/pkgs/tools/networking/chrony @thoughtpolice
180159/pkgs/tools/networking/ntp @thoughtpolice
181160/pkgs/tools/networking/openntpd @thoughtpolice
182161/nixos/modules/services/networking/ntp @thoughtpolice
183162
184−# Network
185−/pkgs/tools/networking/kea/default.nix @mweinelt
186−/pkgs/tools/networking/babeld/default.nix @mweinelt
187−/nixos/modules/services/networking/babeld.nix @mweinelt
188−/nixos/modules/services/networking/kea.nix @mweinelt
189−/nixos/modules/services/networking/knot.nix @mweinelt
190−/nixos/tests/babeld.nix @mweinelt
191−/nixos/tests/kea.nix @mweinelt
192−/nixos/tests/knot.nix @mweinelt
193−
194163# Dhall
195164/pkgs/development/dhall-modules @Gabriel439 @Profpatsch @ehmry
196165/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry
@@ -199,7 +168,7 @@
199168/pkgs/development/idris-modules @Infinisil
200169
201170# Bazel
202−/pkgs/development/tools/build-managers/bazel @Profpatsch
171+/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch
203172
204173# NixOS modules for e-mail and dns services
205174/nixos/modules/services/mail/mailman.nix @peti
@@ -208,18 +177,18 @@
208177/nixos/modules/services/mail/rspamd.nix @peti
209178
210179# Emacs
211−/pkgs/applications/editors/emacs/elisp-packages @adisbladis
212−/pkgs/applications/editors/emacs @adisbladis
213−/pkgs/top-level/emacs-packages.nix @adisbladis
180+/pkgs/applications/editors/emacs-modes @adisbladis
181+/pkgs/applications/editors/emacs @adisbladis
182+/pkgs/top-level/emacs-packages.nix @adisbladis
214183
215184# Neovim
216185/pkgs/applications/editors/neovim @jonringer @teto
217186
218187# VimPlugins
219−/pkgs/applications/editors/vim/plugins @jonringer
188+/pkgs/misc/vim-plugins @jonringer @softinio
220189
221190# VsCode Extensions
222−/pkgs/applications/editors/vscode/extensions @jonringer
191+/pkgs/misc/vscode-extensions @jonringer
223192
224193# Prometheus exporter modules and tests
225194/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz
@@ -227,65 +196,33 @@
227196/nixos/tests/prometheus-exporters.nix @WilliButz
228197
229198# PHP interpreter, packages, extensions, tests and documentation
230−/doc/languages-frameworks/php.section.md @aanderse @etu @globin @ma27 @talyz
231−/nixos/tests/php @aanderse @etu @globin @ma27 @talyz
232−/pkgs/build-support/build-pecl.nix @aanderse @etu @globin @ma27 @talyz
233−/pkgs/development/interpreters/php @jtojnar @aanderse @etu @globin @ma27 @talyz
234−/pkgs/development/php-packages @aanderse @etu @globin @ma27 @talyz
235−/pkgs/top-level/php-packages.nix @jtojnar @aanderse @etu @globin @ma27 @talyz
199+/doc/languages-frameworks/php.section.md @NixOS/php
200+/nixos/tests/php @NixOS/php
201+/pkgs/build-support/build-pecl.nix @NixOS/php
202+/pkgs/development/interpreters/php @NixOS/php
203+/pkgs/development/php-packages @NixOS/php
204+/pkgs/top-level/php-packages.nix @NixOS/php
236205
237206# Podman, CRI-O modules and related
238−/nixos/modules/virtualisation/containers.nix @zowoq @adisbladis
239−/nixos/modules/virtualisation/cri-o.nix @zowoq @adisbladis
240−/nixos/modules/virtualisation/podman @zowoq @adisbladis
241−/nixos/tests/cri-o.nix @zowoq @adisbladis
242−/nixos/tests/podman @zowoq @adisbladis
207+/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq
208+/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq
209+/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq
210+/nixos/tests/cri-o.nix @NixOS/podman @zowoq
211+/nixos/tests/podman.nix @NixOS/podman @zowoq
243212
244213# Docker tools
245−/pkgs/build-support/docker @roberth
246−/nixos/tests/docker-tools* @roberth
247−/doc/builders/images/dockertools.section.md @roberth
214+/pkgs/build-support/docker @roberth @utdemir
215+/nixos/tests/docker-tools-overlay.nix @roberth
216+/nixos/tests/docker-tools.nix @roberth
217+/doc/builders/images/dockertools.xml @roberth
248218
249219# Blockchains
250220/pkgs/applications/blockchains @mmahut @RaghavSood
251221
252222# Go
253−/doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq
254223/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq
255224/pkgs/development/go-modules @kalbasit @Mic92 @zowoq
256225/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
257226
258−# GNOME
259−/pkgs/desktops/gnome @jtojnar @hedning
260−/pkgs/desktops/gnome/extensions @piegamesde @jtojnar @hedning
261−
262227# Cinnamon
263228/pkgs/desktops/cinnamon @mkg20001
264−
265−# nim
266−/pkgs/development/compilers/nim @ehmry
267−/pkgs/development/nim-packages @ehmry
268−/pkgs/top-level/nim-packages.nix @ehmry
269−
270−# terraform providers
271−/pkgs/applications/networking/cluster/terraform-providers @zowoq
272−
273−# kubernetes
274−/nixos/doc/manual/configuration/kubernetes.chapter.md @zowoq
275−/nixos/modules/services/cluster/kubernetes @zowoq
276−/nixos/tests/kubernetes @zowoq
277−/pkgs/applications/networking/cluster/kubernetes @zowoq
278−
279−# Matrix
280−/pkgs/servers/heisenbridge @piegamesde
281−/pkgs/servers/matrix-conduit @piegamesde
282−/pkgs/servers/matrix-synapse/matrix-appservice-irc @piegamesde
283−/nixos/modules/services/misc/heisenbridge.nix @piegamesde
284−/nixos/modules/services/misc/matrix-appservice-irc.nix @piegamesde
285−/nixos/modules/services/misc/matrix-conduit.nix @piegamesde
286−/nixos/tests/matrix-appservice-irc.nix @piegamesde
287−/nixos/tests/matrix-conduit.nix @piegamesde
288−
289−# Dotnet
290−/pkgs/build-support/dotnet @IvarWithoutBones
291−/pkgs/development/compilers/dotnet @IvarWithoutBones
.github/CONTRIBUTING.mdnew file+64
@@ -0,0 +1,64 @@
1+# How to contribute
2+
3+Note: contributing implies licensing those contributions
4+under the terms of [COPYING](../COPYING), which is an MIT-like license.
5+
6+## Opening issues
7+
8+* Make sure you have a [GitHub account](https://github.com/signup/free)
9+* Make sure there is no open issue on the topic
10+* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and fill out the template
11+
12+## Submitting changes
13+
14+* Format the commit messages in the following way:
15+
16+ ```
17+ (pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
18+
19+ (Motivation for change. Additional information.)
20+ ```
21+
22+ 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).
23+
24+ Examples:
25+
26+ * nginx: init at 2.0.1
27+ * firefox: 54.0.1 -> 55.0
28+ * nixos/hydra: add bazBaz option
29+
30+ Dual baz behavior is needed to do foo.
31+ * nixos/nginx: refactor config generation
32+
33+ The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
34+
35+* `meta.description` should:
36+ * Be capitalized.
37+ * Not start with the package name.
38+ * Not have a period at the end.
39+* `meta.license` must be set and fit the upstream license.
40+ * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
41+* `meta.maintainers` must be set.
42+
43+See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
44+
45+## Writing good commit messages
46+
47+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.
48+
49+For package version upgrades and such a one-line commit message is usually sufficient.
50+
51+## Backporting changes
52+
53+Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
54+
55+1. Take note of the commits in which the change was introduced into `master` branch.
56+2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like `nixos-20.09` or `nixpkgs-20.09`.
57+3. Create a branch for your change, e.g. `git checkout -b backport`.
58+4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; 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.
59+5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
60+6. 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. This way maintainers can keep track of missing backports easier.
61+
62+## Reviewing contributions
63+
64+See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions).
.github/ISSUE_TEMPLATE/bug_report.md+13−10
@@ -7,34 +7,37 @@ assignees: ''
77
88---
99
10−### Describe the bug
10+**Describe the bug**
1111A clear and concise description of what the bug is.
1212
13−### Steps To Reproduce
13+**To Reproduce**
1414Steps to reproduce the behavior:
15151. ...
16162. ...
17173. ...
1818
19−### Expected behavior
19+**Expected behavior**
2020A clear and concise description of what you expected to happen.
2121
22−### Screenshots
22+**Screenshots**
2323If applicable, add screenshots to help explain your problem.
2424
25−### Additional context
25+**Additional context**
2626Add any other context about the problem here.
2727
28−### Notify maintainers
28+**Notify maintainers**
2929<!--
3030Please @ people who are in the `meta.maintainers` list of the offending package or module.
3131If in doubt, check `git blame` for whoever last touched something.
3232-->
3333
34−### Metadata
34+**Metadata**
3535Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
3636
37−```console
38−[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"
39−output here
37+Maintainer information:
38+```yaml
39+# a list of nixpkgs attributes affected by the problem
40+attribute:
41+# a list of nixos modules affected by the problem
42+module:
4043```
.github/ISSUE_TEMPLATE/out_of_date_package_report.md+3−3
@@ -13,10 +13,10 @@ assignees: ''
1313<!-- Note that these are hard requirements -->
1414
1515<!--
16−You can use the "Go to file" functionality on GitHub to find the package
16+You can use the "Go to file" functionality on github to find the package
1717Then you can go to the history for this package
1818Find the latest "package_name: old_version -> new_version" commit
19−The "new_version" is the current version of the package
19+The "new_version" is the the current version of the package
2020-->
2121- [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs)
2222<!--
@@ -29,7 +29,7 @@ There's a high chance that you'll have the new version right away while helping
2929###### Project name
3030`nix search` name:
3131<!--
32−The current version can be found easily with the same process as above for checking the master branch
32+The current version can be found easily with the same process than above for checking the master branch
3333If an open PR is present for the package, take this version as the current one and link to the PR
3434-->
3535current version:
.github/PULL_REQUEST_TEMPLATE.md+18−32
@@ -1,41 +1,27 @@
1−###### Description of changes
2−
3−<!--
4−For package updates please link to a changelog or describe changes, this helps your fellow maintainers discover breaking updates.
5−For new packages please briefly describe the package or provide a link to its homepage.
6−-->
7−
8−###### Things done
9−
10−<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
11−
12−- Built on platform(s)
13− - [ ] x86_64-linux
14− - [ ] aarch64-linux
15− - [ ] x86_64-darwin
16− - [ ] aarch64-darwin
17−- [ ] For non-Linux: Is `sandbox = true` set in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html))
18−- [ ] Tested, as applicable:
19− - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
20− - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests)
21− - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test)
22− - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
23−- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
24−- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
25−- [22.05 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2205-release-notes)
26− - [ ] (Package updates) Added a release notes entry if the change is major or breaking
27− - [ ] (Module updates) Added a release notes entry if the change is significant
28− - [ ] (Module addition) Added a release notes entry if adding a new NixOS module
29− - [ ] (Release notes changes) Ran `nixos/doc/manual/md-to-db.sh` to update generated release notes
30−- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
31−
321<!--
332To help with the large amounts of pull requests, we would appreciate your
343reviews of other pull requests, especially simple package updates. Just leave a
354comment describing what you have tested in the relevant package/service.
365Reviewing helps to reduce the average time-to-merge for everyone.
376Thanks a lot if you do!
38−
397List of open PRs: https://github.com/NixOS/nixpkgs/pulls
408Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions
419-->
10+
11+###### Motivation for this change
12+
13+
14+###### Things done
15+
16+<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
17+
18+- [ ] Tested using sandboxing ([nix.useSandbox](https://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](https://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
19+- Built on platform(s)
20+ - [ ] NixOS
21+ - [ ] macOS
22+ - [ ] other Linux distributions
23+- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
24+- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
25+- [ ] Tested execution of all binary files (usually in `./result/bin/`)
26+- [ ] Added a release notes entry if the change is major or breaking
27+- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
.github/STALE-BOT.md+1−1
@@ -3,7 +3,7 @@
33- Thanks for your contribution!
44- To remove the stale label, just leave a new comment.
55- _How to find the right people to ping?_ → [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.)
6−- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/), [our Matrix room](https://matrix.to/#/#nix:nixos.org), or on the [#nixos IRC channel](https://web.libera.chat/#nixos).
6+- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/) or on the [#nixos IRC channel](https://webchat.freenode.net/#nixos).
77
88## Suggestions for PRs
99
.github/labeler.yml+6−11
@@ -5,6 +5,10 @@
55 - pkgs/development/libraries/agda/**/*
66 - pkgs/top-level/agda-packages.nix
77
8+"6.topic: bsd":
9+ - pkgs/os-specific/bsd/**/*
10+ - pkgs/stdenv/freebsd/**/*
11+
812"6.topic: cinnamon":
913 - pkgs/desktops/cinnamon/**/*
1014
@@ -12,7 +16,7 @@
1216 - nixos/modules/services/editors/emacs.nix
1317 - nixos/modules/services/editors/emacs.xml
1418 - nixos/tests/emacs-daemon.nix
15− - pkgs/applications/editors/emacs/elisp-packages/**/*
19+ - pkgs/applications/editors/emacs-modes/**/*
1620 - pkgs/applications/editors/emacs/**/*
1721 - pkgs/build-support/emacs/**/*
1822 - pkgs/top-level/emacs-packages.nix
@@ -66,13 +70,6 @@
6670
6771"6.topic: nixos":
6872 - nixos/**/*
69− - pkgs/os-specific/linux/nixos-rebuild/**/*
70−
71−"6.topic: nim":
72− - doc/languages-frameworks/nim.section.md
73− - pkgs/development/compilers/nim/*
74− - pkgs/development/nim-packages/**/*
75− - pkgs/top-level/nim-packages.nix
7673
7774"6.topic: ocaml":
7875 - doc/languages-frameworks/ocaml.section.md
@@ -138,9 +135,7 @@
138135"6.topic: vim":
139136 - doc/languages-frameworks/vim.section.md
140137 - pkgs/applications/editors/vim/**/*
141− - pkgs/applications/editors/vim/plugins/**/*
142− - nixos/modules/programs/neovim.nix
143− - pkgs/applications/editors/neovim/**/*
138+ - pkgs/misc/vim-plugins/**/*
144139
145140"6.topic: xfce":
146141 - nixos/doc/manual/configuration/xfce.xml
.github/workflows/backport.yml+7−20
@@ -1,35 +1,22 @@
11name: Backport
22on:
3− pull_request_target:
4− types: [closed, labeled]
5−
6−# WARNING:
7−# When extending this action, be aware that $GITHUB_TOKEN allows write access to
8−# the GitHub repository. This means that it should not evaluate user input in a
9−# way that allows code injection.
10−
3+ pull_request:
4+ types: [closed]
115jobs:
126 backport:
13− name: Backport Pull Request
14− if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
7+ name: Create backport PRs
8+ if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true
159 runs-on: ubuntu-latest
1610 steps:
17− - uses: actions/checkout@v3
11+ - uses: actions/checkout@v2
1812 with:
1913 # required to find all branches
2014 fetch-depth: 0
21− ref: ${{ github.event.pull_request.head.sha }}
2215 - name: Create backport PRs
2316 # should be kept in sync with `version`
24− uses: zeebe-io/backport-action@v0.0.5
17+ uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd
2518 with:
26− # Config README: https://github.com/zeebe-io/backport-action#backport-action
2719 github_token: ${{ secrets.GITHUB_TOKEN }}
2820 github_workspace: ${{ github.workspace }}
2921 # should be kept in sync with `uses`
30− version: v0.0.5
31− pull_description: |-
32− Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.
33−
34− * [ ] Before merging, ensure that this backport complies with the [Criteria for Backporting](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#criteria-for-backporting-changes).
35− * Even as a non-commiter, if you find that it does not comply, leave a comment.
22+ version: 9b8949dcd4295d364b0939f07d0c7593598d26cd
.github/workflows/basic-eval.ymldeleted−26
@@ -1,26 +0,0 @@
1−name: Basic evaluation checks
2−
3−on:
4− workflow_dispatch
5− # pull_request:
6− # branches:
7− # - master
8− # - release-**
9− # push:
10− # branches:
11− # - master
12− # - release-**
13−jobs:
14− tests:
15− runs-on: ubuntu-latest
16− # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
17− steps:
18− - uses: actions/checkout@v3
19− - uses: cachix/install-nix-action@v17
20− - uses: cachix/cachix-action@v10
21− with:
22− # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
23− name: nixpkgs-ci
24− signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
25− # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset
26− - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]'
.github/workflows/direct-push.yml+1−4
@@ -17,12 +17,9 @@ jobs:
1717 run: |
1818 ISMERGE=$(curl -H 'Accept: application/vnd.github.groot-preview+json' -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.GITHUB_REPOSITORY }}/commits/${{ env.GITHUB_SHA }}/pulls | jq -r '.[] | select(.merge_commit_sha == "${{ env.GITHUB_SHA }}") | any')
1919 echo "::set-output name=ismerge::$ISMERGE"
20− # github events are eventually consistent, so wait until changes propagate to thier DB
21− - run: sleep 60
22− if: steps.ismerge.outputs.ismerge != 'true'
2320 - name: Warn if the commit was a direct push
2421 if: steps.ismerge.outputs.ismerge != 'true'
25− uses: peter-evans/commit-comment@v2
22+ uses: peter-evans/commit-comment@v1
2623 with:
2724 body: |
2825 @${{ github.actor }}, you pushed a commit directly to master/release branch
.github/workflows/editorconfig.yml+13−10
@@ -11,33 +11,36 @@ on:
1111jobs:
1212 tests:
1313 runs-on: ubuntu-latest
14− if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip editorconfig]')"
14+ if: github.repository_owner == 'NixOS'
1515 steps:
1616 - name: Get list of changed files from PR
1717 env:
1818 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1919 run: |
20+ echo 'PR_DIFF<<EOF' >> $GITHUB_ENV
2021 gh api \
2122 repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \
2223 | jq '.[] | select(.status != "removed") | .filename' \
23− > "$HOME/changed_files"
24− - name: print list of changed files
25− run: |
26− cat "$HOME/changed_files"
27− - uses: actions/checkout@v3
24+ >> $GITHUB_ENV
25+ echo 'EOF' >> $GITHUB_ENV
26+ - uses: actions/checkout@v2
2827 with:
2928 # pull_request_target checks out the base branch by default
3029 ref: refs/pull/${{ github.event.pull_request.number }}/merge
31− - uses: cachix/install-nix-action@v17
30+ if: env.PR_DIFF
31+ - uses: cachix/install-nix-action@v13
32+ if: env.PR_DIFF
3233 with:
3334 # nixpkgs commit is pinned so that it doesn't break
34− # editorconfig-checker 2.4.0
35− nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz
35+ nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz
3636 - name: install editorconfig-checker
3737 run: nix-env -iA editorconfig-checker -f '<nixpkgs>'
38+ if: env.PR_DIFF
3839 - name: Checking EditorConfig
40+ if: env.PR_DIFF
3941 run: |
40− cat "$HOME/changed_files" | xargs -r editorconfig-checker -disable-indent-size
42+ echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size
4143 - if: ${{ failure() }}
4244 run: |
4345 echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again."
46+
.github/workflows/labels.yml+1−6
@@ -4,11 +4,6 @@ on:
44 pull_request_target:
55 types: [edited, opened, synchronize, reopened]
66
7−# WARNING:
8−# When extending this action, be aware that $GITHUB_TOKEN allows some write
9−# access to the GitHub API. This means that it should not evaluate user input in
10−# a way that allows code injection.
11−
127permissions:
138 contents: read
149 pull-requests: write
@@ -18,7 +13,7 @@ jobs:
1813 runs-on: ubuntu-latest
1914 if: github.repository_owner == 'NixOS'
2015 steps:
21− - uses: actions/labeler@v4
16+ - uses: actions/labeler@v3
2217 with:
2318 repo-token: ${{ secrets.GITHUB_TOKEN }}
2419 sync-labels: true
.github/workflows/manual-nixos.yml+4−4
@@ -14,17 +14,17 @@ jobs:
1414 runs-on: ubuntu-latest
1515 if: github.repository_owner == 'NixOS'
1616 steps:
17− - uses: actions/checkout@v3
17+ - uses: actions/checkout@v2
1818 with:
1919 # pull_request_target checks out the base branch by default
2020 ref: refs/pull/${{ github.event.pull_request.number }}/merge
21− - uses: cachix/install-nix-action@v17
21+ - uses: cachix/install-nix-action@v13
2222 with:
2323 # explicitly enable sandbox
2424 extra_nix_config: sandbox = true
25− - uses: cachix/cachix-action@v10
25+ - uses: cachix/cachix-action@v9
2626 with:
27− # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
27+ # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.
2828 name: nixpkgs-ci
2929 signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
3030 - name: Building NixOS manual
.github/workflows/manual-nixpkgs.yml+4−4
@@ -14,17 +14,17 @@ jobs:
1414 runs-on: ubuntu-latest
1515 if: github.repository_owner == 'NixOS'
1616 steps:
17− - uses: actions/checkout@v3
17+ - uses: actions/checkout@v2
1818 with:
1919 # pull_request_target checks out the base branch by default
2020 ref: refs/pull/${{ github.event.pull_request.number }}/merge
21− - uses: cachix/install-nix-action@v17
21+ - uses: cachix/install-nix-action@v13
2222 with:
2323 # explicitly enable sandbox
2424 extra_nix_config: sandbox = true
25− - uses: cachix/cachix-action@v10
25+ - uses: cachix/cachix-action@v9
2626 with:
27− # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
27+ # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.
2828 name: nixpkgs-ci
2929 signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
3030 - name: Building Nixpkgs manual
.github/workflows/merge-staging.ymlnew file+41
@@ -0,0 +1,41 @@
1+name: "merge staging(-next)"
2+
3+on:
4+ schedule:
5+ # * is a special character in YAML so you have to quote this string
6+ # Merge every 6 hours
7+ - cron: '0 */6 * * *'
8+
9+jobs:
10+ sync-branch:
11+ if: github.repository_owner == 'NixOS'
12+ runs-on: ubuntu-latest
13+ steps:
14+ - uses: actions/checkout@v2
15+
16+ - name: Merge master into staging-next
17+ id: staging_next
18+ uses: devmasx/merge-branch@v1.3.1
19+ with:
20+ type: now
21+ from_branch: master
22+ target_branch: staging-next
23+ github_token: ${{ secrets.GITHUB_TOKEN }}
24+
25+ - name: Merge staging-next into staging
26+ id: staging
27+ uses: devmasx/merge-branch@v1.3.1
28+ with:
29+ type: now
30+ from_branch: staging-next
31+ target_branch: staging
32+ github_token: ${{ secrets.GITHUB_TOKEN }}
33+
34+ - name: Comment on failure
35+ uses: peter-evans/create-or-update-comment@v1
36+ if: ${{ failure() }}
37+ with:
38+ issue-number: 105153
39+ body: |
40+ An automatic merge${{ (steps.staging_next.outcome == 'failure' && ' from master to staging-next') || ((steps.staging.outcome == 'failure' && ' from staging-next to staging') || '') }} [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
41+
.github/workflows/nixos-manual.yml+3−8
@@ -1,9 +1,7 @@
11name: NixOS manual checks
22
3−permissions: read-all
4−
53on:
6− pull_request_target:
4+ pull_request:
75 branches-ignore:
86 - 'release-**'
97 paths:
@@ -15,11 +13,8 @@ jobs:
1513 runs-on: ubuntu-latest
1614 if: github.repository_owner == 'NixOS'
1715 steps:
18− - uses: actions/checkout@v3
19− with:
20− # pull_request_target checks out the base branch by default
21− ref: refs/pull/${{ github.event.pull_request.number }}/merge
22− - uses: cachix/install-nix-action@v17
16+ - uses: actions/checkout@v2
17+ - uses: cachix/install-nix-action@v12
2318 - name: Check DocBook files generated from Markdown are consistent
2419 run: |
2520 nixos/doc/manual/md-to-db.sh
.github/workflows/no-channel.ymldeleted−21
@@ -1,21 +0,0 @@
1−name: "No channel PR"
2−
3−on:
4− pull_request:
5− branches:
6− - 'nixos-**'
7− - 'nixpkgs-**'
8−
9−jobs:
10− fail:
11− name: "This PR is is targeting a channel branch"
12− runs-on: ubuntu-latest
13− steps:
14− - run: |
15− cat <<EOF
16− The nixos-* and nixpkgs-* branches are pushed to by the channel
17− release script and should not be merged into directly.
18−
19− Please target the equivalent release-* branch or master instead.
20− EOF
21− exit 1
.github/workflows/pending-set.yml−5
@@ -3,11 +3,6 @@ name: "set pending status"
33on:
44 pull_request_target:
55
6−# WARNING:
7−# When extending this action, be aware that $GITHUB_TOKEN allows write access to
8−# the GitHub repository. This means that it should not evaluate user input in a
9−# way that allows code injection.
10−
116jobs:
127 action:
138 runs-on: ubuntu-latest
.github/workflows/periodic-merge-24h.ymldeleted−57
@@ -1,57 +0,0 @@
1−# This action periodically merges base branches into staging branches.
2−# This is done to
3−# * prevent conflicts or rather resolve them early
4−# * make all potential breakage happen on the staging branch
5−# * and make sure that all major rebuilds happen before the staging
6−# branch get’s merged back into its base branch.
7−
8−name: "Periodic Merges (24h)"
9−
10−
11−on:
12− schedule:
13− # * is a special character in YAML so you have to quote this string
14− # Merge every 24 hours
15− - cron: '0 0 * * *'
16−
17−jobs:
18− periodic-merge:
19− if: github.repository_owner == 'NixOS'
20− runs-on: ubuntu-latest
21− strategy:
22− # don't fail fast, so that all pairs are tried
23− fail-fast: false
24− # certain branches need to be merged in order, like master->staging-next->staging
25− # and disabling parallelism ensures the order of the pairs below.
26− max-parallel: 1
27− matrix:
28− pairs:
29− - from: master
30− into: haskell-updates
31− - from: release-21.05
32− into: staging-next-21.05
33− - from: staging-next-21.05
34− into: staging-21.05
35− - from: release-21.11
36− into: staging-next-21.11
37− - from: staging-next-21.11
38− into: staging-21.11
39− name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
40− steps:
41− - uses: actions/checkout@v3
42−
43− - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
44− uses: devmasx/merge-branch@1.4.0
45− with:
46− type: now
47− from_branch: ${{ matrix.pairs.from }}
48− target_branch: ${{ matrix.pairs.into }}
49− github_token: ${{ secrets.GITHUB_TOKEN }}
50−
51− - name: Comment on failure
52− uses: peter-evans/create-or-update-comment@v2
53− if: ${{ failure() }}
54− with:
55− issue-number: 105153
56− body: |
57− Periodic merge from `${{ matrix.pairs.from }}` into `${{ matrix.pairs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
.github/workflows/periodic-merge-6h.ymldeleted−51
@@ -1,51 +0,0 @@
1−# This action periodically merges base branches into staging branches.
2−# This is done to
3−# * prevent conflicts or rather resolve them early
4−# * make all potential breakage happen on the staging branch
5−# * and make sure that all major rebuilds happen before the staging
6−# branch get’s merged back into its base branch.
7−
8−name: "Periodic Merges (6h)"
9−
10−
11−on:
12− schedule:
13− # * is a special character in YAML so you have to quote this string
14− # Merge every 6 hours
15− - cron: '0 */6 * * *'
16−
17−jobs:
18− periodic-merge:
19− if: github.repository_owner == 'NixOS'
20− runs-on: ubuntu-latest
21− strategy:
22− # don't fail fast, so that all pairs are tried
23− fail-fast: false
24− # certain branches need to be merged in order, like master->staging-next->staging
25− # and disabling parallelism ensures the order of the pairs below.
26− max-parallel: 1
27− matrix:
28− pairs:
29− - from: master
30− into: staging-next
31− - from: staging-next
32− into: staging
33− name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
34− steps:
35− - uses: actions/checkout@v3
36−
37− - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
38− uses: devmasx/merge-branch@1.4.0
39− with:
40− type: now
41− from_branch: ${{ matrix.pairs.from }}
42− target_branch: ${{ matrix.pairs.into }}
43− github_token: ${{ secrets.GITHUB_TOKEN }}
44−
45− - name: Comment on failure
46− uses: peter-evans/create-or-update-comment@v2
47− if: ${{ failure() }}
48− with:
49− issue-number: 105153
50− body: |
51− Periodic merge from `${{ matrix.pairs.from }}` into `${{ matrix.pairs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
.github/workflows/rebase.ymlnew file+134
@@ -0,0 +1,134 @@
1+on:
2+ issue_comment:
3+ types:
4+ - created
5+
6+# This action allows people with write access to the repo to rebase a PRs base branch
7+# by commenting `/rebase ${branch}` on the PR while avoiding CODEOWNER notifications.
8+
9+jobs:
10+ rebase:
11+ runs-on: ubuntu-latest
12+ if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
13+ steps:
14+ - uses: peter-evans/create-or-update-comment@v1
15+ with:
16+ comment-id: ${{ github.event.comment.id }}
17+ reactions: eyes
18+ - uses: scherermichael-oss/action-has-permission@1.0.6
19+ id: check-write-access
20+ with:
21+ required-permission: write
22+ env:
23+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+ - name: check permissions
25+ run: |
26+ echo "Commenter doesn't have write access to the repo"
27+ exit 1
28+ if: "! steps.check-write-access.outputs.has-permission"
29+ - name: setup
30+ run: |
31+ curl "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}" 2>/dev/null >pr.json
32+ cat <<EOF >>"$GITHUB_ENV"
33+ CAN_MODIFY=$(jq -r '.maintainer_can_modify' pr.json)
34+ COMMITS=$(jq -r '.commits' pr.json)
35+ CURRENT_BASE=$(jq -r '.base.ref' pr.json)
36+ PR_BRANCH=$(jq -r '.head.ref' pr.json)
37+ COMMENT_BRANCH=$(echo ${{ github.event.comment.body }} | awk "/^\/rebase / {print \$2}")
38+ PULL_REQUEST=${{ github.event.issue.number }}
39+ EOF
40+ rm pr.json
41+ - name: check branch
42+ env:
43+ PERMANENT_BRANCHES: "haskell-updates|master|nixos|nixpkgs|python-unstable|release|staging"
44+ VALID_BRANCHES: "haskell-updates|master|python-unstable|release-20.09|release-21.05|staging|staging-20.09|staging-21.05|staging-next|staging-next-21.05"
45+ run: |
46+ message() {
47+ cat <<EOF
48+ Can't rebase $PR_BRANCH from $CURRENT_BASE onto $COMMENT_BRANCH (PR:$PULL_REQUEST COMMITS:$COMMITS)
49+ EOF
50+ }
51+ if ! [[ "$COMMENT_BRANCH" =~ ^($VALID_BRANCHES)$ ]]; then
52+ cat <<EOF
53+ Check that the branch from the comment is valid:
54+
55+ $(message)
56+
57+ This action can only rebase onto these branches:
58+
59+ $VALID_BRANCHES
60+
61+ \`/rebase \${branch}\` must be at the start of the line
62+ EOF
63+ exit 1
64+ fi
65+ if [[ "$COMMENT_BRANCH" == "$CURRENT_BASE" ]]; then
66+ cat <<EOF
67+ Check that the branch from the comment isn't the current base branch:
68+
69+ $(message)
70+ EOF
71+ exit 1
72+ fi
73+ if [[ "$COMMENT_BRANCH" == "$PR_BRANCH" ]]; then
74+ cat <<EOF
75+ Check that the branch from the comment isn't the current branch:
76+
77+ $(message)
78+ EOF
79+ exit 1
80+ fi
81+ if [[ "$PR_BRANCH" =~ ^($PERMANENT_BRANCHES) ]]; then
82+ cat <<EOF
83+ Check that the PR branch isn't a permanent branch:
84+
85+ $(message)
86+ EOF
87+ exit 1
88+ fi
89+ if [[ "$CAN_MODIFY" != "true" ]]; then
90+ cat <<EOF
91+ Check that maintainers can edit the PR branch:
92+
93+ $(message)
94+ EOF
95+ exit 1
96+ fi
97+ - uses: actions/checkout@v2
98+ with:
99+ fetch-depth: 0
100+ - name: rebase pull request
101+ env:
102+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103+ run: |
104+ git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
105+ git config --global user.name "github-actions[bot]"
106+ git fetch origin
107+ gh pr checkout "$PULL_REQUEST"
108+ git rebase \
109+ --onto="$(git merge-base origin/"$CURRENT_BASE" origin/"$COMMENT_BRANCH")" \
110+ "HEAD~$COMMITS"
111+ git push --force
112+ curl \
113+ -X POST \
114+ -H "Accept: application/vnd.github.v3+json" \
115+ -H "Authorization: token $GITHUB_TOKEN" \
116+ -d "{ \"base\": \"$COMMENT_BRANCH\" }" \
117+ "https://api.github.com/repos/${{ github.repository }}/pulls/$PULL_REQUEST"
118+ curl \
119+ -X PATCH \
120+ -H "Accept: application/vnd.github.v3+json" \
121+ -H "Authorization: token $GITHUB_TOKEN" \
122+ -d '{ "state": "closed" }' \
123+ "https://api.github.com/repos/${{ github.repository }}/pulls/$PULL_REQUEST"
124+ - uses: peter-evans/create-or-update-comment@v1
125+ with:
126+ issue-number: ${{ github.event.issue.number }}
127+ body: |
128+ Rebased, please reopen the pull request to restart CI
129+ - uses: peter-evans/create-or-update-comment@v1
130+ if: failure()
131+ with:
132+ issue-number: ${{ github.event.issue.number }}
133+ body: |
134+ [Failed to rebase](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
.github/workflows/update-terraform-providers.ymldeleted−48
@@ -1,48 +0,0 @@
1−name: "Update terraform-providers"
2−
3−on:
4− schedule:
5− - cron: "14 3 * * 1"
6− workflow_dispatch:
7−
8−jobs:
9− tf-providers:
10− if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master
11− runs-on: ubuntu-latest
12− steps:
13− - uses: actions/checkout@v3
14− - uses: cachix/install-nix-action@v17
15− - name: setup
16− id: setup
17− run: |
18− echo ::set-output name=title::"terraform-providers: update $(date -u +"%Y-%m-%d")"
19− - name: update terraform-providers
20− run: |
21− git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
22− git config user.name "github-actions[bot]"
23− pushd pkgs/applications/networking/cluster/terraform-providers
24− ./update-all-providers --no-build
25− git commit -m "${{ steps.setup.outputs.title }}" providers.json
26− popd
27− - name: create PR
28− uses: peter-evans/create-pull-request@v4
29− with:
30− body: |
31− Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
32−
33− Check that all providers build with:
34− ```
35− @ofborg build terraform-full
36− ```
37− branch: terraform-providers-update
38− delete-branch: false
39− labels: "2.status: work-in-progress"
40− title: ${{ steps.setup.outputs.title }}
41− token: ${{ secrets.GITHUB_TOKEN }}
42− - name: comment on failure
43− uses: peter-evans/create-or-update-comment@v2
44− if: ${{ failure() }}
45− with:
46− issue-number: 153416
47− body: |
48− Automatic update of terraform providers [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
.gitignore−7
@@ -2,12 +2,8 @@
22,*
33.*.swp
44.*.swo
5−.idea/
6−.vscode/
7−outputs/
85result
96result-*
10−source/
117/doc/NEWS.html
128/doc/NEWS.txt
139/doc/manual.html
@@ -24,6 +20,3 @@ __pycache__
2420
2521# generated by pkgs/common-updater/update-script.nix
2622update-git-commits.txt
27−
28−# JetBrains IDEA module declaration file
29−/nixpkgs.iml
.version+1−1
@@ -1 +1 @@
1−22.05
1+21.11
CONTRIBUTING.mddeleted−130
@@ -1,130 +0,0 @@
1−# How to contribute
2−
3−Note: contributing implies licensing those contributions
4−under the terms of [COPYING](COPYING), which is an MIT-like license.
5−
6−## Opening issues
7−
8−* Make sure you have a [GitHub account](https://github.com/signup/free)
9−* Make sure there is no open issue on the topic
10−* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and fill out the template
11−
12−## Submitting changes
13−
14−Read the ["Submitting changes"](https://nixos.org/nixpkgs/manual/#chap-submitting-changes) section of the nixpkgs manual. It explains how to write, test, and iterate on your change, and which branch to base your pull request against.
15−
16−Below is a short excerpt of some points in there:
17−
18−* Format the commit messages in the following way:
19−
20− ```
21− (pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
22−
23− (Motivation for change. Link to release notes. Additional information.)
24− ```
25−
26− 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).
27−
28− Examples:
29−
30− * nginx: init at 2.0.1
31− * firefox: 54.0.1 -> 55.0
32− https://www.mozilla.org/en-US/firefox/55.0/releasenotes/
33− * nixos/hydra: add bazBaz option
34−
35− Dual baz behavior is needed to do foo.
36− * nixos/nginx: refactor config generation
37−
38− The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
39−
40−* `meta.description` should:
41− * Be capitalized.
42− * Not start with the package name.
43− * Not have a period at the end.
44−* `meta.license` must be set and fit the upstream license.
45− * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
46−* `meta.maintainers` must be set.
47−
48−See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes).
49−
50−## Writing good commit messages
51−
52−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.
53−
54−For package version upgrades and such a one-line commit message is usually sufficient.
55−
56−## Rebasing between branches (i.e. from master to staging)
57−
58−From time to time, changes between branches must be rebased, for example, if the
59−number of new rebuilds they would cause is too large for the target branch. When
60−rebasing, care must be taken to include only the intended changes, otherwise
61−many CODEOWNERS will be inadvertently requested for review. To achieve this,
62−rebasing should not be performed directly on the target branch, but on the merge
63−base between the current and target branch.
64−
65−In the following example, we see a rebase from `master` onto the merge base
66−between `master` and `staging`, so that a change can eventually be retargeted to
67−`staging`. The example uses `upstream` as the remote for `NixOS/nixpkgs.git`
68−while the `origin` remote is used for the remote you are pushing to.
69−
70−
71−```console
72−# Find the common base between two branches
73−common=$(git merge-base upstream/master upstream/staging)
74−# Find the common base between your feature branch and master
75−commits=$(git merge-base $(git branch --show-current) upstream/master)
76−# Rebase all commits onto the common base
77−git rebase --onto=$common $commits
78−# Force push your changes
79−git push origin $(git branch --show-current) --force-with-lease
80−```
81−
82−Then change the base branch in the GitHub PR using the *Edit* button in the upper
83−right corner, and switch from `master` to `staging`. After the PR has been
84−retargeted it might be necessary to do a final rebase onto the target branch, to
85−resolve any outstanding merge conflicts.
86−
87−```console
88−# Rebase onto target branch
89−git rebase upstream/staging
90−# Review and fixup possible conflicts
91−git status
92−# Force push your changes
93−git push origin $(git branch --show-current) --force-with-lease
94−```
95−
96−## Backporting changes
97−
98−Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
99−
100−1. Take note of the commits in which the change was introduced into `master` branch.
101−2. Check out the target _release branch_, e.g. `release-21.11`. Do not use a _channel branch_ like `nixos-21.11` or `nixpkgs-21.11-darwin`.
102−3. Create a branch for your change, e.g. `git checkout -b backport`.
103−4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; 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.
104−5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-21.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[21.11]`.
105−6. 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. This way maintainers can keep track of missing backports easier.
106−
107−## Criteria for Backporting changes
108−
109−Anything that does not cause user or downstream dependency regressions can be backported. This includes:
110−- New Packages / Modules
111−- Security / Patch updates
112−- Version updates which include new functionality (but no breaking changes)
113−- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
114−- Security critical applications (E.g. `firefox`)
115−
116−## Generating 22.05 Release Notes
117−
118−(This section also applies to backporting 21.11 release notes: substitute "rl-2205" for "rl-2111".)
119−
120−Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document.
121−
122−Steps for updating 22.05 Release notes:
123−
124−1. Edit `nixos/doc/manual/release-notes/rl-2205.section.md` with the desired changes
125−2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2205.section.xml`
126−3. Include changes to `rl-2205.section.md` and `rl-2205.section.xml` in the same commit.
127−
128−## Reviewing contributions
129−
130−See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions).
COPYING+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2003-2022 Eelco Dolstra and the Nixpkgs/NixOS contributors
1+Copyright (c) 2003-2021 Eelco Dolstra and the Nixpkgs/NixOS contributors
22
33Permission is hereby granted, free of charge, to any person obtaining
44a copy of this software and associated documentation files (the
README.md+9−15
@@ -1,19 +1,14 @@
11<p align="center">
2− <a href="https://nixos.org#gh-light-mode-only">
3− <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png" width="500px" alt="NixOS logo"/>
4− </a>
5− <a href="https://nixos.org#gh-dark-mode-only">
6− <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png" width="500px" alt="NixOS logo"/>
7− </a>
2+ <a href="https://nixos.org/nixos"><img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="NixOS logo" /></a>
83</p>
94
105<p align="center">
11− <a href="https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md"><img src="https://img.shields.io/github/contributors-anon/NixOS/nixpkgs" alt="Contributors badge" /></a>
12− <a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=supporters&color=brightgreen" alt="Open Collective supporters" /></a>
6+ <a href="https://www.codetriage.com/nixos/nixpkgs"><img src="https://www.codetriage.com/nixos/nixpkgs/badges/users.svg" alt="Code Triagers badge" /></a>
7+ <a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=Supporter&color=brightgreen" alt="Open Collective supporters" /></a>
138</p>
149
1510[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over
16−80,000 software packages that can be installed with the
11+60,000 software packages that can be installed with the
1712[Nix](https://nixos.org/nix/) package manager. It also implements
1813[NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution.
1914
@@ -51,14 +46,14 @@ Nixpkgs and NixOS are built and tested by our continuous integration
5146system, [Hydra](https://hydra.nixos.org/).
5247
5348* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
54−* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11)
49+* [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09)
5550* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
56−* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents)
51+* [Tests for the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/tested#tabs-constituents)
5752
5853Artifacts successfully built with Hydra are published to cache at
5954https://cache.nixos.org/. When successful build and test criteria are
6055met, the Nixpkgs expressions are distributed via [Nix
61−channels](https://nixos.org/manual/nix/stable/package-management/channels.html).
56+channels](https://nixos.org/nix/manual/#sec-channels).
6257
6358# Contributing
6459
@@ -92,7 +87,7 @@ Most contributions are based on and merged into these branches:
9287 deemed of sufficiently high quality
9388
9489For more information about contributing to the project, please visit
95−the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
90+the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
9691
9792# Donations
9893
@@ -102,8 +97,7 @@ Foundation](https://nixos.org/nixos/foundation.html). To ensure the
10297continuity and expansion of the NixOS infrastructure, we are looking
10398for donations to our organization.
10499
105−You can donate to the NixOS foundation through [SEPA bank
106−transfers](https://nixos.org/donate.html) or by using Open Collective:
100+You can donate to the NixOS foundation by using Open Collective:
107101
108102<a href="https://opencollective.com/nixos#support"><img src="https://opencollective.com/nixos/tiers/supporter.svg?width=890" /></a>
109103
doc/Makefile+13−25
@@ -1,21 +1,5 @@
11MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$' -not -name README.md)))
22
3−PANDOC ?= pandoc
4−
5−pandoc_media_dir = media
6−# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh) and conversion script (/maintainers/scripts/db-to-md.sh).
7−# TODO: Remove raw-attribute when we can get rid of DocBook altogether.
8−pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute
9−# Not needed:
10−# - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST)
11−pandoc_flags = --extract-media=$(pandoc_media_dir) \
12− --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \
13− --lua-filter=build-aux/pandoc-filters/myst-reader/roles.lua \
14− --lua-filter=build-aux/pandoc-filters/link-unix-man-references.lua \
15− --lua-filter=build-aux/pandoc-filters/docbook-writer/rst-roles.lua \
16− --lua-filter=build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua \
17− -f commonmark$(pandoc_commonmark_enabled_extensions)+smart
18−
193.PHONY: all
204all: validate format out/html/index.html out/epub/manual.epub
215
@@ -38,7 +22,7 @@ fix-misc-xml:
3822.PHONY: clean
3923clean:
4024 rm -f ${MD_TARGETS} doc-support/result .version manual-full.xml functions/library/locations.xml functions/library/generated
41− rm -rf ./out/ ./highlightjs ./media
25+ rm -rf ./out/ ./highlightjs
4226
4327.PHONY: validate
4428validate: manual-full.xml doc-support/result
@@ -55,7 +39,7 @@ out/html/index.html: doc-support/result manual-full.xml style.css highlightjs
5539 mkdir -p out/html/highlightjs/
5640 cp -r highlightjs out/html/
5741
58− cp -r $(pandoc_media_dir) out/html/
42+ cp -r media out/html/
5943 cp ./overrides.css out/html/
6044 cp ./style.css out/html/style.css
6145
@@ -70,7 +54,7 @@ out/epub/manual.epub: manual-full.xml
7054 doc-support/result/epub.xsl \
7155 ./manual-full.xml
7256
73− cp -r $(pandoc_media_dir) out/epub/scratch/OEBPS
57+ cp -r media out/epub/scratch/OEBPS
7458 cp ./overrides.css out/epub/scratch/OEBPS
7559 cp ./style.css out/epub/scratch/OEBPS
7660 mkdir -p out/epub/scratch/OEBPS/images/callouts/
@@ -105,12 +89,16 @@ functions/library/generated: doc-support/result
10589 ln -rfs ./doc-support/result/function-docs functions/library/generated
10690
10791%.section.xml: %.section.md
108− $(PANDOC) $^ -t docbook \
109− $(pandoc_flags) \
110− -o $@
92+ pandoc $^ -t docbook \
93+ --extract-media=media \
94+ --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \
95+ -f markdown+smart \
96+ | cat > $@
11197
11298%.chapter.xml: %.chapter.md
113− $(PANDOC) $^ -t docbook \
99+ pandoc $^ -t docbook \
114100 --top-level-division=chapter \
115− $(pandoc_flags) \
116− -o $@
101+ --extract-media=media \
102+ --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \
103+ -f markdown+smart \
104+ | cat > $@
doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.luadeleted−23
@@ -1,23 +0,0 @@
1−--[[
2−Converts Code AST nodes produced by pandoc’s DocBook reader
3−from citerefentry elements into AST for corresponding role
4−for reStructuredText.
5−
6−We use subset of MyST syntax (CommonMark with features from rST)
7−so let’s use the rST AST for rST features.
8−
9−Reference: https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage
10−]]
11−
12−function Code(elem)
13− elem.classes = elem.classes:map(function (x)
14− if x == 'citerefentry' then
15− elem.attributes['role'] = 'manpage'
16− return 'interpreted-text'
17− else
18− return x
19− end
20− end)
21−
22− return elem
23−end
doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.luadeleted−34
@@ -1,34 +0,0 @@
1−--[[
2−Converts Link AST nodes with empty label to DocBook xref elements.
3−
4−This is a temporary script to be able use cross-references conveniently
5−using syntax taken from MyST, while we still use docbook-xsl
6−for generating the documentation.
7−
8−Reference: https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing
9−]]
10−
11−local function starts_with(start, str)
12− return str:sub(1, #start) == start
13−end
14−
15−local function escape_xml_arg(arg)
16− amps = arg:gsub('&', '&')
17− amps_quotes = amps:gsub('"', '"')
18− amps_quotes_lt = amps_quotes:gsub('<', '<')
19−
20− return amps_quotes_lt
21−end
22−
23−function Link(elem)
24− has_no_content = #elem.content == 0
25− targets_anchor = starts_with('#', elem.target)
26− has_no_attributes = elem.title == '' and elem.identifier == '' and #elem.classes == 0 and #elem.attributes == 0
27−
28− if has_no_content and targets_anchor and has_no_attributes then
29− -- xref expects idref without the pound-sign
30− target_without_hash = elem.target:sub(2, #elem.target)
31−
32− return pandoc.RawInline('docbook', '<xref linkend="' .. escape_xml_arg(target_without_hash) .. '" />')
33− end
34−end
doc/build-aux/pandoc-filters/docbook-writer/rst-roles.luadeleted−36
@@ -1,36 +0,0 @@
1−--[[
2−Converts AST for reStructuredText roles into corresponding
3−DocBook elements.
4−
5−Currently, only a subset of roles is supported.
6−
7−Reference:
8− List of roles:
9− https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html
10− manpage:
11− https://tdg.docbook.org/tdg/5.1/citerefentry.html
12− file:
13− https://tdg.docbook.org/tdg/5.1/filename.html
14−]]
15−
16−function Code(elem)
17− if elem.classes:includes('interpreted-text') then
18− local tag = nil
19− local content = elem.text
20− if elem.attributes['role'] == 'manpage' then
21− tag = 'citerefentry'
22− local title, volnum = content:match('^(.+)%((%w+)%)$')
23− if title == nil then
24− -- No volnum in parentheses.
25− title = content
26− end
27− content = '<refentrytitle>' .. title .. '</refentrytitle>' .. (volnum ~= nil and ('<manvolnum>' .. volnum .. '</manvolnum>') or '')
28− elseif elem.attributes['role'] == 'file' then
29− tag = 'filename'
30− end
31−
32− if tag ~= nil then
33− return pandoc.RawInline('docbook', '<' .. tag .. '>' .. content .. '</' .. tag .. '>')
34− end
35− end
36−end
doc/build-aux/pandoc-filters/link-unix-man-references.luadeleted−17
@@ -1,17 +0,0 @@
1−--[[
2−Turns a manpage reference into a link, when a mapping is defined below.
3−]]
4−
5−local man_urls = {
6− ["tmpfiles.d(5)"] = "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html",
7− ["nix.conf(5)"] = "https://nixos.org/manual/nix/stable/#sec-conf-file",
8− ["systemd.time(7)"] = "https://www.freedesktop.org/software/systemd/man/systemd.time.html",
9− ["systemd.timer(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.timer.html",
10−}
11−
12−function Code(elem)
13− local is_man_role = elem.classes:includes('interpreted-text') and elem.attributes['role'] == 'manpage'
14− if is_man_role and man_urls[elem.text] ~= nil then
15− return pandoc.Link(elem, man_urls[elem.text])
16− end
17−end
doc/build-aux/pandoc-filters/myst-reader/roles.luadeleted−29
@@ -1,29 +0,0 @@
1−--[[
2−Replaces Str AST nodes containing {role}, followed by a Code node
3−by a Code node with attrs that would be produced by rST reader
4−from the role syntax.
5−
6−This is to emulate MyST syntax in Pandoc.
7−(MyST is a CommonMark flavour with rST features mixed in.)
8−
9−Reference: https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point
10−]]
11−
12−function Inlines(inlines)
13− for i = #inlines-1,1,-1 do
14− local first = inlines[i]
15− local second = inlines[i+1]
16− local correct_tags = first.tag == 'Str' and second.tag == 'Code'
17− if correct_tags then
18− -- docutils supports alphanumeric strings separated by [-._:]
19− -- We are slightly more liberal for simplicity.
20− local role = first.text:match('^{([-._+:%w]+)}$')
21− if role ~= nil then
22− inlines:remove(i)
23− second.attributes['role'] = role
24− second.classes:insert('interpreted-text')
25− end
26− end
27− end
28− return inlines
29−end
doc/build-aux/pandoc-filters/myst-writer/roles.luadeleted−25
@@ -1,25 +0,0 @@
1−--[[
2−Replaces Code nodes with attrs that would be produced by rST reader
3−from the role syntax by a Str AST node containing {role}, followed by a Code node.
4−
5−This is to emulate MyST syntax in Pandoc.
6−(MyST is a CommonMark flavour with rST features mixed in.)
7−
8−Reference: https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point
9−]]
10−
11−function Code(elem)
12− local role = elem.attributes['role']
13−
14− if elem.classes:includes('interpreted-text') and role ~= nil then
15− elem.classes = elem.classes:filter(function (c)
16− return c ~= 'interpreted-text'
17− end)
18− elem.attributes['role'] = nil
19−
20− return {
21− pandoc.Str('{' .. role .. '}'),
22− elem,
23− }
24− end
25−end
doc/builders/fetchers.chapter.md+25−61
@@ -1,16 +1,8 @@
11# Fetchers {#chap-pkgs-fetchers}
22
3−When using Nix, you will frequently need to download source code and other files from the internet. For this purpose, Nix provides the [_fixed output derivation_](https://nixos.org/manual/nix/stable/#fixed-output-drvs) feature and Nixpkgs provides various functions that implement the actual fetching from various protocols and services.
3+When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way.
44
5−## Caveats
6−
7−Because fixed output derivations are _identified_ by their hash, a common mistake is to update a fetcher's URL or a version parameter, without updating the hash. **This will cause the old contents to be used.** So remember to always invalidate the hash argument.
8−
9−For those who develop and maintain fetchers, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#tester-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful.
10−
11−## `fetchurl` and `fetchzip` {#fetchurl}
12−
13−Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of `fetchurl` is provided below.
5+The two fetcher primitives are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below.
146
157```nix
168{ stdenv, fetchurl }:
@@ -24,91 +16,63 @@ stdenv.mkDerivation {
2416}
2517```
2618
27−The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand, will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.
19+The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.
20+
21+`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
2822
29−`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example, it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
3023
31−Most other fetchers return a directory rather than a single file.
24+Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`.
3225
33−## `fetchsvn` {#fetchsvn}
26+## `fetchsvn`
3427
3528Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha256`.
3629
37−## `fetchgit` {#fetchgit}
30+## `fetchgit`
3831
3932Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`.
4033
41−Additionally, the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout.
34+Additionally the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout.
4235
43−If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) and [git clone --filter](https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---filterltfilter-specgt) for more information:
44−
45−```nix
46−{ stdenv, fetchgit }:
47−
48−stdenv.mkDerivation {
49− name = "hello";
50− src = fetchgit {
51− url = "https://...";
52− sparseCheckout = ''
53− path/to/be/included
54− another/path
55− '';
56− sha256 = "0000000000000000000000000000000000000000000000000000";
57− };
58−}
59−```
60−
61−## `fetchfossil` {#fetchfossil}
36+## `fetchfossil`
6237
6338Used with Fossil. Expects `url` to a Fossil archive, `rev`, and `sha256`.
6439
65−## `fetchcvs` {#fetchcvs}
40+## `fetchcvs`
6641
6742Used with CVS. Expects `cvsRoot`, `tag`, and `sha256`.
6843
69−## `fetchhg` {#fetchhg}
44+## `fetchhg`
7045
7146Used with Mercurial. Expects `url`, `rev`, and `sha256`.
7247
7348A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below.
7449
75−## `fetchFromGitea` {#fetchfromgitea}
76−
77−`fetchFromGitea` expects five arguments. `domain` is the gitea server name. `owner` is a string corresponding to the Gitea user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every Gitea HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred.
50+## `fetchFromGitHub`
7851
79−## `fetchFromGitHub` {#fetchfromgithub}
80−
81−`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available, but `sha256` is currently preferred.
52+`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred.
8253
8354`fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options.
8455
85−## `fetchFromGitLab` {#fetchfromgitlab}
56+## `fetchFromGitLab`
8657
87−This is used with GitLab repositories. The arguments expected are very similar to `fetchFromGitHub` above.
58+This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above.
8859
89−## `fetchFromGitiles` {#fetchfromgitiles}
60+## `fetchFromGitiles`
9061
91−This is used with Gitiles repositories. The arguments expected are similar to `fetchgit`.
62+This is used with Gitiles repositories. The arguments expected are similar to fetchgit.
9263
93−## `fetchFromBitbucket` {#fetchfrombitbucket}
64+## `fetchFromBitbucket`
9465
9566This is used with BitBucket repositories. The arguments expected are very similar to fetchFromGitHub above.
9667
97−## `fetchFromSavannah` {#fetchfromsavannah}
98−
99−This is used with Savannah repositories. The arguments expected are very similar to `fetchFromGitHub` above.
68+## `fetchFromSavannah`
10069
101−## `fetchFromRepoOrCz` {#fetchfromrepoorcz}
70+This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above.
10271
103−This is used with repo.or.cz repositories. The arguments expected are very similar to `fetchFromGitHub` above.
72+## `fetchFromRepoOrCz`
10473
105−## `fetchFromSourcehut` {#fetchfromsourcehut}
74+This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.
10675
107−This is used with sourcehut repositories. Similar to `fetchFromGitHub` above,
108−it expects `owner`, `repo`, `rev` and `sha256`, but don't forget the tilde (~)
109−in front of the username! Expected arguments also include `vc` ("git" (default)
110−or "hg"), `domain` and `fetchSubmodules`.
76+## `fetchFromSourcehut`
11177
112−If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit`
113−or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,
114−respectively. Otherwise, the fetcher uses `fetchzip`.
78+This is used with sourcehut repositories. The arguments expected are very similar to fetchFromGitHub above. Don't forget the tilde (~) in front of the user name!
doc/builders/images/appimagetools.section.md+1−1
@@ -2,7 +2,7 @@
22
33`pkgs.appimageTools` is a set of functions for extracting and wrapping [AppImage](https://appimage.org/) files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, `pkgs.appimage-run` can be used as well.
44
5−::: {.warning}
5+::: warning
66The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future.
77:::
88
doc/builders/images/dockertools.section.md+10−16
@@ -1,6 +1,6 @@
11# pkgs.dockerTools {#sec-pkgs-dockerTools}
22
3−`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120). Docker itself is not used to perform any of the operations done by these functions.
3+`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120). Docker itself is not used to perform any of the operations done by these functions.
44
55## buildImage {#ssec-pkgs-dockerTools-buildImage}
66
@@ -52,13 +52,13 @@ The above example will build a Docker image `redis/latest` from the given base i
5252
5353> **_NOTE:_** Using this parameter requires the `kvm` device to be available.
5454
55−- `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
55+- `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
5656
5757After the new layer has been created, its closure (to which `contents`, `config` and `runAsRoot` contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied.
5858
5959At the end of the process, only one new single layer will be produced and added to the resulting image.
6060
61−The resulting repository will only list the single image `image/tag`. In the case of [the `buildImage` example](#ex-dockerTools-buildImage), it would be `redis/latest`.
61+The resulting repository will only list the single image `image/tag`. In the case of [the `buildImage` example](#ex-dockerTools-buildImage) it would be `redis/latest`.
6262
6363It is possible to inspect the arguments with which an image was built using its `buildArgs` attribute.
6464
@@ -87,7 +87,7 @@ pkgs.dockerTools.buildImage {
8787}
8888```
8989
90−Now the Docker CLI will display a reasonable date and sort the images as expected:
90+and now the Docker CLI will display a reasonable date and sort the images as expected:
9191
9292```ShellSession
9393$ docker images
@@ -95,7 +95,7 @@ REPOSITORY TAG IMAGE ID CREATED SIZE
9595hello latest de2bf4786de6 About a minute ago 25.2MB
9696```
9797
98−However, the produced images will not be binary reproducible.
98+however, the produced images will not be binary reproducible.
9999
100100## buildLayeredImage {#ssec-pkgs-dockerTools-buildLayeredImage}
101101
@@ -119,13 +119,13 @@ Create a Docker image with many of the store paths being on their own layer to i
119119
120120`contents` _optional_
121121
122−: Top-level paths in the container. Either a single derivation, or a list of derivations.
122+: Top level paths in the container. Either a single derivation, or a list of derivations.
123123
124124 *Default:* `[]`
125125
126126`config` _optional_
127127
128−: Run-time configuration of the container. A full list of the options are available at in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
128+: Run-time configuration of the container. A full list of the options are available at in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
129129
130130 *Default:* `{}`
131131
@@ -151,12 +151,6 @@ Create a Docker image with many of the store paths being on their own layer to i
151151
152152: Shell commands to run while creating the archive for the final layer in a fakeroot environment. Unlike `extraCommands`, you can run `chown` to change the owners of the files in the archive, changing fakeroot's state instead of the real filesystem. The latter would require privileges that the build user does not have. Static binaries do not interact with the fakeroot environment. By default all files in the archive will be owned by root.
153153
154−`enableFakechroot` _optional_
155−
156−: Whether to run in `fakeRootCommands` in `fakechroot`, making programs behave as though `/` is the root of the image being created, while files in the Nix store are available as usual. This allows scripts that perform installation in `/` to work as expected. Considering that `fakechroot` is implemented via the same mechanism as `fakeroot`, the same caveats apply.
157−
158− *Default:* `false`
159−
160154### Behavior of `contents` in the final image {#dockerTools-buildLayeredImage-arg-contents}
161155
162156Each path directly listed in `contents` will have a symlink in the root of the image.
@@ -195,9 +189,9 @@ pkgs.dockerTools.buildLayeredImage {
195189
196190Increasing the `maxLayers` increases the number of layers which have a chance to be shared between different images.
197191
198−Modern Docker installations support up to 128 layers, but older versions support as few as 42.
192+Modern Docker installations support up to 128 layers, however older versions support as few as 42.
199193
200−If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However, it will be impossible to extend the image further.
194+If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However it will be impossible to extend the image further.
201195
202196The first (`maxLayers-2`) most "popular" paths will have their own individual layers, then layer \#`maxLayers-1` will contain all the remaining "unpopular" paths, and finally layer \#`maxLayers` will contain the Image configuration.
203197
@@ -213,7 +207,7 @@ The image produced by running the output script can be piped directly into `dock
213207$(nix-build) | docker load
214208```
215209
216−Alternatively, the image be piped via `gzip` into `skopeo`, e.g., to copy it into a registry:
210+Alternatively, the image be piped via `gzip` into `skopeo`, e.g. to copy it into a registry:
217211
218212```ShellSession
219213$(nix-build) | gzip --fast | skopeo copy docker-archive:/dev/stdin docker://some_docker_registry/myimage:tag
doc/builders/images/ocitools.section.md+3−3
@@ -1,10 +1,10 @@
11# pkgs.ociTools {#sec-pkgs-ociTools}
22
3−`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that, it makes no assumptions about the container runner you choose to use to run the created container.
3+`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that it makes no assumptions about the container runner you choose to use to run the created container.
44
55## buildContainer {#ssec-pkgs-ociTools-buildContainer}
66
7−This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory. The nix store of the container will contain all referenced dependencies of the given command.
7+This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command.
88
99The parameters of `buildContainer` with an example value are described below:
1010
@@ -30,7 +30,7 @@ buildContainer {
3030}
3131```
3232
33−- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container.
33+- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container
3434
3535- `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs)
3636
doc/builders/images/snaptools.section.md+3−3
@@ -14,7 +14,7 @@ Currently, `makeSnap` does not support creating GUI stubs.
1414
1515The following expression packages GNU Hello as a Snapcraft snap.
1616
17−``` {#ex-snapTools-buildSnap-hello .nix}
17+```{#ex-snapTools-buildSnap-hello .nix}
1818let
1919 inherit (import <nixpkgs> { }) snapTools hello;
2020in snapTools.makeSnap {
@@ -33,9 +33,9 @@ in snapTools.makeSnap {
3333
3434## Build a Graphical Snap {#ssec-pkgs-snapTools-build-a-snap-firefox}
3535
36−Graphical programs require many more integrations with the host. This example uses Firefox as an example because it is one of the most complicated programs we could package.
36+Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package.
3737
38−``` {#ex-snapTools-buildSnap-firefox .nix}
38+```{#ex-snapTools-buildSnap-firefox .nix}
3939let
4040 inherit (import <nixpkgs> { }) snapTools firefox;
4141in snapTools.makeSnap {
doc/builders/packages/cataclysm-dda.section.md+3−3
@@ -1,6 +1,6 @@
11# Cataclysm: Dark Days Ahead {#cataclysm-dark-days-ahead}
22
3−## How to install Cataclysm DDA {#how-to-install-cataclysm-dda}
3+## How to install Cataclysm DDA
44
55To install the latest stable release of Cataclysm DDA to your profile, execute
66`nix-env -f "<nixpkgs>" -iA cataclysm-dda`. For the curses build (build
@@ -34,7 +34,7 @@ cataclysm-dda.override {
3434}
3535```
3636
37−## Important note for overriding packages {#important-note-for-overriding-packages}
37+## Important note for overriding packages
3838
3939After applying `overrideAttrs`, you need to fix `passthru.pkgs` and
4040`passthru.withMods` attributes either manually or by using `attachPkgs`:
@@ -69,7 +69,7 @@ in
6969goodExample2.withMods (_: []) # parallel building enabled
7070```
7171
72−## Customizing with mods {#customizing-with-mods}
72+## Customizing with mods
7373
7474To install Cataclysm DDA with mods of your choice, you can use `withMods`
7575attribute:
doc/builders/packages/citrix.section.md+5−5
@@ -4,13 +4,13 @@ The [Citrix Workspace App](https://www.citrix.com/products/workspace-app/) is a
44
55## Basic usage {#sec-citrix-base}
66
7−The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix.
7+The tarball archive needs to be downloaded manually as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store the package can be built and installed with Nix.
88
9−## Citrix Self-service {#sec-citrix-selfservice}
9+## Citrix Selfservice {#sec-citrix-selfservice}
1010
11−The [self-service](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions.
11+The [selfservice](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions.
1212
13−In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that, you can configure the `selfservice` like this:
13+In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that you can configure the `selfservice` like this:
1414
1515```ShellSession
1616$ storebrowse -C ~/Downloads/receiverconfig.cr
@@ -19,7 +19,7 @@ $ selfservice
1919
2020## Custom certificates {#sec-citrix-custom-certs}
2121
22−The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`:
22+The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`:
2323
2424```nix
2525with import <nixpkgs> { config.allowUnfree = true; };
doc/builders/packages/eclipse.section.md+5−5
@@ -8,9 +8,9 @@ Nixpkgs provides a number of packages that will install Eclipse in its various f
88$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description
99```
1010
11−Once an Eclipse variant is installed, it can be run using the `eclipse` command, as expected. From within Eclipse, it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.
11+Once an Eclipse variant is installed it can be run using the `eclipse` command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.
1212
13−If you prefer to install plugins in a more declarative manner, then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add:
13+If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add
1414
1515```nix
1616packageOverrides = pkgs: {
@@ -22,15 +22,15 @@ packageOverrides = pkgs: {
2222}
2323```
2424
25−to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running:
25+to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running
2626
2727```ShellSession
2828$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description
2929```
3030
31−If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.
31+If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.
3232
33−Expanding the previous example with two plugins using the above functions, we have:
33+Expanding the previous example with two plugins using the above functions we have
3434
3535```nix
3636packageOverrides = pkgs: {
doc/builders/packages/elm.section.md+2−2
@@ -1,11 +1,11 @@
11# Elm {#sec-elm}
22
3−To start a development environment, run:
3+To start a development environment do
44
55```ShellSession
66nix-shell -p elmPackages.elm elmPackages.elm-format
77```
88
9−To update the Elm compiler, see `nixpkgs/pkgs/development/compilers/elm/README.md`.
9+To update the Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>.
1010
1111To package Elm applications, [read about elm2nix](https://github.com/hercules-ci/elm2nix#elm2nix).
doc/builders/packages/emacs.section.md+4−4
@@ -20,7 +20,7 @@ The Emacs package comes with some extra helpers to make it easier to configure.
2020}
2121```
2222
23−You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provides a `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts.
23+You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts.
2424
2525```nix
2626{
@@ -101,16 +101,16 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
101101}
102102```
103103
104−This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command.
104+This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing `-q` to the Emacs command.
105105
106−Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope'`.
106+Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`.
107107
108108```nix
109109overrides = self: super: rec {
110110 haskell-mode = self.melpaPackages.haskell-mode;
111111 ...
112112};
113−((emacsPackagesFor emacs).overrideScope' overrides).withPackages
113+((emacsPackagesFor emacs).overrideScope' overrides).emacs.pkgs.withPackages
114114 (p: with p; [
115115 # here both these package will use haskell-mode of our own choice
116116 ghc-mod
doc/builders/packages/etc-files.section.mddeleted−18
@@ -1,18 +0,0 @@
1−# /etc files {#etc}
2−
3−Certain calls in glibc require access to runtime files found in `/etc` such as `/etc/protocols` or `/etc/services` -- [getprotobyname](https://linux.die.net/man/3/getprotobyname) is one such function.
4−
5−On non-NixOS distributions these files are typically provided by packages (i.e., [netbase](https://packages.debian.org/sid/netbase)) if not already pre-installed in your distribution. This can cause non-reproducibility for code if they rely on these files being present.
6−
7−If [iana-etc](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.iana-etc.x86_64-linux) is part of your `buildInputs`, then it will set the environment variables `NIX_ETC_PROTOCOLS` and `NIX_ETC_SERVICES` to the corresponding files in the package through a setup hook.
8−
9−
10−```bash
11−> nix-shell -p iana-etc
12−
13−[nix-shell:~]$ env | grep NIX_ETC
14−NIX_ETC_SERVICES=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/services
15−NIX_ETC_PROTOCOLS=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/protocols
16−```
17−
18−Nixpkg's version of [glibc](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/glibc/default.nix) has been patched to check for the existence of these environment variables. If the environment variables are *not* set, then it will attempt to find the files at the default location within `/etc`.
doc/builders/packages/firefox.section.md+8−10
@@ -1,13 +1,12 @@
11# Firefox {#sec-firefox}
22
3−## Build wrapped Firefox with extensions and policies {#build-wrapped-firefox-with-extensions-and-policies}
3+## Build wrapped Firefox with extensions and policies
44
5−The `wrapFirefox` function allows to pass policies, preferences and extensions that are available to Firefox. With the help of `fetchFirefoxAddon` this allows to build a Firefox version that already comes with add-ons pre-installed:
5+The `wrapFirefox` function allows to pass policies, preferences and extension that are available to firefox. With the help of `fetchFirefoxAddon` this allows build a firefox version that already comes with addons pre-installed:
66
77```nix
88{
9− # Nix firefox addons only work with the firefox-esr package.
10− myFirefox = wrapFirefox firefox-esr-unwrapped {
9+ myFirefox = wrapFirefox firefox-unwrapped {
1110 nixExtensions = [
1211 (fetchFirefoxAddon {
1312 name = "ublock"; # Has to be unique!
@@ -40,12 +39,11 @@ The `wrapFirefox` function allows to pass policies, preferences and extensions t
4039}
4140```
4241
43−If `nixExtensions != null`, then all manually installed add-ons will be uninstalled from your browser profile.
44−To view available enterprise policies, visit [enterprise policies](https://github.com/mozilla/policy-templates#enterprisepoliciesenabled)
45−or type into the Firefox URL bar: `about:policies#documentation`.
46−Nix installed add-ons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded add-ons are checksummed and manual add-ons can't be installed. Also, make sure that the `name` field of `fetchFirefoxAddon` is unique. If you remove an add-on from the `nixExtensions` array, rebuild and start Firefox: the removed add-on will be completely removed with all of its settings.
42+If `nixExtensions != null` then all manually installed addons will be uninstalled from your browser profile.
43+To view available enterprise policies visit [enterprise policies](https://github.com/mozilla/policy-templates#enterprisepoliciesenabled)
44+or type into the Firefox url bar: `about:policies#documentation`.
45+Nix installed addons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded addons are checksumed and manual addons can't be installed. Also make sure that the `name` field of fetchFirefoxAddon is unique. If you remove an addon from the nixExtensions array, rebuild and start Firefox the removed addon will be completly removed with all of its settings.
4746
4847## Troubleshooting {#sec-firefox-troubleshooting}
49−If add-ons are marked as broken or the signature is invalid, make sure you have Firefox ESR installed. Normal Firefox does not provide the ability anymore to disable signature verification for add-ons thus nix add-ons get disabled by the normal Firefox binary.
48+If addons do not appear installed although they have been defined in your nix configuration file reset the local addon state of your Firefox profile by clicking `help -> restart with addons disabled -> restart -> refresh firefox`. This can happen if you switch from manual addon mode to nix addon mode and then back to manual mode and then again to nix addon mode.
5049
51−If add-ons do not appear installed despite being defined in your nix configuration file, reset the local add-on state of your Firefox profile by clicking `Help -> More Troubleshooting Information -> Refresh Firefox`. This can happen if you switch from manual add-on mode to nix add-on mode and then back to manual mode and then again to nix add-on mode.
doc/builders/packages/fish.section.md+1−1
@@ -36,7 +36,7 @@ using `buildFishPlugin` and running unit tests with the `fishtape` test runner.
3636## Fish wrapper {#sec-fish-wrapper}
3737
3838The `wrapFish` package is a wrapper around Fish which can be used to create
39−Fish shells initialized with some plugins as well as completions, configuration
39+Fish shells initialised with some plugins as well as completions, configuration
4040snippets and functions sourced from the given paths. This provides a convenient
4141way to test Fish plugins and scripts without having to alter the environment.
4242
doc/builders/packages/fuse.section.md+2−2
@@ -24,10 +24,10 @@ packages on macOS:
2424 checking for fuse.h... no
2525 configure: error: No fuse.h found.
2626
27−This happens on autoconf based projects that use `AC_CHECK_HEADERS` or
27+This happens on autoconf based projects that uses `AC_CHECK_HEADERS` or
2828`AC_CHECK_LIBS` to detect libfuse, and will occur even when the `fuse` package
2929is included in `buildInputs`. It happens because libfuse headers throw an error
30−on macOS if the `FUSE_USE_VERSION` macro is undefined. Many projects do define
30+on macOS if the `FUSE_USE_VERSION` macro is undefined. Many proejcts do define
3131`FUSE_USE_VERSION`, but only inside C source files. This results in the above
3232error at configure time because the configure script would attempt to compile
3333sample FUSE programs without defining `FUSE_USE_VERSION`.
doc/builders/packages/ibus.section.md+3−3
@@ -6,7 +6,7 @@ This package is an ibus-based completion method to speed up typing.
66
77IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html).
88
9−On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
9+On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
1010
1111```nix
1212{ pkgs, ... }: {
@@ -19,7 +19,7 @@ On NixOS, you need to explicitly enable `ibus` with given engines before customi
1919
2020## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell}
2121
22−The IBus engine is based on `hunspell` to support completion in many languages. By default, the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
22+The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
2323
2424```nix
2525ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; }
@@ -31,7 +31,7 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe
3131
3232The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
3333
34−On NixOS, it can be installed using the following expression:
34+On NixOS it can be installed using the following expression:
3535
3636```nix
3737{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }
doc/builders/packages/index.xml−1
@@ -17,7 +17,6 @@
1717 <xi:include href="kakoune.section.xml" />
1818 <xi:include href="linux.section.xml" />
1919 <xi:include href="locales.section.xml" />
20− <xi:include href="etc-files.section.xml" />
2120 <xi:include href="nginx.section.xml" />
2221 <xi:include href="opengl.section.xml" />
2322 <xi:include href="shell-helpers.section.xml" />
doc/builders/packages/linux.section.md+11−11
@@ -4,7 +4,7 @@ The Nix expressions to build the Linux kernel are in [`pkgs/os-specific/linux/ke
44
55The function that builds the kernel has an argument `kernelPatches` which should be a list of `{name, patch, extraConfig}` attribute sets, where `name` is the name of the patch (which is included in the kernel’s `meta.description` attribute), `patch` is the patch itself (possibly compressed), and `extraConfig` (optional) is a string specifying extra options to be concatenated to the kernel configuration file (`.config`).
66
7−The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e., has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package:
7+The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package:
88
99```nix
1010modulesTree = [kernel]
@@ -14,28 +14,28 @@ modulesTree = [kernel]
1414
1515How to add a new (major) version of the Linux kernel to Nixpkgs:
1616
17−1. Copy the old Nix expression (e.g., `linux-2.6.21.nix`) to the new one (e.g., `linux-2.6.22.nix`) and update it.
17+1. Copy the old Nix expression (e.g. `linux-2.6.21.nix`) to the new one (e.g. `linux-2.6.22.nix`) and update it.
1818
19−2. Add the new kernel to the `kernels` attribute set in `linux-kernels.nix` (e.g., create an attribute `kernel_2_6_22`).
19+2. Add the new kernel to `all-packages.nix` (e.g., create an attribute `kernel_2_6_22`).
2020
21213. Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (`i686`, `x86_64`, `uml`) do the following:
2222
23− 1. Make a copy from the old config (e.g., `config-2.6.21-i686-smp`) to the new one (e.g., `config-2.6.22-i686-smp`).
23+ 1. Make an copy from the old config (e.g. `config-2.6.21-i686-smp`) to the new one (e.g. `config-2.6.22-i686-smp`).
2424
25− 2. Copy the config file for this platform (e.g., `config-2.6.22-i686-smp`) to `.config` in the kernel source tree.
25+ 2. Copy the config file for this platform (e.g. `config-2.6.22-i686-smp`) to `.config` in the kernel source tree.
2626
27− 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e., don’t enable some feature on `i686` and disable it on `x86_64`).
27+ 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on `i686` and disable it on `x86_64`).
2828
29− 4. If needed, you can also run `make menuconfig`:
29+ 4. If needed you can also run `make menuconfig`:
3030
3131 ```ShellSession
32− $ nix-env -f "<nixpkgs>" -iA ncurses
32+ $ nix-env -i ncurses
3333 $ export NIX_CFLAGS_LINK=-lncurses
3434 $ make menuconfig ARCH=arch
3535 ```
3636
37− 5. Copy `.config` over the new config file (e.g., `config-2.6.22-i686-smp`).
37+ 5. Copy `.config` over the new config file (e.g. `config-2.6.22-i686-smp`).
3838
39−4. Test building the kernel: `nix-build -A linuxKernel.kernels.kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it.
39+4. Test building the kernel: `nix-build -A kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it.
4040
41−5. It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the `linuxPackagesFor` function in `linux-kernels.nix` (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around.
41+5. It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the `linuxPackagesFor` function in `all-packages.nix` (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around.
doc/builders/packages/locales.section.md+2−2
@@ -1,5 +1,5 @@
11# Locales {#locales}
22
3−To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats, Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.
3+To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.
44
5−On non-NixOS distributions, this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.
5+On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.
doc/builders/packages/nginx.section.md+2−2
@@ -4,8 +4,8 @@
44
55## ETags on static files served from the Nix store {#sec-nginx-etag}
66
7−HTTP has a couple of different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` header. This doesn't give the desired behavior when the file is in the Nix store because all file timestamps are set to 0 (for reasons related to build reproducibility).
7+HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility).
88
9−Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g., a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.
9+Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.
1010
1111As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of `/nix/store`, the hash in the store path is used as the `ETag` header in the HTTP response, thus providing proper caching functionality. This happens automatically; you do not need to do modify any configuration to get this behavior.
doc/builders/packages/opengl.section.md+3−3
@@ -4,12 +4,12 @@ OpenGL support varies depending on which hardware is used and which drivers are
44
55Broadly, we support both GL vendors: Mesa and NVIDIA.
66
7−## NixOS Desktop {#nixos-desktop}
7+## NixOS Desktop
88
99The NixOS desktop or other non-headless configurations are the primary target for OpenGL libraries and applications. The current solution for discovering which drivers are available is based on [libglvnd](https://gitlab.freedesktop.org/glvnd/libglvnd). `libglvnd` performs "vendor-neutral dispatch", trying a variety of techniques to find the system's GL implementation. In practice, this will be either via standard GLX for X11 users or EGL for Wayland users, and supporting either NVIDIA or Mesa extensions.
1010
11−## Nix on GNU/Linux {#nix-on-gnulinux}
11+## Nix on GNU/Linux
1212
1313If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of `libglvnd` and `mesa.drivers` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs.
1414
15−For proprietary video drivers, you might have luck with also adding the corresponding video driver package.
15+For proprietary video drivers you might have luck with also adding the corresponding video driver package.
doc/builders/packages/shell-helpers.section.md+1−1
@@ -4,7 +4,7 @@ Some packages provide the shell integration to be more useful. But unlike other
44
55- `fzf` : `fzf-share`
66
7−E.g. `fzf` can then be used in the `.bashrc` like this:
7+E.g. `fzf` can then used in the `.bashrc` like this:
88
99```bash
1010source "$(fzf-share)/completion.bash"
doc/builders/packages/steam.section.md+23−17
@@ -2,25 +2,24 @@
22
33## Steam in Nix {#sec-steam-nix}
44
5−Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in `$HOME`.
5+Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in \$HOME.
66
77Nix problems and constraints:
88
9−- We don't have `/bin/bash` and many scripts point there. Same thing for `/usr/bin/python`.
9+- We don't have `/bin/bash` and many scripts point there. Similarly for `/usr/bin/python`.
1010- We don't have the dynamic loader in `/lib`.
11−- The `steam.sh` script in `$HOME` cannot be patched, as it is checked and rewritten by steam.
11+- The `steam.sh` script in \$HOME can not be patched, as it is checked and rewritten by steam.
1212- The steam binary cannot be patched, it's also checked.
1313
1414The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.
1515
1616## How to play {#sec-steam-play}
1717
18−Use `programs.steam.enable = true;` if you want to add steam to `systemPackages` and also enable a few workarounds as well as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro Controller.
18+Use `programs.steam.enable = true;` if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr.
1919
2020## Troubleshooting {#sec-steam-troub}
2121
2222- **Steam fails to start. What do I do?**
23−
2423 Try to run
2524
2625 ```ShellSession
@@ -32,31 +31,38 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages`
3231- **Using the FOSS Radeon or nouveau (nvidia) drivers**
3332
3433 - The `newStdcpp` parameter was removed since NixOS 17.09 and should not be needed anymore.
35− - Steam ships statically linked with a version of `libcrypto` that conflicts with the one dynamically loaded by radeonsi_dri.so. If you get the error:
36−
34+ - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error
3735 ```
3836 steam.sh: line 713: 7842 Segmentation fault (core dumped)
3937 ```
40−
4138 have a look at [this pull request](https://github.com/NixOS/nixpkgs/pull/20269).
4239
4340- **Java**
4441
45− 1. There is no java in steam chrootenv by default. If you get a message like:
42+ 1. There is no java in steam chrootenv by default. If you get a message like
4643
47− ```
48− /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found
49− ```
44+ ```
45+ /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found
46+ ```
5047
51− you need to add:
48+ You need to add
5249
53− ```nix
54− steam.override { withJava = true; };
55− ```
50+ ```nix
51+ steam.override { withJava = true; };
52+ ```
5653
5754## steam-run {#sec-steam-run}
5855
59−The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with:
56+The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add
57+
58+```nix
59+pkgs.steam.override ({
60+ nativeOnly = true;
61+ newStdcpp = true;
62+ }).run
63+```
64+
65+to your configuration, rebuild, and run the game with
6066
6167```
6268steam-run ./foo
doc/builders/packages/urxvt.section.md+4−4
@@ -4,7 +4,7 @@ Urxvt, also known as rxvt-unicode, is a highly customizable terminal emulator.
44
55## Configuring urxvt {#sec-urxvt-conf}
66
7−In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as:
7+In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as
88
99```nix
1010rxvt-unicode.override {
@@ -58,14 +58,14 @@ rxvt-unicode.override {
5858
5959## Packaging urxvt plugins {#sec-urxvt-pkg}
6060
61−Urxvt plugins resides in `pkgs/applications/misc/rxvt-unicode-plugins`. To add a new plugin, create an expression in a subdirectory and add the package to the set in `pkgs/applications/misc/rxvt-unicode-plugins/default.nix`.
61+Urxvt plugins resides in `pkgs/applications/misc/rxvt-unicode-plugins`. To add a new plugin create an expression in a subdirectory and add the package to the set in `pkgs/applications/misc/rxvt-unicode-plugins/default.nix`.
6262
6363A plugin can be any kind of derivation, the only requirement is that it should always install perl scripts in `$out/lib/urxvt/perl`. Look for existing plugins for examples.
6464
65−If the plugin is itself a Perl package that needs to be imported from other plugins or scripts, add the following passthrough:
65+If the plugin is itself a perl package that needs to be imported from other plugins or scripts, add the following passthrough:
6666
6767```nix
6868passthru.perlPackages = [ "self" ];
6969```
7070
71−This will make the urxvt wrapper pick up the dependency and set up the Perl path accordingly.
71+This will make the urxvt wrapper pick up the dependency and set up the perl path accordingly.
doc/builders/packages/weechat.section.md+6−6
@@ -1,6 +1,6 @@
1−# WeeChat {#sec-weechat}
1+# Weechat {#sec-weechat}
22
3−WeeChat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration, such as:
3+Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as
44
55```nix
66weechat.override {configure = {availablePlugins, ...}: {
@@ -13,7 +13,7 @@ If the `configure` function returns an attrset without the `plugins` attribute,
1313
1414The plugins currently available are `python`, `perl`, `ruby`, `guile`, `tcl` and `lua`.
1515
16−The Python and Perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute:
16+The python and perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute:
1717
1818```nix
1919weechat.override { configure = {availablePlugins, ...}: {
@@ -41,7 +41,7 @@ weechat.override {
4141 configure = { availablePlugins, ... }: {
4242 init = ''
4343 /set foo bar
44− /server add libera irc.libera.chat
44+ /server add freenode chat.freenode.org
4545 '';
4646 };
4747}
@@ -49,7 +49,7 @@ weechat.override {
4949
5050Further values can be added to the list of commands when running `weechat --run-command "your-commands"`.
5151
52−Additionally, it's possible to specify scripts to be loaded when starting `weechat`. These will be loaded before the commands from `init`:
52+Additionally it's possible to specify scripts to be loaded when starting `weechat`. These will be loaded before the commands from `init`:
5353
5454```nix
5555weechat.override {
@@ -64,7 +64,7 @@ weechat.override {
6464}
6565```
6666
67−In `nixpkgs` there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a `passthru.scripts` attribute, which contains a list of all scripts inside the store path. Furthermore, all scripts have to live in `$out/share`. An exemplary derivation looks like this:
67+In `nixpkgs` there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a `passthru.scripts` attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in `$out/share`. An exemplary derivation looks like this:
6868
6969```nix
7070{ stdenv, fetchurl }:
doc/builders/packages/xorg.section.md+4−4
@@ -2,7 +2,7 @@
22
33The Nix expressions for the X.org packages reside in `pkgs/servers/x11/xorg/default.nix`. This file is automatically generated from lists of tarballs in an X.org release. As such it should not be modified directly; rather, you should modify the lists, the generator script or the file `pkgs/servers/x11/xorg/overrides.nix`, in which you can override or add to the derivations produced by the generator.
44
5−## Katamari Tarballs {#katamari-tarballs}
5+## Katamari Tarballs
66
77X.org upstream releases used to include [katamari](https://en.wiktionary.org/wiki/%E3%81%8B%E3%81%9F%E3%81%BE%E3%82%8A) releases, which included a holistic recommended version for each tarball, up until 7.7. To create a list of tarballs in a katamari release:
88
@@ -14,11 +14,11 @@ cat $(PRINT_PATH=1 nix-prefetch-url $url | tail -n 1) \
1414 | sort > "tarballs-$release.list"
1515```
1616
17−## Individual Tarballs {#individual-tarballs}
17+## Individual Tarballs
1818
1919The upstream release process for [X11R7.8](https://x.org/wiki/Releases/7.8/) does not include a planned katamari. Instead, each component of X.org is released as its own tarball. We maintain `pkgs/servers/x11/xorg/tarballs.list` as a list of tarballs for each individual package. This list includes X.org core libraries and protocol descriptions, extra newer X11 interface libraries, like `xorg.libxcb`, and classic utilities which are largely unused but still available if needed, like `xorg.imake`.
2020
21−## Generating Nix Expressions {#generating-nix-expressions}
21+## Generating Nix Expressions
2222
2323The generator is invoked as follows:
2424
@@ -29,6 +29,6 @@ cd pkgs/servers/x11/xorg
2929
3030For each of the tarballs in the `.list` files, the script downloads it, unpacks it, and searches its `configure.ac` and `*.pc.in` files for dependencies. This information is used to generate `default.nix`. The generator caches downloaded tarballs between runs. Pay close attention to the `NOT FOUND: $NAME` messages at the end of the run, since they may indicate missing dependencies. (Some might be optional dependencies, however.)
3131
32−## Overriding the Generator {#overriding-the-generator}
32+## Overriding the Generator
3333
3434If the expression for a package requires derivation attributes that the generator cannot figure out automatically (say, `patches` or a `postInstall` hook), you should modify `pkgs/servers/x11/xorg/overrides.nix`.
doc/builders/special/fhs-environments.section.md+2−6
@@ -18,8 +18,6 @@
1818 Additional commands to be executed for finalizing the derivation with runner script.
1919- `runScript`
2020 A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to `bash`.
21−- `profile`
22− Optional script for `/etc/profile` within the sandbox.
2321
2422One can create a simple environment using a `shell.nix` like that:
2523
@@ -30,7 +28,7 @@ One can create a simple environment using a `shell.nix` like that:
3028 name = "simple-x11-env";
3129 targetPkgs = pkgs: (with pkgs;
3230 [ udev
33− alsa-lib
31+ alsaLib
3432 ]) ++ (with pkgs.xorg;
3533 [ libX11
3634 libXcursor
@@ -38,12 +36,10 @@ One can create a simple environment using a `shell.nix` like that:
3836 ]);
3937 multiPkgs = pkgs: (with pkgs;
4038 [ udev
41− alsa-lib
39+ alsaLib
4240 ]);
4341 runScript = "bash";
4442}).env
4543```
4644
4745Running `nix-shell` would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change `runScript` to the application path, e.g. `./bin/start.sh` -- relative paths are supported.
48−
49−Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGAppsHook`.
doc/builders/special/mkshell.section.md+6−26
@@ -1,37 +1,17 @@
11# pkgs.mkShell {#sec-pkgs-mkShell}
22
3−`pkgs.mkShell` is a specialized `stdenv.mkDerivation` that removes some
4−repetition when using it with `nix-shell` (or `nix develop`).
3+`pkgs.mkShell` is a special kind of derivation that is only useful when using
4+it combined with `nix-shell`. It will in fact fail to instantiate when invoked
5+with `nix-build`.
56
67## Usage {#sec-pkgs-mkShell-usage}
78
8−Here is a common usage example:
9−
109```nix
1110{ pkgs ? import <nixpkgs> {} }:
1211pkgs.mkShell {
12+ # specify which packages to add to the shell environment
1313 packages = [ pkgs.gnumake ];
14−
15− inputsFrom = [ pkgs.hello pkgs.gnutar ];
16−
17− shellHook = ''
18− export DEBUG=1
19− '';
14+ # add all the dependencies, of the given packages, to the shell environment
15+ inputsFrom = with pkgs; [ hello gnutar ];
2016}
2117```
22−
23−## Attributes
24−
25−* `name` (default: `nix-shell`). Set the name of the derivation.
26−* `packages` (default: `[]`). Add executable packages to the `nix-shell` environment.
27−* `inputsFrom` (default: `[]`). Add build dependencies of the listed derivations to the `nix-shell` environment.
28−* `shellHook` (default: `""`). Bash statements that are executed by `nix-shell`.
29−
30−... all the attributes of `stdenv.mkDerivation`.
31−
32−## Building the shell
33−
34−This derivation output will contain a text file that contains a reference to
35−all the build inputs. This is useful in CI where we want to make sure that
36−every derivation, and its dependencies, build properly. Or when creating a GC
37−root so that the build dependencies don't get garbage-collected.
doc/builders/testers.chapter.mddeleted−82
@@ -1,82 +0,0 @@
1−# Testers {#chap-testers}
2−This chapter describes several testing builders which are available in the <literal>testers</literal> namespace.
3−
4−## `testVersion` {#tester-testVersion}
5−
6−Checks the command output contains the specified version
7−
8−Although simplistic, this test assures that the main program
9−can run. While there's no substitute for a real test case,
10−it does catch dynamic linking errors and such. It also provides
11−some protection against accidentally building the wrong version,
12−for example when using an 'old' hash in a fixed-output derivation.
13−
14−Examples:
15−
16−```nix
17−passthru.tests.version = testVersion { package = hello; };
18−
19−passthru.tests.version = testVersion {
20− package = seaweedfs;
21− command = "weed version";
22−};
23−
24−passthru.tests.version = testVersion {
25− package = key;
26− command = "KeY --help";
27− # Wrong '2.5' version in the code. Drop on next version.
28− version = "2.5";
29−};
30−```
31−
32−## `testEqualDerivation` {#tester-testEqualDerivation}
33−
34−Checks that two packages produce the exact same build instructions.
35−
36−This can be used to make sure that a certain difference of configuration,
37−such as the presence of an overlay does not cause a cache miss.
38−
39−When the derivations are equal, the return value is an empty file.
40−Otherwise, the build log explains the difference via `nix-diff`.
41−
42−Example:
43−
44−```nix
45−testEqualDerivation
46− "The hello package must stay the same when enabling checks."
47− hello
48− (hello.overrideAttrs(o: { doCheck = true; }))
49−```
50−
51−## `invalidateFetcherByDrvHash` {#tester-invalidateFetcherByDrvHash}
52−
53−Use the derivation hash to invalidate the output via name, for testing.
54−
55−Type: `(a@{ name, ... } -> Derivation) -> a -> Derivation`
56−
57−Normally, fixed output derivations can and should be cached by their output
58−hash only, but for testing we want to re-fetch everytime the fetcher changes.
59−
60−Changes to the fetcher become apparent in the drvPath, which is a hash of
61−how to fetch, rather than a fixed store path.
62−By inserting this hash into the name, we can make sure to re-run the fetcher
63−every time the fetcher changes.
64−
65−This relies on the assumption that Nix isn't clever enough to reuse its
66−database of local store contents to optimize fetching.
67−
68−You might notice that the "salted" name derives from the normal invocation,
69−not the final derivation. `invalidateFetcherByDrvHash` has to invoke the fetcher
70−function twice: once to get a derivation hash, and again to produce the final
71−fixed output derivation.
72−
73−Example:
74−
75−```nix
76−tests.fetchgit = invalidateFetcherByDrvHash fetchgit {
77− name = "nix-source";
78− url = "https://github.com/NixOS/nix";
79− rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
80− sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
81−};
82−```
doc/builders/trivial-builders.chapter.md+4−128
@@ -35,10 +35,10 @@ This works just like `runCommand`. The only difference is that it also provides
3535
3636## `runCommandLocal` {#trivial-builder-runCommandLocal}
3737
38−Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network round-trip and can speed up a build.
38+Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
3939
40−::: {.note}
41−This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g., just copying some files to a different location or adding symlinks) because there the `system` is usually the same as `builtins.currentSystem`.
40+::: note
41+This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the `system` is usually the same as `builtins.currentSystem`.
4242:::
4343
4444## `writeTextFile`, `writeText`, `writeTextDir`, `writeScript`, `writeScriptBin` {#trivial-builder-writeText}
@@ -47,133 +47,9 @@ These functions write `text` to the Nix store. This is useful for creating scrip
4747
4848Many more commands wrap `writeTextFile` including `writeText`, `writeTextDir`, `writeScript`, and `writeScriptBin`. These are convenience functions over `writeTextFile`.
4949
50−Here are a few examples:
51−```nix
52−# Writes my-file to /nix/store/<store path>
53−writeTextFile {
54− name = "my-file";
55− text = ''
56− Contents of File
57− '';
58−}
59−# See also the `writeText` helper function below.
60−
61−# Writes executable my-file to /nix/store/<store path>/bin/my-file
62−writeTextFile {
63− name = "my-file";
64− text = ''
65− Contents of File
66− '';
67− executable = true;
68− destination = "/bin/my-file";
69−}
70−# Writes contents of file to /nix/store/<store path>
71−writeText "my-file"
72− ''
73− Contents of File
74− '';
75−# Writes contents of file to /nix/store/<store path>/share/my-file
76−writeTextDir "share/my-file"
77− ''
78− Contents of File
79− '';
80−# Writes my-file to /nix/store/<store path> and makes executable
81−writeScript "my-file"
82− ''
83− Contents of File
84− '';
85−# Writes my-file to /nix/store/<store path>/bin/my-file and makes executable.
86−writeScriptBin "my-file"
87− ''
88− Contents of File
89− '';
90−# Writes my-file to /nix/store/<store path> and makes executable.
91−writeShellScript "my-file"
92− ''
93− Contents of File
94− '';
95−# Writes my-file to /nix/store/<store path>/bin/my-file and makes executable.
96−writeShellScriptBin "my-file"
97− ''
98− Contents of File
99− '';
100−
101−```
102−
103−## `concatTextFile`, `concatText`, `concatScript` {#trivial-builder-concatText}
104−
105−These functions concatenate `files` to the Nix store in a single file. This is useful for configuration files structured in lines of text. `concatTextFile` takes an attribute set and expects two arguments, `name` and `files`. `name` corresponds to the name used in the Nix store path. `files` will be the files to be concatenated. You can also set `executable` to true to make this file have the executable bit set.
106−`concatText` and`concatScript` are simple wrappers over `concatTextFile`.
107−
108−Here are a few examples:
109−```nix
110−
111−# Writes my-file to /nix/store/<store path>
112−concatTextFile {
113− name = "my-file";
114− files = [ drv1 "${drv2}/path/to/file" ];
115−}
116−# See also the `concatText` helper function below.
117−
118−# Writes executable my-file to /nix/store/<store path>/bin/my-file
119−concatTextFile {
120− name = "my-file";
121− files = [ drv1 "${drv2}/path/to/file" ];
122− executable = true;
123− destination = "/bin/my-file";
124−}
125−# Writes contents of files to /nix/store/<store path>
126−concatText "my-file" [ file1 file2 ]
127−
128−# Writes contents of files to /nix/store/<store path>
129−concatScript "my-file" [ file1 file2 ]
130−```
131−
132−## `writeShellApplication` {#trivial-builder-writeShellApplication}
133−
134−This can be used to easily produce a shell script that has some dependencies (`runtimeInputs`). It automatically sets the `PATH` of the script to contain all of the listed inputs, sets some sanity shellopts (`errexit`, `nounset`, `pipefail`), and checks the resulting script with [`shellcheck`](https://github.com/koalaman/shellcheck).
135−
136−For example, look at the following code:
137−
138−```nix
139−writeShellApplication {
140− name = "show-nixos-org";
141−
142− runtimeInputs = [ curl w3m ];
143−
144− text = ''
145− curl -s 'https://nixos.org' | w3m -dump -T text/html
146− '';
147−}
148−```
149−
150−Unlike with normal `writeShellScriptBin`, there is no need to manually write out `${curl}/bin/curl`, setting the PATH
151−was handled by `writeShellApplication`. Moreover, the script is being checked with `shellcheck` for more strict
152−validation.
153−
15450## `symlinkJoin` {#trivial-builder-symlinkJoin}
15551
15652This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within.
157−Here is an example:
158−```nix
159−# adds symlinks of hello and stack to current build and prints "links added"
160−symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; }
161−```
162−This creates a derivation with a directory structure like the following:
163−```
164−/nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample
165−|-- bin
166−| |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello
167−| `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack
168−`-- share
169− |-- bash-completion
170− | `-- completions
171− | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack
172− |-- fish
173− | `-- vendor_completions.d
174− | `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish
175−...
176−```
17753
17854## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile}
17955
@@ -219,5 +95,5 @@ produces an output path `/nix/store/<hash>-runtime-references` containing
21995/nix/store/<hash>-hello-2.10
22096```
22197
222−but none of `hello`'s dependencies because those are not referenced directly
98+but none of `hello`'s dependencies, because those are not referenced directly
22399by `hi`'s output.
doc/contributing/coding-conventions.chapter.md+16−84
@@ -6,7 +6,7 @@
66
77- 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.
88
9−- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [](#sec-package-naming).
9+- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in <xref linkend="sec-package-naming"/>.
1010
1111- Function calls with attribute set arguments are written as
1212
@@ -181,23 +181,11 @@
181181 rev = "${version}";
182182 ```
183183
184−- Building lists conditionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`.
185−
186− ```nix
187− buildInputs = lib.optional stdenv.isDarwin iconv;
188− ```
189−
190− instead of
191−
192− ```nix
193− buildInputs = if stdenv.isDarwin then [ iconv ] else null;
194− ```
195−
196− As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
197− If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.
198−
199184- Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.
200185
186+- The top-level `lib` must be used in the master and 21.05 branch over its alias `stdenv.lib` as it now causes evaluation errors when aliases are disabled which is the case for ofborg.
187+ `lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing locally to avoid having to modify the function inputs just to test something out.
188+
201189## Package naming {#sec-package-naming}
202190
203191The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _should not_, _recommended_, _may_, and _optional_ in this section are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). Only _emphasized_ words are to be interpreted in this way.
@@ -214,17 +202,17 @@ Most of the time, these are the same. For instance, the package `e2fsprogs` has
214202
215203There are a few naming guidelines:
216204
217−- The `pname` attribute _should_ be identical to the upstream package name.
205+- The `name` attribute _should_ be identical to the upstream package name.
218206
219−- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer" instead of `"MPlayer"`.
207+- The `name` attribute _must not_ contain uppercase letters — e.g., `"mplayer-1.0rc2"` instead of `"MPlayer-1.0rc2"`.
220208
221−- The `version` attribute _must_ start with a digit e.g`"0.3.1rc2".
209+- The version part of the `name` attribute _must_ start with a digit (following a dash) — e.g., `"hello-0.3.1rc2"`.
222210
223−- If a package is not a release but a commit from a repository, then the `version` attribute _must_ be the date of that (fetched) commit. The date _must_ be in `"unstable-YYYY-MM-DD"` format.
211+- If a package is not a release but a commit from a repository, then the version part of the name _must_ be the date of that (fetched) commit. The date _must_ be in `"YYYY-MM-DD"` format. Also append `"unstable"` to the name - e.g., `"pkgname-unstable-2014-09-23"`.
224212
225−- Dashes in the package `pname` _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names.
213+- Dashes in the package name _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names.
226214
227−- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c_0_9` and `json-c_0_11`. If there is an obvious “default” version, make an attribute like `json-c = json-c_0_9;`. See also [](#sec-versioning)
215+- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c-0-9` and `json-c-0-11`. If there is an obvious “default” version, make an attribute like `json-c = json-c-0-9;`. See also <xref linkend="sec-versioning" />
228216
229217## File naming and organisation {#sec-organisation}
230218
@@ -477,9 +465,9 @@ Preferred source hash type is sha256. There are several ways to get it.
477465
478466 For package updates it is enough to change one symbol to make hash fake. For new packages, you can use `lib.fakeSha256`, `lib.fakeSha512` or any other fake hash.
479467
480− This is last resort method when reconstructing source URL is non-trivial and `nix-prefetch-url -A` isn’t applicable (for example, [one of `kodi` dependencies](https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73)). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash.
468+ This is last resort method when reconstructing source URL is non-trivial and `nix-prefetch-url -A` isn't applicable (for example, [one of `kodi` dependencies](https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73")). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash.
481469
482−::: {.warning}
470+::: warning
483471This method has security problems. Check below for details.
484472:::
485473
@@ -535,52 +523,16 @@ If you do need to do create this sort of patch file, one way to do so is with gi
5355234. Use git to create a diff, and pipe the output to a patch file:
536524
537525 ```ShellSession
538− $ git diff -a > nixpkgs/pkgs/the/package/0001-changes.patch
526+ $ git diff > nixpkgs/pkgs/the/package/0001-changes.patch
539527 ```
540528
541−If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`:
542−
543−- `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it.
544−- `stripLen`: Remove the first `stripLen` components of pathnames in the patch.
545−- `extraPrefix`: Prefix pathnames by this string.
546−- `excludes`: Exclude files matching these patterns (applies after the above arguments).
547−- `includes`: Include only files matching these patterns (applies after the above arguments).
548−- `revert`: Revert the patch.
549−
550−Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `sha256` argument is changed as well.
551−
552529## Package tests {#sec-package-tests}
553530
554531Tests are important to ensure quality and make reviews and automatic updates easy.
555532
556−The following types of tests exists:
557−
558−* [NixOS **module tests**](https://nixos.org/manual/nixos/stable/#sec-nixos-tests), which spawn one or more NixOS VMs. They exercise both NixOS modules and the packaged programs used within them. For example, a NixOS module test can start a web server VM running the `nginx` module, and a client VM running `curl` or a graphical `firefox`, and test that they can talk to each other and display the correct content.
559−* Nix **package tests** are a lightweight alternative to NixOS module tests. They should be used to create simple integration tests for packages, but cannot test NixOS services, and some programs with graphical user interfaces may also be difficult to test with them.
560−* The **`checkPhase` of a package**, which should execute the unit tests that are included in the source code of a package.
561−
562−Here in the nixpkgs manual we describe mostly _package tests_; for _module tests_ head over to the corresponding [section in the NixOS manual](https://nixos.org/manual/nixos/stable/#sec-nixos-tests).
563−
564−### Writing inline package tests {#ssec-inline-package-tests-writing}
565−
566−For very simple tests, they can be written inline:
567−
568−```nix
569−{ …, yq-go }:
570−
571−buildGoModule rec {
572− …
573−
574− passthru.tests = {
575− simple = runCommand "${pname}-test" {} ''
576− echo "test: 1" | ${yq-go}/bin/yq eval -j > $out
577− [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ]
578− '';
579− };
580−}
581−```
533+Nix package tests are a lightweight alternative to [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). They can be used to create simple integration tests for packages while the module tests are used to test services or programs with a graphical user interface on a NixOS VM. Unittests that are included in the source code of a package should be executed in the `checkPhase`.
582534
583−### Writing larger package tests {#ssec-package-tests-writing}
535+### Writing package tests {#ssec-package-tests-writing}
584536
585537This is an example using the `phoronix-test-suite` package with the current best practices.
586538
@@ -609,7 +561,7 @@ let
609561 inherit (phoronix-test-suite) pname version;
610562in
611563
612−runCommand "${pname}-tests" { meta.timeout = 60; }
564+runCommand "${pname}-tests" { meta.timeout = 3; }
613565 ''
614566 # automatic initial setup to prevent interactive questions
615567 ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null
@@ -643,23 +595,3 @@ Here are examples of package tests:
643595- [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix)
644596- [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix)
645597- [Multiple tests for nanopb](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/nanopb/default.nix)
646−
647−### Linking NixOS module tests to a package {#ssec-nixos-tests-linking}
648−
649−Like [package tests](#ssec-package-tests-writing) as shown above, [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests) can also be linked to a package, so that the tests can be easily run when changing the related package.
650−
651−For example, assuming we're packaging `nginx`, we can link its module test via `passthru.tests`:
652−
653−```nix
654−{ stdenv, lib, nixosTests }:
655−
656−stdenv.mkDerivation {
657− ...
658−
659− passthru.tests = {
660− nginx = nixosTests.nginx;
661− };
662−
663− ...
664−}
665−```
doc/contributing/contributing-to-documentation.chapter.md+2−84
@@ -1,13 +1,13 @@
11# Contributing to this documentation {#chap-contributing}
22
3−The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. The manual is still partially written in DocBook but it is progressively being converted to [Markdown](#sec-contributing-markup).
3+The DocBook sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository.
44
55You can quickly check your edits with `make`:
66
77```ShellSession
88$ cd /path/to/nixpkgs/doc
99$ nix-shell
10−[nix-shell]$ make
10+[nix-shell]$ make $makeFlags
1111```
1212
1313If you experience problems, run `make debug` to help understand the docbook errors.
@@ -22,85 +22,3 @@ $ nix-shell
2222```
2323
2424If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`.
25−
26−## Syntax {#sec-contributing-markup}
27−
28−As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect.
29−
30−Additionally, the following syntax extensions are currently used:
31−
32−- []{#ssec-contributing-markup-anchors}
33− Explicitly defined **anchors** on headings, to allow linking to sections. These should be always used, to ensure the anchors can be linked even when the heading text changes, and to prevent conflicts between [automatically assigned identifiers](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/auto_identifiers.md).
34−
35− It uses the widely compatible [header attributes](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/attributes.md) syntax:
36−
37− ```markdown
38− ## Syntax {#sec-contributing-markup}
39− ```
40−
41−- []{#ssec-contributing-markup-anchors-inline}
42− **Inline anchors**, which allow linking arbitrary place in the text (e.g. individual list items, sentences…).
43−
44− They are defined using a hybrid of the link syntax with the attributes syntax known from headings, called [bracketed spans](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/bracketed_spans.md):
45−
46− ```markdown
47− - []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`.
48− ```
49−
50−- []{#ssec-contributing-markup-automatic-links}
51− If you **omit a link text** for a link pointing to a section, the text will be substituted automatically. For example, `[](#chap-contributing)` will result in [](#chap-contributing).
52−
53− This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing).
54−
55−- []{#ssec-contributing-markup-inline-roles}
56− If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`.
57−
58− The references will turn into links when a mapping exists in {file}`doc/build-aux/pandoc-filters/link-unix-man-references.lua`.
59−
60− This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax.
61−
62−- []{#ssec-contributing-markup-admonitions}
63− **Admonitions**, set off from the text to bring attention to something.
64−
65− It uses pandoc’s [fenced `div`s syntax](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/fenced_divs.md):
66−
67− ```markdown
68− ::: {.warning}
69− This is a warning
70− :::
71− ```
72−
73− which renders as
74−
75− > ::: {.warning}
76− > This is a warning.
77− > :::
78−
79− The following are supported:
80−
81− - [`caution`](https://tdg.docbook.org/tdg/5.0/caution.html)
82− - [`important`](https://tdg.docbook.org/tdg/5.0/important.html)
83− - [`note`](https://tdg.docbook.org/tdg/5.0/note.html)
84− - [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html)
85− - [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html)
86−
87−- []{#ssec-contributing-markup-definition-lists}
88− [**Definition lists**](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/definition_lists.md), for defining a group of terms:
89−
90− ```markdown
91− pear
92− : green or yellow bulbous fruit
93−
94− watermelon
95− : green fruit with red flesh
96− ```
97−
98− which renders as
99−
100− > pear
101− > : green or yellow bulbous fruit
102− >
103− > watermelon
104− > : green fruit with red flesh
105−
106−For contributing to the legacy parts, please see [DocBook: The Definitive Guide](https://tdg.docbook.org/) or the [DocBook rocks! primer](https://web.archive.org/web/20200816233747/https://docbook.rocks/).
doc/contributing/quick-start.chapter.md+1−1
@@ -9,7 +9,7 @@ To add a package to Nixpkgs:
99 $ cd nixpkgs
1010 ```
1111
12−2. Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into `pkgs/development/libraries/pkgname`, while a web browser goes into `pkgs/applications/networking/browsers/pkgname`. See [](#sec-organisation) for some hints on the tree organisation. Create a directory for your package, e.g.
12+2. Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into `pkgs/development/libraries/pkgname`, while a web browser goes into `pkgs/applications/networking/browsers/pkgname`. See <xref linkend="sec-organisation" /> for some hints on the tree organisation. Create a directory for your package, e.g.
1313
1414 ```ShellSession
1515 $ mkdir pkgs/development/libraries/libfoo
doc/contributing/reviewing-contributions.chapter.md+5−9
@@ -1,6 +1,6 @@
11# Reviewing contributions {#chap-reviewing-contributions}
22
3−::: {.warning}
3+::: warning
44The 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).
55:::
66
@@ -35,18 +35,15 @@ Reviewing process:
3535- Building the package locally.
3636 - pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds.
3737 - It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone.
38−
3938 ```ShellSession
4039 $ git fetch origin nixos-unstable
4140 $ git fetch origin pull/PRNUMBER/head
4241 $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD
4342 ```
44−
4543 - The first command fetches the nixos-unstable branch.
4644 - The second command fetches the pull request changes, `PRNUMBER` is the number at the end of the pull request title and `BASEBRANCH` the base branch of the pull request.
4745 - The third command rebases the pull request changes to the nixos-unstable branch.
4846 - The [nixpkgs-review](https://github.com/Mic92/nixpkgs-review) tool can be used to review a pull request content in a single command. `PRNUMBER` should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url.
49−
5047 ```ShellSession
5148 $ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER"
5249 ```
@@ -103,8 +100,7 @@ Sample template for a new package review is provided below.
103100- [ ] `meta.maintainers` is set
104101- [ ] build time only dependencies are declared in `nativeBuildInputs`
105102- [ ] source is fetched using the appropriate function
106−- [ ] the list of `phases` is not overridden
107−- [ ] when a phase (like `installPhase`) is overridden it starts with `runHook preInstall` and ends with `runHook postInstall`.
103+- [ ] phases are respected
108104- [ ] patches that are remotely available are fetched with `fetchpatch`
109105
110106##### Possible improvements
@@ -122,10 +118,10 @@ Reviewing process:
122118 - [CODEOWNERS](https://help.github.com/articles/about-codeowners/) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
123119- Ensure that the module tests, if any, are succeeding.
124120- Ensure that the introduced options are correct.
125− - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).
121+ - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated).
126122 - Description, default and example should be provided.
127123- Ensure that option changes are backward compatible.
128− - `mkRenamedOptionModuleWith` provides a way to make option changes backward compatible.
124+ - `mkRenamedOptionModule` and `mkAliasOptionModule` functions provide way to make option changes backward compatible.
129125- Ensure that removed options are declared with `mkRemovedOptionModule`
130126- Ensure that changes that are not backward compatible are mentioned in release notes.
131127- Ensure that documentations affected by the change is updated.
@@ -157,7 +153,7 @@ Reviewing process:
157153
158154- Ensure that the module tests, if any, are succeeding.
159155- Ensure that the introduced options are correct.
160− - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).
156+ - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated).
161157 - Description, default and example should be provided.
162158- Ensure that module `meta` field is present
163159 - Maintainers should be declared in `meta.maintainers`.
doc/contributing/submitting-changes.chapter.md+13−36
@@ -43,13 +43,13 @@
4343 - nixpkgs:
4444
4545 - update pkg
46− - `nix-env -iA pkg-attribute-name -f <path to your local nixpkgs folder>`
46+ - `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
4747 - add pkg
4848 - Make sure it’s in `pkgs/top-level/all-packages.nix`
49− - `nix-env -iA pkg-attribute-name -f <path to your local nixpkgs folder>`
49+ - `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
5050 - _If you don’t want to install pkg in you profile_.
51− - `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
52− - If you installed your package with `nix-env`, you can run `nix-env -e pkg-name` where `pkg-name` is as reported by `nix-env -q` to uninstall it from your system.
51+ - `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
52+ - If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
5353
5454 - NixOS and its modules:
5555 - You can add new module to your NixOS configuration file (usually it’s `/etc/nixos/configuration.nix`). And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`.
@@ -62,7 +62,7 @@
6262
6363- Push your changes to your fork of nixpkgs.
6464- Create the pull request
65−- Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#submitting-changes).
65+- Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes).
6666
6767## Submitting security fixes {#submitting-changes-submitting-security-fixes}
6868
@@ -71,7 +71,6 @@ Security fixes are submitted in the same way as other changes and thus the same
7171- If a new version fixing the vulnerability has been released, update the package;
7272- If the security fix comes in the form of a patch and a CVE is available, then add the patch to the Nixpkgs tree, and apply it to the package.
7373 The name of the patch should be the CVE identifier, so e.g. `CVE-2019-13636.patch`; If a patch is fetched the name needs to be set as well, e.g.:
74−
7574 ```nix
7675 (fetchpatch {
7776 name = "CVE-2019-11068.patch";
@@ -90,18 +89,17 @@ There is currently no policy when to remove a package.
9089
9190Before removing a package, one should try to find a new maintainer or fix smaller issues first.
9291
93−### Steps to remove a package from Nixpkgs {#steps-to-remove-a-package-from-nixpkgs}
92+### Steps to remove a package from Nixpkgs
9493
9594We use jbidwatcher as an example for a discontinued project here.
9695
97961. Have Nixpkgs checked out locally and up to date.
98971. Create a new branch for your change, e.g. `git checkout -b jbidwatcher`
99−1. Remove the actual package including its directory, e.g. `git rm -rf pkgs/applications/misc/jbidwatcher`
98+1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`
100991. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`).
101−1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)
100+1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)
102101
103102 For example in this case:
104−
105103 ```
106104 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15
107105 ```
@@ -193,7 +191,7 @@ It’s important to test any executables generated by a build when you change or
193191
194192### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards}
195193
196−The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing 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.
194+The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). The contributing 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.
197195
198196## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests}
199197
@@ -227,7 +225,7 @@ digraph {
227225}
228226```
229227
230−[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours.
228+[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/merge-staging.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours.
231229
232230
233231### Master branch {#submitting-changes-master-branch}
@@ -246,21 +244,11 @@ If the branch is already in a broken state, please refrain from adding extra new
246244
247245### Stable release branches {#submitting-changes-stable-release-branches}
248246
249−The same staging workflow applies to stable release branches, but the main branch is called `release-*` instead of `master`.
250−
251−Example branch names: `release-21.11`, `staging-21.11`, `staging-next-21.11`.
252−
253−Most changes added to the stable release branches are cherry-picked (“backported”) from the `master` and staging branches.
254−
255−#### Automatically backporting a Pull Request {#submitting-changes-stable-release-branches-automatic-backports}
247+For cherry-picking a commit to a stable release branch (“backporting”), use `git cherry-pick -x <original commit>` so that the original commit id is included in the commit.
256248
257−Assign label `backport <branch>` (e.g. `backport release-21.11`) to the PR and a backport PR is automatically created after the PR is merged.
249+Add a reason for the backport by using `git cherry-pick -xe <original commit>` instead when it is not obvious from the original commit message. It is not needed when it's a minor version update that includes security and bug fixes but don't add new features or when the commit fixes an otherwise broken package.
258250
259−#### Manually backporting changes {#submitting-changes-stable-release-branches-manual-backports}
260−
261−Cherry-pick changes via `git cherry-pick -x <original commit>` so that the original commit id is included in the commit message.
262−
263−Add a reason for the backport when it is not obvious from the original commit message. You can do this by cherry picking with `git cherry-pick -xe <original commit>`, which allows editing the commit message. This is not needed for minor version updates that include security and bug fixes but don't add new features or when the commit fixes an otherwise broken package.
251+For backporting Pull Requests to stable branches, assign label `backport <branch>` to the original Pull Requests and automation should take care of the rest once the Pull Requests is merged.
264252
265253Here is an example of a cherry-picked commit message with good reason description:
266254
@@ -279,14 +267,3 @@ Other examples of reasons are:
279267- Previously the build would fail due to, e.g., `getaddrinfo` not being defined
280268- The previous download links were all broken
281269- Crash when starting on some X11 systems
282−
283−#### Acceptable backport criteria
284−
285−The stable branch does have some changes which cannot be backported. Most notable are breaking changes. The desire is to have stable users be uninterrupted when updating packages.
286−
287−However, many changes are able to be backported, including:
288−- New Packages / Modules
289−- Security / Patch updates
290−- Version updates which include new functionality (but no breaking changes)
291−- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
292−- Security critical applications (E.g. `firefox`)
doc/default.nix+4−3
@@ -17,6 +17,10 @@ in pkgs.stdenv.mkDerivation {
1717
1818 src = lib.cleanSource ./.;
1919
20+ makeFlags = [
21+ "PANDOC_LUA_FILTERS_DIR=${pkgs.pandoc-lua-filters}/share/pandoc/filters"
22+ ];
23+
2024 postPatch = ''
2125 ln -s ${doc-support} ./doc-support/result
2226 '';
@@ -33,7 +37,4 @@ in pkgs.stdenv.mkDerivation {
3337 echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
3438 echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products
3539 '';
36−
37− # Environment variables
38− PANDOC_LUA_FILTERS_DIR = "${pkgs.pandoc-lua-filters}/share/pandoc/filters";
3940}
doc/doc-support/lib-function-docs.nix−1
@@ -22,6 +22,5 @@ with pkgs; stdenv.mkDerivation {
2222 docgen lists 'List manipulation functions'
2323 docgen debug 'Debugging functions'
2424 docgen options 'NixOS / nixpkgs option handling'
25− docgen sources 'Source filtering functions'
2625 '';
2726}
doc/functions.xml+4−4
@@ -7,8 +7,8 @@
77 The nixpkgs repository has several utility functions to manipulate Nix expressions.
88 </para>
99 <xi:include href="functions/library.xml" />
10− <xi:include href="functions/generators.section.xml" />
11− <xi:include href="functions/debug.section.xml" />
12− <xi:include href="functions/prefer-remote-fetch.section.xml" />
13− <xi:include href="functions/nix-gitignore.section.xml" />
10+ <xi:include href="functions/generators.xml" />
11+ <xi:include href="functions/debug.xml" />
12+ <xi:include href="functions/prefer-remote-fetch.xml" />
13+ <xi:include href="functions/nix-gitignore.xml" />
1414</chapter>
doc/functions/debug.section.mddeleted−5
@@ -1,5 +0,0 @@
1−# Debugging Nix Expressions {#sec-debug}
2−
3−Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions.
4−
5−In the `lib/debug.nix` file you will find a number of functions that help (pretty-)printing values while evaluation is running. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in `lib/debug.nix` for usage information.
doc/functions/debug.xmlnew file+14
@@ -0,0 +1,14 @@
1+<section xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xmlns:xi="http://www.w3.org/2001/XInclude"
4+ xml:id="sec-debug">
5+ <title>Debugging Nix Expressions</title>
6+
7+ <para>
8+ Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions.
9+ </para>
10+
11+ <para>
12+ In the <literal>lib/debug.nix</literal> file you will find a number of functions that help (pretty-)printing values while evaluation is runnnig. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in <literal>lib/debug.nix</literal> for usage information.
13+ </para>
14+</section>
doc/functions/generators.section.mddeleted−56
@@ -1,56 +0,0 @@
1−# Generators {#sec-generators}
2−Generators are functions that create file formats from nix data structures, e. g. for configuration files. There are generators available for: `INI`, `JSON` and `YAML`
3−
4−All generators follow a similar call interface: `generatorName configFunctions data`, where `configFunctions` is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is `mkSectionName ? (name: libStr.escape [ "[" "]" ] name)` from the `INI` generator. It receives the name of a section and sanitizes it. The default `mkSectionName` escapes `[` and `]` with a backslash.
5−
6−Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses `: ` as separator, the strings `"yes"`/`"no"` as boolean values and requires all string values to be quoted:
7−
8−```nix
9−with lib;
10−let
11− customToINI = generators.toINI {
12− # specifies how to format a key/value pair
13− mkKeyValue = generators.mkKeyValueDefault {
14− # specifies the generated string for a subset of nix values
15− mkValueString = v:
16− if v == true then ''"yes"''
17− else if v == false then ''"no"''
18− else if isString v then ''"${v}"''
19− # and delegats all other values to the default generator
20− else generators.mkValueStringDefault {} v;
21− } ":";
22− };
23−
24−# the INI file can now be given as plain old nix values
25−in customToINI {
26− main = {
27− pushinfo = true;
28− autopush = false;
29− host = "localhost";
30− port = 42;
31− };
32− mergetool = {
33− merge = "diff3";
34− };
35−}
36−```
37−
38−This will produce the following INI file as nix string:
39−
40−```INI
41−[main]
42−autopush:"no"
43−host:"localhost"
44−port:42
45−pushinfo:"yes"
46−str\:ange:"very::strange"
47−
48−[mergetool]
49−merge:"diff3"
50−```
51−
52−::: {.note}
53−Nix store paths can be converted to strings by enclosing a derivation attribute like so: `"${drv}"`.
54−:::
55−
56−Detailed documentation for each generator can be found in `lib/generators.nix`.
doc/functions/generators.xmlnew file+74
@@ -0,0 +1,74 @@
1+<section xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xmlns:xi="http://www.w3.org/2001/XInclude"
4+ xml:id="sec-generators">
5+ <title>Generators</title>
6+
7+ <para>
8+ Generators are functions that create file formats from nix data structures, e. g. for configuration files. There are generators available for: <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal>
9+ </para>
10+
11+ <para>
12+ All generators follow a similar call interface: <code>generatorName configFunctions data</code>, where <literal>configFunctions</literal> is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]" ] name)</code> from the <literal>INI</literal> generator. It receives the name of a section and sanitizes it. The default <literal>mkSectionName</literal> escapes <literal>[</literal> and <literal>]</literal> with a backslash.
13+ </para>
14+
15+ <para>
16+ Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses <literal>: </literal> as separator, the strings <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and requires all string values to be quoted:
17+ </para>
18+
19+<programlisting>
20+with lib;
21+let
22+ customToINI = generators.toINI {
23+ # specifies how to format a key/value pair
24+ mkKeyValue = generators.mkKeyValueDefault {
25+ # specifies the generated string for a subset of nix values
26+ mkValueString = v:
27+ if v == true then ''"yes"''
28+ else if v == false then ''"no"''
29+ else if isString v then ''"${v}"''
30+ # and delegats all other values to the default generator
31+ else generators.mkValueStringDefault {} v;
32+ } ":";
33+ };
34+
35+# the INI file can now be given as plain old nix values
36+in customToINI {
37+ main = {
38+ pushinfo = true;
39+ autopush = false;
40+ host = "localhost";
41+ port = 42;
42+ };
43+ mergetool = {
44+ merge = "diff3";
45+ };
46+}
47+</programlisting>
48+
49+ <para>
50+ This will produce the following INI file as nix string:
51+ </para>
52+
53+<programlisting>
54+[main]
55+autopush:"no"
56+host:"localhost"
57+port:42
58+pushinfo:"yes"
59+str\:ange:"very::strange"
60+
61+[mergetool]
62+merge:"diff3"
63+</programlisting>
64+
65+ <note>
66+ <para>
67+ Nix store paths can be converted to strings by enclosing a derivation attribute like so: <code>"${drv}"</code>.
68+ </para>
69+ </note>
70+
71+ <para>
72+ Detailed documentation for each generator can be found in <literal>lib/generators.nix</literal>.
73+ </para>
74+</section>
doc/functions/library.xml−2
@@ -25,6 +25,4 @@
2525 <xi:include href="./library/generated/debug.xml" />
2626
2727 <xi:include href="./library/generated/options.xml" />
28−
29− <xi:include href="./library/generated/sources.xml" />
3028</section>
doc/functions/library/attrsets.xml+2−2
@@ -772,7 +772,7 @@ nameValuePair "some" 6
772772 <title>Modifying each value of an attribute set</title>
773773<programlisting><![CDATA[
774774lib.attrsets.mapAttrs
775− (name: value: name + "-" + value)
775+ (name: value: name + "-" value)
776776 { x = "foo"; y = "bar"; }
777777=> { x = "x-foo"; y = "y-bar"; }
778778]]></programlisting>
@@ -1474,7 +1474,7 @@ lib.attrsets.zipAttrsWith
14741474 <section xml:id="function-library-lib.attrsets.zipAttrs">
14751475 <title><function>lib.attrsets.zipAttrs</function></title>
14761476
1477− <subtitle><literal>zipAttrs :: [ AttrSet ] -> AttrSet</literal>
1477+ <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal>
14781478 </subtitle>
14791479
14801480 <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" />
doc/functions/nix-gitignore.section.mddeleted−49
@@ -1,49 +0,0 @@
1−# pkgs.nix-gitignore {#sec-pkgs-nix-gitignore}
2−
3−`pkgs.nix-gitignore` is a function that acts similarly to `builtins.filterSource` but also allows filtering with the help of the gitignore format.
4−
5−## Usage {#sec-pkgs-nix-gitignore-usage}
6−
7−`pkgs.nix-gitignore` exports a number of functions, but you\'ll most likely need either `gitignoreSource` or `gitignoreSourcePure`. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string.
8−
9−```nix
10−{ pkgs ? import <nixpkgs> {} }:
11−
12− nix-gitignore.gitignoreSource [] ./source
13− # Simplest version
14−
15− nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source
16− # This one reads the ./source/.gitignore and concats the auxiliary ignores
17−
18− nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source
19− # Use this string as gitignore, don't read ./source/.gitignore.
20−
21− nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source
22− # It also accepts a list (of strings and paths) that will be concatenated
23− # once the paths are turned to strings via readFile.
24−```
25−
26−These functions are derived from the `Filter` functions by setting the first filter argument to `(_: _: true)`:
27−
28−```nix
29−gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true);
30−gitignoreSource = gitignoreFilterSource (_: _: true);
31−```
32−
33−Those filter functions accept the same arguments the `builtins.filterSource` function would pass to its filters, thus `fn: gitignoreFilterSourcePure fn ""` should be extensionally equivalent to `filterSource`. The file is blacklisted if it\'s blacklisted by either your filter or the gitignoreFilter.
34−
35−If you want to make your own filter from scratch, you may use
36−
37−```nix
38−gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
39−```
40−
41−## gitignore files in subdirectories {#sec-pkgs-nix-gitignore-usage-recursive}
42−
43−If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function:
44−
45−```nix
46−gitignoreFilterRecursiveSource = filter: patterns: root:
47−# OR
48−gitignoreRecursiveSource = gitignoreFilterSourcePure (_: _: true);
49−```
doc/functions/nix-gitignore.xmlnew file+70
@@ -0,0 +1,70 @@
1+<section xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xmlns:xi="http://www.w3.org/2001/XInclude"
4+ xml:id="sec-pkgs-nix-gitignore">
5+ <title>pkgs.nix-gitignore</title>
6+
7+ <para>
8+ <function>pkgs.nix-gitignore</function> is a function that acts similarly to <literal>builtins.filterSource</literal> but also allows filtering with the help of the gitignore format.
9+ </para>
10+
11+ <section xml:id="sec-pkgs-nix-gitignore-usage">
12+ <title>Usage</title>
13+
14+ <para>
15+ <literal>pkgs.nix-gitignore</literal> exports a number of functions, but you'll most likely need either <literal>gitignoreSource</literal> or <literal>gitignoreSourcePure</literal>. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string.
16+ </para>
17+
18+<programlisting><![CDATA[
19+{ pkgs ? import <nixpkgs> {} }:
20+
21+ nix-gitignore.gitignoreSource [] ./source
22+ # Simplest version
23+
24+ nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source
25+ # This one reads the ./source/.gitignore and concats the auxiliary ignores
26+
27+ nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source
28+ # Use this string as gitignore, don't read ./source/.gitignore.
29+
30+ nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source
31+ # It also accepts a list (of strings and paths) that will be concatenated
32+ # once the paths are turned to strings via readFile.
33+ ]]></programlisting>
34+
35+ <para>
36+ These functions are derived from the <literal>Filter</literal> functions by setting the first filter argument to <literal>(_: _: true)</literal>:
37+ </para>
38+
39+<programlisting><![CDATA[
40+gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true);
41+gitignoreSource = gitignoreFilterSource (_: _: true);
42+ ]]></programlisting>
43+
44+ <para>
45+ Those filter functions accept the same arguments the <literal>builtins.filterSource</literal> function would pass to its filters, thus <literal>fn: gitignoreFilterSourcePure fn ""</literal> should be extensionally equivalent to <literal>filterSource</literal>. The file is blacklisted iff it's blacklisted by either your filter or the gitignoreFilter.
46+ </para>
47+
48+ <para>
49+ If you want to make your own filter from scratch, you may use
50+ </para>
51+
52+<programlisting><![CDATA[
53+gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
54+ ]]></programlisting>
55+ </section>
56+
57+ <section xml:id="sec-pkgs-nix-gitignore-usage-recursive">
58+ <title>gitignore files in subdirectories</title>
59+
60+ <para>
61+ If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function:
62+ </para>
63+
64+<programlisting><![CDATA[
65+gitignoreFilterRecursiveSource = filter: patterns: root:
66+# OR
67+gitignoreRecursiveSource = gitignoreFilterSourcePure (_: _: true);
68+ ]]></programlisting>
69+ </section>
70+</section>
doc/functions/prefer-remote-fetch.section.mddeleted−17
@@ -1,17 +0,0 @@
1−# prefer-remote-fetch overlay {#sec-prefer-remote-fetch}
2−
3−`prefer-remote-fetch` is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay:
4−
5−```nix
6−self: super:
7− (super.prefer-remote-fetch self super)
8−```
9−
10−A full configuration example for that sets the overlay up for your own account, could look like this
11−
12−```ShellSession
13−$ mkdir ~/.config/nixpkgs/overlays/
14−$ cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF
15− self: super: super.prefer-remote-fetch self super
16−EOF
17−```
doc/functions/prefer-remote-fetch.xmlnew file+21
@@ -0,0 +1,21 @@
1+<section xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xmlns:xi="http://www.w3.org/2001/xinclude"
4+ xml:id="sec-prefer-remote-fetch">
5+ <title>prefer-remote-fetch overlay</title>
6+
7+ <para>
8+ <function>prefer-remote-fetch</function> is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay:
9+<programlisting>
10+self: super:
11+ (super.prefer-remote-fetch self super)
12+</programlisting>
13+ A full configuration example for that sets the overlay up for your own account, could look like this
14+<screen>
15+<prompt>$ </prompt>mkdir ~/.config/nixpkgs/overlays/
16+<prompt>$ </prompt>cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF
17+ self: super: super.prefer-remote-fetch self super
18+EOF
19+</screen>
20+ </para>
21+</section>
doc/hooks/index.xmldeleted−10
@@ -1,10 +0,0 @@
1−<chapter xmlns="http://docbook.org/ns/docbook"
2− xmlns:xlink="http://www.w3.org/1999/xlink"
3− xmlns:xi="http://www.w3.org/2001/XInclude"
4− xml:id="chap-hooks">
5− <title>Hooks reference</title>
6− <para>
7− Nixpkgs has several hook packages that augment the stdenv phases.
8− </para>
9− <xi:include href="./postgresql-test-hook.section.xml" />
10−</chapter>
doc/hooks/postgresql-test-hook.section.mddeleted−59
@@ -1,59 +0,0 @@
1−
2−# `postgresqlTestHook` {#sec-postgresqlTestHook}
3−
4−This hook starts a PostgreSQL server during the `checkPhase`. Example:
5−
6−```nix
7−{ stdenv, postgresql, postgresqlTestHook }:
8−stdenv.mkDerivation {
9−
10− # ...
11−
12− checkInputs = [
13− postgresql
14− postgresqlTestHook
15− ];
16−}
17−```
18−
19−If you use a custom `checkPhase`, remember to add the `runHook` calls:
20−```nix
21− checkPhase ''
22− runHook preCheck
23−
24− # ... your tests
25−
26− runHook postCheck
27− ''
28−```
29−
30−## Variables {#sec-postgresqlTestHook-variables}
31−
32−The hook logic will read a number of variables and set them to a default value if unset or empty.
33−
34−Exported variables:
35−
36− - `PGDATA`: location of server files.
37− - `PGHOST`: location of UNIX domain socket directory; the default `host` in a connection string.
38− - `PGUSER`: user to create / log in with, default: `test_user`.
39− - `PGDATABASE`: database name, default: `test_db`.
40−
41−Bash-only variables:
42−
43− - `postgresqlTestUserOptions`: SQL options to use when creating the `$PGUSER` role, default: `LOGIN`.
44− - `postgresqlTestSetupSQL`: SQL commands to run as database administrator after startup, default: statements that create `$PGUSER` and `$PGDATABASE`.
45− - `postgresqlTestSetupCommands`: bash commands to run after database start, defaults to running `$postgresqlTestSetupSQL` as database administrator.
46− - `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended.
47− - `postgresqlStartCommands`: defaults to `pg_ctl start`.
48−
49−## TCP and the Nix sandbox {#sec-postgresqlTestHook-tcp}
50−
51−`postgresqlEnableTCP` relies on network sandboxing, which is not available on macOS and some custom Nix installations, resulting in flaky tests.
52−For this reason, it is disabled by default.
53−
54−The preferred solution is to make the test suite use a UNIX domain socket connection. This is the default behavior when no `host` connection parameter is provided.
55−Some test suites hardcode a value for `host` though, so a patch may be required. If you can upstream the patch, you can make `host` default to the `PGHOST` environment variable when set. Otherwise, you can patch it locally to omit the `host` connection string parameter altogether.
56−
57−::: {.note}
58−The error `libpq: failed (could not receive data from server: Connection refused` is generally an indication that the test suite is trying to connect through TCP.
59−:::
doc/languages-frameworks/agda.section.md+14−83
@@ -1,6 +1,6 @@
11# Agda {#agda}
22
3−## How to use Agda {#how-to-use-agda}
3+## How to use Agda
44
55Agda is available as the [agda](https://search.nixos.org/packages?channel=unstable&show=agda&from=0&size=30&sort=relevance&query=agda)
66package.
@@ -43,7 +43,6 @@ agda.withPackages (p: [
4343```
4444
4545You can also reference a GitHub repository
46−
4746```nix
4847agda.withPackages (p: [
4948 (p.standard-library.overrideAttrs (oldAttrs: {
@@ -60,7 +59,6 @@ agda.withPackages (p: [
6059
6160If you want to use a library not added to Nixpkgs, you can add a
6261dependency to a local library by calling `agdaPackages.mkDerivation`.
63−
6462```nix
6563agda.withPackages (p: [
6664 (p.mkDerivation {
@@ -94,21 +92,20 @@ See [Building Agda Packages](#building-agda-packages) for more information on `m
9492Agda will not by default use these libraries. To tell Agda to use a library we have some options:
9593
9694* Call `agda` with the library flag:
97− ```ShellSession
98− $ agda -l standard-library -i . MyFile.agda
99− ```
95+```ShellSession
96+$ agda -l standard-library -i . MyFile.agda
97+```
10098* Write a `my-library.agda-lib` file for the project you are working on which may look like:
101− ```
102− name: my-library
103− include: .
104− depend: standard-library
105− ```
99+```
100+name: my-library
101+include: .
102+depend: standard-library
103+```
106104* Create the file `~/.agda/defaults` and add any libraries you want to use by default.
107105
108106More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html).
109107
110−## Compiling Agda {#compiling-agda}
111−
108+## Compiling Agda
112109Agda modules can be compiled using the GHC backend with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag.
113110This can be overridden by a different version of `ghc` as follows:
114111
@@ -119,8 +116,7 @@ agda.withPackages {
119116}
120117```
121118
122−## Writing Agda packages {#writing-agda-packages}
123−
119+## Writing Agda packages
124120To write a nix derivation for an Agda library, first check that the library has a `*.agda-lib` file.
125121
126122A derivation can then be written using `agdaPackages.mkDerivation`. This has similar arguments to `stdenv.mkDerivation` with the following additions:
@@ -144,37 +140,19 @@ agdaPackages.mkDerivation {
144140}
145141```
146142
147−### Building Agda packages {#building-agda-packages}
148−
143+### Building Agda packages
149144The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file.
150145If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden.
151146Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file.
152147`agda` and the Agda libraries contained in `buildInputs` are made available during the build phase.
153148
154−### Installing Agda packages {#installing-agda-packages}
155−
149+### Installing Agda packages
156150The default install phase copies Agda source files, Agda interface files (`*.agdai`) and `*.agda-lib` files to the output directory.
157151This can be overridden.
158152
159153By default, Agda sources are files ending on `.agda`, or literate Agda files ending on `.lagda`, `.lagda.tex`, `.lagda.org`, `.lagda.md`, `.lagda.rst`. The list of recognised Agda source extensions can be extended by setting the `extraExtensions` config variable.
160154
161−## Maintaining the Agda package set on Nixpkgs {#maintaining-the-agda-package-set-on-nixpkgs}
162−
163−We are aiming at providing all common Agda libraries as packages on `nixpkgs`,
164−and keeping them up to date.
165−Contributions and maintenance help is always appreciated,
166−but the maintenance effort is typically low since the Agda ecosystem is quite small.
167−
168−The `nixpkgs` Agda package set tries to take up a role similar to that of [Stackage](https://www.stackage.org/) in the Haskell world.
169−It is a curated set of libraries that:
170−
171−1. Always work together.
172−2. Are as up-to-date as possible.
173−
174−While the Haskell ecosystem is huge, and Stackage is highly automatised,
175−the Agda package set is small and can (still) be maintained by hand.
176−
177−### Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs}
155+## Adding Agda packages to Nixpkgs
178156
179157To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like:
180158
@@ -204,53 +182,6 @@ mkDerivation {
204182 '';
205183}
206184```
207−
208185This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName = "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`.
209186
210187When writing an Agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes Agda to think that the nix store is a Agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613).
211−
212−In the pull request adding this library,
213−you can test whether it builds correctly by writing in a comment:
214−
215−```
216−@ofborg build agdaPackages.iowa-stdlib
217−```
218−
219−### Maintaining Agda packages
220−
221−As mentioned before, the aim is to have a compatible, and up-to-date package set.
222−These two conditions sometimes exclude each other:
223−For example, if we update `agdaPackages.standard-library` because there was an upstream release,
224−this will typically break many reverse dependencies,
225−i.e. downstream Agda libraries that depend on the standard library.
226−In `nixpkgs` we are typically among the first to notice this,
227−since we have build tests in place to check this.
228−
229−In a pull request updating e.g. the standard library, you should write the following comment:
230−
231−```
232−@ofborg build agdaPackages.standard-library.passthru.tests
233−```
234−
235−This will build all reverse dependencies of the standard library,
236−for example `agdaPackages.agda-categories`, or `agdaPackages.generic`.
237−
238−In some cases it is useful to build _all_ Agda packages.
239−This can be done with the following Github comment:
240−
241−```
242−@ofborg build agda.passthru.tests.allPackages
243−```
244−
245−Sometimes, the builds of the reverse dependencies fail because they have not yet been updated and released.
246−You should drop the maintainers a quick issue notifying them of the breakage,
247−citing the build error (which you can get from the ofborg logs).
248−If you are motivated, you might even send a pull request that fixes it.
249−Usually, the maintainers will answer within a week or two with a new release.
250−Bumping the version of that reverse dependency should be a further commit on your PR.
251−
252−In the rare case that a new release is not to be expected within an acceptable time,
253−simply mark the broken package as broken by setting `meta.broken = true;`.
254−This will exclude it from the build test.
255−It can be added later when it is fixed,
256−and does not hinder the advancement of the whole package set in the meantime.
doc/languages-frameworks/android.section.md+16−17
@@ -3,8 +3,8 @@
33The Android build environment provides three major features and a number of
44supporting features.
55
6−## Deploying an Android SDK installation with plugins {#deploying-an-android-sdk-installation-with-plugins}
7−
6+Deploying an Android SDK installation with plugins
7+--------------------------------------------------
88The first use case is deploying the SDK with a desired set of plugins or subsets
99of an SDK.
1010
@@ -136,8 +136,8 @@ in
136136androidComposition.platform-tools
137137```
138138
139−## Using predefined Android package compositions {#using-predefined-android-package-compositions}
140−
139+Using predefined Android package compositions
140+---------------------------------------------
141141In addition to composing an Android package set manually, it is also possible
142142to use a predefined composition that contains all basic packages for a specific
143143Android version, such as version 9.0 (API-level 28).
@@ -159,13 +159,12 @@ with import <nixpkgs> {};
159159androidenv.androidPkgs_9_0.platform-tools
160160```
161161
162−## Building an Android application {#building-an-android-application}
163−
162+Building an Android application
163+-------------------------------
164164In addition to the SDK, it is also possible to build an Ant-based Android
165165project and automatically deploy all the Android plugins that a project
166166requires.
167167
168−
169168```nix
170169with import <nixpkgs> {};
171170
@@ -200,8 +199,8 @@ to build Android apps. An Android APK gets exposed as a build product and can be
200199installed on any Android device with a web browser by navigating to the build
201200result page.
202201
203−## Spawning emulator instances {#spawning-emulator-instances}
204−
202+Spawning emulator instances
203+---------------------------
205204For testing purposes, it can also be quite convenient to automatically generate
206205scripts that spawn emulator instances with all desired configuration settings.
207206
@@ -242,8 +241,8 @@ androidenv.emulateApp {
242241In addition to prebuilt APKs, you can also bind the APK parameter to a
243242`buildApp {}` function invocation shown in the previous example.
244243
245−## Notes on environment variables in Android projects {#notes-on-environment-variables-in-android-projects}
246−
244+Notes on environment variables in Android projects
245+--------------------------------------------------
247246* `ANDROID_SDK_ROOT` should point to the Android SDK. In your Nix expressions, this should be
248247 `${androidComposition.androidsdk}/libexec/android-sdk`. Note that `ANDROID_HOME` is deprecated,
249248 but if you rely on tools that need it, you can export it too.
@@ -301,8 +300,8 @@ This shell.nix includes a shell hook that overwrites local.properties with the c
301300sdk.dir and ndk.dir values. This will ensure that the SDK and NDK directories will
302301both be correct when you run Android Studio inside nix-shell.
303302
304−## Notes on improving build.gradle compatibility {#notes-on-improving-build.gradle-compatibility}
305−
303+Notes on improving build.gradle compatibility
304+---------------------------------------------
306305Ensure that your buildToolsVersion and ndkVersion match what is declared in androidenv.
307306If you are using cmake, make sure its declared version is correct too.
308307
@@ -322,8 +321,8 @@ android {
322321
323322```
324323
325−## Querying the available versions of each plugin {#querying-the-available-versions-of-each-plugin}
326−
324+Querying the available versions of each plugin
325+----------------------------------------------
327326repo.json provides all the options in one file now.
328327
329328A shell script in the `pkgs/development/mobile/androidenv/` subdirectory can be used to retrieve all
@@ -335,8 +334,8 @@ possible options:
335334
336335The above command-line instruction queries all package versions in repo.json.
337336
338−## Updating the generated expressions {#updating-the-generated-expressions}
339−
337+Updating the generated expressions
338+----------------------------------
340339repo.json is generated from XML files that the Android Studio package manager uses.
341340To update the expressions run the `generate.sh` script that is stored in the
342341`pkgs/development/mobile/androidenv/` subdirectory:
doc/languages-frameworks/beam.section.md+59−137
@@ -4,9 +4,9 @@
44
55In this document and related Nix expressions, we use the term, _BEAM_, to describe the environment. BEAM is the name of the Erlang Virtual Machine and, as far as we're concerned, from a packaging perspective, all languages that run on the BEAM are interchangeable. That which varies, like the build system, is transparent to users of any given BEAM package, so we make no distinction.
66
7−## Available versions and deprecations schedule {#available-versions-and-deprecations-schedule}
7+## Available versions and deprecations schedule
88
9−### Elixir {#elixir}
9+### Elixir
1010
1111nixpkgs follows the [official elixir deprecation schedule](https://hexdocs.pm/elixir/compatibility-and-deprecations.html) and keeps the last 5 released versions of Elixir available.
1212
@@ -68,107 +68,27 @@ Erlang.mk functions similarly to Rebar3, except we use `buildErlangMk` instead o
6868
6969`mixRelease` is used to make a release in the mix sense. Dependencies will need to be fetched with `fetchMixDeps` and passed to it.
7070
71−#### mixRelease - Elixir Phoenix example {#mix-release-elixir-phoenix-example}
71+#### mixRelease - Elixir Phoenix example
7272
73−there are 3 steps, frontend dependencies (javascript), backend dependencies (elixir) and the final derivation that puts both of those together
74−
75−##### mixRelease - Frontend dependencies (javascript) {#mix-release-javascript-deps}
76−
77−For phoenix projects, inside of nixpkgs you can either use yarn2nix (mkYarnModule) or node2nix. An example with yarn2nix can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39). An example with node2nix will follow. To package something outside of nixpkgs, you have alternatives like [npmlock2nix](https://github.com/nix-community/npmlock2nix) or [nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage)
78−
79−##### mixRelease - backend dependencies (mix) {#mix-release-mix-deps}
80−
81−There are 2 ways to package backend dependencies. With mix2nix and with a fixed-output-derivation (FOD).
82−
83−###### mix2nix {#mix2nix}
84−
85−`mix2nix` is a cli tool available in nixpkgs. it will generate a nix expression from a mix.lock file. It is quite standard in the 2nix tool series.
86−
87−Note that currently mix2nix can't handle git dependencies inside the mix.lock file. If you have git dependencies, you can either add them manually (see [example](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/pleroma/default.nix#L20)) or use the FOD method.
88−
89−The advantage of using mix2nix is that nix will know your whole dependency graph. On a dependency update, this won't trigger a full rebuild and download of all the dependencies, where FOD will do so.
90−
91−Practical steps:
92−
93−- run `mix2nix > mix_deps.nix` in the upstream repo.
94−- pass `mixNixDeps = with pkgs; import ./mix_deps.nix { inherit lib beamPackages; };` as an argument to mixRelease.
95−
96−If there are git depencencies.
97−
98−- You'll need to fix the version artificially in mix.exs and regenerate the mix.lock with fixed version (on upstream). This will enable you to run `mix2nix > mix_deps.nix`.
99−- From the mix_deps.nix file, remove the dependencies that had git versions and pass them as an override to the import function.
100−
101−```nix
102− mixNixDeps = import ./mix.nix {
103− inherit beamPackages lib;
104− overrides = (final: prev: {
105− # mix2nix does not support git dependencies yet,
106− # so we need to add them manually
107− prometheus_ex = beamPackages.buildMix rec {
108− name = "prometheus_ex";
109− version = "3.0.5";
110−
111− # Change the argument src with the git src that you actually need
112− src = fetchFromGitLab {
113− domain = "git.pleroma.social";
114− group = "pleroma";
115− owner = "elixir-libraries";
116− repo = "prometheus.ex";
117− rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5";
118− sha256 = "1v0q4bi7sb253i8q016l7gwlv5562wk5zy3l2sa446csvsacnpjk";
119− };
120− # you can re-use the same beamDeps argument as generated
121− beamDeps = with final; [ prometheus ];
122− };
123− });
124−};
125−```
126−
127−You will need to run the build process once to fix the sha256 to correspond to your new git src.
128−
129−###### FOD {#fixed-output-derivation}
130−
131−A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir_ls.nix) for a usage example of FOD.
132−
133−Practical steps
134−
135−- start with the following argument to mixRelease
136−
137−```nix
138− mixFodDeps = fetchMixDeps {
139− pname = "mix-deps-${pname}";
140− inherit src version;
141− sha256 = lib.fakeSha256;
142− };
143−```
144−
145−The first build will complain about the sha256 value, you can replace with the suggested value after that.
146−
147−Note that if after you've replaced the value, nix suggests another sha256, then mix is not fetching the dependencies reproducibly. An FOD will not work in that case and you will have to use mix2nix.
148−
149−##### mixRelease - example {#mix-release-example}
150−
151−Here is how your `default.nix` file would look for a phoenix project.
73+Here is how your `default.nix` file would look.
15274
15375```nix
15476with import <nixpkgs> { };
15577
15678let
157− # beam.interpreters.erlangR23 is available if you need a particular version
15879 packages = beam.packagesWith beam.interpreters.erlang;
159−
160− pname = "your_project";
161− version = "0.0.1";
162−
16380 src = builtins.fetchgit {
16481 url = "ssh://git@github.com/your_id/your_repo";
16582 rev = "replace_with_your_commit";
16683 };
16784
168− # if using mix2nix you can use the mixNixDeps attribute
85+ pname = "your_project";
86+ version = "0.0.1";
87+ mixEnv = "prod";
88+
16989 mixFodDeps = packages.fetchMixDeps {
17090 pname = "mix-deps-${pname}";
171− inherit src version;
91+ inherit src mixEnv version;
17292 # nix will complain and tell you the right value to replace this with
17393 sha256 = lib.fakeSha256;
17494 # if you have build time environment variables add them here
@@ -177,19 +97,45 @@ let
17797
17898 nodeDependencies = (pkgs.callPackage ./assets/default.nix { }).shell.nodeDependencies;
17999
100+ frontEndFiles = stdenvNoCC.mkDerivation {
101+ pname = "frontend-${pname}";
102+
103+ nativeBuildInputs = [ nodejs ];
104+
105+ inherit version src;
106+
107+ buildPhase = ''
108+ cp -r ./assets $TEMPDIR
109+
110+ mkdir -p $TEMPDIR/assets/node_modules/.cache
111+ cp -r ${nodeDependencies}/lib/node_modules $TEMPDIR/assets
112+ export PATH="${nodeDependencies}/bin:$PATH"
113+
114+ cd $TEMPDIR/assets
115+ webpack --config ./webpack.config.js
116+ cd ..
117+ '';
118+
119+ installPhase = ''
120+ cp -r ./priv/static $out/
121+ '';
122+
123+ outputHashAlgo = "sha256";
124+ outputHashMode = "recursive";
125+ # nix will complain and tell you the right value to replace this with
126+ outputHash = lib.fakeSha256;
127+
128+ impureEnvVars = lib.fetchers.proxyImpureEnvVars;
129+ };
130+
131+
180132in packages.mixRelease {
181− inherit src pname version mixFodDeps;
133+ inherit src pname version mixEnv mixFodDeps;
182134 # if you have build time environment variables add them here
183135 MY_ENV_VAR="my_value";
184−
185− postBuild = ''
186− ln -sf ${nodeDependencies}/lib/node_modules assets/node_modules
187− npm run deploy --prefix ./assets
188−
189− # for external task you need a workaround for the no deps check flag
190− # https://github.com/phoenixframework/phoenix/issues/2690
191− mix do deps.loadpaths --no-deps-check, phx.digest
192− mix phx.digest --no-deps-check
136+ preInstall = ''
137+ mkdir -p ./priv/static
138+ cp -r ${frontEndFiles} ./priv/static
193139 '';
194140}
195141```
@@ -202,7 +148,7 @@ Setup will require the following steps:
202148- you can now `nix-build .`
203149- To run the release, set the `RELEASE_TMP` environment variable to a directory that your program has write access to. It will be used to store the BEAM settings.
204150
205−#### Example of creating a service for an Elixir - Phoenix project {#example-of-creating-a-service-for-an-elixir---phoenix-project}
151+#### Example of creating a service for an Elixir - Phoenix project
206152
207153In order to create a service with your release, you could add a `service.nix`
208154in your project with the following
@@ -219,8 +165,6 @@ in
219165 systemd.services.${release_name} = {
220166 wantedBy = [ "multi-user.target" ];
221167 after = [ "network.target" "postgresql.service" ];
222− # note that if you are connecting to a postgres instance on a different host
223− # postgresql.service should not be included in the requires.
224168 requires = [ "network-online.target" "postgresql.service" ];
225169 description = "my app";
226170 environment = {
@@ -257,7 +201,6 @@ in
257201 path = [ pkgs.bash ];
258202 };
259203
260− # in case you have migration scripts or you want to use a remote shell
261204 environment.systemPackages = [ release ];
262205}
263206```
@@ -269,42 +212,23 @@ in
269212Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of Erlang and any other interpreters, and then use your normal build tools. As an example with Elixir:
270213
271214```nix
272−{ pkgs ? import <nixpkgs> {} }:
215+{ pkgs ? import "<nixpkgs"> {} }:
273216
274217with pkgs;
275−let
276− elixir = beam.packages.erlangR24.elixir_1_12;
277−in
278−mkShell {
279− buildInputs = [ elixir ];
280−}
281−```
282218
283−### Using an overlay
284−
285−If you need to use an overlay to change some attributes of a derivation, e.g. if you need a bugfix from a version that is not yet available in nixpkgs, you can override attributes such as `version` (and the corresponding `sha256`) and then use this overlay in your development environment:
219+let
286220
287−#### `shell.nix`
221+ elixir = beam.packages.erlangR22.elixir_1_9;
288222
289−```nix
290−let
291− elixir_1_13_1_overlay = (self: super: {
292− elixir_1_13 = super.elixir_1_13.override {
293− version = "1.13.1";
294− sha256 = "0z0b1w2vvw4vsnb99779c2jgn9bgslg7b1pmd9vlbv02nza9qj5p";
295− };
296− });
297− pkgs = import <nixpkgs> { overlays = [ elixir_1_13_1_overlay ]; };
298223in
299−with pkgs;
300224mkShell {
301− buildInputs = [
302− elixir_1_13
303− ];
225+ buildInputs = [ elixir ];
226+
227+ ERL_INCLUDE_PATH="${erlang}/lib/erlang/usr/include";
304228}
305229```
306230
307−#### Elixir - Phoenix project {#elixir---phoenix-project}
231+#### Elixir - Phoenix project
308232
309233Here is an example `shell.nix`.
310234
@@ -315,10 +239,10 @@ let
315239 # define packages to install
316240 basePackages = [
317241 git
318− # replace with beam.packages.erlang.elixir_1_13 if you need
242+ # replace with beam.packages.erlang.elixir_1_11 if you need
319243 beam.packages.erlang.elixir
320− nodejs
321− postgresql_14
244+ nodejs-15_x
245+ postgresql_13
322246 # only used for frontend dependencies
323247 # you are free to use yarn2nix as well
324248 nodePackages.node2nix
@@ -336,12 +260,10 @@ let
336260 mkdir -p .nix-mix .nix-hex
337261 export MIX_HOME=$PWD/.nix-mix
338262 export HEX_HOME=$PWD/.nix-mix
339− # make hex from Nixpkgs available
340− # `mix local.hex` will install hex into MIX_HOME and should take precedence
341− export MIX_PATH="${beam.packages.erlang.hex}/lib/erlang/lib/hex/ebin"
342263 export PATH=$MIX_HOME/bin:$HEX_HOME/bin:$PATH
343− export LANG=C.UTF-8
344− # keep your shell history in iex
264+ # TODO: not sure how to make hex available without installing it afterwards.
265+ mix local.hex --if-missing
266+ export LANG=en_US.UTF-8
345267 export ERL_AFLAGS="-kernel shell_history enabled"
346268
347269 # postges related
doc/languages-frameworks/bower.section.md+1−1
@@ -149,7 +149,7 @@ A few notes about [Full example — `default.nix`](#ex-buildBowerComponentsDefau
149149
150150## Troubleshooting {#ssec-bower2nix-troubleshooting}
151151
152−### ENOCACHE errors from buildBowerComponents {#enocache-errors-from-buildbowercomponents}
152+### ENOCACHE errors from buildBowerComponents
153153
154154This means that Bower was looking for a package version which doesn't exist in the generated `bower-packages.nix`.
155155
doc/languages-frameworks/chicken.section.mddeleted−49
@@ -1,49 +0,0 @@
1−# CHICKEN {#sec-chicken}
2−
3−[CHICKEN](https://call-cc.org/) is a
4−[R⁵RS](https://schemers.org/Documents/Standards/R5RS/HTML/)-compliant Scheme
5−compiler. It includes an interactive mode and a custom package format, "eggs".
6−
7−## Using Eggs
8−
9−Eggs described in nixpkgs are available inside the
10−`chickenPackages.chickenEggs` attrset. Including an egg as a build input is
11−done in the typical Nix fashion. For example, to include support for [SRFI
12−189](https://srfi.schemers.org/srfi-189/srfi-189.html) in a derivation, one
13−might write:
14−
15−```nix
16− buildInputs = [
17− chicken
18− chickenPackages.chickenEggs.srfi-189
19− ];
20−```
21−
22−Both `chicken` and its eggs have a setup hook which configures the environment
23−variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`.
24−
25−## Updating Eggs
26−
27−nixpkgs only knows about a subset of all published eggs. It uses
28−[egg2nix](https://github.com/the-kenny/egg2nix) to generate a
29−package set from a list of eggs to include.
30−
31−The package set is regenerated by running the following shell commands:
32−
33−```
34−$ nix-shell -p chickenPackages.egg2nix
35−$ cd pkgs/development/compilers/chicken/5/
36−$ egg2nix eggs.scm > eggs.nix
37−```
38−
39−## Adding Eggs
40−
41−When we run `egg2nix`, we obtain one collection of eggs with
42−mutually-compatible versions. This means that when we add new eggs, we may
43−need to update existing eggs. To keep those separate, follow the procedure for
44−updating eggs before including more eggs.
45−
46−To include more eggs, edit `pkgs/development/compilers/chicken/5/eggs.scm`.
47−The first section of this file lists eggs which are required by `egg2nix`
48−itself; all other eggs go into the second section. After editing, follow the
49−procedure for updating eggs.
doc/languages-frameworks/coq.section.md+4−6
@@ -1,6 +1,6 @@
11# Coq and coq packages {#sec-language-coq}
22
3−## Coq derivation: `coq` {#coq-derivation-coq}
3+## Coq derivation: `coq`
44
55The Coq derivation is overridable through the `coq.override overrides`, where overrides is an attribute set which contains the arguments to override. We recommend overriding either of the following
66
@@ -8,7 +8,7 @@ The Coq derivation is overridable through the `coq.override overrides`, where ov
88* `customOCamlPackage` (optional, defaults to `null`, which lets Coq choose a version automatically), which can be set to any of the ocaml packages attribute of `ocaml-ng` (such as `ocaml-ng.ocamlPackages_4_10` which is the default for Coq 8.11 for example).
99* `coq-version` (optional, defaults to the short version e.g. "8.10"), is a version number of the form "x.y" that indicates which Coq's version build behavior to mimic when using a source which is not a release. E.g. `coq.override { version = "d370a9d1328a4e1cdb9d02ee032f605a9d94ec7a"; coq-version = "8.10"; }`.
1010
11−## Coq packages attribute sets: `coqPackages` {#coq-packages-attribute-sets-coqpackages}
11+## Coq packages attribute sets: `coqPackages`
1212
1313The recommended way of defining a derivation for a Coq library, is to use the `coqPackages.mkCoqDerivation` function, which is essentially a specialization of `mkDerivation` taking into account most of the specifics of Coq libraries. The following attributes are supported:
1414
@@ -28,13 +28,11 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
2828* `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/coq-modules/heq/default.nix` for an example),
2929* `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags,
3030* `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers,
31−* `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`,
32−* `extraNativeBuildInputs` (optional), by default `nativeBuildInputs` just contains `coq`, this allows to add more native build inputs, `nativeBuildInputs` are executables and `buildInputs` are libraries and dependencies,
33−* `extraBuildInputs` (optional), this allows to add more build inputs,
31+* `namePrefix` (optional), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`,
32+* `extraBuildInputs` (optional), by default `buildInputs` just contains `coq`, this allows to add more build inputs,
3433* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against.
3534* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
3635* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
37−* `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build.
3836* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.
3937* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
4038* `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`,
doc/languages-frameworks/crystal.section.md+2−4
@@ -1,22 +1,20 @@
11# Crystal {#crystal}
22
3−## Building a Crystal package {#building-a-crystal-package}
3+## Building a Crystal package
44
55This section uses [Mint](https://github.com/mint-lang/mint) as an example for how to build a Crystal package.
66
7−If the Crystal project has any dependencies, the first step is to get a `shards.nix` file encoding those. Get a copy of the project and go to its root directory such that its `shard.lock` file is in the current directory. Executable projects should usually commit the `shard.lock` file, but sometimes that's not the case, which means you need to generate it yourself. With an existing `shard.lock` file, `crystal2nix` can be run.
7+If the Crystal project has any dependencies, the first step is to get a `shards.nix` file encoding those. Get a copy of the project and go to its root directory such that its `shard.lock` file is in the current directory, then run `crystal2nix` in it
88```bash
99$ git clone https://github.com/mint-lang/mint
1010$ cd mint
1111$ git checkout 0.5.0
12−$ if [ ! -f shard.lock ]; then nix-shell -p shards --run "shards lock"; fi
1312$ nix-shell -p crystal2nix --run crystal2nix
1413```
1514
1615This should have generated a `shards.nix` file.
1716
1817Next create a Nix file for your derivation and use `pkgs.crystal.buildCrystalPackage` as follows:
19−
2018```nix
2119with import <nixpkgs> {};
2220crystal.buildCrystalPackage rec {
doc/languages-frameworks/cuda.section.mddeleted−34
@@ -1,34 +0,0 @@
1−# CUDA {#cuda}
2−
3−CUDA-only packages are stored in the `cudaPackages` packages set. This set
4−includes the `cudatoolkit`, portions of the toolkit in separate derivations,
5−`cudnn`, `cutensor` and `nccl`.
6−
7−A package set is available for each CUDA version, so for example
8−`cudaPackages_11_6`. Within each set is a matching version of the above listed
9−packages. Additionally, other versions of the packages that are packaged and
10−compatible are available as well. For example, there can be a
11−`cudaPackages.cudnn_8_3_2` package.
12−
13−To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional
14−```nix
15−cudaSupport ? false
16−cudaPackages ? {}
17−```
18−
19−When using `callPackage`, you can choose to pass in a different variant, e.g.
20−when a different version of the toolkit suffices
21−```nix
22−mypkg = callPackage { cudaPackages = cudaPackages_11_5; }
23−```
24−
25−If another version of say `cudnn` or `cutensor` is needed, you can override the
26−package set to make it the default. This guarantees you get a consistent package
27−set.
28−```nix
29−mypkg = let
30− cudaPackages = cudaPackages_11_5.overrideScope' (final: prev {
31− cudnn = prev.cudnn_8_3_2;
32− }});
33−in callPackage { inherit cudaPackages; };
34−```
doc/languages-frameworks/dhall.section.md+15−46
@@ -50,7 +50,7 @@ expression does not protect the Prelude import with a semantic integrity
5050check, so the first step is to freeze the expression using `dhall freeze`,
5151like this:
5252
53−```ShellSession
53+```bash
5454$ dhall freeze --inplace ./true.dhall
5555```
5656
@@ -113,7 +113,7 @@ in
113113
114114… which we can then build using this command:
115115
116−```ShellSession
116+```bash
117117$ nix build --file ./example.nix dhallPackages.true
118118```
119119
@@ -121,7 +121,7 @@ $ nix build --file ./example.nix dhallPackages.true
121121
122122The above package produces the following directory tree:
123123
124−```ShellSession
124+```bash
125125$ tree -a ./result
126126result
127127├── .cache
@@ -135,7 +135,7 @@ result
135135
136136* `source.dhall` contains the result of interpreting our Dhall package:
137137
138− ```ShellSession
138+ ```bash
139139 $ cat ./result/source.dhall
140140 True
141141 ```
@@ -143,7 +143,7 @@ result
143143* The `.cache` subdirectory contains one binary cache product encoding the
144144 same result as `source.dhall`:
145145
146− ```ShellSession
146+ ```bash
147147 $ dhall decode < ./result/.cache/dhall/122027abdeddfe8503496adeb623466caa47da5f63abd2bc6fa19f6cfcb73ecfed70
148148 True
149149 ```
@@ -151,7 +151,7 @@ result
151151* `binary.dhall` contains a Dhall expression which handles fetching and decoding
152152 the same cache product:
153153
154− ```ShellSession
154+ ```bash
155155 $ cat ./result/binary.dhall
156156 missing sha256:27abdeddfe8503496adeb623466caa47da5f63abd2bc6fa19f6cfcb73ecfed70
157157 $ cp -r ./result/.cache .cache
@@ -168,7 +168,7 @@ to conserve disk space when they are used exclusively as dependencies. For
168168example, if we build the Prelude package it will only contain the binary
169169encoding of the expression:
170170
171−```ShellSession
171+```bash
172172$ nix build --file ./example.nix dhallPackages.Prelude
173173
174174$ tree -a result
@@ -199,7 +199,7 @@ Dhall overlay like this:
199199… and now the Prelude will contain the fully decoded result of interpreting
200200the Prelude:
201201
202−```ShellSession
202+```bash
203203$ nix build --file ./example.nix dhallPackages.Prelude
204204
205205$ tree -a result
@@ -302,7 +302,7 @@ Additionally, `buildDhallGitHubPackage` accepts the same arguments as
302302You can use the `dhall-to-nixpkgs` command-line utility to automate
303303packaging Dhall code. For example:
304304
305−```ShellSession
305+```bash
306306$ nix-env --install --attr haskellPackages.dhall-nixpkgs
307307
308308$ nix-env --install --attr nix-prefetch-git # Used by dhall-to-nixpkgs
@@ -329,12 +329,12 @@ The utility takes care of automatically detecting remote imports and converting
329329them to package dependencies. You can also use the utility on local
330330Dhall directories, too:
331331
332−```ShellSession
332+```bash
333333$ dhall-to-nixpkgs directory ~/proj/dhall-semver
334334{ buildDhallDirectoryPackage, Prelude }:
335335 buildDhallDirectoryPackage {
336336 name = "proj";
337− src = ~/proj/dhall-semver;
337+ src = /Users/gabriel/proj/dhall-semver;
338338 file = "package.dhall";
339339 source = false;
340340 document = false;
@@ -342,37 +342,6 @@ $ dhall-to-nixpkgs directory ~/proj/dhall-semver
342342 }
343343```
344344
345−### Remote imports as fixed-output derivations {#ssec-dhall-remote-imports-as-fod}
346−
347−`dhall-to-nixpkgs` has the ability to fetch and build remote imports as
348−fixed-output derivations by using their Dhall integrity check. This is
349−sometimes easier than manually packaging all remote imports.
350−
351−This can be used like the following:
352−
353−```ShellSession
354−$ dhall-to-nixpkgs directory --fixed-output-derivations ~/proj/dhall-semver
355−{ buildDhallDirectoryPackage, buildDhallUrl }:
356− buildDhallDirectoryPackage {
357− name = "proj";
358− src = ~/proj/dhall-semver;
359− file = "package.dhall";
360− source = false;
361− document = false;
362− dependencies = [
363− (buildDhallUrl {
364− url = "https://prelude.dhall-lang.org/v17.0.0/package.dhall";
365− hash = "sha256-ENs8kZwl6QRoM9+Jeo/+JwHcOQ+giT2VjDQwUkvlpD4=";
366− dhallHash = "sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e";
367− })
368− ];
369− }
370−```
371−
372−Here, `dhall-semver`'s `Prelude` dependency is fetched and built with the
373−`buildDhallUrl` helper function, instead of being passed in as a function
374−argument.
375−
376345## Overriding dependency versions {#ssec-dhall-overriding-dependency-versions}
377346
378347Suppose that we change our `true.dhall` example expression to depend on an older
@@ -390,7 +359,7 @@ in Prelude.Bool.not False
390359
391360If we try to rebuild that expression the build will fail:
392361
393−```ShellSession
362+```
394363$ nix build --file ./example.nix dhallPackages.true
395364builder for '/nix/store/0f1hla7ff1wiaqyk1r2ky4wnhnw114fi-true.drv' failed with exit code 1; last 10 log lines:
396365
@@ -416,7 +385,7 @@ importing the URL.
416385However, we can override the default Prelude version by using `dhall-to-nixpkgs`
417386to create a Dhall package for our desired Prelude:
418387
419−```ShellSession
388+```bash
420389$ dhall-to-nixpkgs github https://github.com/dhall-lang/dhall-lang.git \
421390 --name Prelude \
422391 --directory Prelude \
@@ -427,7 +396,7 @@ $ dhall-to-nixpkgs github https://github.com/dhall-lang/dhall-lang.git \
427396… and then referencing that package in our Dhall overlay, by either overriding
428397the Prelude globally for all packages, like this:
429398
430−```nix
399+```bash
431400 dhallOverrides = self: super: {
432401 true = self.callPackage ./true.nix { };
433402
@@ -438,7 +407,7 @@ the Prelude globally for all packages, like this:
438407… or selectively overriding the Prelude dependency for just the `true` package,
439408like this:
440409
441−```nix
410+```bash
442411 dhallOverrides = self: super: {
443412 true = self.callPackage ./true.nix {
444413 Prelude = self.callPackage ./Prelude.nix { };
doc/languages-frameworks/dotnet.section.md+12−69
@@ -1,6 +1,6 @@
1−# Dotnet {#dotnet}
1+# Dotnet
22
3−## Local Development Workflow {#local-development-workflow}
3+## Local Development Workflow
44
55For local development, it's recommended to use nix-shell to create a dotnet environment:
66
@@ -16,7 +16,7 @@ mkShell {
1616}
1717```
1818
19−### Using many sdks in a workflow {#using-many-sdks-in-a-workflow}
19+### Using many sdks in a workflow
2020
2121It's very likely that more than one sdk will be needed on a given project. Dotnet provides several different frameworks (E.g dotnetcore, aspnetcore, etc.) as well as many versions for a given framework. Normally, dotnet is able to fetch a framework and install it relative to the executable. However, this would mean writing to the nix store in nixpkgs, which is read-only. To support the many-sdk use case, one can compose an environment using `dotnetCorePackages.combinePackages`:
2222
@@ -28,7 +28,8 @@ mkShell {
2828 packages = [
2929 (with dotnetCorePackages; combinePackages [
3030 sdk_3_1
31− sdk_5_0
31+ sdk_3_0
32+ sdk_2_1
3233 ])
3334 ];
3435}
@@ -36,7 +37,7 @@ mkShell {
3637
3738This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output:
3839
39−```ShellSession
40+```ShellSesssion
4041$ dotnet --info
4142.NET Core SDK (reflecting any global.json):
4243 Version: 3.1.101
@@ -59,74 +60,16 @@ $ dotnet --info
5960 Microsoft.NETCore.App 3.1.1 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App]
6061```
6162
62−## dotnet-sdk vs dotnetCorePackages.sdk {#dotnet-sdk-vs-dotnetcorepackages.sdk}
63+## dotnet-sdk vs dotnetCorePackages.sdk
6364
6465The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project.
6566
66−## dotnetCorePackages.sdk vs dotnetCorePackages.runtime vs dotnetCorePackages.aspnetcore {#dotnetcorepackages.sdk-vs-dotnetcorepackages.runtime-vs-dotnetcorepackages.aspnetcore}
67−
68−The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `runtime` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications.
69−
70−## Packaging a Dotnet Application {#packaging-a-dotnet-application}
71−
72−To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions:
73−
74−* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well.
75−* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. A script to fetch these is available as `passthru.fetch-deps`. This file can also be generated manually using `nuget-to-nix` tool, which is available in nixpkgs.
76−* `packNupkg` is used to pack project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`.
77−* `projectReferences` can be used to resolve `ProjectReference` project items. Referenced projects can be packed with `buildDotnetModule` by setting the `packNupkg = true` attribute and passing a list of derivations to `projectReferences`. Since we are sharing referenced projects as NuGets they must be added to csproj/fsproj files as `PackageReference` as well.
78− For example, your project has a local dependency:
79− ```xml
80− <ProjectReference Include="../foo/bar.fsproj" />
81− ```
82− To enable discovery through `projectReferences` you would need to add:
83− ```xml
84− <ProjectReference Include="../foo/bar.fsproj" />
85− <PackageReference Include="bar" Version="*" Condition=" '$(ContinuousIntegrationBuild)'=='true' "/>
86− ```
87−* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. This gets done in the `preFixup` phase.
88−* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies.
89−* `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`.
90−* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used.
91−* `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore.
92−* `dotnet-test-sdk` is useful in cases where unit tests expect a different dotnet SDK. By default, this is set to the `dotnet-sdk` attribute.
93−* `testProjectFile` is useful in cases where the regular project file does not contain the unit tests. It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this.
94−* `disabledTests` is used to disable running specific unit tests. This gets passed as: `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all unit test frameworks.
95−* `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`.
96−* `dotnetBuildFlags` can be used to pass flags to `dotnet build`.
97−* `dotnetTestFlags` can be used to pass flags to `dotnet test`. Used only if `doCheck` is set to `true`.
98−* `dotnetInstallFlags` can be used to pass flags to `dotnet install`.
99−* `dotnetPackFlags` can be used to pass flags to `dotnet pack`. Used only if `packNupkg` is set to `true`.
100−* `dotnetFlags` can be used to pass flags to all of the above phases.
101−
102−When packaging a new application, you need to fetch it's dependencies. You can set `nugetDeps` to an empty string to make the derivation temporarily evaluate, and then run `nix-build -A package.passthru.fetch-deps` to generate it's dependency fetching script. After running the script, you should have the location of the generated lockfile printed to the console. This can be copied to a stable directory. Note that if either `projectFile` or `nugetDeps` are unset, this script cannot be generated!
103−
104−Here is an example `default.nix`, using some of the previously discussed arguments:
105−```nix
106−{ lib, buildDotnetModule, dotnetCorePackages, ffmpeg }:
107−
108−let
109− referencedProject = import ../../bar { ... };
110−in buildDotnetModule rec {
111− pname = "someDotnetApplication";
112− version = "0.1";
113−
114− src = ./.;
115−
116− projectFile = "src/project.sln";
117− nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`.
67+## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore
11868
119− projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.
69+The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version.
12070
121− dotnet-sdk = dotnetCorePackages.sdk_3_1;
122− dotnet-runtime = dotnetCorePackages.net_5_0;
123− dotnetFlags = [ "--runtime linux-x64" ];
71+## Packaging a Dotnet Application
12472
125− executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.
126− executables = []; # Don't install any executables.
73+Ideally, we would like to build against the sdk, then only have the dotnet runtime available in the runtime closure.
12774
128− packNupkg = true; # This packs the project as "foo-0.1.nupkg" at `$out/share`.
129−
130− runtimeDeps = [ ffmpeg ]; # This will wrap ffmpeg's library path into `LD_LIBRARY_PATH`.
131−}
132−```
75+TODO: Create closure-friendly way to package dotnet applications
doc/languages-frameworks/emscripten.section.md+10−8
@@ -15,26 +15,28 @@ Modes of use of `emscripten`:
1515
1616 If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands:
1717
18− * `nix-env -f "<nixpkgs>" -iA emscripten`
18+ * `nix-env -i emscripten`
1919 * `nix-shell -p emscripten`
2020
2121* **Declarative usage**:
2222
23− This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`. From the root of the nixpkgs repository:
23+ This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
2424 * build and install all packages:
2525 * `nix-env -iA emscriptenPackages`
2626
2727 * dev-shell for zlib implementation hacking:
2828 * `nix-shell -A emscriptenPackages.zlib`
2929
30−## Imperative usage {#imperative-usage}
30+
31+## Imperative usage
3132
3233A few things to note:
3334
3435* `export EMCC_DEBUG=2` is nice for debugging
3536* `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time
3637
37−## Declarative usage {#declarative-usage}
38+
39+## Declarative usage
3840
3941Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`:
4042
@@ -48,7 +50,7 @@ A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = tru
4850* Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong.
4951* ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic.
5052
51−### Usage 1: pkgs.zlib.override {#usage-1-pkgs.zlib.override}
53+### Usage 1: pkgs.zlib.override
5254
5355This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside...
5456
@@ -108,7 +110,7 @@ See the `zlib` example:
108110 '';
109111 });
110112
111−### Usage 2: pkgs.buildEmscriptenPackage {#usage-2-pkgs.buildemscriptenpackage}
113+### Usage 2: pkgs.buildEmscriptenPackage
112114
113115This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used.
114116
@@ -163,7 +165,7 @@ This `xmlmirror` example features a emscriptenPackage which is defined completel
163165 '';
164166 };
165167
166−### Declarative debugging {#declarative-debugging}
168+### Declarative debugging
167169
168170Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project.
169171
@@ -175,7 +177,7 @@ Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from
1751776. `buildPhase`
1761787. ... happy hacking...
177179
178−## Summary {#summary}
180+## Summary
179181
180182Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from.
181183
doc/languages-frameworks/gnome.section.md+5−37
@@ -8,30 +8,12 @@ Programs in the GNOME universe are written in various languages but they all use
88
99[GSettings](https://developer.gnome.org/gio/stable/GSettings.html) API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for `glib-2.0/schemas/gschemas.compiled` files inside the directories of `XDG_DATA_DIRS`.
1010
11−On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.
11+On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` GIO module to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.
1212
1313Last you will need the dconf database D-Bus service itself. You can enable it using `programs.dconf.enable`.
1414
1515Some applications will also require `gsettings-desktop-schemas` for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for `org.gnome.desktop` and `org.gnome.system` to see if the schemas are needed.
1616
17−### GIO modules {#ssec-gnome-gio-modules}
18−
19−GLib’s [GIO](https://developer.gnome.org/gio/stable/ch01.html) library supports several [extension points](https://developer.gnome.org/gio/stable/extending-gio.html). Notably, they allow:
20−
21−* implementing settings backends (already [mentioned](#ssec-gnome-settings))
22−* adding TLS support
23−* proxy settings
24−* virtual file systems
25−
26−The modules are typically installed to `lib/gio/modules/` directory of a package and you need to add them to `GIO_EXTRA_MODULES` if you need any of those features.
27−
28−In particular, we recommend:
29−
30−* adding `dconf.lib` for any software on Linux that reads [GSettings](#ssec-gnome-settings) (even transitivily through e.g. GTK’s file manager)
31−* adding `glib-networking` for any software that accesses network using GIO or libsoup – glib-networking contains a module that implements TLS support and loads system-wide proxy settings
32−
33−To allow software to use various virtual file systems, `gvfs` package can be also added. But that is usually an optional feature so we typically use `gvfs` from the system (e.g. installed globally using NixOS module).
34−
3517### GdkPixbuf loaders {#ssec-gnome-gdk-pixbuf-loaders}
3618
3719GTK applications typically use [GdkPixbuf](https://developer.gnome.org/gdk-pixbuf/stable/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`.
@@ -42,21 +24,7 @@ Unlike other libraries mentioned in this section, GdkPixbuf only supports a sing
4224
4325### Icons {#ssec-gnome-icons}
4426
45−When an application uses icons, an icon theme should be available in `XDG_DATA_DIRS` during runtime. The package for the default, icon-less [hicolor-icon-theme](https://www.freedesktop.org/wiki/Software/icon-theme/) (should be propagated by every icon theme) contains [a setup hook](#ssec-gnome-hooks-hicolor-icon-theme) that will pick up icon themes from `buildInputs` and add their datadirs to `XDG_ICON_DIRS` environment variable (this is Nixpkgs specific, not actually a XDG standard variable). Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed.
46−
47−In the rare case you need to use icons from dependencies (e.g. when an app forces an icon theme), you can use the following to pick them up:
48−
49−```nix
50− buildInputs = [
51− pantheon.elementary-icon-theme
52− ];
53− preFixup = ''
54− gappsWrapperArgs+=(
55− # The icon theme is hardcoded.
56− --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
57− )
58− '';
59−```
27+When an application uses icons, an icon theme should be available in `XDG_DATA_DIRS` during runtime. The package for the default, icon-less [hicolor-icon-theme](https://www.freedesktop.org/wiki/Software/icon-theme/) (should be propagated by every icon theme) contains [a setup hook](#ssec-gnome-hooks-hicolor-icon-theme) that will pick up icon themes from `buildInputs` and pass it to our wrapper. Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed.
6028
6129To avoid costly file system access when locating icons, GTK, [as well as Qt](https://woboq.com/blog/qicon-reads-gtk-icon-cache-in-qt57.html), can rely on `icon-theme.cache` files from the themes' top-level directories. These files are generated using `gtk-update-icon-cache`, which is expected to be run whenever an icon is added or removed to an icon theme (typically an application icon into `hicolor` theme) and some programs do indeed run this after icon installation. However, since packages are installed into their own prefix by Nix, this would lead to conflicts. For that reason, `gtk3` provides a [setup hook](#ssec-gnome-hooks-gtk-drop-icon-theme-cache) that will clean the file from installation. Since most applications only ship their own icon that will be loaded on start-up, it should not affect them too much. On the other hand, icon themes are much larger and more widely used so we need to cache them. Because we recommend installing icon themes globally, we will generate the cache files from all packages in a profile using a NixOS module. You can enable the cache generation using `gtk.iconCache.enable` option if your desktop environment does not already do that.
6230
@@ -106,17 +74,17 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti
10674
10775- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`.
10876
109−- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](#ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGAppsHook` copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper.
77+- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGAppsHook` copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper.
11078
11179- []{#ssec-gnome-hooks-gtk-drop-icon-theme-cache} One of `gtk3`’s setup hooks will remove `icon-theme.cache` files from package’s icon theme directories to avoid conflicts. Icon theme packages should prevent this with `dontDropIconThemeCache = true;`.
11280
11381- []{#ssec-gnome-hooks-dconf} `dconf.lib` is a dependency of `wrapGAppsHook`, which then also adds it to the `GIO_EXTRA_MODULES` variable.
11482
115−- []{#ssec-gnome-hooks-hicolor-icon-theme} `hicolor-icon-theme`’s setup hook will add icon themes to `XDG_ICON_DIRS`.
83+- []{#ssec-gnome-hooks-hicolor-icon-theme} `hicolor-icon-theme`’s setup hook will add icon themes to `XDG_ICON_DIRS` which is prepended to `XDG_DATA_DIRS` by `wrapGAppsHook`.
11684
11785- []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`.
11886
119− ::: {.warning}
87+ ::: warning
12088 The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`.
12189 :::
12290
doc/languages-frameworks/go.section.md+16−25
@@ -12,7 +12,7 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil
1212In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function:
1313
1414- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;`
15−- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums.
15+- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.
1616
1717```nix
1818pet = buildGoModule rec {
@@ -28,11 +28,14 @@ pet = buildGoModule rec {
2828
2929 vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j";
3030
31+ runVend = true;
32+
3133 meta = with lib; {
3234 description = "Simple command-line snippet manager, written in Go";
3335 homepage = "https://github.com/knqyf263/pet";
3436 license = licenses.mit;
3537 maintainers = with maintainers; [ kalbasit ];
38+ platforms = platforms.linux ++ platforms.darwin;
3639 };
3740}
3841```
@@ -41,7 +44,7 @@ pet = buildGoModule rec {
4144
4245The function `buildGoPackage` builds legacy Go programs, not supporting Go modules.
4346
44−### Example for `buildGoPackage` {#example-for-buildgopackage}
47+### Example for `buildGoPackage`
4548
4649In the following is an example expression using buildGoPackage, the following arguments are of special significance to the function:
4750
@@ -109,31 +112,23 @@ done
109112
110113Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used:
111114
112−### `ldflags` {#var-go-ldflags}
115+### `buildFlagsArray` and `buildFlags`: {#ex-goBuildFlags-noarray}
113116
114−Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build`. The most common use case for this argument is to make the resulting executable aware of its own version. For example:
117+These attributes set build flags supported by `go build`. We recommend using `buildFlagsArray`. The most common use case of these attributes is to make the resulting executable aware of its own version. For example:
115118
116119```nix
117− ldflags = [
118− "-s" "-w"
119− "-X main.Version=${version}"
120− "-X main.Commit=${version}"
120+ buildFlagsArray = [
121+ # Note: single quotes are not needed.
122+ "-ldflags=-X main.Version=${version} -X main.Commit=${version}"
121123 ];
122124```
123125
124−### `tags` {#var-go-tags}
125−
126−Arguments to pass to the Go via the `-tags` argument of `go build`. For example:
127−
128126```nix
129− tags = [
130− "production"
131− "sqlite"
132− ];
133−```
134−
135−```nix
136− tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ];
127+ buildFlagsArray = ''
128+ -ldflags=
129+ -X main.Version=${version}
130+ -X main.Commit=${version}
131+ '';
137132```
138133
139134### `deleteVendor` {#var-go-deleteVendor}
@@ -142,8 +137,4 @@ Removes the pre-existing vendor directory. This should only be used if the depen
142137
143138### `subPackages` {#var-go-subPackages}
144139
145−Specified as a string or list of strings. Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built.
146−
147−### `excludedPackages` {#var-go-excludedPackages}
148−
149−Specified as a string or list of strings. Causes the builder to skip building child packages that match any of the provided values. If `excludedPackages` is not specified, all child packages will be built.
140+Limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built.
doc/languages-frameworks/hy.section.mddeleted−31
@@ -1,31 +0,0 @@
1−# Hy {#sec-language-hy}
2−
3−## Installation {#ssec-hy-installation}
4−
5−### Installation without packages {#installation-without-packages}
6−
7−You can install `hy` via nix-env or by adding it to `configuration.nix` by reffering to it as a `hy` attribute. This kind of installation adds `hy` to your environment and it succesfully works with `python3`.
8−
9−::: {.caution}
10−Packages that are installed with your python derivation, are not accesible by `hy` this way.
11−:::
12−
13−### Installation with packages {#installation-with-packages}
14−
15−Creating `hy` derivation with custom `python` packages is really simple and similar to the way that python does it. Attribute `hy` provides function `withPackages` that creates custom `hy` derivation with specified packages.
16−
17−For example if you want to create shell with `matplotlib` and `numpy`, you can do it like so:
18−
19−```ShellSession
20−$ nix-shell -p "hy.withPackages (ps: with ps; [ numpy matplotlib ])"
21−```
22−
23−Or if you want to extend your `configuration.nix`:
24−```nix
25−{ # ...
26−
27− environment.systemPackages = with pkgs; [
28− (hy.withPackages (py-packages: with py-packages; [ numpy matplotlib ]))
29− ];
30−}
31−```
doc/languages-frameworks/idris.section.md+16−15
@@ -1,11 +1,14 @@
11# Idris {#idris}
22
3−## Installing Idris {#installing-idris}
3+## Installing Idris
44
55The easiest way to get a working idris version is to install the `idris` attribute:
66
7−```ShellSession
8−$ nix-env -f "<nixpkgs>" -iA idris
7+```ShellSesssion
8+$ # On NixOS
9+$ nix-env -i nixos.idris
10+$ # On non-NixOS
11+$ nix-env -i nixpkgs.idris
912```
1013
1114This however only provides the `prelude` and `base` libraries. To install idris with additional libraries, you can use the `idrisPackages.with-packages` function, e.g. in an overlay in `~/.config/nixpkgs/overlays/my-idris.nix`:
@@ -18,7 +21,7 @@ self: super: {
1821
1922And then:
2023
21−```ShellSession
24+```ShellSesssion
2225$ # On NixOS
2326$ nix-env -iA nixos.myIdris
2427$ # On non-NixOS
@@ -26,8 +29,7 @@ $ nix-env -iA nixpkgs.myIdris
2629```
2730
2831To see all available Idris packages:
29−
30−```ShellSession
32+```ShellSesssion
3133$ # On NixOS
3234$ nix-env -qaPA nixos.idrisPackages
3335$ # On non-NixOS
@@ -35,23 +37,22 @@ $ nix-env -qaPA nixpkgs.idrisPackages
3537```
3638
3739Similarly, entering a `nix-shell`:
38−
39−```ShellSession
40+```ShellSesssion
4041$ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])'
4142```
4243
43−## Starting Idris with library support {#starting-idris-with-library-support}
44+## Starting Idris with library support
4445
4546To have access to these libraries in idris, call it with an argument `-p <library name>` for each library:
4647
47−```ShellSession
48+```ShellSesssion
4849$ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])'
4950[nix-shell:~]$ idris -p contrib -p pruviloj
5051```
5152
5253A listing of all available packages the Idris binary has access to is available via `--listlibs`:
5354
54−```ShellSession
55+```ShellSesssion
5556$ idris --listlibs
565700prelude-idx.ibc
5758pruviloj
@@ -63,7 +64,7 @@ prelude
636400contrib-idx.ibc
6465```
6566
66−## Building an Idris project with Nix {#building-an-idris-project-with-nix}
67+## Building an Idris project with Nix
6768
6869As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`:
6970
@@ -104,7 +105,7 @@ build-idris-package {
104105
105106Assuming this file is saved as `yaml.nix`, it's buildable using
106107
107−```ShellSession
108+```ShellSesssion
108109$ nix-build -E '(import <nixpkgs> {}).idrisPackages.callPackage ./yaml.nix {}'
109110```
110111
@@ -120,11 +121,11 @@ with import <nixpkgs> {};
120121
121122in another file (say `default.nix`) to be able to build it with
122123
123−```ShellSession
124+```ShellSesssion
124125$ nix-build -A yaml
125126```
126127
127−## Passing options to `idris` commands {#passing-options-to-idris-commands}
128+## Passing options to `idris` commands
128129
129130The `build-idris-package` function provides also optional input values to set additional options for the used `idris` commands.
130131
doc/languages-frameworks/index.xml+1−7
@@ -9,26 +9,20 @@
99 <xi:include href="android.section.xml" />
1010 <xi:include href="beam.section.xml" />
1111 <xi:include href="bower.section.xml" />
12− <xi:include href="chicken.section.xml" />
1312 <xi:include href="coq.section.xml" />
1413 <xi:include href="crystal.section.xml" />
15− <xi:include href="cuda.section.xml" />
1614 <xi:include href="dhall.section.xml" />
17− <xi:include href="dotnet.section.xml" />
1815 <xi:include href="emscripten.section.xml" />
1916 <xi:include href="gnome.section.xml" />
2017 <xi:include href="go.section.xml" />
2118 <xi:include href="haskell.section.xml" />
22− <xi:include href="hy.section.xml" />
2319 <xi:include href="idris.section.xml" />
2420 <xi:include href="ios.section.xml" />
2521 <xi:include href="java.section.xml" />
26− <xi:include href="javascript.section.xml" />
2722 <xi:include href="lua.section.xml" />
2823 <xi:include href="maven.section.xml" />
29− <xi:include href="nim.section.xml" />
24+ <xi:include href="node.section.xml" />
3025 <xi:include href="ocaml.section.xml" />
31− <xi:include href="octave.section.xml" />
3226 <xi:include href="perl.section.xml" />
3327 <xi:include href="php.section.xml" />
3428 <xi:include href="python.section.xml" />
doc/languages-frameworks/ios.section.md+8−9
@@ -20,8 +20,8 @@ Hydra.
2020
2121The Xcode build environment implements a number of features.
2222
23−## Deploying a proxy component wrapper exposing Xcode {#deploying-a-proxy-component-wrapper-exposing-xcode}
24−
23+Deploying a proxy component wrapper exposing Xcode
24+--------------------------------------------------
2525The first use case is deploying a Nix package that provides symlinks to the Xcode
2626installation on the host system. This package can be used as a build input to
2727any build function implemented in the Nix expression language that requires
@@ -55,8 +55,8 @@ lrwxr-xr-x 1 sander staff 61 1 jan 1970 xcodebuild -> /Applications/Xcode.a
5555lrwxr-xr-x 1 sander staff 14 1 jan 1970 xcrun -> /usr/bin/xcrun
5656```
5757
58−## Building an iOS application {#building-an-ios-application}
59−
58+Building an iOS application
59+---------------------------
6060We can build an iOS app executable for the simulator, or an IPA/xcarchive file
6161for release purposes, e.g. ad-hoc, enterprise or store installations, by
6262executing the `xcodeenv.buildApp {}` function:
@@ -99,7 +99,6 @@ xcodeenv.buildApp {
9999```
100100
101101The above function takes a variety of parameters:
102−
103102* The `name` and `src` parameters are mandatory and specify the name of the app
104103 and the location where the source code resides
105104* `sdkVersion` specifies which version of the iOS SDK to use.
@@ -152,8 +151,8 @@ the `xcodeenv.composeXcodeWrapper {}` function takes. For example, the
152151`xcodeBaseDir` parameter can be overridden to refer to a different Xcode
153152version.
154153
155−## Spawning simulator instances {#spawning-simulator-instances}
156−
154+Spawning simulator instances
155+----------------------------
157156In addition to building iOS apps, we can also automatically spawn simulator
158157instances:
159158
@@ -214,8 +213,8 @@ xcode.simulateApp {
214213By providing the result of an `xcode.buildApp {}` function and configuring the
215214app bundle id, the app gets deployed automatically and started.
216215
217−## Troubleshooting {#troubleshooting}
218−
216+Troubleshooting
217+---------------
219218In some rare cases, it may happen that after a failure, changes are not picked
220219up. Most likely, this is caused by a derived data cache that Xcode maintains.
221220To wipe it you can run:
doc/languages-frameworks/java.section.md−9
@@ -72,15 +72,6 @@ in
7272 ...
7373```
7474
75−You can also specify what JDK your JRE should be based on, for example
76−selecting a 'headless' build to avoid including a link to GTK+:
77−
78−```nix
79−my_jre = pkgs.jre_minimal.override {
80− jdk = jdk11_headless;
81−};
82−```
83−
8475Note all JDKs passthru `home`, so if your application requires
8576environment variables like `JAVA_HOME` being set, that can be done in a
8677generic fashion with the `--set` argument of `makeWrapper`:
doc/languages-frameworks/javascript.section.mddeleted−278
@@ -1,278 +0,0 @@
1−# Javascript {#language-javascript}
2−
3−## Introduction {#javascript-introduction}
4−
5−This contains instructions on how to package javascript applications.
6−
7−The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given.
8−
9−## Getting unstuck / finding code examples
10−
11−If you find you are lacking inspiration for packing javascript applications, the links below might prove useful.
12−Searching online for prior art can be helpful if you are running into solved problems.
13−
14−### Github
15−
16−- Searching Nix files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+language%3ANix&type=code>
17−
18−- Searching just `flake.nix` files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+filename%3Aflake.nix&type=code>
19−
20−### Gitlab
21−
22−- Searching Nix files for `mkYarnPackage`: <https://gitlab.com/search?scope=blobs&search=mkYarnPackage+extension%3Anix>
23−
24−- Searching just `flake.nix` files for `mkYarnPackage`: <https://gitlab.com/search?scope=blobs&search=mkYarnPackage+filename%3Aflake.nix>
25−
26−## Tools overview {#javascript-tools-overview}
27−
28−## General principles {#javascript-general-principles}
29−
30−The following principles are given in order of importance with potential exceptions.
31−
32−### Try to use the same node version used upstream {#javascript-upstream-node-version}
33−
34−It is often not documented which node version is used upstream, but if it is, try to use the same version when packaging.
35−
36−This can be a problem if upstream is using the latest and greatest and you are trying to use an earlier version of node. Some cryptic errors regarding V8 may appear.
37−
38−An exception to this:
39−
40−### Try to respect the package manager originally used by upstream (and use the upstream lock file) {#javascript-upstream-package-manager}
41−
42−A lock file (package-lock.json, yarn.lock...) is supposed to make reproducible installations of node_modules for each tool.
43−
44−Guidelines of package managers, recommend to commit those lock files to the repos. If a particular lock file is present, it is a strong indication of which package manager is used upstream.
45−
46−It's better to try to use a nix tool that understand the lock file. Using a different tool might give you hard to understand error because different packages have been installed. An example of problems that could arise can be found [here](https://github.com/NixOS/nixpkgs/pull/126629). Upstream uses npm, but this is an attempt to package it with yarn2nix (that uses yarn.lock)
47−
48−Using a different tool forces to commit a lock file to the repository. Those files are fairly large, so when packaging for nixpkgs, this approach does not scale well.
49−
50−Exceptions to this rule are:
51−
52−- when you encounter one of the bugs from a nix tool. In each of the tool specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to recreate a lock file and commit it to nixpkgs. In general yarn2nix has less known problems and so a simple search in nixpkgs will reveal many yarn.lock files committed
53−- Some lock files contain particular version of a package that has been pulled off npm for some reason. In that case, you can recreate upstream lock (by removing the original and `npm install`, `yarn`, ...) and commit this to nixpkgs.
54−- The only tool that supports workspaces (a feature of npm that helps manage sub-directories with different package.json from a single top level package.json) is yarn2nix. If upstream has workspaces you should try yarn2nix.
55−
56−### Try to use upstream package.json {#javascript-upstream-package-json}
57−
58−Exceptions to this rule are
59−
60−- Sometimes the upstream repo assumes some dependencies be installed globally. In that case you can add them manually to the upstream package.json (`yarn add xxx` or `npm install xxx`, ...). Dependencies that are installed locally can be executed with `npx` for cli tools. (e.g. `npx postcss ...`, this is how you can call those dependencies in the phases).
61−- Sometimes there is a version conflict between some dependency requirements. In that case you can fix a version (by removing the `^`).
62−- Sometimes the script defined in the package.json does not work as is. Some scripts for example use cli tools that might not be available, or cd in directory with a different package.json (for workspaces notably). In that case, it's perfectly fine to look at what the particular script is doing and break this down in the phases. In the build script you can see `build:*` calling in turns several other build scripts like `build:ui` or `build:server`. If one of those fails, you can try to separate those into:
63−
64−```Shell
65−yarn build:ui
66−yarn build:server
67−# OR
68−npm run build:ui
69−npm run build:server
70−```
71−
72−when you need to override a package.json. It's nice to use the one from the upstream src and do some explicit override. Here is an example.
73−
74−```nix
75−patchedPackageJSON = final.runCommand "package.json" { } ''
76− ${jq}/bin/jq '.version = "0.4.0" |
77− .devDependencies."@jsdoc/cli" = "^0.2.5"
78− ${sonar-src}/package.json > $out
79−'';
80−```
81−
82−you will still need to commit the modified version of the lock files, but at least the overrides are explicit for everyone to see.
83−
84−### Using node_modules directly {#javascript-using-node_modules}
85−
86−each tool has an abstraction to just build the node_modules (dependencies) directory. you can always use the stdenv.mkDerivation with the node_modules to build the package (symlink the node_modules directory and then use the package build command). the node_modules abstraction can be also used to build some web framework frontends. For an example of this see how [plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix) is built. mkYarnModules to make the derivation containing node_modules. Then when building the frontend you can just symlink the node_modules directory
87−
88−## Javascript packages inside nixpkgs {#javascript-packages-nixpkgs}
89−
90−The `pkgs/development/node-packages` folder contains a generated collection of
91−[NPM packages](https://npmjs.com/) that can be installed with the Nix package
92−manager.
93−
94−As a rule of thumb, the package set should only provide _end user_ software
95−packages, such as command-line utilities. Libraries should only be added to the
96−package set if there is a non-NPM package that requires it.
97−
98−When it is desired to use NPM libraries in a development project, use the
99−`node2nix` generator directly on the `package.json` configuration file of the
100−project.
101−
102−The package set provides support for the official stable Node.js versions.
103−The latest stable LTS release in `nodePackages`, as well as the latest stable
104−Current release in `nodePackages_latest`.
105−
106−If your package uses native addons, you need to examine what kind of native
107−build system it uses. Here are some examples:
108−
109−- `node-gyp`
110−- `node-gyp-builder`
111−- `node-pre-gyp`
112−
113−After you have identified the correct system, you need to override your package
114−expression while adding in build system as a build input. For example, `dat`
115−requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blob/32f5e5da4a1b3f0595527f5195ac3a91451e9b56/pkgs/development/node-packages/default.nix#L37-L40) its expression in [`default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/default.nix):
116−
117−```nix
118− dat = super.dat.override {
119− buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ];
120− meta.broken = since "12";
121− };
122−```
123−
124−### Adding and Updating Javascript packages in nixpkgs
125−
126−To add a package from NPM to nixpkgs:
127−
128−1. Modify `pkgs/development/node-packages/node-packages.json` to add, update
129− or remove package entries to have it included in `nodePackages` and
130− `nodePackages_latest`.
131−2. Run the script: `./pkgs/development/node-packages/generate.sh`.
132−3. Build your new package to test your changes:
133− `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
134− To build against the latest stable Current Node.js version (e.g. 14.x):
135− `nix-build -A nodePackages_latest.<new-or-updated-package>`
136−4. Add and commit all modified and generated files.
137−
138−For more information about the generation process, consult the
139−[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
140−tool.
141−
142−To update NPM packages in nixpkgs, run the same `generate.sh` script:
143−
144−```sh
145−./pkgs/development/node-packages/generate.sh
146−```
147−
148−#### Git protocol error
149−
150−Some packages may have Git dependencies from GitHub specified with `git://`.
151−GitHub has
152−[disabled unecrypted Git connections](https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git),
153−so you may see the following error when running the generate script:
154−`The unauthenticated git protocol on port 9418 is no longer supported`.
155−
156−Use the following Git configuration to resolve the issue:
157−
158−```sh
159−git config --global url."https://github.com/".insteadOf git://github.com/
160−```
161−
162−## Tool specific instructions {#javascript-tool-specific}
163−
164−### node2nix {#javascript-node2nix}
165−
166−#### Preparation {#javascript-node2nix-preparation}
167−
168−you will need to generate a nix expression for the dependencies
169−
170−- don't forget the `-l package-lock.json` if there is a lock file
171−- Most probably you will need the `--development` to include the `devDependencies`
172−
173−so the command will most likely be
174−`node2nix --development -l package-lock.json`
175−
176−[link to the doc in the repo](https://github.com/svanderburg/node2nix)
177−
178−#### Pitfalls {#javascript-node2nix-pitfalls}
179−
180−- if upstream package.json does not have a "version" attribute, node2nix will crash. You will need to add it like shown in [the package.json section](#javascript-upstream-package-json)
181−- node2nix has some [bugs](https://github.com/svanderburg/node2nix/issues/238). related to working with lock files from npm distributed with nodejs-16_x
182−- node2nix does not like missing packages from npm. If you see something like `Cannot resolve version: vue-loader-v16@undefined` then you might want to try another tool. The package might have been pulled off of npm.
183−
184−### yarn2nix {#javascript-yarn2nix}
185−
186−#### Preparation {#javascript-yarn2nix-preparation}
187−
188−you will need at least a yarn.lock and yarn.nix file
189−
190−- generate a yarn.lock in upstream if it is not already there
191−- `yarn2nix > yarn.nix` will generate the dependencies in a nix format
192−
193−#### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage}
194−
195−this will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React...), you will need to explicitly override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in package.json use
196−
197−```nix
198−buildPhase = ''
199− yarn build --offline
200−'';
201−```
202−
203−The dist phase is also trying to build a binary, the only way to override it is with
204−
205−```nix
206−distPhase = "true";
207−```
208−
209−the configure phase can sometimes fail because it tries to be too clever.
210−One common override is
211−
212−```nix
213−configurePhase = "ln -s $node_modules node_modules";
214−```
215−
216−#### mkYarnModules {#javascript-yarn2nix-mkYarnModules}
217−
218−this will generate a derivation including the node_modules. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. [Plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39) offers a good example of how to do this.
219−
220−#### Overriding dependency behavior
221−
222−In the `mkYarnPackage` record the property `pkgConfig` can be used to override packages when you encounter problems building.
223−
224−For instance, say your package is throwing errors when trying to invoke node-sass: `ENOENT: no such file or directory, scandir '/build/source/node_modules/node-sass/vendor'`
225−
226−To fix this we will specify different versions of build inputs to use, as well as some post install steps to get the software built the way we want:
227−
228−```nix
229−mkYarnPackage rec {
230− pkgConfig = {
231− node-sass = {
232− buildInputs = with final;[ python libsass pkg-config ];
233− postInstall = ''
234− LIBSASS_EXT=auto yarn --offline run build
235− rm build/config.gypi
236− '';
237− };
238− };
239−}
240−```
241−
242−#### Pitfalls {#javascript-yarn2nix-pitfalls}
243−
244−- if version is missing from upstream package.json, yarn will silently install nothing. In that case, you will need to override package.json as shown in the [package.json section](#javascript-upstream-package-json)
245−
246−- having trouble with node-gyp? Try adding these lines to the `yarnPreBuild` steps:
247−
248− ```nix
249− yarnPreBuild = ''
250− mkdir -p $HOME/.node-gyp/${nodejs.version}
251− echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
252− ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
253− export npm_config_nodedir=${nodejs}
254− '';
255− ```
256−
257− - The `echo 9` steps comes from this answer: <https://stackoverflow.com/a/49139496>
258− - Exporting the headers in `npm_config_nodedir` comes from this issue: <https://github.com/nodejs/node-gyp/issues/1191#issuecomment-301243919>
259−
260−## Outside of nixpkgs {#javascript-outside-nixpkgs}
261−
262−There are some other options available that can't be used inside nixpkgs. Those other options are written in nix. Importing them in nixpkgs will require moving the source code into nixpkgs. Using [Import From Derivation](https://nixos.wiki/wiki/Import_From_Derivation) is not allowed in hydra at present. If you are packaging something outside nixpkgs, those can be considered
263−
264−### npmlock2nix {#javascript-npmlock2nix}
265−
266−[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might be subject to change.
267−
268−#### Pitfalls {#javascript-npmlock2nix-pitfalls}
269−
270−- there are some [problems with npm v7](https://github.com/tweag/npmlock2nix/issues/45).
271−
272−### nix-npm-buildpackage {#javascript-nix-npm-buildpackage}
273−
274−[nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might change. It supports both package-lock.json and yarn.lock.
275−
276−#### Pitfalls {#javascript-nix-npm-buildpackage-pitfalls}
277−
278−- there are some [problems with npm v7](https://github.com/serokell/nix-npm-buildpackage/issues/33).
doc/languages-frameworks/lua.section.md+29−37
@@ -1,8 +1,8 @@
1−# User’s Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure}
1+# User's Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure}
22
3−## Using Lua {#using-lua}
3+## Using Lua
44
5−### Overview of Lua {#overview-of-lua}
5+### Overview of Lua
66
77Several versions of the Lua interpreter are available: luajit, lua 5.1, 5.2, 5.3.
88The attribute `lua` refers to the default interpreter, it is also possible to refer to specific versions, e.g. `lua5_2` refers to Lua 5.2.
@@ -17,31 +17,27 @@ The main package set contains aliases to these package sets, e.g.
1717`luaPackages` refers to `lua5_1.pkgs` and `lua52Packages` to
1818`lua5_2.pkgs`.
1919
20−### Installing Lua and packages {#installing-lua-and-packages}
20+### Installing Lua and packages
2121
22−#### Lua environment defined in separate `.nix` file {#lua-environment-defined-in-separate-.nix-file}
22+#### Lua environment defined in separate `.nix` file
2323
2424Create a file, e.g. `build.nix`, with the following expression
25−
2625```nix
2726with import <nixpkgs> {};
2827
2928lua5_2.withPackages (ps: with ps; [ busted luafilesystem ])
3029```
31−
3230and install it in your profile with
33−
3431```shell
3532nix-env -if build.nix
3633```
3734Now you can use the Lua interpreter, as well as the extra packages (`busted`,
3835`luafilesystem`) that you added to the environment.
3936
40−#### Lua environment defined in `~/.config/nixpkgs/config.nix` {#lua-environment-defined-in-.confignixpkgsconfig.nix}
37+#### Lua environment defined in `~/.config/nixpkgs/config.nix`
4138
4239If you prefer to, you could also add the environment as a package override to the Nixpkgs set, e.g.
4340using `config.nix`,
44−
4541```nix
4642{ # ...
4743
@@ -50,16 +46,14 @@ using `config.nix`,
5046 };
5147}
5248```
53−
5449and install it in your profile with
55−
5650```shell
5751nix-env -iA nixpkgs.myLuaEnv
5852```
5953The environment is installed by referring to the attribute, and considering
6054the `nixpkgs` channel was used.
6155
62−#### Lua environment defined in `/etc/nixos/configuration.nix` {#lua-environment-defined-in-etcnixosconfiguration.nix}
56+#### Lua environment defined in `/etc/nixos/configuration.nix`
6357
6458For the sake of completeness, here's another example how to install the environment system-wide.
6559
@@ -72,7 +66,7 @@ For the sake of completeness, here's another example how to install the environm
7266}
7367```
7468
75−### How to override a Lua package using overlays? {#how-to-override-a-lua-package-using-overlays}
69+### How to override a Lua package using overlays?
7670
7771Use the following overlay template:
7872
@@ -93,22 +87,18 @@ final: prev:
9387}
9488```
9589
96−### Temporary Lua environment with `nix-shell` {#temporary-lua-environment-with-nix-shell}
90+### Temporary Lua environment with `nix-shell`
9791
9892
9993There are two methods for loading a shell with Lua packages. The first and recommended method
10094is to create an environment with `lua.buildEnv` or `lua.withPackages` and load that. E.g.
101−
10295```sh
10396$ nix-shell -p 'lua.withPackages(ps: with ps; [ busted luafilesystem ])'
10497```
105−
10698opens a shell from which you can launch the interpreter
107−
10899```sh
109100[nix-shell:~] lua
110101```
111−
112102The other method, which is not recommended, does not create an environment and requires you to list the packages directly,
113103
114104```sh
@@ -118,7 +108,7 @@ Again, it is possible to launch the interpreter from the shell.
118108The Lua interpreter has the attribute `pkgs` which contains all Lua libraries for that specific interpreter.
119109
120110
121−## Developing with Lua {#developing-with-lua}
111+## Developing with Lua
122112
123113Now that you know how to get a working Lua environment with Nix, it is time
124114to go forward and start actually developing with Lua. There are two ways to
@@ -126,9 +116,9 @@ package lua software, either it is on luarocks and most of it can be taken care
126116of by the luarocks2nix converter or the packaging has to be done manually.
127117Let's present the luarocks way first and the manual one in a second time.
128118
129−### Packaging a library on luarocks {#packaging-a-library-on-luarocks}
119+### Packaging a library on luarocks
130120
131−[Luarocks.org](https://luarocks.org/) is the main repository of lua packages.
121+[Luarocks.org](www.luarocks.org) is the main repository of lua packages.
132122The site proposes two types of packages, the rockspec and the src.rock
133123(equivalent of a [rockspec](https://github.com/luarocks/luarocks/wiki/Rockspec-format) but with the source).
134124These packages can have different build types such as `cmake`, `builtin` etc .
@@ -139,15 +129,16 @@ the whitelist maintainers/scripts/luarocks-packages.csv and updated by running m
139129[luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).
140130The automation only goes so far though and some packages need to be customized.
141131These customizations go in `pkgs/development/lua-modules/overrides.nix`.
142−For instance if the rockspec defines `external_dependencies`, these need to be manually added to the overrides.nix.
132+For instance if the rockspec defines `external_dependencies`, these need to be manually added in its rockspec file then it won't work.
143133
144134You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`.
135+Nix rely on luarocks to install lua packages, basically it runs:
136+`luarocks make --deps-mode=none --tree $out`
145137
146−#### Packaging a library manually {#packaging-a-library-manually}
138+#### Packaging a library manually
147139
148140You can develop your package as you usually would, just don't forget to wrap it
149141within a `toLuaModule` call, for instance
150−
151142```nix
152143mynewlib = toLuaModule ( stdenv.mkDerivation { ... });
153144```
@@ -155,15 +146,16 @@ mynewlib = toLuaModule ( stdenv.mkDerivation { ... });
155146There is also the `buildLuaPackage` function that can be used when lua modules
156147are not packaged for luarocks. You can see a few examples at `pkgs/top-level/lua-packages.nix`.
157148
158−## Lua Reference {#lua-reference}
149+## Lua Reference
159150
160−### Lua interpreters {#lua-interpreters}
151+### Lua interpreters
161152
162−Versions 5.1, 5.2, 5.3 and 5.4 of the lua interpreter are available as
163−respectively `lua5_1`, `lua5_2`, `lua5_3` and `lua5_4`. Luajit is available too.
153+Versions 5.1, 5.2 and 5.3 of the lua interpreter are available as
154+respectively `lua5_1`, `lua5_2` and `lua5_3`. Luajit is available too.
164155The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua-5`.
165156
166−#### Attributes on lua interpreters packages {#attributes-on-lua-interpreters-packages}
157+
158+#### Attributes on lua interpreters packages
167159
168160Each interpreter has the following attributes:
169161
@@ -172,7 +164,8 @@ Each interpreter has the following attributes:
172164- `withPackages`. Simpler interface to `buildEnv`.
173165- `pkgs`. Set of Lua packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.
174166
175−#### `buildLuarocksPackage` function {#buildluarockspackage-function}
167+
168+#### `buildLuarocksPackage` function
176169
177170The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-lua-package.nix`
178171The following is an example:
@@ -212,17 +205,16 @@ install the package
212205
213206By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise.
214207
215−#### `buildLuaApplication` function {#buildluaapplication-function}
208+#### `buildLuaApplication` function
216209
217210The `buildLuaApplication` function is practically the same as `buildLuaPackage`.
218211The difference is that `buildLuaPackage` by default prefixes the names of the packages with the version of the interpreter.
219212Because with an application we're not interested in multiple version the prefix is dropped.
220213
221−#### lua.withPackages function {#lua.withpackages-function}
214+#### lua.withPackages function
222215
223216The `lua.withPackages` takes a function as an argument that is passed the set of lua packages and returns the list of packages to be included in the environment.
224217Using the `withPackages` function, the previous example for the luafilesystem environment can be written like this:
225−
226218```nix
227219with import <nixpkgs> {};
228220
@@ -231,7 +223,6 @@ lua.withPackages (ps: [ps.luafilesystem])
231223
232224`withPackages` passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `luaPackages`.
233225But you can also easily switch to using `lua5_2`:
234−
235226```nix
236227with import <nixpkgs> {};
237228
@@ -240,12 +231,13 @@ lua5_2.withPackages (ps: [ps.lua])
240231
241232Now, `ps` is set to `lua52Packages`, matching the version of the interpreter.
242233
243−### Possible Todos {#possible-todos}
234+
235+### Possible Todos
244236
245237* export/use version specific variables such as `LUA_PATH_5_2`/`LUAROCKS_CONFIG_5_2`
246238* let luarocks check for dependencies via exporting the different rocktrees in temporary config
247239
248−### Lua Contributing guidelines {#lua-contributing-guidelines}
240+### Lua Contributing guidelines
249241
250242Following rules should be respected:
251243
doc/languages-frameworks/maven.section.md+7−10
@@ -43,9 +43,9 @@ public class Main {
4343
4444You find this demo project at https://github.com/fzakaria/nixos-maven-example
4545
46−## Solving for dependencies {#solving-for-dependencies}
46+## Solving for dependencies
4747
48−### buildMaven with NixOS/mvn2nix-maven-plugin {#buildmaven-with-nixosmvn2nix-maven-plugin}
48+### buildMaven with NixOS/mvn2nix-maven-plugin
4949
5050> ⚠️ Although `buildMaven` is the "blessed" way within nixpkgs, as of 2020, it hasn't seen much activity in quite a while.
5151
@@ -82,7 +82,6 @@ This file is then given to the `buildMaven` function, and it returns 2 attribute
8282 A simple derivation that runs through `mvn compile` & `mvn package` to build the JAR. You may use this as inspiration for more complicated derivations.
8383
8484Here is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/build-maven-repository.nix) of building the Maven repository
85−
8685```nix
8786{ pkgs ? import <nixpkgs> { } }:
8887with pkgs;
@@ -104,8 +103,7 @@ The benefit over the _double invocation_ as we will see below, is that the _/nix
104103│ └── 4.1.3
105104│ ├── avalon-framework-4.1.3.jar -> /nix/store/iv5fp3955w3nq28ff9xfz86wvxbiw6n9-avalon-framework-4.1.3.jar
106105```
107−
108−### Double Invocation {#double-invocation}
106+### Double Invocation
109107
110108> ⚠️ This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing.
111109
@@ -165,7 +163,7 @@ The build will fail, and tell you the expected `outputHash` to place. When you'v
165163
166164If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a strong likelihood that over-time your output hash will change since the resolved dependencies may change. Hence this method is less recommended then using `buildMaven`.
167165
168−## Building a JAR {#building-a-jar}
166+## Building a JAR
169167
170168Regardless of which strategy is chosen above, the step to build the derivation is the same.
171169
@@ -203,7 +201,7 @@ in stdenv.mkDerivation rec {
2032012 directories, 1 file
204202```
205203
206−## Runnable JAR {#runnable-jar}
204+## Runnable JAR
207205
208206The previous example builds a `jar` file but that's not a file one can run.
209207
@@ -215,7 +213,7 @@ We will use the same repository we built above (either _double invocation_ or _b
215213
216214The following two methods are more suited to Nix then building an [UberJar](https://imagej.net/Uber-JAR) which may be the more traditional approach.
217215
218−### CLASSPATH {#classpath}
216+### CLASSPATH
219217
220218> This is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`.
221219
@@ -254,12 +252,11 @@ in stdenv.mkDerivation rec {
254252}
255253```
256254
257−### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin}
255+### MANIFEST file via Maven Plugin
258256
259257> This is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it.
260258
261259Augment the `pom.xml` to create a JAR with the following manifest:
262−
263260```xml
264261<build>
265262 <plugins>
doc/languages-frameworks/nim.section.mddeleted−91
@@ -1,91 +0,0 @@
1−# Nim {#nim}
2−
3−## Overview {#nim-overview}
4−
5−The Nim compiler, a builder function, and some packaged libraries are available
6−in Nixpkgs. Until now each compiler release has been effectively backwards
7−compatible so only the latest version is available.
8−
9−## Nim program packages in Nixpkgs {#nim-program-packages-in-nixpkgs}
10−
11−Nim programs can be built using `nimPackages.buildNimPackage`. In the
12−case of packages not containing exported library code the attribute
13−`nimBinOnly` should be set to `true`.
14−
15−The following example shows a Nim program that depends only on Nim libraries:
16−
17−```nix
18−{ lib, nimPackages, fetchurl }:
19−
20−nimPackages.buildNimPackage rec {
21− pname = "hottext";
22− version = "1.4";
23−
24− nimBinOnly = true;
25−
26− src = fetchurl {
27− url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz";
28− sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY=";
29− };
30−
31− buildInputs = with nimPackages; [
32− bumpy
33− chroma
34− flatty
35− nimsimd
36− pixie
37− sdl2
38− typography
39− vmath
40− zippy
41− ];
42−}
43−
44−```
45−
46−## Nim library packages in Nixpkgs {#nim-library-packages-in-nixpkgs}
47−
48−
49−Nim libraries can also be built using `nimPackages.buildNimPackage`, but
50−often the product of a fetcher is sufficient to satisfy a dependency.
51−The `fetchgit`, `fetchFromGitHub`, and `fetchNimble` functions yield an
52−output that can be discovered during the `configurePhase` of `buildNimPackage`.
53−
54−Nim library packages are listed in
55−[pkgs/top-level/nim-packages.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/nim-packages.nix) and implemented at
56−[pkgs/development/nim-packages](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/nim-packages).
57−
58−The following example shows a Nim library that propagates a dependency on a
59−non-Nim package:
60−```nix
61−{ lib, buildNimPackage, fetchNimble, SDL2 }:
62−
63−buildNimPackage rec {
64− pname = "sdl2";
65− version = "2.0.4";
66− src = fetchNimble {
67− inherit pname version;
68− hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
69− };
70− propagatedBuildInputs = [ SDL2 ];
71−}
72−```
73−
74−## `buildNimPackage` parameters {#buildnimpackage-parameters}
75−
76−All parameters from `stdenv.mkDerivation` function are still supported. The
77−following are specific to `buildNimPackage`:
78−
79−* `nimBinOnly ? false`: If `true` then build only the programs listed in
80− the Nimble file in the packages sources.
81−* `nimbleFile`: Specify the Nimble file location of the package being built
82− rather than discover the file at build-time.
83−* `nimRelease ? true`: Build the package in *release* mode.
84−* `nimDefines ? []`: A list of Nim defines. Key-value tuples are not supported.
85−* `nimFlags ? []`: A list of command line arguments to pass to the Nim compiler.
86− Use this to specify defines with arguments in the form of `-d:${name}=${value}`.
87−* `nimDoc` ? false`: Build and install HTML documentation.
88−
89−* `buildInputs` ? []: The packages listed here will be searched for `*.nimble`
90− files which are used to populate the Nim library path. Otherwise the standard
91− behavior is in effect.
doc/languages-frameworks/node.section.mdnew file+51
@@ -0,0 +1,51 @@
1+# Node.js {#node.js}
2+
3+The `pkgs/development/node-packages` folder contains a generated collection of
4+[NPM packages](https://npmjs.com/) that can be installed with the Nix package
5+manager.
6+
7+As a rule of thumb, the package set should only provide *end user* software
8+packages, such as command-line utilities. Libraries should only be added to the
9+package set if there is a non-NPM package that requires it.
10+
11+When it is desired to use NPM libraries in a development project, use the
12+`node2nix` generator directly on the `package.json` configuration file of the
13+project.
14+
15+The package set provides support for the official stable Node.js versions.
16+The latest stable LTS release in `nodePackages`, as well as the latest stable
17+Current release in `nodePackages_latest`.
18+
19+If your package uses native addons, you need to examine what kind of native
20+build system it uses. Here are some examples:
21+
22+* `node-gyp`
23+* `node-gyp-builder`
24+* `node-pre-gyp`
25+
26+After you have identified the correct system, you need to override your package
27+expression while adding in build system as a build input. For example, `dat`
28+requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blob/32f5e5da4a1b3f0595527f5195ac3a91451e9b56/pkgs/development/node-packages/default.nix#L37-L40) its expression in [`default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/default.nix):
29+
30+```nix
31+ dat = super.dat.override {
32+ buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ];
33+ meta.broken = since "12";
34+ };
35+```
36+
37+To add a package from NPM to nixpkgs:
38+
39+ 1. Modify `pkgs/development/node-packages/node-packages.json` to add, update
40+ or remove package entries to have it included in `nodePackages` and
41+ `nodePackages_latest`.
42+ 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
43+ 3. Build your new package to test your changes:
44+ `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
45+ To build against the latest stable Current Node.js version (e.g. 14.x):
46+ `nix-build -A nodePackages_latest.<new-or-updated-package>`
47+ 4. Add and commit all modified and generated files.
48+
49+For more information about the generation process, consult the
50+[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
51+tool.
doc/languages-frameworks/ocaml.section.md+25−86
@@ -1,116 +1,63 @@
11# OCaml {#sec-language-ocaml}
22
3−## User guide {#sec-language-ocaml-user-guide}
4−
5−OCaml libraries are available in attribute sets of the form `ocaml-ng.ocamlPackages_X_XX` where X is to be replaced with the desired compiler version. For example, ocamlgraph compiled with OCaml 4.12 can be found in `ocaml-ng.ocamlPackages_4_12.ocamlgraph`. The compiler itself is also located in this set, under the name `ocaml`.
6−
7−If you don't care about the exact compiler version, `ocamlPackages` is a top-level alias pointing to a recent version of OCaml.
8−
9−OCaml applications are usually available top-level, and not inside `ocamlPackages`. Notable exceptions are build tools that must be built with the same compiler version as the compiler you intend to use like `dune` or `ocaml-lsp`.
10−
11−To open a shell able to build a typical OCaml project, put the dependencies in `buildInputs` and add `ocamlPackages.ocaml` and `ocamlPackages.findlib` to `nativeBuildInputs` at least.
12−For example:
13−```nix
14−let
15− pkgs = import <nixpkgs> {};
16− # choose the ocaml version you want to use
17− ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_12;
18−in
19−pkgs.mkShell {
20− # build tools
21− nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_2 ocaml-lsp ];
22− # dependencies
23− buildInputs = with ocamlPackages; [ ocamlgraph ];
24−}
25−```
26−
27−## Packaging guide {#sec-language-ocaml-packaging}
28−
293OCaml libraries should be installed in `$(out)/lib/ocaml/${ocaml.version}/site-lib/`. Such directories are automatically added to the `$OCAMLPATH` environment variable when building another package that depends on them or when opening a `nix-shell`.
304
315Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes a convenience build support function called `buildDunePackage` that will build an OCaml package using dune, OCaml and findlib and any additional dependencies provided as `buildInputs` or `propagatedBuildInputs`.
326
33−Here is a simple package example.
34−
35−- It defines an (optional) attribute `minimalOCamlVersion` (see note below)
36− that will be used to throw a descriptive evaluation error if building with
37− an older OCaml is attempted.
38−
39−- It uses the `fetchFromGitHub` fetcher to get its source.
40−
41−- `duneVersion = "2"` ensures that Dune version 2 is used for the
42− build (this is the default; valid values are `"1"`, `"2"`, and `"3"`);
43− note that there is also a legacy `useDune2` boolean attribute:
44− set to `false` it corresponds to `duneVersion = "1"`; set to `true` it
45− corresponds to `duneVersion = "2"`. If both arguments (`duneVersion` and
46− `useDune2`) are given, the second one (`useDune2`) is silently ignored.
47−
48−- It sets the optional `doCheck` attribute such that tests will be run with
49− `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is
50− complete, but only if the Ocaml version is at at least `"4.05"`.
51−
52−- It uses the package `ocaml-syntax-shims` as a build input, `alcotest` and
53− `ppx_let` as check inputs (because they are needed to run the tests), and
54− `bigstringaf` and `result` as propagated build inputs (thus they will also be
55− available to libraries depending on this library).
56−
57−- The library will be installed using the `angstrom.install` file that dune
58− generates.
7+Here is a simple package example. It defines an (optional) attribute `minimumOCamlVersion` that will be used to throw a descriptive evaluation error if building with an older OCaml is attempted. It uses the `fetchFromGitHub` fetcher to get its source. It sets the `doCheck` (optional) attribute to `true` which means that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is complete. It uses `alcotest` as a build input (because it is needed to run the tests) and `bigstringaf` and `result` as propagated build inputs (thus they will also be available to libraries depending on this library). The library will be installed using the `angstrom.install` file that dune generates.
598
609```nix
61−{ lib,
62− fetchFromGitHub,
63− buildDunePackage,
64− ocaml,
65− ocaml-syntax-shims,
66− alcotest,
67− result,
68− bigstringaf,
69− ppx_let }:
10+{ lib
11+, fetchFromGitHub
12+, buildDunePackage
13+, alcotest
14+, result
15+, bigstringaf
16+}:
7017
7118buildDunePackage rec {
7219 pname = "angstrom";
73− version = "0.15.0";
74− duneVersion = "2";
20+ version = "0.10.0";
7521
76− minimalOCamlVersion = "4.04";
22+ minimumOCamlVersion = "4.03";
7723
7824 src = fetchFromGitHub {
7925 owner = "inhabitedtype";
8026 repo = pname;
8127 rev = version;
82− sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh";
28+ sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
8329 };
8430
85− checkInputs = [ alcotest ppx_let ];
86− buildInputs = [ ocaml-syntax-shims ];
31+ buildInputs = [ alcotest ];
8732 propagatedBuildInputs = [ bigstringaf result ];
88− doCheck = lib.versionAtLeast ocaml.version "4.05";
33+ doCheck = true;
8934
90− meta = {
35+ meta = with lib; {
9136 homepage = "https://github.com/inhabitedtype/angstrom";
9237 description = "OCaml parser combinators built for speed and memory efficiency";
93− license = lib.licenses.bsd3;
94− maintainers = with lib.maintainers; [ sternenseemann ];
38+ license = licenses.bsd3;
39+ maintainers = with maintainers; [ sternenseemann ];
9540 };
41+}
9642```
9743
9844Here is a second example, this time using a source archive generated with `dune-release`. It is a good idea to use this archive when it is available as it will usually contain substituted variables such as a `%%VERSION%%` field. This library does not depend on any other OCaml library and no tests are run after building it.
9945
10046```nix
101−{ lib, fetchurl, buildDunePackage }:
47+{ lib
48+, fetchurl
49+, buildDunePackage
50+}:
10251
10352buildDunePackage rec {
10453 pname = "wtf8";
105− version = "1.0.2";
54+ version = "1.0.1";
10655
107− useDune2 = true;
108−
109− minimalOCamlVersion = "4.02";
56+ minimumOCamlVersion = "4.01";
11057
11158 src = fetchurl {
112− url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
113− sha256 = "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp";
59+ url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
60+ sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
11461 };
11562
11663 meta = with lib; {
@@ -121,11 +68,3 @@ buildDunePackage rec {
12168 };
12269}
12370```
124−
125−Note about `minimalOCamlVersion`. A deprecated version of this argument was
126−spelled `minimumOCamlVersion`; setting the old attribute wrongly modifies the
127−derivation hash and is therefore inappropriate. As a technical dept, currently
128−packaged libraries may still use the old spelling: maintainers are invited to
129−fix this when updating packages. Massive renaming is strongly discouraged as it
130−would be challenging to review, difficult to test, and will cause unnecessary
131−rebuild.
doc/languages-frameworks/octave.section.mddeleted−92
@@ -1,92 +0,0 @@
1−# Octave {#sec-octave}
2−
3−## Introduction {#ssec-octave-introduction}
4−
5−Octave is a modular scientific programming language and environment.
6−A majority of the packages supported by Octave from their [website](https://octave.sourceforge.io/packages.php) are packaged in nixpkgs.
7−
8−## Structure {#ssec-octave-structure}
9−
10−All Octave add-on packages are available in two ways:
11−1. Under the top-level `Octave` attribute, `octave.pkgs`.
12−2. As a top-level attribute, `octavePackages`.
13−
14−## Packaging Octave Packages {#ssec-octave-packaging}
15−
16−Nixpkgs provides a function `buildOctavePackage`, a generic package builder function for any Octave package that complies with the Octave's current packaging format.
17−
18−All Octave packages are defined in [pkgs/top-level/octave-packages.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/octave-packages.nix) rather than `pkgs/all-packages.nix`.
19−Each package is defined in their own file in the [pkgs/development/octave-modules](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/octave-modules) directory.
20−Octave packages are made available through `all-packages.nix` through both the attribute `octavePackages` and `octave.pkgs`.
21−You can test building an Octave package as follows:
22−
23−```ShellSession
24−$ nix-build -A octavePackages.symbolic
25−```
26−
27−To install it into your user profile, run this command from the root of the repository:
28−
29−```ShellSession
30−$ nix-env -f. -iA octavePackages.symbolic
31−```
32−
33−You can build Octave with packages by using the `withPackages` passed-through function.
34−
35−```ShellSession
36−$ nix-shell -p 'octave.withPackages (ps: with ps; [ symbolic ])'
37−```
38−
39−This will also work in a `shell.nix` file.
40−
41−```nix
42−{ pkgs ? import <nixpkgs> { }}:
43−
44−pkgs.mkShell {
45− nativeBuildInputs = with pkgs; [
46− (octave.withPackages (opkgs: with opkgs; [ symbolic ]))
47− ];
48−}
49−```
50−
51−### `buildOctavePackage` Steps {#sssec-buildOctavePackage-steps}
52−
53−The `buildOctavePackage` does several things to make sure things work properly.
54−
55−1. Sets the environment variable `OCTAVE_HISTFILE` to `/dev/null` during package compilation so that the commands run through the Octave interpreter directly are not logged.
56−2. Skips the configuration step, because the packages are stored as gzipped tarballs, which Octave itself handles directly.
57−3. Change the hierarchy of the tarball so that only a single directory is at the top-most level of the tarball.
58−4. Use Octave itself to run the `pkg build` command, which unzips the tarball, extracts the necessary files written in Octave, and compiles any code written in C++ or Fortran, and places the fully compiled artifact in `$out`.
59−
60−`buildOctavePackage` is built on top of `stdenv` in a standard way, allowing most things to be customized.
61−
62−### Handling Dependencies {#sssec-octave-handling-dependencies}
63−
64−In Octave packages, there are four sets of dependencies that can be specified:
65−
66−`nativeBuildInputs`
67−: Just like other packages, `nativeBuildInputs` is intended for architecture-dependent build-time-only dependencies.
68−
69−`buildInputs`
70−: Like other packages, `buildInputs` is intended for architecture-independent build-time-only dependencies.
71−
72−`propagatedBuildInputs`
73−: Similar to other packages, `propagatedBuildInputs` is intended for packages that are required for both building and running of the package.
74−See [Symbolic](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/octave-modules/symbolic/default.nix) for how this works and why it is needed.
75−
76−`requiredOctavePackages`
77−: This is a special dependency that ensures the specified Octave packages are dependent on others, and are made available simultaneously when loading them in Octave.
78−
79−### Installing Octave Packages {#sssec-installing-octave-packages}
80−
81−By default, the `buildOctavePackage` function does _not_ install the requested package into Octave for use.
82−The function will only build the requested package.
83−This is due to Octave maintaining an text-based database about which packages are installed where.
84−To this end, when all the requested packages have been built, the Octave package and all its add-on packages are put together into an environment, similar to Python.
85−
86−1. First, all the Octave binaries are wrapped with the environment variable `OCTAVE_SITE_INITFILE` set to a file in `$out`, which is required for Octave to be able to find the non-standard package database location.
87−2. Because of the way `buildEnv` works, all tarballs that are present (which should be all Octave packages to install) should be removed.
88−3. The path down to the default install location of Octave packages is recreated so that Nix-operated Octave can install the packages.
89−4. Install the packages into the `$out` environment while writing package entries to the database file.
90−This database file is unique for each different (according to Nix) environment invocation.
91−5. Rewrite the Octave-wide startup file to read from the list of packages installed in that particular environment.
92−6. Wrap any programs that are required by the Octave packages so that they work with all the paths defined within the environment.
doc/languages-frameworks/perl.section.md+9−5
@@ -58,7 +58,13 @@ in `all-packages.nix`. You can test building a Perl package as follows:
5858$ nix-build -A perlPackages.ClassC3
5959```
6060
61−To install it with `nix-env` instead: `nix-env -f. -iA perlPackages.ClassC3`.
61+`buildPerlPackage` adds `perl-` to the start of the name attribute, so the package above is actually called `perl-Class-C3-0.21`. So to install it, you can say:
62+
63+```ShellSession
64+$ nix-env -i perl-Class-C3
65+```
66+
67+(Of course you can also install using the attribute name: `nix-env -i -A perlPackages.ClassC3`.)
6268
6369So what does `buildPerlPackage` do? It does the following:
6470
@@ -116,7 +122,7 @@ ImageExifTool = buildPerlPackage {
116122 };
117123
118124 buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
119− postInstall = lib.optionalString stdenv.isDarwin ''
125+ postInstall = lib.optional stdenv.isDarwin ''
120126 shortenPerlShebang $out/bin/exiftool
121127 '';
122128};
@@ -129,11 +135,9 @@ This will remove the `-I` flags from the shebang line, rewrite them in the `use
129135Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program `nix-generate-from-cpan`, which can be installed as follows:
130136
131137```ShellSession
132−$ nix-env -f "<nixpkgs>" -iA nix-generate-from-cpan
138+$ nix-env -i nix-generate-from-cpan
133139```
134140
135−Substitute `<nixpkgs>` by the path of a nixpkgs clone to use the latest version.
136−
137141This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example:
138142
139143```ShellSession
doc/languages-frameworks/python.section.md+72−157
@@ -1,14 +1,14 @@
11# Python {#python}
22
3−## User Guide {#user-guide}
3+## User Guide
44
5−### Using Python {#using-python}
5+### Using Python
66
7−#### Overview {#overview}
7+#### Overview
88
99Several versions of the Python interpreter are available on Nix, as well as a
1010high amount of packages. The attribute `python3` refers to the default
11−interpreter, which is currently CPython 3.9. The attribute `python` refers to
11+interpreter, which is currently CPython 3.8. The attribute `python` refers to
1212CPython 2.7 for backwards-compatibility. It is also possible to refer to
1313specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to
1414the default PyPy interpreter.
@@ -31,7 +31,7 @@ The main package set contains aliases to these package sets, e.g.
3131`pythonPackages` refers to `python.pkgs` and `python38Packages` to
3232`python38.pkgs`.
3333
34−#### Installing Python and packages {#installing-python-and-packages}
34+#### Installing Python and packages
3535
3636The Nix and NixOS manuals explain how packages are generally installed. In the
3737case of Python and Nix, it is important to make a distinction between whether the
@@ -62,7 +62,7 @@ Philosphically, this should be familiar to users who are used to a `venv` style
6262of development: individual projects create their own Python environments without
6363impacting the global environment or each other.
6464
65−#### Ad-hoc temporary Python environment with `nix-shell` {#ad-hoc-temporary-python-environment-with-nix-shell}
65+#### Ad-hoc temporary Python environment with `nix-shell`
6666
6767The simplest way to start playing with the way nix wraps and sets up Python
6868environments is with `nix-shell` at the cmdline. These environments create a
@@ -131,7 +131,7 @@ arbitrary dependencies. This is a good way to get a feel for how the Python
131131interpreter and dependencies work in Nix and NixOS, but to do some actual
132132development, we'll want to make it a bit more persistent.
133133
134−##### Running Python scripts and using `nix-shell` as shebang {#running-python-scripts-and-using-nix-shell-as-shebang}
134+##### Running Python scripts and using `nix-shell` as shebang
135135
136136Sometimes, we have a script whose header looks like this:
137137
@@ -146,7 +146,7 @@ print(f"The dot product of {a} and {b} is: {np.dot(a, b)}")
146146Executing this script requires a `python3` that has `numpy`. Using what we learned
147147in the previous section, we could startup a shell and just run it like so:
148148
149−```ShellSession
149+```ShellSesssion
150150$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py'
151151The dot product of [1 2] and [3 4] is: 11
152152```
@@ -203,7 +203,7 @@ of the package versions.
203203This is also a great way to ensure the script executes identically on different
204204servers.
205205
206−##### Load environment from `.nix` expression {#load-environment-from-.nix-expression}
206+##### Load environment from `.nix` expression
207207
208208We've now seen how to create an ad-hoc temporary shell session, and how to
209209create a single script with Python dependencies, but in the course of normal
@@ -262,7 +262,7 @@ and its Python dependencies, but also tools like `black` or `mypy` and libraries
262262like `libffi` the `openssl` in scope. This is generic and can span any number of
263263tools or languages across the Nixpkgs ecosystem.
264264
265−##### Installing environments globally on the system {#installing-environments-globally-on-the-system}
265+##### Installing environments globally on the system
266266
267267Up to now, we've been creating environments scoped to an ad-hoc shell session,
268268or a single script, or a single project. This is generally advisable, as it
@@ -315,7 +315,7 @@ If you get a conflict or prefer to keep the setup clean, you can have `nix-env`
315315atomically *uninstall* all other imperatively installed packages and replace
316316your profile with just `myEnv` by using the `--replace` flag.
317317
318−##### Environment defined in `/etc/nixos/configuration.nix` {#environment-defined-in-etcnixosconfiguration.nix}
318+##### Environment defined in `/etc/nixos/configuration.nix`
319319
320320For the sake of completeness, here's how to install the environment system-wide
321321on NixOS.
@@ -329,7 +329,7 @@ on NixOS.
329329}
330330```
331331
332−### Developing with Python {#developing-with-python}
332+### Developing with Python
333333
334334Above, we were mostly just focused on use cases and what to do to get started
335335creating working Python environments in nix.
@@ -338,7 +338,7 @@ Now that you know the basics to be up and running, it is time to take a step
338338back and take a deeper look at how Python packages are packaged on Nix. Then,
339339we will look at how you can use development mode with your code.
340340
341−#### Python library packages in Nixpkgs {#python-library-packages-in-nixpkgs}
341+#### Python library packages in Nixpkgs
342342
343343With Nix all packages are built by functions. The main function in Nix for
344344building Python libraries is `buildPythonPackage`. Let's see how we can build the
@@ -425,7 +425,7 @@ of `withPackages` we used a `let` expression. You can see that we used
425425`toolz` from the Nixpkgs package set this time, but instead took our own version
426426that we introduced with the `let` expression.
427427
428−#### Handling dependencies {#handling-dependencies}
428+#### Handling dependencies
429429
430430Our example, `toolz`, does not have any dependencies on other Python packages or
431431system libraries. According to the manual, `buildPythonPackage` uses the
@@ -439,7 +439,7 @@ The following example shows which arguments are given to `buildPythonPackage` in
439439order to build [`datashape`](https://github.com/blaze/datashape).
440440
441441```nix
442−{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, python-dateutil, pytest }:
442+{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, dateutil, pytest }:
443443
444444buildPythonPackage rec {
445445 pname = "datashape";
@@ -451,7 +451,7 @@ buildPythonPackage rec {
451451 };
452452
453453 checkInputs = [ pytest ];
454− propagatedBuildInputs = [ numpy multipledispatch python-dateutil ];
454+ propagatedBuildInputs = [ numpy multipledispatch dateutil ];
455455
456456 meta = with lib; {
457457 homepage = "https://github.com/ContinuumIO/datashape";
@@ -463,7 +463,7 @@ buildPythonPackage rec {
463463```
464464
465465We can see several runtime dependencies, `numpy`, `multipledispatch`, and
466−`python-dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a
466+`dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a
467467test runner and is only used during the `checkPhase` and is therefore not added
468468to `propagatedBuildInputs`.
469469
@@ -537,10 +537,9 @@ buildPythonPackage rec {
537537 };
538538}
539539```
540−
541540Note also the line `doCheck = false;`, we explicitly disabled running the test-suite.
542541
543−#### Testing Python Packages {#testing-python-packages}
542+#### Testing Python Packages
544543
545544It is highly encouraged to have testing as part of the package build. This
546545helps to avoid situations where the package was able to build and install,
@@ -560,11 +559,10 @@ thus can cause issues when a test suite asserts on that behavior.
560559as many tests should be enabled as possible. Failing tests can still be
561560a good indication that the package is not in a valid state.
562561
563−#### Using pytest {#using-pytest}
562+#### Using pytest
564563
565564Pytest is the most common test runner for python repositories. A trivial
566565test run would be:
567−
568566```
569567 checkInputs = [ pytest ];
570568 checkPhase = "pytest";
@@ -574,7 +572,6 @@ However, many repositories' test suites do not translate well to nix's build
574572sandbox, and will generally need many tests to be disabled.
575573
576574To filter tests using pytest, one can do the following:
577−
578575```
579576 checkInputs = [ pytest ];
580577 # avoid tests which need additional data or touch network
@@ -590,20 +587,19 @@ easier than having to create a new package.
590587
591588`-k` is used to define a predicate for test names. In this example, we are
592589filtering out tests which contain `download` or `update` in their test case name.
593−Only one `-k` argument is allowed, and thus a long predicate should be concatenated
594−with “\\” and wrapped to the next line.
590+Only one `-k` argument is allows, and thus a long predicate should be concatenated
591+with "\" and wrapped to the next line.
595592
596−*NOTE:* In pytest==6.0.1, the use of “\\” to continue a line (e.g. `-k 'not download \'`) has
593+*NOTE:* In pytest==6.0.1, the use of "\" to continue a line (e.g. `-k 'not download \'`) has
597594been removed, in this case, it's recommended to use `pytestCheckHook`.
598595
599−#### Using pytestCheckHook {#using-pytestcheckhook}
596+#### Using pytestCheckHook
600597
601598`pytestCheckHook` is a convenient hook which will substitute the setuptools
602599`test` command for a checkPhase which runs `pytest`. This is also beneficial
603600when a package may need many items disabled to run the test suite.
604601
605602Using the example above, the analagous pytestCheckHook usage would be:
606−
607603```
608604 checkInputs = [ pytestCheckHook ];
609605
@@ -641,7 +637,7 @@ Trying to concatenate the related strings to disable tests in a regular checkPha
641637would be much harder to read. This also enables us to comment on why specific tests
642638are disabled.
643639
644−#### Using pythonImportsCheck {#using-pythonimportscheck}
640+#### Using pythonImportsCheck
645641
646642Although unit tests are highly prefered to validate correctness of a package, not
647643all packages have test suites that can be ran easily, and some have none at all.
@@ -663,7 +659,7 @@ However, this is done in it's own phase, and not dependent on whether `doCheck =
663659This can also be useful in verifying that the package doesn't assume commonly
664660present packages (e.g. `setuptools`)
665661
666−### Develop local package {#develop-local-package}
662+### Develop local package
667663
668664As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode)
669665(`python setup.py develop`); instead of installing the package this command
@@ -698,7 +694,7 @@ buildPythonPackage rec {
698694It is important to note that due to how development mode is implemented on Nix
699695it is not possible to have multiple packages simultaneously in development mode.
700696
701−### Organising your packages {#organising-your-packages}
697+### Organising your packages
702698
703699So far we discussed how you can use Python on Nix, and how you can develop with
704700it. We've looked at how you write expressions to package Python packages, and we
@@ -710,7 +706,7 @@ like to be able to use in different projects. In order to minimise unnecessary
710706duplication we now look at how you can maintain a repository with your
711707own packages. The important functions here are `import` and `callPackage`.
712708
713−### Including a derivation using `callPackage` {#including-a-derivation-using-callpackage}
709+### Including a derivation using `callPackage`
714710
715711Earlier we created a Python environment using `withPackages`, and included the
716712`toolz` package via a `let` expression.
@@ -760,12 +756,12 @@ don't explicitly define which `python` derivation should be used. In the above
760756example we use `buildPythonPackage` that is part of the set `python38Packages`,
761757and in this case the `python38` interpreter is automatically used.
762758
763−## Reference {#reference}
759+## Reference
764760
765−### Interpreters {#interpreters}
761+### Interpreters
766762
767−Versions 2.7, 3.7, 3.8 and 3.9 of the CPython interpreter are available as
768−respectively `python27`, `python37`, `python38` and `python39`. The
763+Versions 2.7, 3.6, 3.7, 3.8 and 3.9 of the CPython interpreter are available as
764+respectively `python27`, `python36`, `python37`, `python38` and `python39`. The
769765aliases `python2` and `python3` correspond to respectively `python27` and
770766`python39`. The attribute `python` maps to `python2`. The PyPy interpreters
771767compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with
@@ -777,11 +773,11 @@ All packages depending on any Python interpreter get appended
777773`out/{python.sitePackages}` to `$PYTHONPATH` if such directory
778774exists.
779775
780−#### Missing `tkinter` module standard library {#missing-tkinter-module-standard-library}
776+#### Missing `tkinter` module standard library
781777
782778To reduce closure size the `Tkinter`/`tkinter` is available as a separate package, `pythonPackages.tkinter`.
783779
784−#### Attributes on interpreters packages {#attributes-on-interpreters-packages}
780+#### Attributes on interpreters packages
785781
786782Each interpreter has the following attributes:
787783
@@ -793,7 +789,7 @@ Each interpreter has the following attributes:
793789- `executable`. Name of the interpreter executable, e.g. `python3.8`.
794790- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.
795791
796−### Optimizations {#optimizations}
792+### Optimizations
797793
798794The Python interpreters are by default not build with optimizations enabled, because
799795the builds are in that case not reproducible. To enable optimizations, override the
@@ -810,7 +806,7 @@ let
810806in mypython
811807```
812808
813−### Building packages and applications {#building-packages-and-applications}
809+### Building packages and applications
814810
815811Python libraries and applications that use `setuptools` or
816812`distutils` are typically built with respectively the `buildPythonPackage` and
@@ -830,20 +826,19 @@ attribute set is created for each available Python interpreter. The available
830826sets are
831827
832828* `pkgs.python27Packages`
829+* `pkgs.python36Packages`
833830* `pkgs.python37Packages`
834831* `pkgs.python38Packages`
835832* `pkgs.python39Packages`
836−* `pkgs.python310Packages`
837−* `pkgs.python311Packages`
838833* `pkgs.pypyPackages`
839834
840835and the aliases
841836
842837* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
843−* `pkgs.python3Packages` pointing to `pkgs.python39Packages`
838+* `pkgs.python3Packages` pointing to `pkgs.python38Packages`
844839* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
845840
846−#### `buildPythonPackage` function {#buildpythonpackage-function}
841+#### `buildPythonPackage` function
847842
848843The `buildPythonPackage` function is implemented in
849844`pkgs/development/interpreters/python/mk-python-derivation`
@@ -852,7 +847,7 @@ using setup hooks.
852847The following is an example:
853848
854849```nix
855−{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools-scm, attrs, py, setuptools, six, pluggy }:
850+{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }:
856851
857852buildPythonPackage rec {
858853 pname = "pytest";
@@ -869,7 +864,7 @@ buildPythonPackage rec {
869864 '';
870865
871866 checkInputs = [ hypothesis ];
872− nativeBuildInputs = [ setuptools-scm ];
867+ nativeBuildInputs = [ setuptools_scm ];
873868 propagatedBuildInputs = [ attrs py setuptools six pluggy ];
874869
875870 meta = with lib; {
@@ -895,7 +890,7 @@ e.g. the test runner, should be added to `checkInputs`.
895890By default `meta.platforms` is set to the same value
896891as the interpreter unless overridden otherwise.
897892
898−##### `buildPythonPackage` parameters {#buildpythonpackage-parameters}
893+##### `buildPythonPackage` parameters
899894
900895All parameters from `stdenv.mkDerivation` function are still supported. The
901896following are specific to `buildPythonPackage`:
@@ -951,7 +946,7 @@ because their behaviour is different:
951946 `buildPythonPackage` also injects code into and wraps executables with the
952947 paths included in this list. Items listed in `install_requires` go here.
953948
954−##### Overriding Python packages {#overriding-python-packages}
949+##### Overriding Python packages
955950
956951The `buildPythonPackage` function has a `overridePythonAttrs` method that can be
957952used to override the package. In the following example we create an environment
@@ -979,32 +974,7 @@ with import <nixpkgs> {};
979974in python.withPackages(ps: [ps.blaze])).env
980975```
981976
982−#### Optional extra dependencies
983−
984−Some packages define optional dependencies for additional features. With
985−`setuptools` this is called `extras_require` and `flit` calls it `extras-require`. A
986−method for supporting this is by declaring the extras of a package in its
987−`passthru`, e.g. in case of the package `dask`
988−
989−```nix
990−passthru.extras-require = {
991− complete = [ distributed ];
992−};
993−```
994−
995−and letting the package requiring the extra add the list to its dependencies
996−
997−```nix
998−propagatedBuildInputs = [
999− ...
1000−] ++ dask.extras-require.complete;
1001−```
1002−
1003−Note this method is preferred over adding parameters to builders, as that can
1004−result in packages depending on different variants and thereby causing
1005−collisions.
1006−
1007−#### `buildPythonApplication` function {#buildpythonapplication-function}
977+#### `buildPythonApplication` function
1008978
1009979The `buildPythonApplication` function is practically the same as
1010980`buildPythonPackage`. The main purpose of this function is to build a Python
@@ -1021,18 +991,18 @@ called with `callPackage` and passed `python` or `pythonPackages` (possibly
1021991specifying an interpreter version), like this:
1022992
1023993```nix
1024−{ lib, python3 }:
994+{ lib, python3Packages }:
1025995
1026−python3.pkgs.buildPythonApplication rec {
996+python3Packages.buildPythonApplication rec {
1027997 pname = "luigi";
1028998 version = "2.7.9";
1029999
1030− src = python3.pkgs.fetchPypi {
1000+ src = python3Packages.fetchPypi {
10311001 inherit pname version;
10321002 sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
10331003 };
10341004
1035− propagatedBuildInputs = with python3.pkgs; [ tornado python-daemon ];
1005+ propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
10361006
10371007 meta = with lib; {
10381008 ...
@@ -1049,7 +1019,7 @@ luigi = callPackage ../applications/networking/cluster/luigi { };
10491019Since the package is an application, a consumer doesn't need to care about
10501020Python versions or modules, which is why they don't go in `pythonPackages`.
10511021
1052−#### `toPythonApplication` function {#topythonapplication-function}
1022+#### `toPythonApplication` function
10531023
10541024A distinction is made between applications and libraries, however, sometimes a
10551025package is used as both. In this case the package is added as a library to
@@ -1061,12 +1031,11 @@ The Nix expression shall use `buildPythonPackage` and be called from
10611031`python-packages.nix`. A reference shall be created from `all-packages.nix` to
10621032the attribute in `python-packages.nix`, and the `toPythonApplication` shall be
10631033applied to the reference:
1064−
10651034```nix
10661035youtube-dl = with pythonPackages; toPythonApplication youtube-dl;
10671036```
10681037
1069−#### `toPythonModule` function {#topythonmodule-function}
1038+#### `toPythonModule` function
10701039
10711040In some cases, such as bindings, a package is created using
10721041`stdenv.mkDerivation` and added as attribute in `all-packages.nix`. The Python
@@ -1083,7 +1052,7 @@ opencv = toPythonModule (pkgs.opencv.override {
10831052
10841053Do pay attention to passing in the right Python version!
10851054
1086−#### `python.buildEnv` function {#python.buildenv-function}
1055+#### `python.buildEnv` function
10871056
10881057Python environments can be created using the low-level `pkgs.buildEnv` function.
10891058This example shows how to create an environment that has the Pyramid Web Framework.
@@ -1121,8 +1090,8 @@ with import <nixpkgs> {};
11211090will drop you into a shell where Python will have the
11221091specified packages in its path.
11231092
1124−##### `python.buildEnv` arguments {#python.buildenv-arguments}
11251093
1094+##### `python.buildEnv` arguments
11261095
11271096* `extraLibs`: List of packages installed inside the environment.
11281097* `postBuild`: Shell command executed after the build of environment.
@@ -1130,7 +1099,7 @@ specified packages in its path.
11301099* `permitUserSite`: Skip setting the `PYTHONNOUSERSITE` environment variable in
11311100 wrapped binaries in the environment.
11321101
1133−#### `python.withPackages` function {#python.withpackages-function}
1102+#### `python.withPackages` function
11341103
11351104The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality.
11361105It takes a function as an argument that is passed the set of python packages and returns the list
@@ -1172,7 +1141,7 @@ need them, you have to use `python.buildEnv`.
11721141Python 2 namespace packages may provide `__init__.py` that collide. In that case
11731142`python.buildEnv` should be used with `ignoreCollisions = true`.
11741143
1175−#### Setup hooks {#setup-hooks}
1144+#### Setup hooks
11761145
11771146The following are setup hooks specifically for Python packages. Most of these
11781147are used in `buildPythonPackage`.
@@ -1197,7 +1166,7 @@ are used in `buildPythonPackage`.
11971166- `wheelUnpackHook` to move a wheel to the correct folder so it can be installed
11981167 with the `pipInstallHook`.
11991168
1200−### Development mode {#development-mode}
1169+### Development mode
12011170
12021171Development or editable mode is supported. To develop Python packages
12031172`buildPythonPackage` has additional logic inside `shellPhase` to run `pip
@@ -1206,7 +1175,6 @@ install -e . --prefix $TMPDIR/`for the package.
12061175Warning: `shellPhase` is executed only if `setup.py` exists.
12071176
12081177Given a `default.nix`:
1209−
12101178```nix
12111179with import <nixpkgs> {};
12121180
@@ -1229,7 +1197,7 @@ nix-shell -p pythonPackages.pyramid zlib libjpeg git
12291197
12301198Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
12311199
1232−### Tools {#tools}
1200+### Tools
12331201
12341202Packages inside nixpkgs are written by hand. However many tools exist in
12351203community to help save time. No tool is preferred at the moment.
@@ -1241,7 +1209,7 @@ community to help save time. No tool is preferred at the moment.
12411209- [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools)
12421210- [poetry2nix](https://github.com/nix-community/poetry2nix)
12431211
1244−### Deterministic builds {#deterministic-builds}
1212+### Deterministic builds
12451213
12461214The Python interpreters are now built deterministically. Minor modifications had
12471215to be made to the interpreters in order to generate deterministic bytecode. This
@@ -1253,7 +1221,7 @@ have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1`
12531221and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED).
12541222Both are also exported in `nix-shell`.
12551223
1256−### Automatic tests {#automatic-tests}
1224+### Automatic tests
12571225
12581226It is recommended to test packages as part of the build process.
12591227Source distributions (`sdist`) often include test files, but not always.
@@ -1262,7 +1230,7 @@ By default the command `python setup.py test` is run as part of the
12621230`checkPhase`, but often it is necessary to pass a custom `checkPhase`. An
12631231example of such a situation is when `py.test` is used.
12641232
1265−#### Common issues {#common-issues}
1233+#### Common issues
12661234
12671235* Non-working tests can often be deselected. By default `buildPythonPackage`
12681236 runs `python setup.py test`. Most Python modules follows the standard test
@@ -1279,19 +1247,18 @@ example of such a situation is when `py.test` is used.
12791247 '';
12801248 }
12811249 ```
1282−
12831250* Tests that attempt to access `$HOME` can be fixed by using the following
12841251 work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
12851252
1286−## FAQ {#faq}
1253+## FAQ
12871254
1288−### How to solve circular dependencies? {#how-to-solve-circular-dependencies}
1255+### How to solve circular dependencies?
12891256
12901257Consider the packages `A` and `B` that depend on each other. When packaging `B`,
12911258a solution is to override package `A` not to depend on `B` as an input. The same
12921259should also be done when packaging `A`.
12931260
1294−### How to override a Python package? {#how-to-override-a-python-package}
1261+### How to override a Python package?
12951262
12961263We can override the interpreter and pass `packageOverrides`. In the following
12971264example we rename the `pandas` package and build it.
@@ -1349,7 +1316,7 @@ let
13491316in newpkgs.inkscape
13501317```
13511318
1352−### `python setup.py bdist_wheel` cannot create .whl {#python-setup.py-bdist_wheel-cannot-create-.whl}
1319+### `python setup.py bdist_wheel` cannot create .whl
13531320
13541321Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
13551322```
@@ -1382,7 +1349,7 @@ or unset `SOURCE_DATE_EPOCH`:
13821349nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
13831350```
13841351
1385−### `install_data` / `data_files` problems {#install_data-data_files-problems}
1352+### `install_data` / `data_files` problems
13861353
13871354If you get the following error:
13881355
@@ -1402,7 +1369,7 @@ ${python.interpreter} setup.py install_data --install-dir=$out --root=$out
14021369sed -i '/ = data\_files/d' setup.py
14031370```
14041371
1405−### Rationale of non-existent global site-packages {#rationale-of-non-existent-global-site-packages}
1372+### Rationale of non-existent global site-packages
14061373
14071374On most operating systems a global `site-packages` is maintained. This however
14081375becomes problematic if you want to run multiple Python versions or have multiple
@@ -1417,7 +1384,7 @@ If you want to create a Python environment for development, then the recommended
14171384method is to use `nix-shell`, either with or without the `python.buildEnv`
14181385function.
14191386
1420−### How to consume Python modules using pip in a virtual environment like I am used to on other Operating Systems? {#how-to-consume-python-modules-using-pip-in-a-virtual-environment-like-i-am-used-to-on-other-operating-systems}
1387+### How to consume Python modules using pip in a virtual environment like I am used to on other Operating Systems?
14211388
14221389While this approach is not very idiomatic from Nix perspective, it can still be
14231390useful when dealing with pre-existing projects or in situations where it's not
@@ -1530,7 +1497,7 @@ is executed it will attempt to download the Python modules listed in
15301497requirements.txt. However these will be cached locally within the `virtualenv`
15311498folder and not downloaded again.
15321499
1533−### How to override a Python package from `configuration.nix`? {#how-to-override-a-python-package-from-configuration.nix}
1500+### How to override a Python package from `configuration.nix`?
15341501
15351502If you need to change a package's attribute(s) from `configuration.nix` you could do:
15361503
@@ -1539,7 +1506,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
15391506 python = super.python.override {
15401507 packageOverrides = python-self: python-super: {
15411508 twisted = python-super.twisted.overrideAttrs (oldAttrs: {
1542− src = super.fetchPypi {
1509+ src = super.fetchPipy {
15431510 pname = "twisted";
15441511 version = "19.10.0";
15451512 sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";
@@ -1568,7 +1535,7 @@ this snippet:
15681535 }
15691536```
15701537
1571−### How to override a Python package using overlays? {#how-to-override-a-python-package-using-overlays}
1538+### How to override a Python package using overlays?
15721539
15731540Use the following overlay template:
15741541
@@ -1589,12 +1556,12 @@ self: super: {
15891556}
15901557```
15911558
1592−### How to use Intel’s MKL with numpy and scipy? {#how-to-use-intels-mkl-with-numpy-and-scipy}
1559+### How to use Intel's MKL with numpy and scipy?
15931560
15941561MKL can be configured using an overlay. See the section "[Using overlays to
15951562configure alternatives](#sec-overlays-alternatives-blas-lapack)".
15961563
1597−### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? {#what-inputs-do-setup_requires-install_requires-and-tests_require-map-to}
1564+### What inputs do `setup_requires`, `install_requires` and `tests_require` map to?
15981565
15991566In a `setup.py` or `setup.cfg` it is common to declare dependencies:
16001567
@@ -1602,9 +1569,9 @@ In a `setup.py` or `setup.cfg` it is common to declare dependencies:
16021569* `install_requires` corresponds to `propagatedBuildInputs`
16031570* `tests_require` corresponds to `checkInputs`
16041571
1605−## Contributing {#contributing}
1572+## Contributing
16061573
1607−### Contributing guidelines {#contributing-guidelines}
1574+### Contributing guidelines
16081575
16091576The following rules are desired to be respected:
16101577
@@ -1628,55 +1595,3 @@ The following rules are desired to be respected:
16281595 If necessary, `pname` has to be given a different value within `fetchPypi`.
16291596* Attribute names in `python-packages.nix` should be sorted alphanumerically to
16301597 avoid merge conflicts and ease locating attributes.
1631−
1632−## Package set maintenance
1633−
1634−The whole Python package set has a lot of packages that do not see regular
1635−updates, because they either are a very fragile component in the Python
1636−ecosystem, like for example the `hypothesis` package, or packages that have
1637−no maintainer, so maintenance falls back to the package set maintainers.
1638−
1639−### Updating packages in bulk
1640−
1641−There is a tool to update alot of python libraries in bulk, it exists at
1642−`maintainers/scripts/update-python-libraries` with this repository.
1643−
1644−It can quickly update minor or major versions for all packages selected
1645−and create update commits, and supports the `fetchPypi`, `fetchurl` and
1646−`fetchFromGitHub` fetchers. When updating lots of packages that are
1647−hosted on GitHub, exporting a `GITHUB_API_TOKEN` is highly recommended.
1648−
1649−Updating packages in bulk leads to lots of breakages, which is why a
1650−stabilization period on the `python-unstable` branch is required.
1651−
1652−Once the branch is sufficiently stable it should normally be merged
1653−into the `staging` branch.
1654−
1655−An exemplary call to update all python libraries between minor versions
1656−would be:
1657−
1658−```ShellSession
1659−$ maintainers/scripts/update-python-libraries --target minor --commit --use-pkgs-prefix pkgs/development/python-modules/**/default.nix
1660−```
1661−
1662−## CPython Update Schedule
1663−
1664−With [PEP 602](https://www.python.org/dev/peps/pep-0602/), CPython now
1665−follows a yearly release cadence. In nixpkgs, all supported interpreters
1666−are made available, but only the most recent two
1667−interpreters package sets are built; this is a compromise between being
1668−the latest interpreter, and what the majority of the Python packages support.
1669−
1670−New CPython interpreters are released in October. Generally, it takes some
1671−time for the majority of active Python projects to support the latest stable
1672−interpreter. To help ease the migration for Nixpkgs users
1673−between Python interpreters the schedule below will be used:
1674−
1675−| When | Event |
1676−| --- | --- |
1677−| After YY.11 Release | Bump CPython package set window. The latest and previous latest stable should now be built. |
1678−| After YY.05 Release | Bump default CPython interpreter to latest stable. |
1679−
1680−In practice, this means that the Python community will have had a stable interpreter
1681−for ~2 months before attempting to update the package set. And this will
1682−allow for ~7 months for Python applications to support the latest interpreter.
doc/languages-frameworks/qt.section.md+3−8
@@ -90,21 +90,19 @@ stdenv.mkDerivation {
9090}
9191```
9292
93−::: {.note}
93+::: note
9494`wrapQtAppsHook` ignores files that are non-ELF executables.
9595This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned.
9696An example of when you'd always need to do this is with Python applications that use PyQt.
9797:::
9898
99−## Adding a library to Nixpkgs {#adding-a-library-to-nixpkgs}
100−
99+## Adding a library to Nixpkgs
101100Add Qt libraries to `qt5-packages.nix` to make them available for every
102101supported Qt version.
103102
104103### Example adding a Qt library {#qt-library-all-packages-nix}
105104
106105The following represents the contents of `qt5-packages.nix`.
107−
108106```nix
109107{
110108 # ...
@@ -128,15 +126,13 @@ stdenv.mkDerivation {
128126}
129127```
130128
131−## Adding an application to Nixpkgs {#adding-an-application-to-nixpkgs}
132−
129+## Adding an application to Nixpkgs
133130Add Qt applications to `qt5-packages.nix`. Add an alias to `all-packages.nix`
134131to select the Qt 5 version used for the application.
135132
136133### Example adding a Qt application {#qt-application-all-packages-nix}
137134
138135The following represents the contents of `qt5-packages.nix`.
139−
140136```nix
141137{
142138 # ...
@@ -148,7 +144,6 @@ The following represents the contents of `qt5-packages.nix`.
148144```
149145
150146The following represents the contents of `all-packages.nix`.
151−
152147```nix
153148{
154149 # ...
doc/languages-frameworks/r.section.md+12−16
@@ -1,6 +1,6 @@
11# R {#r}
22
3−## Installation {#installation}
3+## Installation
44
55Define an environment for R that contains all the libraries that you'd like to
66use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
@@ -31,7 +31,6 @@ output is the name that has to be passed to rWrapper in the code snipped above.
3131However, if you'd like to add a file to your project source to make the
3232environment available for other contributors, you can create a `default.nix`
3333file like so:
34−
3534```nix
3635with import <nixpkgs> {};
3736{
@@ -51,7 +50,7 @@ with import <nixpkgs> {};
5150and then run `nix-shell .` to be dropped into a shell with those packages
5251available.
5352
54−## RStudio {#rstudio}
53+## RStudio
5554
5655RStudio uses a standard set of packages and ignores any custom R
5756environments or installed packages you may have. To create a custom
@@ -94,12 +93,7 @@ Executing `nix-shell` will then drop you into an environment equivalent to the
9493one above. If you need additional packages just add them to the list and
9594re-enter the shell.
9695
97−## Updating the package set {#updating-the-package-set}
98−
99−There is a script and associated environment for regenerating the package
100−sets and synchronising the rPackages tree to the current CRAN and matching
101−BIOC release. These scripts are found in the `pkgs/development/r-modules`
102−directory and executed as follows:
96+## Updating the package set
10397
10498```bash
10599nix-shell generate-shell.nix
@@ -117,11 +111,13 @@ Rscript generate-r-packages.R bioc-experiment > bioc-experiment-packages.nix.new
117111mv bioc-experiment-packages.nix.new bioc-experiment-packages.nix
118112```
119113
120−`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefore
121−the renaming.
114+`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefor the renaming.
115+
116+
117+## Testing if the Nix-expression could be evaluated
118+
119+```bash
120+nix-build test-evaluation.nix --dry-run
121+```
122122
123−Some packages require overrides to specify external dependencies or other
124−patches and special requirements. These overrides are specified in the
125−`pkgs/development/r-modules/default.nix` file. As the `*-packages.nix`
126−contents are automatically generated it should not be edited and broken
127−builds should be addressed using overrides.
123+If this exits fine, the expression is ok. If not, you have to edit `default.nix`
doc/languages-frameworks/ruby.section.md+12−25
@@ -1,6 +1,6 @@
11# Ruby {#sec-language-ruby}
22
3−## Using Ruby {#using-ruby}
3+## Using Ruby
44
55Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 2.6. It's also possible to refer to specific versions, e.g. `ruby_2_y`, `jruby`, or `mruby`.
66
@@ -8,11 +8,11 @@ In the Nixpkgs tree, Ruby packages can be found throughout, depending on what th
88
99There are two main approaches for using Ruby with gems. One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. The other is to depend on the common gems, which we'll explain further down, and rely on them being updated regularly.
1010
11−The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_2_7.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
11+The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_2_6.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
1212
1313Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual.
1414
15−### Temporary Ruby environment with `nix-shell` {#temporary-ruby-environment-with-nix-shell}
15+### Temporary Ruby environment with `nix-shell`
1616
1717Rather than having a single Ruby environment shared by all Ruby development projects on a system, Nix allows you to create separate environments per project. `nix-shell` gives you the possibility to temporarily load another environment akin to a combined `chruby` or `rvm` and `bundle exec`.
1818
@@ -30,7 +30,7 @@ $ nix-shell -p ruby.gems.nokogiri ruby.gems.pry
3030
3131Again, it's possible to launch the interpreter from the shell. The Ruby interpreter has the attribute `gems` which contains all Ruby gems for that specific interpreter.
3232
33−#### Load Ruby environment from `.nix` expression {#load-ruby-environment-from-.nix-expression}
33+#### Load Ruby environment from `.nix` expression
3434
3535As explained in the Nix manual, `nix-shell` can also load an expression from a `.nix` file. Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with:
3636
@@ -45,7 +45,7 @@ What's happening here?
45452. Then we create a Ruby environment with the `withPackages` function.
46463. The `withPackages` function expects us to provide a function as an argument that takes the set of all ruby gems and returns a list of packages to include in the environment. Here, we select the packages `nokogiri` and `pry` from the package set.
4747
48−#### Execute command with `--run` {#execute-command-with---run}
48+#### Execute command with `--run`
4949
5050A convenient flag for `nix-shell` is `--run`. It executes a command in the `nix-shell`. We can e.g. directly open a `pry` REPL:
5151
@@ -65,7 +65,7 @@ Or run a script using this environment:
6565$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb"
6666```
6767
68−#### Using `nix-shell` as shebang {#using-nix-shell-as-shebang}
68+#### Using `nix-shell` as shebang
6969
7070In fact, for the last case, there is a more convenient method. You can add a [shebang](<https://en.wikipedia.org/wiki/Shebang_(Unix)>) to your script specifying which dependencies `nix-shell` needs. With the following shebang, you can just execute `./example.rb`, and it will run with all dependencies.
7171
@@ -80,9 +80,9 @@ body = RestClient.get('http://example.com').body
8080puts Nokogiri::HTML(body).at('h1').text
8181```
8282
83−## Developing with Ruby {#developing-with-ruby}
83+## Developing with Ruby
8484
85−### Using an existing Gemfile {#using-an-existing-gemfile}
85+### Using an existing Gemfile
8686
8787In most cases, you'll already have a `Gemfile.lock` listing all your dependencies. This can be used to generate a `gemset.nix` which is used to fetch the gems and combine them into a single environment. The reason why you need to have a separate file for this, is that Nix requires you to have a checksum for each input to your build. Since the `Gemfile.lock` that `bundler` generates doesn't provide us with checksums, we have to first download each gem, calculate its SHA256, and store it in this separate file.
8888
@@ -120,7 +120,7 @@ One common issue that you might have is that you have Ruby 2.6, but also `bundle
120120mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; }
121121```
122122
123−### Gem-specific configurations and workarounds {#gem-specific-configurations-and-workarounds}
123+### Gem-specific configurations and workarounds
124124
125125In some cases, especially if the gem has native extensions, you might need to modify the way the gem is built.
126126
@@ -201,20 +201,7 @@ $ nix-shell --run 'ruby -rpg -e "puts PG.library_version"'
201201
202202Of course for this use-case one could also use overlays since the configuration for `pg` depends on the `postgresql` alias, but for demonstration purposes this has to suffice.
203203
204−### Platform-specific gems
205−
206−Right now, bundix has some issues with pre-built, platform-specific gems: [bundix PR #68](https://github.com/nix-community/bundix/pull/68).
207−Until this is solved, you can tell bundler to not use platform-specific gems and instead build them from source each time:
208−- globally (will be set in `~/.config/.bundle/config`):
209−```shell
210−$ bundle config set force_ruby_platform true
211−```
212−- locally (will be set in `<project-root>/.bundle/config`):
213−```shell
214−$ bundle config set --local force_ruby_platform true
215−```
216−
217−### Adding a gem to the default gemset {#adding-a-gem-to-the-default-gemset}
204+### Adding a gem to the default gemset
218205
219206Now that you know how to get a working Ruby environment with Nix, it's time to go forward and start actually developing with Ruby. We will first have a look at how Ruby gems are packaged on Nix. Then, we will look at how you can use development mode with your code.
220207
@@ -228,7 +215,7 @@ To test that it works, you can then try using the gem with:
228215NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])"
229216```
230217
231−### Packaging applications {#packaging-applications}
218+### Packaging applications
232219
233220A common task is to add a ruby executable to nixpkgs, popular examples would be `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` function, that allows you to make a package that only exposes the listed executables, otherwise the package may cause conflicts through common paths like `bin/rake` or `bin/bundler` that aren't meant to be used.
234221
@@ -256,7 +243,7 @@ bundlerApp {
256243
257244All that's left to do is to generate the corresponding `Gemfile.lock` and `gemset.nix` as described above in the `Using an existing Gemfile` section.
258245
259−#### Packaging executables that require wrapping {#packaging-executables-that-require-wrapping}
246+#### Packaging executables that require wrapping
260247
261248Sometimes your app will depend on other executables at runtime, and tries to find it through the `PATH` environment variable.
262249
doc/languages-frameworks/rust.section.md+112−204
@@ -13,14 +13,14 @@ into your `configuration.nix` or bring them into scope with `nix-shell -p rustc
1313
1414For other versions such as daily builds (beta and nightly),
1515use either `rustup` from nixpkgs (which will manage the rust installation in your home directory),
16−or use a community maintained [Rust overlay](#using-community-rust-overlays).
16+or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
1717
18−## Compiling Rust applications with Cargo {#compiling-rust-applications-with-cargo}
18+## Compiling Rust applications with Cargo
1919
2020Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
2121
2222```nix
23−{ lib, fetchFromGitHub, rustPlatform }:
23+{ lib, rustPlatform }:
2424
2525rustPlatform.buildRustPackage rec {
2626 pname = "ripgrep";
@@ -107,7 +107,7 @@ rustPlatform.buildRustPackage rec {
107107}
108108```
109109
110−### Importing a `Cargo.lock` file {#importing-a-cargo.lock-file}
110+### Importing a `Cargo.lock` file
111111
112112Using `cargoSha256` or `cargoHash` is tedious when using
113113`buildRustPackage` within a project, since it requires that the hash
@@ -116,13 +116,13 @@ is updated after every change to `Cargo.lock`. Therefore,
116116a `Cargo.lock` file using the `cargoLock` argument. For example:
117117
118118```nix
119−rustPlatform.buildRustPackage {
119+rustPlatform.buildRustPackage rec {
120120 pname = "myproject";
121121 version = "1.0.0";
122122
123123 cargoLock = {
124124 lockFile = ./Cargo.lock;
125− };
125+ }
126126
127127 # ...
128128}
@@ -131,36 +131,6 @@ rustPlatform.buildRustPackage {
131131This will retrieve the dependencies using fixed-output derivations from
132132the specified lockfile.
133133
134−One caveat is that `Cargo.lock` cannot be patched in the `patchPhase`
135−because it runs after the dependencies have already been fetched. If
136−you need to patch or generate the lockfile you can alternatively set
137−`cargoLock.lockFileContents` to a string of its contents:
138−
139−```nix
140−rustPlatform.buildRustPackage {
141− pname = "myproject";
142− version = "1.0.0";
143−
144− cargoLock = let
145− fixupLockFile = path: f (builtins.readFile path);
146− in {
147− lockFileContents = fixupLockFile ./Cargo.lock;
148− };
149−
150− # ...
151−}
152−```
153−
154−Note that setting `cargoLock.lockFile` or `cargoLock.lockFileContents`
155−doesn't add a `Cargo.lock` to your `src`, and a `Cargo.lock` is still
156−required to build a rust package. A simple fix is to use:
157−
158−```nix
159−postPatch = ''
160− cp ${./Cargo.lock} Cargo.lock
161−'';
162−```
163−
164134The output hash of each dependency that uses a git source must be
165135specified in the `outputHashes` attribute. For example:
166136
@@ -174,7 +144,7 @@ rustPlatform.buildRustPackage rec {
174144 outputHashes = {
175145 "finalfusion-0.14.0" = "17f4bsdzpcshwh74w5z119xjy2if6l2wgyjy56v621skr2r8y904";
176146 };
177− };
147+ }
178148
179149 # ...
180150}
@@ -186,34 +156,7 @@ added. To find the correct hash, you can first use `lib.fakeSha256` or
186156`lib.fakeHash` as a stub hash. Building the package (and thus the
187157vendored dependencies) will then inform you of the correct hash.
188158
189−### Cargo features {#cargo-features}
190−
191−You can disable default features using `buildNoDefaultFeatures`, and
192−extra features can be added with `buildFeatures`.
193−
194−If you want to use different features for check phase, you can use
195−`checkNoDefaultFeatures` and `checkFeatures`. They are only passed to
196−`cargo test` and not `cargo build`. If left unset, they default to
197−`buildNoDefaultFeatures` and `buildFeatures`.
198−
199−For example:
200−
201−```nix
202−rustPlatform.buildRustPackage rec {
203− pname = "myproject";
204− version = "1.0.0";
205−
206− buildNoDefaultFeatures = true;
207− buildFeatures = [ "color" "net" ];
208−
209− # disable network features in tests
210− checkFeatures = [ "color" ];
211−
212− # ...
213−}
214−```
215−
216−### Cross compilation {#cross-compilation}
159+### Cross compilation
217160
218161By default, Rust packages are compiled for the host platform, just like any
219162other package is. The `--target` passed to rust tools is computed from this.
@@ -225,7 +168,6 @@ where they are known to differ. But there are ways to customize the argument:
225168 name will be used instead.
226169
227170 For example:
228−
229171 ```nix
230172 import <nixpkgs> {
231173 crossSystem = (import <nixpkgs/lib>).systems.examples.armhf-embedded // {
@@ -233,9 +175,7 @@ where they are known to differ. But there are ways to customize the argument:
233175 };
234176 }
235177 ```
236−
237178 will result in:
238−
239179 ```shell
240180 --target thumbv7em-none-eabi
241181 ```
@@ -248,7 +188,6 @@ where they are known to differ. But there are ways to customize the argument:
248188 will be used instead.
249189
250190 For example:
251−
252191 ```nix
253192 import <nixpkgs> {
254193 crossSystem = (import <nixpkgs/lib>).systems.examples.armhf-embedded // {
@@ -257,17 +196,31 @@ where they are known to differ. But there are ways to customize the argument:
257196 };
258197 }
259198 ```
260−
261199 will result in:
262−
263200 ```shell
264201 --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""}
265202 ```
266203
204+Finally, as an ad-hoc escape hatch, a computed target (string or JSON file
205+path) can be passed directly to `buildRustPackage`:
206+
207+```nix
208+pkgs.rustPlatform.buildRustPackage {
209+ /* ... */
210+ target = "x86_64-fortanix-unknown-sgx";
211+}
212+```
213+
214+This is useful to avoid rebuilding Rust tools, since they are actually target
215+agnostic and don't need to be rebuilt. But in the future, we should always
216+build the Rust tools and standard library crates separately so there is no
217+reason not to take the `stdenv.hostPlatform.rustc`-modifying approach, and the
218+ad-hoc escape hatch to `buildRustPackage` can be removed.
219+
267220Note that currently custom targets aren't compiled with `std`, so `cargo test`
268221will fail. This can be ignored by adding `doCheck = false;` to your derivation.
269222
270−### Running package tests {#running-package-tests}
223+### Running package tests
271224
272225When using `buildRustPackage`, the `checkPhase` is enabled by default and runs
273226`cargo test` on the package to build. To make sure that we don't compile the
@@ -288,14 +241,14 @@ rustPlatform.buildRustPackage {
288241Please note that the code will be compiled twice here: once in `release` mode
289242for the `buildPhase`, and again in `debug` mode for the `checkPhase`.
290243
291−Test flags, e.g., `--package foo`, can be passed to `cargo test` via the
244+Test flags, e.g., `--features xxx/yyy`, can be passed to `cargo test` via the
292245`cargoTestFlags` attribute.
293246
294247Another attribute, called `checkFlags`, is used to pass arguments to the test
295248binary itself, as stated
296−[here](https://doc.rust-lang.org/cargo/commands/cargo-test.html).
249+(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html].
297250
298−#### Tests relying on the structure of the `target/` directory {#tests-relying-on-the-structure-of-the-target-directory}
251+#### Tests relying on the structure of the `target/` directory
299252
300253Some tests may rely on the structure of the `target/` directory. Those tests
301254are likely to fail because we use `cargo --target` during the build. This means that
@@ -305,7 +258,7 @@ rather than in `target/release/`.
305258
306259This can only be worked around by patching the affected tests accordingly.
307260
308−#### Disabling package-tests {#disabling-package-tests}
261+#### Disabling package-tests
309262
310263In some instances, it may be necessary to disable testing altogether (with `doCheck = false;`):
311264
@@ -319,7 +272,7 @@ The above are just guidelines, and exceptions may be granted on a case-by-case b
319272However, please check if it's possible to disable a problematic subset of the
320273test suite and leave a comment explaining your reasoning.
321274
322−#### Setting `test-threads` {#setting-test-threads}
275+#### Setting `test-threads`
323276
324277`buildRustPackage` will use parallel test threads by default,
325278sometimes it may be necessary to disable this so the tests run consecutively.
@@ -331,7 +284,7 @@ rustPlatform.buildRustPackage {
331284}
332285```
333286
334−### Building a package in `debug` mode {#building-a-package-in-debug-mode}
287+### Building a package in `debug` mode
335288
336289By default, `buildRustPackage` will use `release` mode for builds. If a package
337290should be built in `debug` mode, it can be configured like so:
@@ -345,14 +298,14 @@ rustPlatform.buildRustPackage {
345298
346299In this scenario, the `checkPhase` will be ran in `debug` mode as well.
347300
348−### Custom `build`/`install`-procedures {#custom-buildinstall-procedures}
301+### Custom `build`/`install`-procedures
349302
350303Some packages may use custom scripts for building/installing, e.g. with a `Makefile`.
351304In these cases, it's recommended to override the `buildPhase`/`installPhase`/`checkPhase`.
352305
353306Otherwise, some steps may fail because of the modified directory structure of `target/`.
354307
355−### Building a crate with an absent or out-of-date Cargo.lock file {#building-a-crate-with-an-absent-or-out-of-date-cargo.lock-file}
308+### Building a crate with an absent or out-of-date Cargo.lock file
356309
357310`buildRustPackage` needs a `Cargo.lock` file to get all dependencies in the
358311source code in a reproducible way. If it is missing or out-of-date one can use
@@ -368,13 +321,13 @@ rustPlatform.buildRustPackage rec {
368321}
369322```
370323
371−## Compiling non-Rust packages that include Rust code {#compiling-non-rust-packages-that-include-rust-code}
324+## Compiling non-Rust packages that include Rust code
372325
373326Several non-Rust packages incorporate Rust code for performance- or
374327security-sensitive parts. `rustPlatform` exposes several functions and
375328hooks that can be used to integrate Cargo in non-Rust packages.
376329
377−### Vendoring of dependencies {#vendoring-of-dependencies}
330+### Vendoring of dependencies
378331
379332Since network access is not allowed in sandboxed builds, Rust crate
380333dependencies need to be retrieved using a fetcher. `rustPlatform`
@@ -420,7 +373,7 @@ hashes need to be specified since they are not available through the
420373lock file. For example:
421374
422375```
423−cargoDeps = rustPlatform.importCargoLock {
376+cargoDeps = {
424377 lockFile = ./Cargo.lock;
425378 outputHashes = {
426379 "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa";
@@ -434,11 +387,11 @@ added. To find the correct hash, you can first use `lib.fakeSha256` or
434387`lib.fakeHash` as a stub hash. Building `cargoDeps` will then inform
435388you of the correct hash.
436389
437−### Hooks {#hooks}
390+### Hooks
438391
439392`rustPlatform` provides the following hooks to automate Cargo builds:
440393
441−* `cargoSetupHook`: configure Cargo to use dependencies vendored
394+* `cargoSetupHook`: configure Cargo to use depenencies vendored
442395 through `fetchCargoTarball`. This hook uses the `cargoDeps`
443396 environment variable to find the vendored dependencies. If a project
444397 already vendors its dependencies, the variable `cargoVendorDir` can
@@ -448,28 +401,24 @@ you of the correct hash.
448401* `cargoBuildHook`: use Cargo to build a crate. If the crate to be
449402 built is a crate in e.g. a Cargo workspace, the relative path to the
450403 crate to build can be set through the optional `buildAndTestSubdir`
451− environment variable. Features can be specified with
452− `cargoBuildNoDefaultFeatures` and `cargoBuildFeatures`. Additional
453− Cargo build flags can be passed through `cargoBuildFlags`.
404+ environment variable. Additional Cargo build flags can be passed
405+ through `cargoBuildFlags`.
454406* `maturinBuildHook`: use [Maturin](https://github.com/PyO3/maturin)
455407 to build a Python wheel. Similar to `cargoBuildHook`, the optional
456408 variable `buildAndTestSubdir` can be used to build a crate in a
457− Cargo workspace. Additional Maturin flags can be passed through
409+ Cargo workspace. Additional maturin flags can be passed through
458410 `maturinBuildFlags`.
459411* `cargoCheckHook`: run tests using Cargo. The build type for checks
460− can be set using `cargoCheckType`. Features can be specified with
461− `cargoCheckNoDefaultFeaatures` and `cargoCheckFeatures`. Additional
462− flags can be passed to the tests using `checkFlags` and
463− `checkFlagsArray`. By default, tests are run in parallel. This can
464− be disabled by setting `dontUseCargoParallelTests`.
412+ can be set using `cargoCheckType`. Additional flags can be passed to
413+ the tests using `checkFlags` and `checkFlagsArray`. By default,
414+ tests are run in parallel. This can be disabled by setting
415+ `dontUseCargoParallelTests`.
465416* `cargoInstallHook`: install binaries and static/shared libraries
466417 that were built using `cargoBuildHook`.
467−* `bindgenHook`: for crates which use `bindgen` as a build dependency, lets
468− `bindgen` find `libclang` and `libclang` find the libraries in `buildInputs`.
469418
470−### Examples {#examples}
419+### Examples
471420
472−#### Python package using `setuptools-rust` {#python-package-using-setuptools-rust}
421+#### Python package using `setuptools-rust`
473422
474423For Python packages using `setuptools-rust`, you can use
475424`fetchCargoTarball` and `cargoSetupHook` to retrieve and set up Cargo
@@ -478,7 +427,7 @@ dependencies. The build itself is then performed by
478427
479428The following example outlines how the `tokenizers` Python package is
480429built. Since the Python package is in the `source/bindings/python`
481−directory of the `tokenizers` project's source archive, we use
430+directory of the *tokenizers* project's source archive, we use
482431`sourceRoot` to point the tooling to this directory:
483432
484433```nix
@@ -555,7 +504,7 @@ buildPythonPackage rec {
555504}
556505```
557506
558−#### Python package using `maturin` {#python-package-using-maturin}
507+#### Python package using `maturin`
559508
560509Python packages that use [Maturin](https://github.com/PyO3/maturin)
561510can be built with `fetchCargoTarball`, `cargoSetupHook`, and
@@ -596,9 +545,9 @@ buildPythonPackage rec {
596545}
597546```
598547
599−## Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo}
548+## Compiling Rust crates using Nix instead of Cargo
600549
601−### Simple operation {#simple-operation}
550+### Simple operation
602551
603552When run, `cargo build` produces a file called `Cargo.lock`,
604553containing pinned versions of all dependencies. Nixpkgs contains a
@@ -609,15 +558,14 @@ That Nix expression calls `rustc` directly (hence bypassing Cargo),
609558and can be used to compile a crate and all its dependencies. Here is
610559an example for a minimal `hello` crate:
611560
612−```ShellSession
613−$ cargo new hello
614−$ cd hello
615−$ cargo build
561+
562+ $ cargo new hello
563+ $ cd hello
564+ $ cargo build
616565 Compiling hello v0.1.0 (file:///tmp/hello)
617− Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
618−$ carnix -o hello.nix --src ./. Cargo.lock --standalone
619−$ nix-build hello.nix -A hello_0_1_0
620−```
566+ Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
567+ $ carnix -o hello.nix --src ./. Cargo.lock --standalone
568+ $ nix-build hello.nix -A hello_0_1_0
621569
622570Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
623571
@@ -696,14 +644,14 @@ Here, the `libc` crate has no `src` attribute, so `buildRustCrate`
696644will fetch it from [crates.io](https://crates.io). A `sha256`
697645attribute is still needed for Nix purity.
698646
699−### Handling external dependencies {#handling-external-dependencies}
647+### Handling external dependencies
700648
701649Some crates require external libraries. For crates from
702650[crates.io](https://crates.io), such libraries can be specified in
703651`defaultCrateOverrides` package in nixpkgs itself.
704652
705653Starting from that file, one can add more overrides, to add features
706−or build inputs by overriding the hello crate in a separate file.
654+or build inputs by overriding the hello crate in a seperate file.
707655
708656```nix
709657with import <nixpkgs> {};
@@ -755,12 +703,12 @@ with import <nixpkgs> {};
755703}
756704```
757705
758−### Options and phases configuration {#options-and-phases-configuration}
706+### Options and phases configuration
759707
760708Actually, the overrides introduced in the previous section are more
761709general. A number of other parameters can be overridden:
762710
763−- The version of `rustc` used to compile the crate:
711+- The version of rustc used to compile the crate:
764712
765713 ```nix
766714 (hello {}).override { rust = pkgs.rust; };
@@ -773,7 +721,7 @@ general. A number of other parameters can be overridden:
773721 (hello {}).override { release = false; };
774722 ```
775723
776−- Whether to print the commands sent to `rustc` when building
724+- Whether to print the commands sent to rustc when building
777725 (equivalent to `--verbose` in cargo:
778726
779727 ```nix
@@ -802,7 +750,7 @@ general. A number of other parameters can be overridden:
802750 };
803751 ```
804752
805−### Features {#features}
753+### Features
806754
807755One can also supply features switches. For example, if we want to
808756compile `diesel_cli` only with the `postgres` feature, and no default
@@ -817,15 +765,14 @@ features, we would write:
817765
818766Where `diesel.nix` is the file generated by Carnix, as explained above.
819767
820−## Setting Up `nix-shell` {#setting-up-nix-shell}
821768
769+## Setting Up `nix-shell`
822770Oftentimes you want to develop code from within `nix-shell`. Unfortunately
823771`buildRustCrate` does not support common `nix-shell` operations directly
824772(see [this issue](https://github.com/NixOS/nixpkgs/issues/37945))
825773so we will use `stdenv.mkDerivation` instead.
826774
827775Using the example `hello` project above, we want to do the following:
828−
829776- Have access to `cargo` and `rustc`
830777- Have the `openssl` library available to a crate through it's _normal_
831778 compilation mechanism (`pkg-config`).
@@ -854,15 +801,13 @@ stdenv.mkDerivation {
854801```
855802
856803You should now be able to run the following:
857−
858−```ShellSession
804+```ShellSesssion
859805$ nix-shell --pure
860806$ cargo build
861807$ cargo test
862808```
863809
864−### Controlling Rust Version Inside `nix-shell` {#controlling-rust-version-inside-nix-shell}
865−
810+### Controlling Rust Version Inside `nix-shell`
866811To control your rust version (i.e. use nightly) from within `shell.nix` (or
867812other nix expressions) you can use the following `shell.nix`
868813
@@ -894,7 +839,6 @@ stdenv.mkDerivation {
894839```
895840
896841Now run:
897−
898842```ShellSession
899843$ rustc --version
900844rustc 1.26.0-nightly (188e693b3 2018-03-26)
@@ -902,107 +846,71 @@ rustc 1.26.0-nightly (188e693b3 2018-03-26)
902846
903847To see that you are using nightly.
904848
905−## Using community Rust overlays {#using-community-rust-overlays}
906849
907−There are two community maintained approaches to Rust toolchain management:
908−- [oxalica's Rust overlay](https://github.com/oxalica/rust-overlay)
909−- [fenix](https://github.com/nix-community/fenix)
850+## Using the Rust nightlies overlay
910851
911−Oxalica's overlay allows you to select a particular Rust version and components.
912−See [their documentation](https://github.com/oxalica/rust-overlay#rust-overlay) for more
913−detailed usage.
852+Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.
853+This overlay can _also_ be used to install recent unstable or stable versions
854+of Rust, if desired.
914855
915−Fenix is an alternative to `rustup` and can also be used as an overlay.
856+### Rust overlay installation
916857
917−Both oxalica's overlay and fenix better integrate with nix and cache optimizations.
918−Because of this and ergonomics, either of those community projects
919−should be preferred to the Mozilla's Rust overlay (`nixpkgs-mozilla`).
858+You can use this overlay by either changing your local nixpkgs configuration,
859+or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`.
860+For more information see [#sec-overlays-install](the manual on installing overlays).
920861
921−### How to select a specific `rustc` and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version}
862+#### Imperative rust overlay installation
922863
923−You can consume the oxalica overlay and use it to grab a specific Rust toolchain version.
924−Here is an example `shell.nix` showing how to grab the current stable toolchain:
925−```nix
926−{ pkgs ? import <nixpkgs> {
927− overlays = [
928− (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))
929− ];
930− }
931−}:
932−pkgs.mkShell {
933− nativeBuildInputs = with pkgs; [
934− pkg-config
935− rust-bin.stable.latest.minimal
936− ];
937−}
938−```
864+Clone [nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla),
865+and create a symbolic link to the file
866+[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix)
867+in the `~/.config/nixpkgs/overlays` directory.
939868
940−You can try this out by:
941−1. Saving that to `shell.nix`
942−2. Executing `nix-shell --pure --command 'rustc --version'`
869+ $ git clone https://github.com/mozilla/nixpkgs-mozilla.git
870+ $ mkdir -p ~/.config/nixpkgs/overlays
871+ $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix
943872
944−As of writing, this prints out `rustc 1.56.0 (09c42c458 2021-10-18)`.
873+### Declarative rust overlay installation
945874
946−### How to use an overlay toolchain in a derivation {#how-to-use-an-overlay-toolchain-in-a-derivation}
875+Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar:
947876
948−You can also use an overlay's Rust toolchain with `buildRustPackage`.
949−The below snippet demonstrates invoking `buildRustPackage` with an oxalica overlay selected Rust toolchain:
950877```nix
951−with import <nixpkgs> {
952− overlays = [
953− (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))
954− ];
878+{ pkgs ? import <nixpkgs> {
879+ overlays = [
880+ (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
881+ # Further overlays go here
882+ ];
883+ };
955884};
885+```
956886
957−rustPlatform.buildRustPackage rec {
958− pname = "ripgrep";
959− version = "12.1.1";
960− nativeBuildInputs = [
961− rust-bin.stable.latest.minimal
962− ];
887+Note that this will fetch the latest overlay version when rebuilding your system.
963888
964− src = fetchFromGitHub {
965− owner = "BurntSushi";
966− repo = "ripgrep";
967− rev = version;
968− sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps";
969− };
889+### Rust overlay usage
970890
971− cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp";
891+The overlay contains attribute sets corresponding to different versions of the rust toolchain, such as:
972892
973− meta = with lib; {
974− description = "A fast line-oriented regex search tool, similar to ag and ack";
975− homepage = "https://github.com/BurntSushi/ripgrep";
976− license = licenses.unlicense;
977− maintainers = [ maintainers.tailhook ];
978− };
979−}
980−```
893+* `latest.rustChannels.stable`
894+* `latest.rustChannels.nightly`
895+* a function `rustChannelOf`, called as `(rustChannelOf { date = "2018-04-11"; channel = "nightly"; })`, or...
896+* `(nixpkgs.rustChannelOf { rustToolchain = ./rust-toolchain; })` if you have a local `rust-toolchain` file (see https://github.com/mozilla/nixpkgs-mozilla#using-in-nix-expressions for an example)
981897
982−Follow the below steps to try that snippet.
983−1. create a new directory
984−1. save the above snippet as `default.nix` in that directory
985−1. cd into that directory and run `nix-build`
898+Each of these contain packages such as `rust`, which contains your usual rust development tools with the respective toolchain chosen.
899+For example, you might want to add `latest.rustChannels.stable.rust` to the list of packages in your configuration.
986900
987−### Rust overlay installation {#rust-overlay-installation}
901+Imperatively, the latest stable version can be installed with the following command:
988902
989−You can use this overlay by either changing your local nixpkgs configuration,
990−or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`.
991−For more information see [the manual on installing overlays](#sec-overlays-install).
903+ $ nix-env -Ai nixpkgs.latest.rustChannels.stable.rust
992904
993−### Declarative Rust overlay installation {#declarative-rust-overlay-installation}
905+Or using the attribute with nix-shell:
994906
995−This snippet shows how to use oxalica's Rust overlay.
996−Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar:
907+ $ nix-shell -p nixpkgs.latest.rustChannels.stable.rust
997908
998−```nix
999−{ pkgs ? import <nixpkgs> {
1000− overlays = [
1001− (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))
1002− # Further overlays go here
1003− ];
1004− };
1005−};
1006−```
909+Substitute the `nixpkgs` prefix with `nixos` on NixOS.
910+To install the beta or nightly channel, "stable" should be substituted by
911+"nightly" or "beta", or
912+use the function provided by this overlay to pull a version based on a
913+build date.
1007914
1008−Note that this will fetch the latest overlay version when rebuilding your system.
915+The overlay automatically updates itself as it uses the same source as
916+[rustup](https://www.rustup.rs/).
doc/languages-frameworks/texlive.section.md+1−3
@@ -5,8 +5,7 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under
55## User's guide {#sec-language-texlive-user-guide}
66
77- For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support.
8−
9−- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this. Most CTAN packages should be available:
8+- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this:
109
1110 ```nix
1211 texlive.combine {
@@ -15,7 +14,6 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under
1514 ```
1615
1716- There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences).
18−
1917- By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add `pkgFilter` function to `combine`.
2018
2119 ```nix
doc/languages-frameworks/titanium.section.md+4−4
@@ -9,8 +9,8 @@ applications for Android and iOS devices from source code.
99Not all Titanium features supported -- currently, it can only be used to build
1010Android and iOS apps.
1111
12−## Building a Titanium app {#building-a-titanium-app}
13−
12+Building a Titanium app
13+-----------------------
1414We can build a Titanium app from source for Android or iOS and for debugging or
1515release purposes by invoking the `titaniumenv.buildApp {}` function:
1616
@@ -103,8 +103,8 @@ When `enableWirelessDistribution` has been enabled, you must also provide the
103103path of the PHP script (`installURL`) (that is included with the iOS build
104104environment) to enable wireless ad-hoc installations.
105105
106−## Emulating or simulating the app {#emulating-or-simulating-the-app}
107−
106+Emulating or simulating the app
107+-------------------------------
108108It is also possible to simulate the correspond iOS simulator build by using
109109`xcodeenv.simulateApp {}` and emulate an Android APK by using
110110`androidenv.emulateApp {}`.
doc/languages-frameworks/vim.section.md+17−47
@@ -12,13 +12,13 @@ At the moment we support three different methods for managing plugins:
1212- Pathogen
1313- vim-plug
1414
15−## Custom configuration {#custom-configuration}
15+## Custom configuration
1616
1717Adding custom .vimrc lines can be done using the following code:
1818
1919```nix
2020vim_configurable.customize {
21− # `name` optionally specifies the name of the executable and package
21+ # `name` specifies the name of the executable and package
2222 name = "vim-with-plugins";
2323
2424 vimrcConfig.customRC = ''
@@ -28,9 +28,6 @@ vim_configurable.customize {
2828```
2929
3030This configuration is used when Vim is invoked with the command specified as name, in this case `vim-with-plugins`.
31−You can also omit `name` to customize Vim itself. See the
32−[definition of `vimUtils.makeCustomizable`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-utils.nix#L408)
33−for all supported options.
3431
3532For Neovim the `configure` argument can be overridden to achieve the same:
3633
@@ -59,7 +56,7 @@ neovim-qt.override {
5956}
6057```
6158
62−## Managing plugins with Vim packages {#managing-plugins-with-vim-packages}
59+## Managing plugins with Vim packages
6360
6461To store you plugins in Vim packages (the native Vim plugin manager, see `:help packages`) the following example can be used:
6562
@@ -119,11 +116,11 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n
119116
120117After that you can install your special grafted `myVim` or `myNeovim` packages.
121118
122−### What if your favourite Vim plugin isn’t already packaged? {#what-if-your-favourite-vim-plugin-isnt-already-packaged}
119+### What if your favourite Vim plugin isn't already packaged?
123120
124121If one of your favourite plugins isn't packaged, you can package it yourself:
125122
126−```nix
123+```
127124{ config, pkgs, ... }:
128125
129126let
@@ -157,34 +154,7 @@ in
157154}
158155```
159156
160−### Specificities for some plugins
161−#### Tree sitter
162−
163−By default `nvim-treesitter` encourages you to download, compile and install
164−the required tree-sitter grammars at run time with `:TSInstall`. This works
165−poorly on NixOS. Instead, to install the `nvim-treesitter` plugins with a set
166−of precompiled grammars, you can use `nvim-treesitter.withPlugins` function:
167−
168−```nix
169−(pkgs.neovim.override {
170− configure = {
171− packages.myPlugins = with pkgs.vimPlugins; {
172− start = [
173− (nvim-treesitter.withPlugins (
174− plugins: with plugins; [
175− tree-sitter-nix
176− tree-sitter-python
177− ]
178− ))
179− ];
180− };
181− };
182−})
183−```
184−
185−To enable all grammars packaged in nixpkgs, use `(pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))`.
186−
187−## Managing plugins with vim-plug {#managing-plugins-with-vim-plug}
157+## Managing plugins with vim-plug
188158
189159To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim
190160plugins the following example can be used:
@@ -213,14 +183,14 @@ neovim.override {
213183}
214184```
215185
216−## Managing plugins with VAM {#managing-plugins-with-vam}
186+## Managing plugins with VAM
217187
218−### Handling dependencies of Vim plugins {#handling-dependencies-of-vim-plugins}
188+### Handling dependencies of Vim plugins
219189
220190VAM introduced .json files supporting dependencies without versioning
221191assuming that "using latest version" is ok most of the time.
222192
223−### Example {#example}
193+### Example
224194
225195First create a vim-scripts file having one plugin name per line. Example:
226196
@@ -289,7 +259,7 @@ Sample output1:
289259"reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
290260 name = "reload";
291261 src = fetchgit {
292− url = "https://github.com/xolox/vim-reload";
262+ url = "git://github.com/xolox/vim-reload";
293263 rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1";
294264 sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh";
295265 };
@@ -310,11 +280,11 @@ Sample output2:
310280]
311281```
312282
313−## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}
283+## Adding new plugins to nixpkgs
314284
315−Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
285+Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
316286
317−Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
287+Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
318288
319289```nix
320290deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
@@ -328,21 +298,21 @@ To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This sc
328298
329299Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of Language Server Protocol integration with vim/neovim.
330300
331−## Updating plugins in nixpkgs {#updating-plugins-in-nixpkgs}
301+## Updating plugins in nixpkgs
332302
333303Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token).
334304
335305```sh
336−GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py
306+GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py
337307```
338308
339309Alternatively, set the number of processes to a lower count to avoid rate-limiting.
340310
341311```sh
342−./pkgs/applications/editors/vim/plugins/update.py --proc 1
312+./pkgs/misc/vim-plugins/update.py --proc 1
343313```
344314
345−## Important repositories {#important-repositories}
315+## Important repositories
346316
347317- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository
348318 from VAM plugin manager meant to be used by others as well used by
doc/manual.xml−2
@@ -25,10 +25,8 @@
2525 <title>Builders</title>
2626 <xi:include href="builders/fetchers.chapter.xml" />
2727 <xi:include href="builders/trivial-builders.chapter.xml" />
28− <xi:include href="builders/testers.chapter.xml" />
2928 <xi:include href="builders/special.xml" />
3029 <xi:include href="builders/images.xml" />
31− <xi:include href="hooks/index.xml" />
3230 <xi:include href="languages-frameworks/index.xml" />
3331 <xi:include href="builders/packages/index.xml" />
3432 </part>
doc/preface.chapter.md+1−1
@@ -12,7 +12,7 @@ Nixpkgs. If you like to learn more about the Nix package manager and the Nix
1212expression language, then you are kindly referred to the [Nix manual](https://nixos.org/nix/manual/).
1313The NixOS distribution is documented in the [NixOS manual](https://nixos.org/nixos/manual/).
1414
15−## Overview of Nixpkgs {#overview-of-nixpkgs}
15+## Overview of Nixpkgs
1616
1717Nix expressions describe how to build packages from source and are collected in
1818the [nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
doc/stdenv/cross-compilation.chapter.md+25−53
@@ -6,6 +6,7 @@
66
77This chapter will be organized in three parts. First, it will describe the basics of how to package software in a way that supports cross-compilation. Second, it will describe how to use Nixpkgs when cross-compiling. Third, it will describe the internal infrastructure supporting cross-compilation.
88
9+
910## Packaging in a cross-friendly manner {#sec-cross-packaging}
1011
1112### Platform parameters {#ssec-cross-platform-parameters}
@@ -64,8 +65,8 @@ The exact schema these fields follow is a bit ill-defined due to a long and conv
6465
6566### Theory of dependency categorization {#ssec-cross-dependency-categorization}
6667
67−::: {.note}
68−This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to `mkDerivation`, see [](#ssec-stdenv-dependencies). For a description of how everything is implemented, see [](#ssec-cross-dependency-implementation).
68+::: note
69+This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to `mkDerivation`, see <xref linkend="ssec-stdenv-dependencies"/>. For a description of how everything is implemented, see <xref linkend="ssec-cross-dependency-implementation"/>.
6970:::
7071
7172In this section we explore the relationship between both runtime and build-time dependencies and the 3 Autoconf platforms.
@@ -78,46 +79,21 @@ If both the dependency and depending packages aren't compilers or other machine-
7879
7980Finally, if the depending package is a compiler or other machine-code-producing tool, it might need dependencies that run at "emit time". This is for compilers that (regrettably) insist on being built together with their source languages' standard libraries. Assuming build != host != target, a run-time dependency of the standard library cannot be run at the compiler's build time or run time, but only at the run time of code emitted by the compiler.
8081
81−Putting this all together, that means that we have dependency types of the form "X→ E", which means that the dependency executes on X and emits code for E; each of X and E can be `build`, `host`, or `target`, and E can be `*` to indicate that the dependency is not a compiler-like package.
82−
83−Dependency types describe the relationships that a package has with each of its transitive dependencies. You could think of attaching one or more dependency types to each of the formal parameters at the top of a package's `.nix` file, as well as to all of *their* formal parameters, and so on. Triples like `(foo, bar, baz)`, on the other hand, are a property of an instantiated derivation -- you could would attach a triple `(mips-linux, mips-linux, sparc-solaris)` to a `.drv` file in `/nix/store`.
84−
85−Only nine dependency types matter in practice:
86−
87−#### Possible dependency types {#possible-dependency-types}
88−
89−| Dependency type | Dependency’s host platform | Dependency’s target platform |
90−|-----------------|----------------------------|------------------------------|
91−| build → * | build | (none) |
92−| build → build | build | build |
93−| build → host | build | host |
94−| build → target | build | target |
95−| host → * | host | (none) |
96−| host → host | host | host |
97−| host → target | host | target |
98−| target → * | target | (none) |
99−| target → target | target | target |
100−
101−Let's use `g++` as an example to make this table clearer. `g++` is a C++ compiler written in C. Suppose we are building `g++` with a `(build, host, target)` platform triple of `(foo, bar, baz)`. This means we are using a `foo`-machine to build a copy of `g++` which will run on a `bar`-machine and emit binaries for the `baz`-machine.
102−
103−* `g++` links against the host platform's `glibc` C library, which is a "host→ *" dependency with a triple of `(bar, bar, *)`. Since it is a library, not a compiler, it has no "target".
104−
105−* Since `g++` is written in C, the `gcc` compiler used to compile it is a "build→ host" dependency of `g++` with a triple of `(foo, foo, bar)`. This compiler runs on the build platform and emits code for the host platform.
82+Putting this all together, that means we have dependencies in the form "host → target", in at most the following six combinations:
10683
107−* `gcc` links against the build platform's `glibc` C library, which is a "build→ *" dependency with a triple of `(foo, foo, *)`. Since it is a library, not a compiler, it has no "target".
10884
109−* This `gcc` is itself compiled by an *earlier* copy of `gcc`. This earlier copy of `gcc` is a "build→ build" dependency of `g++` with a triple of `(foo, foo, foo)`. This "early `gcc`" runs on the build platform and emits code for the build platform.
85+#### Possible dependency types
86+| Dependency's host platform | Dependency's target platform |
87+| -- | -- |
88+| build | build |
89+| build | host |
90+| build | target |
91+| host | host |
92+| host | target |
93+| target | target |
11094
111−* `g++` is bundled with `libgcc`, which includes a collection of target-machine routines for exception handling and
112−software floating point emulation. `libgcc` would be a "target→ *" dependency with triple `(foo, baz, *)`, because it consists of machine code which gets linked against the output of the compiler that we are building. It is a library, not a compiler, so it has no target of its own.
11395
114−* `libgcc` is written in C and compiled with `gcc`. The `gcc` that compiles it will be a "build→ target" dependency with triple `(foo, foo, baz)`. It gets compiled *and run* at `g++`-build-time (on platform `foo`), but must emit code for the `baz`-platform.
115−
116−* `g++` allows inline assembler code, so it depends on access to a copy of the `gas` assembler. This would be a "host→ target" dependency with triple `(foo, bar, baz)`.
117−
118−* `g++` (and `gcc`) include a library `libgccjit.so`, which wrap the compiler in a library to create a just-in-time compiler. In nixpkgs, this library is in the `libgccjit` package; if C++ required that programs have access to a JIT, `g++` would need to add a "target→ target" dependency for `libgccjit` with triple `(foo, baz, baz)`. This would ensure that the compiler ships with a copy of `libgccjit` which both executes on and generates code for the `baz`-platform.
119−
120−* If `g++` itself linked against `libgccjit.so` (for example, to allow compile-time-evaluated C++ expressions), then the `libgccjit` package used to provide this functionality would be a "host→ host" dependency of `g++`: it is code which runs on the `host` and emits code for execution on the `host`.
96+Some examples will make this table clearer. Suppose there's some package that is being built with a `(build, host, target)` platform triple of `(foo, bar, baz)`. If it has a build-time library dependency, that would be a "host → build" dependency with a triple of `(foo, foo, *)` (the target platform is irrelevant). If it needs a compiler to be built, that would be a "build → host" dependency with a triple of `(foo, foo, *)` (the target platform is irrelevant). That compiler, would be built with another compiler, also "build → host" dependency, with a triple of `(foo, foo, foo)`.
12197
12298### Cross packaging cookbook {#ssec-cross-cookbook}
12399
@@ -137,18 +113,15 @@ On less powerful machines, it can be inconvenient to cross-compile a package onl
137113$ nix-build '<nixpkgs>' -A pkgsCross.raspberryPi.hello
138114```
139115
140−#### What if my package’s build system needs to build a C program to be run under the build environment? {#cross-qa-build-c-program-in-build-environment}
141−
116+#### What if my package's build system needs to build a C program to be run under the build environment? {#cross-qa-build-c-program-in-build-environment}
142117Add the following to your `mkDerivation` invocation.
143−
144118```nix
145119depsBuildBuild = [ buildPackages.stdenv.cc ];
146120```
147121
148−#### My package’s testsuite needs to run host platform code. {#cross-testsuite-runs-host-code}
122+#### My package's testsuite needs to run host platform code. {#cross-testsuite-runs-host-code}
149123
150124Add the following to your `mkDerivation` invocation.
151−
152125```nix
153126doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
154127```
@@ -161,7 +134,7 @@ Nixpkgs can be instantiated with `localSystem` alone, in which case there is no
161134$ nix-build '<nixpkgs>' --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever
162135```
163136
164−::: {.note}
137+::: note
165138Eventually we would like to make these platform examples an unnecessary convenience so that
166139
167140```ShellSession
@@ -173,7 +146,7 @@ works in the vast majority of cases. The problem today is dependencies on other
173146
174147While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. As discussed in the previous section, only one of `system`, `config`, and `parsed` is needed to infer the other two. Additionally, `libc` will be inferred from `parse`. Finally, `localSystem.system` is also _impurely_ inferred based on the platform evaluation occurs. This means it is often not necessary to pass `localSystem` at all, as in the command-line example in the previous paragraph.
175148
176−::: {.note}
149+::: note
177150Many sources (manual, wiki, etc) probably mention passing `system`, `platform`, along with the optional `crossSystem` to Nixpkgs: `import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }`. Passing those two instead of `localSystem` is still supported for compatibility, but is discouraged. Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience.
178151:::
179152
@@ -183,9 +156,9 @@ One would think that `localSystem` and `crossSystem` overlap horribly with the t
183156
184157### Implementation of dependencies {#ssec-cross-dependency-implementation}
185158
186−The categories of dependencies developed in [](#ssec-cross-dependency-categorization) are specified as lists of derivations given to `mkDerivation`, as documented in [](#ssec-stdenv-dependencies). In short, each list of dependencies for "host → target" is called `deps<host><target>` (where `host`, and `target` values are either `build`, `host`, or `target`), with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `deps<host><target>` is automatically taken from `pkgs<host><target>`. (These `pkgs<host><target>`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.gcc` should be used at run-time.
159+The categories of dependencies developed in <xref linkend="ssec-cross-dependency-categorization"/> are specified as lists of derivations given to `mkDerivation`, as documented in <xref linkend="ssec-stdenv-dependencies"/>. In short, each list of dependencies for "host → target" of "foo → bar" is called `depsFooBar`, with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `depsFooBar` is automatically taken from `pkgsFooBar`. (These `pkgsFooBar`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.gcc` should be used at run-time.
187160
188−Now, for most of Nixpkgs's history, there were no `pkgs<host><target>` attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just `buildPackages`, `pkgs`, and `targetPackages`. Those are now redefined as aliases to `pkgsBuildHost`, `pkgsHostTarget`, and `pkgsTargetTarget`. It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant.
161+Now, for most of Nixpkgs's history, there were no `pkgsFooBar` attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just `buildPackages`, `pkgs`, and `targetPackages`. Those are now redefined as aliases to `pkgsBuildHost`, `pkgsHostTarget`, and `pkgsTargetTarget`. It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant.
189162
190163But before that, there was just `pkgs`, even though both `buildInputs` and `nativeBuildInputs` existed. \[Cross barely worked, and those were implemented with some hacks on `mkDerivation` to override dependencies.\] What this means is the vast majority of packages do not use any explicit package set to populate their dependencies, just using whatever `callPackage` gives them even if they do correctly sort their dependencies into the multiple lists described above. And indeed, asking that users both sort their dependencies, _and_ take them from the right attribute set, is both too onerous and redundant, so the recommended approach (for now) is to continue just categorizing by list and not using an explicit package set.
191164
@@ -205,7 +178,7 @@ While there are many package sets, and thus many edges, the stages can also be a
205178
206179In each stage, `pkgsBuildHost` refers to the previous stage, `pkgsBuildBuild` refers to the one before that, and `pkgsHostTarget` refers to the current one, and `pkgsTargetTarget` refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. `pkgsBuildTarget` and `pkgsHostHost` are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in `pkgs/stdenv/booter.nix`, and secondarily aliases in `pkgs/top-level/stage.nix`.
207180
208−::: {.note}
181+::: note
209182The native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the bootstrapping stages leading up to the final stages are ignored in the previous paragraph.
210183:::
211184
@@ -213,7 +186,6 @@ If one looks at the 3 platform triples, one can see that they overlap such that
213186```
214187(native, native, native, foreign, foreign)
215188```
216−
217189If one imagines the saturating self references at the end being replaced with infinite stages, and then overlays those platform triples, one ends up with the infinite tuple:
218190```
219191(native..., native, native, native, foreign, foreign, foreign...)
@@ -221,8 +193,8 @@ If one imagines the saturating self references at the end being replaced with in
221193One can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstrapping stage where `build != host != target`, more bootstrapping stages are needed since no sliding window provides the pesky `pkgsBuildTarget` package set since it skips the Canadian cross stage's "host".
222194
223195
224−::: {.note}
225−It is much better to refer to `buildPackages` than `targetPackages`, or more broadly package sets that do not mention “target”. There are three reasons for this.
196+::: note
197+It is much better to refer to `buildPackages` than `targetPackages`, or more broadly package sets that do not mention "target". There are three reasons for this.
226198
227199First, it is because bootstrapping stages do not have a unique `targetPackages`. For example a `(x86-linux, x86-linux, arm-linux)` and `(x86-linux, x86-linux, x86-windows)` package set both have a `(x86-linux, x86-linux, x86-linux)` package set. Because there is no canonical `targetPackages` for such a native (`build == host == target`) package set, we set their `targetPackages`
228200
@@ -231,6 +203,6 @@ Second, it is because this is a frequent source of hard-to-follow "infinite recu
231203Thirdly, it is because everything target-mentioning only exists to accommodate compilers with lousy build systems that insist on the compiler itself and standard library being built together. Of course that is bad because bigger derivations means longer rebuilds. It is also problematic because it tends to make the standard libraries less like other libraries than they could be, complicating code and build systems alike. Because of the other problems, and because of these innate disadvantages, compilers ought to be packaged another way where possible.
232204:::
233205
234−::: {.note}
235−If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon.
206+::: note
207+If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with "Cross" in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon.
236208:::
doc/stdenv/meta.chapter.md+10−67
@@ -114,10 +114,6 @@ For details, see [Licenses](#sec-meta-license).
114114
115115A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice”, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`.
116116
117−### `mainProgram` {#var-meta-mainProgram}
118−
119−The name of the main binary for the package. This effects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"`
120−
121117### `priority` {#var-meta-priority}
122118
123119The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the Nix manual page for `nix-env` for details. Example: `"10"` (a low-priority package).
@@ -134,32 +130,11 @@ Attribute Set `lib.platforms` defines [various common lists](https://github.com/
134130
135131### `tests` {#var-meta-tests}
136132
137−::: {.warning}
133+::: warning
138134This attribute is special in that it is not actually under the `meta` attribute set but rather under the `passthru` attribute set. This is due to how `meta` attributes work, and the fact that they are supposed to contain only metadata, not derivations.
139135:::
140136
141−An attribute set with tests as values. A test is a derivation that builds when the test passes and fails to build otherwise.
142−
143−You can run these tests with:
144−
145−```ShellSession
146−$ cd path/to/nixpkgs
147−$ nix-build -A your-package.tests
148−```
149−
150−#### Package tests
151−
152−Tests that are part of the source package are often executed in the `installCheckPhase`.
153−
154−Prefer `passthru.tests` for tests that are introduced in nixpkgs because:
155−
156−* `passthru.tests` tests the 'real' package, independently from the environment in which it was built
157−* we can run `passthru.tests` independently
158−* `installCheckPhase` adds overhead to each build
159−
160−For more on how to write and run package tests, see <xref linkend="sec-package-tests"/>.
161−
162−#### NixOS tests
137+An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have `meta.timeout` defined.
163138
164139The NixOS tests are available as `nixosTests` in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to:
165140
@@ -173,42 +148,6 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For
173148}
174149```
175150
176−NixOS tests run in a VM, so they are slower than regular package tests. For more information see [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests).
177−
178−Alternatively, you can specify other derivations as tests. You can make use of
179−the optional parameter to inject the correct package without
180−relying on non-local definitions, even in the presence of `overrideAttrs`.
181−Here that's `finalAttrs.finalPackage`, but you could choose a different name if
182−`finalAttrs` already exists in your scope.
183−
184−`(mypkg.overrideAttrs f).passthru.tests` will be as expected, as long as the
185−definition of `tests` does not rely on the original `mypkg` or overrides it in
186−all places.
187−
188−```nix
189−# my-package/default.nix
190−{ stdenv, callPackage }:
191−stdenv.mkDerivation (finalAttrs: {
192− # ...
193− passthru.tests.example = callPackage ./example.nix { my-package = finalAttrs.finalPackage; };
194−})
195−```
196−
197−```nix
198−# my-package/example.nix
199−{ runCommand, lib, my-package, ... }:
200−runCommand "my-package-test" {
201− nativeBuildInputs = [ my-package ];
202− src = lib.sources.sourcesByRegex ./. [ ".*.in" ".*.expected" ];
203−} ''
204− my-package --help
205− my-package <example.in >example.actual
206− diff -U3 --color=auto example.expected example.actual
207− mkdir $out
208−''
209−```
210−
211−
212151### `timeout` {#var-meta-timeout}
213152
214153A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`.
@@ -226,26 +165,30 @@ meta.hydraPlatforms = [];
226165
227166If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed.
228167
168+### `updateWalker` {#var-meta-updateWalker}
169+
170+If set to `true`, the package is tested to be updated correctly by the `update-walker.sh` script without additional settings. Such packages have `meta.version` set and their homepage (or the page specified by `meta.downloadPage`) contains a direct link to the package tarball.
171+
229172## Licenses {#sec-meta-license}
230173
231174The `meta.license` attribute should preferably contain a value from `lib.licenses` defined in [`nixpkgs/lib/licenses.nix`](https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix), or in-place license description of the same format if the license is unlikely to be useful in another expression.
232175
233176Although it’s typically better to indicate the specific license, a few generic options are available:
234177
235−### `lib.licenses.free`, `"free"` {#lib.licenses.free-free}
178+### `lib.licenses.free`, `"free"`
236179
237180Catch-all for free software licenses not listed above.
238181
239−### `lib.licenses.unfreeRedistributable`, `"unfree-redistributable"` {#lib.licenses.unfreeredistributable-unfree-redistributable}
182+### `lib.licenses.unfreeRedistributable`, `"unfree-redistributable"`
240183
241184Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the *output* of the derivation. This means that the package can be included in the Nixpkgs channel.
242185
243186Sometimes proprietary software can only be redistributed unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies `patchelf` to make them work. Thus, its license is `"unfree"` and it cannot be included in the Nixpkgs channel.
244187
245−### `lib.licenses.unfree`, `"unfree"` {#lib.licenses.unfree-unfree}
188+### `lib.licenses.unfree`, `"unfree"`
246189
247190Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of the derivation. Thus it cannot be included in the Nixpkgs channel.
248191
249−### `lib.licenses.unfreeRedistributableFirmware`, `"unfree-redistributable-firmware"` {#lib.licenses.unfreeredistributablefirmware-unfree-redistributable-firmware}
192+### `lib.licenses.unfreeRedistributableFirmware`, `"unfree-redistributable-firmware"`
250193
251194This package supplies unfree, redistributable firmware. This is a separate value from `unfree-redistributable` because not everybody cares whether firmware is free.
doc/stdenv/multiple-output.chapter.md+15−15
@@ -6,7 +6,7 @@ The Nix language allows a derivation to produce multiple outputs, which is simil
66
77The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less.
88
9−::: {.note}
9+::: note
1010The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.
1111:::
1212
@@ -28,7 +28,7 @@ NixOS provides two ways to select the outputs to install for packages listed in
2828
2929`nix-env` lacks an easy way to select the outputs to install. When installing a package, `nix-env` always installs the outputs listed in `meta.outputsToInstall`, even when the user explicitly selects an output.
3030
31−::: {.warning}
31+::: warning
3232`nix-env` silenty disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example,
3333
3434```ShellSession
@@ -38,7 +38,7 @@ $ nix-env -iA nixpkgs.coreutils.info
3838installs the `"out"` output (`coreutils.meta.outputsToInstall` is `[ "out" ]`) instead of the requested `"info"`.
3939:::
4040
41−The only recourse to select an output with `nix-env` is to override the package’s `meta.outputsToInstall`, using the functions described in [](#chap-overrides). For example, the following overlay adds the `"info"` output for the `coreutils` package:
41+The only recourse to select an output with `nix-env` is to override the package’s `meta.outputsToInstall`, using the functions described in <xref linkend="chap-overrides" />. For example, the following overlay adds the `"info"` output for the `coreutils` package:
4242
4343```nix
4444self: super:
@@ -53,7 +53,7 @@ self: super:
5353
5454In the Nix language the individual outputs can be reached explicitly as attributes, e.g. `coreutils.info`, but the typical case is just using packages as build inputs.
5555
56−When a multiple-output derivation gets into a build input of another derivation, the `dev` output is added if it exists, otherwise the first output is added. In addition to that, `propagatedBuildOutputs` of that package which by default contain `$outputBin` and `$outputLib` are also added. (See [](#multiple-output-file-type-groups).)
56+When a multiple-output derivation gets into a build input of another derivation, the `dev` output is added if it exists, otherwise the first output is added. In addition to that, `propagatedBuildOutputs` of that package which by default contain `$outputBin` and `$outputLib` are also added. (See <xref linkend="multiple-output-file-type-groups" />.)
5757
5858In some cases it may be desirable to combine different outputs under a single store path. A function `symlinkJoin` can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.)
5959
@@ -69,8 +69,8 @@ outputs = [ "bin" "dev" "out" "doc" ];
6969
7070Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main `out` output, as it catches any files that didn’t get elsewhere.
7171
72−::: {.note}
73−There is a special handling of the `debug` output, described at [](#stdenv-separateDebugInfo).
72+::: note
73+There is a special handling of the `debug` output, described at <xref linkend="stdenv-separateDebugInfo" />.
7474:::
7575
7676### “Binaries first” {#multiple-output-file-binaries-first-convention}
@@ -79,41 +79,41 @@ A commonly adopted convention in `nixpkgs` is that executables provided by the p
7979
8080The `glibc` package is a deliberate single exception to the “binaries first” convention. The `glibc` has `libs` as its first output allowing the libraries provided by `glibc` to be referenced directly (e.g. `${stdenv.glibc}/lib/ld-linux-x86-64.so.2`). The executables provided by `glibc` can be accessed via its `bin` attribute (e.g. `${stdenv.glibc.bin}/bin/ldd`).
8181
82−The reason for why `glibc` deviates from the convention is because referencing a library provided by `glibc` is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of `glibc` libraries from Nix packages (please see the documentation on [patchelf](https://github.com/NixOS/patchelf) for more details).
82+The reason for why `glibc` deviates from the convention is because referencing a library provided by `glibc` is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of `glibc` libraries from Nix packages (please see the documentation on [patchelf](https://github.com/NixOS/patchelf/blob/master/README) for more details).
8383
8484### File type groups {#multiple-output-file-type-groups}
8585
8686The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an `outputFoo` variable specifying the output name where they should go. If that variable isn’t defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn’t defined.
8787
88−#### `$outputDev` {#outputdev}
88+#### ` $outputDev`
8989
9090is for development-only files. These include C(++) headers (`include/`), pkg-config (`lib/pkgconfig/`), cmake (`lib/cmake/`) and aclocal files (`share/aclocal/`). They go to `dev` or `out` by default.
9191
92−#### `$outputBin` {#outputbin}
92+#### ` $outputBin`
9393
9494is meant for user-facing binaries, typically residing in `bin/`. They go to `bin` or `out` by default.
9595
96−#### `$outputLib` {#outputlib}
96+#### ` $outputLib`
9797
9898is meant for libraries, typically residing in `lib/` and `libexec/`. They go to `lib` or `out` by default.
9999
100−#### `$outputDoc` {#outputdoc}
100+#### ` $outputDoc`
101101
102102is for user documentation, typically residing in `share/doc/`. It goes to `doc` or `out` by default.
103103
104−#### `$outputDevdoc` {#outputdevdoc}
104+#### ` $outputDevdoc`
105105
106106is for _developer_ documentation. Currently we count gtk-doc and devhelp books, typically residing in `share/gtk-doc/` and `share/devhelp/`, in there. It goes to `devdoc` or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
107107
108−#### `$outputMan` {#outputman}
108+#### ` $outputMan`
109109
110110is for man pages (except for section 3), typically residing in `share/man/man[0-9]/`. They go to `man` or `$outputBin` by default.
111111
112−#### `$outputDevman` {#outputdevman}
112+#### ` $outputDevman`
113113
114114is for section 3 man pages, typically residing in `share/man/man[0-9]/`. They go to `devman` or `$outputMan` by default.
115115
116−#### `$outputInfo` {#outputinfo}
116+#### ` $outputInfo`
117117
118118is for info pages, typically residing in `share/info/`. They go to `info` or `$outputBin` by default.
119119
doc/stdenv/stdenv.chapter.md+94−202
@@ -39,9 +39,9 @@ stdenv.mkDerivation {
3939}
4040```
4141
42−This attribute ensures that the `bin` subdirectories of these packages appear in the `PATH` environment variable during the build, that their `include` subdirectories are searched by the C compiler, and so on. (See [](#ssec-setup-hooks) for details.)
42+This attribute ensures that the `bin` subdirectories of these packages appear in the `PATH` environment variable during the build, that their `include` subdirectories are searched by the C compiler, and so on. (See <xref linkend="ssec-setup-hooks" /> for details.)
4343
44−Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of *phases*, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see [](#sec-stdenv-phases).) For instance, a package that doesn’t supply a makefile but instead has to be compiled "manually" could be handled like this:
44+Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of *phases*, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see <xref linkend="sec-stdenv-phases" />.) For instance, a package that doesn’t supply a makefile but instead has to be compiled "manually" could be handled like this:
4545
4646```nix
4747stdenv.mkDerivation {
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
5959
6060(Note the use of `''`-style string literals, which are very convenient for large multi-line script fragments because they don’t need escaping of `"` and `\`, and because indentation is intelligently removed.)
6161
62−There are many other attributes to customise the build. These are listed in [](#ssec-stdenv-attributes).
62+There are many other attributes to customise the build. These are listed in <xref linkend="ssec-stdenv-attributes" />.
6363
6464While the standard environment provides a generic builder, you can still supply your own build script:
6565
@@ -116,27 +116,15 @@ On Linux, `stdenv` also includes the `patchelf` utility.
116116
117117## Specifying dependencies {#ssec-stdenv-dependencies}
118118
119−As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See [](#ssec-setup-hooks) for details.
119+As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See <xref linkend="ssec-setup-hooks" /> for details.
120120
121−Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see [](#chap-cross) for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case.
121+Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see <xref linkend="chap-cross" /> for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case.
122122
123123The extension of `PATH` with dependencies, alluded to above, proceeds according to the relative platforms alone. The process is carried out only for dependencies whose host platform matches the new derivation’s build platform i.e. dependencies which run on the platform where the new derivation will be built. [^footnote-stdenv-native-dependencies-in-path] For each dependency \<dep\> of those dependencies, `dep/bin`, if present, is added to the `PATH` environment variable.
124124
125−A dependency is said to be **propagated** when some of its other-transitive (non-immediate) downstream dependencies also need it as an immediate dependency.
126−[^footnote-stdenv-propagated-dependencies]
125+The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.
127126
128−It is important to note that dependencies are not necessarily propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. To determine the exact rules for dependency propagation, we start by assigning to each dependency a couple of ternary numbers (`-1` for `build`, `0` for `host`, and `1` for `target`) representing its [dependency type](#possible-dependency-types), which captures how its host and target platforms are each "offset" from the depending derivation’s host and target platforms. The following table summarize the different combinations that can be obtained:
129−
130−| `host → target` | attribute name | offset |
131−| ------------------- | ------------------- | -------- |
132−| `build --> build` | `depsBuildBuild` | `-1, -1` |
133−| `build --> host` | `nativeBuildInputs` | `-1, 0` |
134−| `build --> target` | `depsBuildTarget` | `-1, 1` |
135−| `host --> host` | `depsHostHost` | `0, 0` |
136−| `host --> target` | `buildInputs` | `0, 1` |
137−| `target --> target` | `depsTargetTarget` | `1, 1` |
138−
139−Algorithmically, we traverse propagated inputs, accumulating every propagated dependency’s propagated dependencies and adjusting them to account for the “shift in perspective” described by the current dependency’s platform offsets. This results is sort of a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.
127+It is important to note that dependencies are not necessarily propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. The exact rules for dependency propagation can be given by assigning to each dependency two integers based one how its host and target platforms are offset from the depending derivation’s platforms. Those offsets are given below in the descriptions of each dependency list attribute. Algorithmically, we traverse propagated inputs, accumulating every propagated dependency’s propagated dependencies and adjusting them to account for the “shift in perspective” described by the current dependency’s platform offsets. This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.
140128
141129We can define the process precisely with [Natural Deduction](https://en.wikipedia.org/wiki/Natural_deduction) using the inference rules. This probably seems a bit obtuse, but so is the bash code that actually implements it! [^footnote-stdenv-find-inputs-location] They’re confusing in very different ways so… hopefully if something doesn’t make sense in one presentation, it will in the other!
142130
@@ -187,41 +175,40 @@ Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In
187175
188176Overall, the unifying theme here is that propagation shouldn’t be introducing transitive dependencies involving platforms the depending package is unaware of. \[One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn’t know how to ask for. The platform description in that scenario is a kind of unforagable capability.\] The offset bounds checking and definition of `mapOffset` together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren’t in the derivation “spec” of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.
189177
190−### Variables specifying dependencies {#variables-specifying-dependencies}
191−
178+### Variables specifying dependencies
192179#### `depsBuildBuild` {#var-stdenv-depsBuildBuild}
193180
194−A list of dependencies whose host and target platforms are the new derivation’s build platform. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries.
181+A list of dependencies whose host and target platforms are the new derivation’s build platform. This means a `-1` host and `-1` target offset from the new derivation’s platforms. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries.
195182
196183Since these packages are able to be run at build-time, they are always added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
197184
198185#### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs}
199186
200−A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s host platform. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild` or `depsBuildTarget`. This could be called `depsBuildHost` but `nativeBuildInputs` is used for historical continuity.
187+A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s host platform. This means a `-1` host offset and `0` target offset from the new derivation’s platforms. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild` or `depsBuildTarget`. This could be called `depsBuildHost` but `nativeBuildInputs` is used for historical continuity.
201188
202189Since these packages are able to be run at build-time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
203190
204191#### `depsBuildTarget` {#var-stdenv-depsBuildTarget}
205192
206−A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s target platform. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won’t run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional.
193+A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s target platform. This means a `-1` host offset and `1` target offset from the new derivation’s platforms. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won’t run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional.
207194
208−This is a somewhat confusing concept to wrap one’s head around, and for good reason. As the only dependency type where the platform offsets, `-1` and `1`, are not adjacent integers, it requires thinking of a bootstrapping stage *two* away from the current one. It and its use-case go hand in hand and are both considered poor form: try to not need this sort of dependency, and try to avoid building standard libraries and runtimes in the same derivation as the compiler produces code using them. Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.
195+This is a somewhat confusing concept to wrap one’s head around, and for good reason. As the only dependency type where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage *two* away from the current one. It and its use-case go hand in hand and are both considered poor form: try to not need this sort of dependency, and try to avoid building standard libraries and runtimes in the same derivation as the compiler produces code using them. Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.
209196
210197Since these packages are able to run at build time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
211198
212199#### `depsHostHost` {#var-stdenv-depsHostHost}
213200
214−A list of dependencies whose host and target platforms match the new derivation’s host platform. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It’s always preferable to use a `depsBuildBuild` dependency in the derivation being built over a `depsHostHost` on the tool doing the building for this purpose.
201+A list of dependencies whose host and target platforms match the new derivation’s host platform. This means a `0` host offset and `0` target offset from the new derivation’s host platform. These are packages used at run-time to generate code also used at run-time. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It’s always preferable to use a `depsBuildBuild` dependency in the derivation being built over a `depsHostHost` on the tool doing the building for this purpose.
215202
216203#### `buildInputs` {#var-stdenv-buildInputs}
217204
218−A list of dependencies whose host platform and target platform match the new derivation’s. This would be called `depsHostTarget` but for historical continuity. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild`.
205+A list of dependencies whose host platform and target platform match the new derivation’s. This means a `0` host offset and a `1` target offset from the new derivation’s host platform. This would be called `depsHostTarget` but for historical continuity. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild`.
219206
220207These are often programs and libraries used by the new derivation at *run*-time, but that isn’t always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker.
221208
222209#### `depsTargetTarget` {#var-stdenv-depsTargetTarget}
223210
224−A list of dependencies whose host platform matches the new derivation’s target platform. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It’s poor form in almost all cases for a package to depend on another from a future stage \[future stage corresponding to positive offset\]. Do not use this attribute unless you are packaging a compiler and are sure it is needed.
211+A list of dependencies whose host platform matches the new derivation’s target platform. This means a `1` offset from the new derivation’s platforms. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It’s poor form in almost all cases for a package to depend on another from a future stage \[future stage corresponding to positive offset\]. Do not use this attribute unless you are packaging a compiler and are sure it is needed.
225212
226213#### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated}
227214
@@ -249,13 +236,13 @@ The propagated equivalent of `depsTargetTarget`. This is prefixed for the same r
249236
250237## Attributes {#ssec-stdenv-attributes}
251238
252−### Variables affecting `stdenv` initialisation {#variables-affecting-stdenv-initialisation}
239+### Variables affecting `stdenv` initialisation
253240
254241#### `NIX_DEBUG` {#var-stdenv-NIX_DEBUG}
255242
256243A natural number indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing.
257244
258−### Attributes affecting build properties {#attributes-affecting-build-properties}
245+### Attributes affecting build properties
259246
260247#### `enableParallelBuilding` {#var-stdenv-enableParallelBuilding}
261248
@@ -263,7 +250,7 @@ If set to `true`, `stdenv` will pass specific flags to `make` and other build to
263250
264251Unless set to `false`, some build systems with good support for parallel building including `cmake`, `meson`, and `qmake` will set it to `true`.
265252
266−### Special variables {#special-variables}
253+### Special variables
267254
268255#### `passthru` {#var-stdenv-passthru}
269256
@@ -311,90 +298,29 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
311298
312299The script will be run with `UPDATE_NIX_ATTR_PATH` environment variable set to the attribute path it is supposed to update.
313300
314−::: {.note}
301+::: note
315302The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running `git commit` or any other commands that cannot handle that.
316303:::
317304
318305For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`.
319306
320−### Recursive attributes in `mkDerivation`
321−
322−If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, including the overrides when reinvoked via `overrideAttrs`. For example:
323−
324−```nix
325−mkDerivation (finalAttrs: {
326− pname = "hello";
327− withFeature = true;
328− configureFlags =
329− lib.optionals finalAttrs.withFeature ["--with-feature"];
330−})
331−```
332−
333−Note that this does not use the `rec` keyword to reuse `withFeature` in `configureFlags`.
334−The `rec` keyword works at the syntax level and is unaware of overriding.
335−
336−Instead, the definition references `finalAttrs`, allowing users to change `withFeature`
337−consistently with `overrideAttrs`.
338−
339−`finalAttrs` also contains the attribute `finalPackage`, which includes the output paths, etc.
340−
341−Let's look at a more elaborate example to understand the differences between
342−various bindings:
343−
344−```nix
345−# `pkg` is the _original_ definition (for illustration purposes)
346−let pkg =
347− mkDerivation (finalAttrs: {
348− # ...
349−
350− # An example attribute
351− packages = [];
352−
353− # `passthru.tests` is a commonly defined attribute.
354− passthru.tests.simple = f finalAttrs.finalPackage;
355−
356− # An example of an attribute containing a function
357− passthru.appendPackages = packages':
358− finalAttrs.finalPackage.overrideAttrs (newSelf: super: {
359− packages = super.packages ++ packages';
360− });
361−
362− # For illustration purposes; referenced as
363− # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below.
364− passthru.finalAttrs = finalAttrs;
365− passthru.original = pkg;
366− });
367−in pkg
368−```
369−
370−Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.finalPackage` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`.
371−
372−See also the section about [`passthru.tests`](#var-meta-tests).
373−
374307## Phases {#sec-stdenv-phases}
375308
376−`stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder.
377−
378−This generic command invokes a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries).
309+The generic builder has a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm.
379310
380311Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`.
381312
382−When overriding a phase, for example `installPhase`, it is important to start with `runHook preInstall` and end it with `runHook postInstall`, otherwise `preInstall` and `postInstall` will not be run. Even if you don't use them directly, it is good practice to do so anyways for downstream users who would want to add a `postInstall` by overriding your derivation.
383−
384−While inside an interactive `nix-shell`, if you wanted to run all phases in the order they would be run in an actual build, you can invoke `genericBuild` yourself.
385−
386313### Controlling phases {#ssec-controlling-phases}
387314
388315There are a number of variables that control what phases are executed and in what order:
389316
390−#### Variables affecting phase control {#variables-affecting-phase-control}
317+#### Variables affecting phase control
391318
392319##### `phases` {#var-stdenv-phases}
393320
394321Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is `$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases`.
395322
396−It is discouraged to set this variable, as it is easy to miss some important functionality hidden in some of the less obviously needed phases (like `fixupPhase` which patches the shebang of scripts).
397−Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`).
323+Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`), as you then don’t specify all the normal phases.
398324
399325##### `prePhases` {#var-stdenv-prePhases}
400326
@@ -428,29 +354,28 @@ Additional phases executed after any of the default phases.
428354
429355The unpack phase is responsible for unpacking the source code of the package. The default implementation of `unpackPhase` unpacks the source files listed in the `src` environment variable to the current directory. It supports the following files by default:
430356
431−#### Tar files {#tar-files}
357+#### Tar files
432358
433359These can optionally be compressed using `gzip` (`.tar.gz`, `.tgz` or `.tar.Z`), `bzip2` (`.tar.bz2`, `.tbz2` or `.tbz`) or `xz` (`.tar.xz`, `.tar.lzma` or `.txz`).
434360
435−#### Zip files {#zip-files}
361+#### Zip files
436362
437363Zip files are unpacked using `unzip`. However, `unzip` is not in the standard environment, so you should add it to `nativeBuildInputs` yourself.
438364
439−#### Directories in the Nix store {#directories-in-the-nix-store}
365+#### Directories in the Nix store
440366
441367These are simply copied to the current directory. The hash part of the file name is stripped, e.g. `/nix/store/1wydxgby13cz...-my-sources` would be copied to `my-sources`.
442368
443369Additional file types can be supported by setting the `unpackCmd` variable (see below).
444370
445−#### Variables controlling the unpack phase {#variables-controlling-the-unpack-phase}
446−
371+#### Variables controlling the unpack phase
447372##### `srcs` / `src` {#var-stdenv-src}
448373
449−The list of source files or directories to be unpacked or copied. One of these must be set. Note that if you use `srcs`, you should also set `sourceRoot` or `setSourceRoot`.
374+The list of source files or directories to be unpacked or copied. One of these must be set.
450375
451376##### `sourceRoot` {#var-stdenv-sourceRoot}
452377
453−After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory. Set `sourceRoot = ".";` if you use `srcs` and control the unpack phase yourself.
378+After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory.
454379
455380##### `setSourceRoot` {#var-stdenv-setSourceRoot}
456381
@@ -480,7 +405,7 @@ The unpack phase evaluates the string `$unpackCmd` for any unrecognised file. Th
480405
481406The patch phase applies the list of patches defined in the `patches` variable.
482407
483−#### Variables controlling the patch phase {#variables-controlling-the-patch-phase}
408+#### Variables controlling the patch phase
484409
485410##### `dontPatch` {#var-stdenv-dontPatch}
486411
@@ -506,7 +431,7 @@ Hook executed at the end of the patch phase.
506431
507432The configure phase prepares the source tree for building. The default `configurePhase` runs `./configure` (typically an Autoconf-generated script) if it exists.
508433
509−#### Variables controlling the configure phase {#variables-controlling-the-configure-phase}
434+#### Variables controlling the configure phase
510435
511436##### `configureScript` {#var-stdenv-configureScript}
512437
@@ -536,12 +461,6 @@ The prefix under which the package must be installed, passed via the `--prefix`
536461
537462The key to use when specifying the prefix. By default, this is set to `--prefix=` as that is used by the majority of packages.
538463
539−##### `dontAddStaticConfigureFlags`
540−
541−By default, when building statically, stdenv will try to add build system appropriate configure flags to try to enable static builds.
542−
543−If this is undesirable, set this variable to true.
544−
545464##### `dontAddDisableDepTrack` {#var-stdenv-dontAddDisableDepTrack}
546465
547466By default, the flag `--disable-dependency-tracking` is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true.
@@ -554,7 +473,7 @@ By default, the configure phase applies some special hackery to all files called
554473
555474By default, when the configure script has `--enable-static`, the option `--disable-static` is added to the configure flags.
556475
557−If this is undesirable, set this variable to true. It is automatically set to true when building statically, for example through `pkgsStatic`.
476+If this is undesirable, set this variable to true.
558477
559478##### `configurePlatforms` {#var-stdenv-configurePlatforms}
560479
@@ -572,7 +491,7 @@ Hook executed at the end of the configure phase.
572491
573492The build phase is responsible for actually building the package (e.g. compiling it). The default `buildPhase` simply calls `make` if a file named `Makefile`, `makefile` or `GNUmakefile` exists in the current directory (or the `makefile` is explicitly set); otherwise it does nothing.
574493
575−#### Variables controlling the build phase {#variables-controlling-the-build-phase}
494+#### Variables controlling the build phase
576495
577496##### `dontBuild` {#var-stdenv-dontBuild}
578497
@@ -590,7 +509,7 @@ A list of strings passed as additional flags to `make`. These flags are also use
590509makeFlags = [ "PREFIX=$(out)" ];
591510```
592511
593−::: {.note}
512+::: note
594513The flags are quoted in bash, but environment variables can be specified by using the make syntax.
595514:::
596515
@@ -626,7 +545,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called
626545
627546The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled.
628547
629−#### Variables controlling the check phase {#variables-controlling-the-check-phase}
548+#### Variables controlling the check phase
630549
631550##### `doCheck` {#var-stdenv-doCheck}
632551
@@ -638,7 +557,7 @@ doCheck = true;
638557
639558in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doCheck` is set, as the newly-built program won’t run on the platform used to build it.
640559
641−##### `makeFlags` / `makeFlagsArray` / `makefile` {#makeflags-makeflagsarray-makefile}
560+##### `makeFlags` / `makeFlagsArray` / `makefile`
642561
643562See the [build phase](#var-stdenv-makeFlags) for details.
644563
@@ -666,13 +585,13 @@ Hook executed at the end of the check phase.
666585
667586The install phase is responsible for installing the package in the Nix store under `out`. The default `installPhase` creates the directory `$out` and calls `make install`.
668587
669−#### Variables controlling the install phase {#variables-controlling-the-install-phase}
588+#### Variables controlling the install phase
670589
671590##### `dontInstall` {#var-stdenv-dontInstall}
672591
673592Set to true to skip the install phase.
674593
675−##### `makeFlags` / `makeFlagsArray` / `makefile` {#makeflags-makeflagsarray-makefile-1}
594+##### `makeFlags` / `makeFlagsArray` / `makefile`
676595
677596See the [build phase](#var-stdenv-makeFlags) for details.
678597
@@ -705,7 +624,7 @@ The fixup phase performs some (Nix-specific) post-processing actions on the file
705624- On Linux, it applies the `patchelf` command to ELF executables and libraries to remove unused directories from the `RPATH` in order to prevent unnecessary runtime dependencies.
706625- It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`.
707626
708−#### Variables controlling the fixup phase {#variables-controlling-the-fixup-phase}
627+#### Variables controlling the fixup phase
709628
710629##### `dontFixup` {#var-stdenv-dontFixup}
711630
@@ -787,9 +706,7 @@ to `~/.gdbinit`. GDB will then be able to find debug information installed via `
787706
788707The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`.
789708
790−It is often better to add tests that are not part of the source distribution to `passthru.tests` (see <xref linkend="var-meta-tests"/>). This avoids adding overhead to every build and enables us to run them independently.
791−
792−#### Variables controlling the installCheck phase {#variables-controlling-the-installcheck-phase}
709+#### Variables controlling the installCheck phase
793710
794711##### `doInstallCheck` {#var-stdenv-doInstallCheck}
795712
@@ -825,7 +742,7 @@ Hook executed at the end of the installCheck phase.
825742
826743The distribution phase is intended to produce a source distribution of the package. The default `distPhase` first calls `make dist`, then it copies the resulting source tarballs to `$out/tarballs/`. This phase is only executed if the attribute `doDist` is set.
827744
828−#### Variables controlling the distribution phase {#variables-controlling-the-distribution-phase}
745+#### Variables controlling the distribution phase
829746
830747##### `distTarget` {#var-stdenv-distTarget}
831748
@@ -851,13 +768,13 @@ Hook executed at the start of the distribution phase.
851768
852769Hook executed at the end of the distribution phase.
853770
854−## Shell functions and utilities {#ssec-stdenv-functions}
771+## Shell functions {#ssec-stdenv-functions}
855772
856773The standard environment provides a number of useful functions.
857774
858775### `makeWrapper` \<executable\> \<wrapperfile\> \<args\> {#fun-makeWrapper}
859776
860−Constructs a wrapper for a program with various possible arguments. It is defined as part of 2 setup-hooks named `makeWrapper` and `makeBinaryWrapper` that implement the same bash functions. Hence, to use it you have to add `makeWrapper` to your `nativeBuildInputs`. Here's an example usage:
777+Constructs a wrapper for a program with various possible arguments. For example:
861778
862779```bash
863780# adds `FOOBAR=baz` to `$out/bin/foo`’s environment
@@ -869,24 +786,9 @@ makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz
869786makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]}
870787```
871788
872−There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh` for the `makeWrapper` implementation and in `nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper.sh` for the `makeBinaryWrapper` implementation.
873−
874−`wrapProgram` is a convenience function you probably want to use most of the time, implemented by both `makeWrapper` and `makeBinaryWrapper`.
875−
876−Using the `makeBinaryWrapper` implementation is usually preferred, as it creates a tiny _compiled_ wrapper executable, that can be used as a shebang interpreter. This is needed mostly on Darwin, where shebangs cannot point to scripts, [due to a limitation with the `execve`-syscall](https://stackoverflow.com/questions/67100831/macos-shebang-with-absolute-path-not-working). Compiled wrappers generated by `makeBinaryWrapper` can be inspected with `less <path-to-wrapper>` - by scrolling past the binary data you should be able to see the shell command that generated the executable and there see the environment variables that were injected into the wrapper.
877−
878−### `remove-references-to -t` \<storepath\> [ `-t` \<storepath\> ... ] \<file\> ... {#fun-remove-references-to}
789+There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh`.
879790
880−Removes the references of the specified files to the specified store files. This is done without changing the size of the file by replacing the hash by `eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee`, and should work on compiled executables. This is meant to be used to remove the dependency of the output on inputs that are known to be unnecessary at runtime. Of course, reckless usage will break the patched programs.
881−To use this, add `removeReferencesTo` to `nativeBuildInputs`.
882−
883−As `remove-references-to` is an actual executable and not a shell function, it can be used with `find`.
884−Example removing all references to the compiler in the output:
885−```nix
886−postInstall = ''
887− find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
888−'';
889−```
791+`wrapProgram` is a convenience function you probably want to use most of the time.
890792
891793### `substitute` \<infile\> \<outfile\> \<subs\> {#fun-substitute}
892794
@@ -961,9 +863,9 @@ someVar=$(stripHash $name)
961863
962864### `wrapProgram` \<executable\> \<makeWrapperArgs\> {#fun-wrapProgram}
963865
964−Convenience function for `makeWrapper` that replaces `<\executable\>` with a wrapper that executes the original program. It takes all the same arguments as `makeWrapper`, except for `--inherit-argv0` (used by the `makeBinaryWrapper` implementation) and `--argv0` (used by both `makeWrapper` and `makeBinaryWrapper` wrapper implementations).
866+Convenience function for `makeWrapper` that automatically creates a sane wrapper file. It takes all the same arguments as `makeWrapper`, except for `--argv0`.
965867
966−If you will apply it multiple times, it will overwrite the wrapper file and you will end up with double wrapping, which should be avoided.
868+It cannot be applied multiple times, since it will overwrite the wrapper file.
967869
968870## Package setup hooks {#ssec-setup-hooks}
969871
@@ -977,7 +879,7 @@ The most typical use of the setup hook is actually to add other hooks which are
977879
978880Packages adding a hook should not hard code a specific hook, but rather choose a variable *relative* to how they are included. Returning to the C compiler wrapper example, if the wrapper itself is an `n` dependency, then it only wants to accumulate flags from `n + 1` dependencies, as only those ones match the compiler’s target platform. The `hostOffset` variable is defined with the current dependency’s host offset `targetOffset` with its target offset, before its setup hook is sourced. Additionally, since most environment hooks don’t care about the target platform, that means the setup hook can append to the right bash array by doing something like
979881
980−```bash
882+```{.bash}
981883addEnvHooks "$hostOffset" myBashFunction
982884```
983885
@@ -985,47 +887,47 @@ The *existence* of setups hooks has long been documented and packages inside Nix
985887
986888First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using `stdenv.mkDerivation`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa.
987889
988−### `move-docs.sh` {#move-docs.sh}
890+### `move-docs.sh`
989891
990892This setup hook moves any installed documentation to the `/share` subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the `share` subdirectory.
991893
992−### `compress-man-pages.sh` {#compress-man-pages.sh}
894+### `compress-man-pages.sh`
993895
994896This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages.
995897
996−### `strip.sh` {#strip.sh}
898+### `strip.sh`
997899
998900This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages.
999901
1000−### `patch-shebangs.sh` {#patch-shebangs.sh}
902+### `patch-shebangs.sh`
1001903
1002904This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g `#!/bin/bash`). In Nix, we want an exact path to that interpreter to be used. This often replaces `/bin/sh` with a path in the Nix store.
1003905
1004−### `audit-tmpdir.sh` {#audit-tmpdir.sh}
906+### `audit-tmpdir.sh`
1005907
1006908This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only.
1007909
1008−### `multiple-outputs.sh` {#multiple-outputs.sh}
910+### `multiple-outputs.sh`
1009911
1010−This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See [](#chap-multiple-output) for more information.
912+This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See <xref linkend="chap-multiple-output" /> for more information.
1011913
1012−### `move-sbin.sh` {#move-sbin.sh}
914+### `move-sbin.sh`
1013915
1014916This setup hook moves any binaries installed in the `sbin/` subdirectory into `bin/`. In addition, a link is provided from `sbin/` to `bin/` for compatibility.
1015917
1016−### `move-lib64.sh` {#move-lib64.sh}
918+### `move-lib64.sh`
1017919
1018920This setup hook moves any libraries installed in the `lib64/` subdirectory into `lib/`. In addition, a link is provided from `lib64/` to `lib/` for compatibility.
1019921
1020−### `move-systemd-user-units.sh` {#move-systemd-user-units.sh}
922+### `move-systemd-user-units.sh`
1021923
1022924This setup hook moves any systemd user units installed in the `lib/` subdirectory into `share/`. In addition, a link is provided from `share/` to `lib/` for compatibility. This is needed for systemd to find user services when installed into the user profile.
1023925
1024−### `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh}
926+### `set-source-date-epoch-to-latest.sh`
1025927
1026928This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file.
1027929
1028−### Bintools Wrapper {#bintools-wrapper}
930+### Bintools Wrapper
1029931
1030932The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper.
1031933
@@ -1035,7 +937,7 @@ A final task of the setup hook is defining a number of standard environment vari
1035937
1036938A problem with this final task is that the Bintools Wrapper is honest and defines `LD` as `ld`. Most packages, however, firstly use the C compiler for linking, secondly use `LD` anyways, defining it as the C compiler, and thirdly, only so define `LD` when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won’t override yet doesn’t want to use. The workaround is to define, just for the problematic package, `LD` as the C compiler. A good way to do this would be `preConfigure = "LD=$CC"`.
1037939
1038−### CC Wrapper {#cc-wrapper}
940+### CC Wrapper
1039941
1040942The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper.
1041943
@@ -1069,11 +971,11 @@ The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, l
1069971
1070972Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable.
1071973
1072−### teTeX / TeX Live {#tetex-tex-live}
974+### teTeX / TeX Live
1073975
1074976Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable.
1075977
1076−### Qt 4 {#qt-4}
978+### Qt 4
1077979
1078980Sets the `QTDIR` environment variable to Qt’s path.
1079981
@@ -1081,13 +983,13 @@ Sets the `QTDIR` environment variable to Qt’s path.
1081983
1082984Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf).
1083985
1084−### GHC {#ghc}
986+### GHC
1085987
1086988Creates a temporary package database and registers every Haskell build input in it (TODO: how?).
1087989
1088−### GNOME platform {#gnome-platform}
990+### GNOME platform
1089991
1090−Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in [](#sec-language-gnome).
992+Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in <xref linkend="sec-language-gnome" />.
1091993
1092994### autoPatchelfHook {#setup-hook-autopatchelfhook}
1093995
@@ -1097,11 +999,11 @@ You can also specify a `runtimeDependencies` variable which lists dependencies t
1097999
10981000In certain situations you may want to run the main command (`autoPatchelf`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchelf` environment variable to a non-empty value.
10991001
1100−By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchelfIgnoreMissingDeps` can be set to a list like `autoPatchelfIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to simply `[ "*" ]` to ignore all missing dependencies.
1002+By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value.
11011003
11021004The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories.
11031005
1104−### breakpointHook {#breakpointhook}
1006+### breakpointHook
11051007
11061008This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`.
11071009
@@ -1111,15 +1013,15 @@ nativeBuildInputs = [ breakpointHook ];
11111013
11121014When a build failure happens there will be an instruction printed that shows how to attach with `cntr` to the build sandbox.
11131015
1114−::: {.note}
1115−::: {.title}
1016+::: note
1017+::: title
11161018Caution with remote builds
11171019:::
11181020
11191021This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`.
11201022:::
11211023
1122−### installShellFiles {#installshellfiles}
1024+### installShellFiles
11231025
11241026This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook.
11251027
@@ -1145,61 +1047,61 @@ postInstall = ''
11451047'';
11461048```
11471049
1148−### libiconv, libintl {#libiconv-libintl}
1050+### libiconv, libintl
11491051
11501052A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`.
11511053
1152−### validatePkgConfig {#validatepkgconfig}
1054+### validatePkgConfig
11531055
11541056The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables.
11551057
1156−### cmake {#cmake}
1058+### cmake
11571059
11581060Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator.
11591061
1160−### xcbuildHook {#xcbuildhook}
1062+### xcbuildHook
11611063
11621064Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild.
11631065
1164−### Meson {#meson}
1066+### Meson
11651067
11661068Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere.
11671069
1168−#### Variables controlling Meson {#variables-controlling-meson}
1070+#### Variables controlling Meson
11691071
1170−##### `mesonFlags` {#mesonflags}
1072+##### `mesonFlags`
11711073
11721074Controls the flags passed to meson.
11731075
1174−##### `mesonBuildType` {#mesonbuildtype}
1076+##### `mesonBuildType`
11751077
11761078Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`.
11771079
1178−##### `mesonAutoFeatures` {#mesonautofeatures}
1080+##### `mesonAutoFeatures`
11791081
11801082What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`.
11811083
1182−##### `mesonWrapMode` {#mesonwrapmode}
1084+##### `mesonWrapMode`
11831085
11841086What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access.
11851087
1186−##### `dontUseMesonConfigure` {#dontusemesonconfigure}
1088+##### `dontUseMesonConfigure`
11871089
11881090Disables using Meson’s `configurePhase`.
11891091
1190−### ninja {#ninja}
1092+### ninja
11911093
11921094Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja.
11931095
1194−### unzip {#unzip}
1096+### unzip
11951097
11961098This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc.
11971099
1198−### wafHook {#wafhook}
1100+### wafHook
11991101
12001102Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script.
12011103
1202−### scons {#scons}
1104+### scons
12031105
12041106Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time.
12051107
@@ -1215,13 +1117,9 @@ There are flags available to harden packages at compile or link-time. These can
12151117
12161118Both parameters take a list of flags as strings. The special `"all"` flag can be passed to `hardeningDisable` to turn off all hardening. These flags can also be used as environment variables for testing or development purposes.
12171119
1218−For more in-depth information on these hardening flags and hardening in general, refer to the [Debian Wiki](https://wiki.debian.org/Hardening), [Ubuntu Wiki](https://wiki.ubuntu.com/Security/Features), [Gentoo Wiki](https://wiki.gentoo.org/wiki/Project:Hardened), and the [Arch Wiki](https://wiki.archlinux.org/title/Security).
1219−
1220−### Hardening flags enabled by default {#sec-hardening-flags-enabled-by-default}
1221−
12221120The following flags are enabled by default and might require disabling with `hardeningDisable` if the program to package is incompatible.
12231121
1224−#### `format` {#format}
1122+### `format`
12251123
12261124Adds the `-Wformat -Wformat-security -Werror=format-security` compiler options. At present, this warns about calls to `printf` and `scanf` functions where the format string is not a string literal and there are no format arguments, as in `printf(foo);`. This may be a security hole if the format string came from untrusted input and contains `%n`.
12271125
@@ -1234,7 +1132,7 @@ This needs to be turned off or fixed for errors similar to:
12341132cc1plus: some warnings being treated as errors
12351133```
12361134
1237−#### `stackprotector` {#stackprotector}
1135+### `stackprotector`
12381136
12391137Adds the `-fstack-protector-strong --param ssp-buffer-size=4` compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application).
12401138
@@ -1245,7 +1143,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':
12451143/tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail'
12461144```
12471145
1248−#### `fortify` {#fortify}
1146+### `fortify`
12491147
12501148Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around.
12511149
@@ -1266,7 +1164,7 @@ installwatch.c:3751:5: error: conflicting types for '__open_2'
12661164fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments
12671165```
12681166
1269−#### `pic` {#pic}
1167+### `pic`
12701168
12711169Adds the `-fPIC` compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible.
12721170
@@ -1279,19 +1177,19 @@ ccbLfRgg.s: Assembler messages:
12791177ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF'
12801178```
12811179
1282−#### `strictoverflow` {#strictoverflow}
1180+### `strictoverflow`
12831181
12841182Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option `-fno-strict-overflow` makes gcc behave as if signed integer overflows were defined.
12851183
12861184This flag should not trigger any build or runtime errors.
12871185
1288−#### `relro` {#relro}
1186+### `relro`
12891187
12901188Adds the `-z relro` linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable.
12911189
12921190This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the `bindnow` flag must also be disabled and incompatible programs typically fail with similar errors at runtime.
12931191
1294−#### `bindnow` {#bindnow}
1192+### `bindnow`
12951193
12961194Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons.
12971195
@@ -1301,22 +1199,16 @@ This flag can break dynamic shared object loading. For instance, the module syst
13011199intel_drv.so: undefined symbol: vgaHWFreeHWRec
13021200```
13031201
1304−### Hardening flags disabled by default {#sec-hardening-flags-disabled-by-default}
1305−
13061202The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services.
13071203
1308−#### `pie` {#pie}
1309−
1310−This flag is disabled by default for normal `glibc` based NixOS package builds, but enabled by default for `musl` based package builds.
1204+### `pie`
13111205
13121206Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack.
13131207
1314−Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option.
1315−If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`.
1208+For more in-depth information on these hardening flags and hardening in general, refer to the [Debian Wiki](https://wiki.debian.org/Hardening), [Ubuntu Wiki](https://wiki.ubuntu.com/Security/Features), [Gentoo Wiki](https://wiki.gentoo.org/wiki/Project:Hardened), and the [Arch Wiki](https://wiki.archlinux.org/index.php/DeveloperWiki:Security).
13161209
13171210[^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation.
13181211[^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`.
1319−[^footnote-stdenv-propagated-dependencies]: Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.
13201212[^footnote-stdenv-find-inputs-location]: The `findInputs` function, currently residing in `pkgs/stdenv/generic/setup.sh`, implements the propagation logic.
13211213[^footnote-stdenv-sys-lib-search-path]: It clears the `sys_lib_*search_path` variables in the Libtool script to prevent Libtool from using libraries in `/usr/lib` and such.
13221214[^footnote-stdenv-build-time-guessing-impurity]: Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
doc/using/overlays.chapter.md+4−22
@@ -63,7 +63,7 @@ The second argument (`super`) corresponds to the result of the evaluation of the
6363
6464The value returned by this function should be a set similar to `pkgs/top-level/all-packages.nix`, containing overridden and/or new packages.
6565
66−Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in [](#sec-modify-via-packageOverrides). Indeed, `packageOverrides` acts as an overlay with only the `super` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute.
66+Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in <xref linkend="sec-modify-via-packageOverrides"/>. Indeed, `packageOverrides` acts as an overlay with only the `super` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute.
6767
6868## Using overlays to configure alternatives {#sec-overlays-alternatives}
6969
@@ -77,7 +77,7 @@ In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear
7777
7878 The Nixpkgs attribute is `openblas` for ILP64 (integer width = 64 bits) and `openblasCompat` for LP64 (integer width = 32 bits). `openblasCompat` is the default.
7979
80−- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS and CBLAS)
80+- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS)
8181
8282 The Nixpkgs attribute is `lapack-reference`.
8383
@@ -112,28 +112,12 @@ self: super:
112112This overlay uses Intel's MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime using `LD_LIBRARY_PATH` of `libblas.so.3` and `liblapack.so.3`. For instance:
113113
114114```ShellSession
115−$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH nix-shell -p octave --run octave
115+$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave
116116```
117117
118118Intel MKL requires an `openmp` implementation when running with multiple processors. By default, `mkl` will use Intel's `iomp` implementation if no other is specified, but this is a runtime-only dependency and binary compatible with the LLVM implementation. To use that one instead, Intel recommends users set it with `LD_PRELOAD`. Note that `mkl` is only available on `x86_64-linux` and `x86_64-darwin`. Moreover, Hydra is not building and distributing pre-compiled binaries using it.
119119
120−To override `blas` and `lapack` with its reference implementations (i.e. for development purposes), one can use the following overlay:
121−
122−```nix
123−self: super:
124−
125−{
126− blas = super.blas.override {
127− blasProvider = self.lapack-reference;
128− };
129−
130− lapack = super.lapack.override {
131− lapackProvider = self.lapack-reference;
132− };
133−}
134−```
135−
136−For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). The attributes `blas` and `lapack` are `LP64` by default. Their `ILP64` version are provided through the attributes `blas-ilp64` and `lapack-ilp64`. Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following:
120+For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following:
137121
138122```nix
139123{ stdenv, blas, lapack, ... }:
@@ -154,8 +138,6 @@ All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Pas
154138
155139- [MPICH](https://www.mpich.org/), attribute name `mpich`
156140
157−- [MVAPICH](https://mvapich.cse.ohio-state.edu/), attribute name `mvapich`
158−
159141To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, simply use the following overlay:
160142
161143```nix
doc/using/overrides.chapter.md+8−12
@@ -39,30 +39,26 @@ The function `overrideAttrs` allows overriding the attribute set passed to a `st
3939Example usage:
4040
4141```nix
42−helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: {
42+helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
4343 separateDebugInfo = true;
4444});
4545```
4646
4747In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package.
4848
49−The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.
49+The argument `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.
5050
51−The argument `finalAttrs` refers to the final attributes passed to `mkDerivation`, plus the `finalPackage` attribute which is equal to the result of `mkDerivation` or subsequent `overrideAttrs` calls.
52−
53−If only a one-argument function is written, the argument has the meaning of `previousAttrs`.
54−
55−::: {.note}
56−Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing).
51+::: note
52+Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing).
5753:::
5854
5955## <pkg>.overrideDerivation {#sec-pkg-overrideDerivation}
6056
61−::: {.warning}
57+::: warning
6258You should prefer `overrideAttrs` in almost all cases, see its documentation for the reasons why. `overrideDerivation` is not deprecated and will continue to work, but is less nice to use and does not have as many abilities as `overrideAttrs`.
6359:::
6460
65−::: {.warning}
61+::: warning
6662Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in `~/.config/nixpkgs/config.nix`.
6763:::
6864
@@ -85,8 +81,8 @@ In the above example, the `name`, `src`, and `patches` of the derivation will be
8581
8682The argument `oldAttrs` is used to refer to the attribute set of the original derivation.
8783
88−::: {.note}
89−A package's attributes are evaluated *before* being modified by the `overrideDerivation` function. For example, the `name` attribute reference in `url = "mirror://gnu/hello/${name}.tar.gz";` is filled-in *before* the `overrideDerivation` function modifies the attribute set. This means that overriding the `name` attribute, in this example, *will not* change the value of the `url` attribute. Instead, we need to override both the `name` *and* `url` attributes.
84+::: note
85+A package's attributes are evaluated *before* being modified by the `overrideDerivation` function. For example, the `name` attribute reference in `url = "mirror://gnu/hello/${name}.tar.gz";` is filled-in *before* the `overrideDerivation` function modifies the attribute set. This means that overriding the `name` attribute, in this example, *will not* change the value of the `url` attribute. Instead, we need to override both the `name` *and* `url` attributes.
9086:::
9187
9288## lib.makeOverridable {#sec-lib-makeOverridable}
flake.nix+41−9
@@ -11,23 +11,55 @@
1111
1212 lib = import ./lib;
1313
14− systems = lib.systems.supported.hydra;
14+ systems = [
15+ "x86_64-linux"
16+ "i686-linux"
17+ "x86_64-darwin"
18+ "aarch64-linux"
19+ "armv6l-linux"
20+ "armv7l-linux"
21+ "aarch64-darwin"
22+ ];
1523
1624 forAllSystems = f: lib.genAttrs systems (system: f system);
1725
1826 in
1927 {
2028 lib = lib.extend (final: prev: {
29+ nixosSystem = { modules, ... } @ args:
30+ import ./nixos/lib/eval-config.nix (args // {
31+ modules =
32+ let
33+ vmConfig = (import ./nixos/lib/eval-config.nix
34+ (args // {
35+ modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ];
36+ })).config;
2137
22− nixos = import ./nixos/lib { lib = final; };
38+ vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix
39+ (args // {
40+ modules = modules ++ [
41+ ./nixos/modules/virtualisation/qemu-vm.nix
42+ { virtualisation.useBootLoader = true; }
43+ ({ config, ... }: {
44+ virtualisation.useEFIBoot =
45+ config.boot.loader.systemd-boot.enable ||
46+ config.boot.loader.efi.canTouchEfiVariables;
47+ })
48+ ];
49+ })).config;
50+ in
51+ modules ++ [
52+ {
53+ system.nixos.versionSuffix =
54+ ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
55+ system.nixos.revision = final.mkIf (self ? rev) self.rev;
2356
24− nixosSystem = args:
25− import ./nixos/lib/eval-config.nix (args // {
26− modules = args.modules ++ [ {
27− system.nixos.versionSuffix =
28− ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
29− system.nixos.revision = final.mkIf (self ? rev) self.rev;
30− } ];
57+ system.build = {
58+ vm = vmConfig.system.build.vm;
59+ vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
60+ };
61+ }
62+ ];
3163 });
3264 });
3365
lib/asserts.nix+12−10
@@ -2,33 +2,35 @@
22
33rec {
44
5− /* Throw if pred is false, else return pred.
5+ /* Print a trace message if pred is false.
66 Intended to be used to augment asserts with helpful error messages.
77
88 Example:
99 assertMsg false "nope"
10− stderr> error: nope
10+ => false
11+ stderr> trace: nope
1112
12− assert assertMsg ("foo" == "bar") "foo is not bar, silly"; ""
13− stderr> error: foo is not bar, silly
13+ assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); ""
14+ stderr> trace: foo is not bar, silly
15+ stderr> assert failed at …
1416
1517 Type:
1618 assertMsg :: Bool -> String -> Bool
1719 */
1820 # TODO(Profpatsch): add tests that check stderr
1921 assertMsg = pred: msg:
20− pred || builtins.throw msg;
22+ if pred
23+ then true
24+ else builtins.trace msg false;
2125
2226 /* Specialized `assertMsg` for checking if val is one of the elements
2327 of a list. Useful for checking enums.
2428
2529 Example:
26− let sslLibrary = "libressl";
30+ let sslLibrary = "libressl"
2731 in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
28− stderr> error: sslLibrary must be one of [
29− stderr> "openssl"
30− stderr> "bearssl"
31− stderr> ], but is: "libressl"
32+ => false
33+ stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl"
3234
3335 Type:
3436 assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
lib/attrsets.nix+29−141
@@ -3,9 +3,9 @@
33
44let
55 inherit (builtins) head tail length;
6− inherit (lib.trivial) id;
7− inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName;
8− inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl;
6+ inherit (lib.trivial) and;
7+ inherit (lib.strings) concatStringsSep sanitizeDerivationName;
8+ inherit (lib.lists) fold concatMap concatLists;
99in
1010
1111rec {
@@ -55,13 +55,10 @@ rec {
5555 => { a = { b = 3; }; }
5656 */
5757 setAttrByPath = attrPath: value:
58− let
59− len = length attrPath;
60− atDepth = n:
61− if n == len
62− then value
63− else { ${elemAt attrPath n} = atDepth (n + 1); };
64− in atDepth 0;
58+ if attrPath == [] then value
59+ else listToAttrs
60+ [ { name = head attrPath; value = setAttrByPath (tail attrPath) value; } ];
61+
6562
6663 /* Like `attrByPath' without a default value. If it doesn't find the
6764 path it will throw.
@@ -73,107 +70,10 @@ rec {
7370 getAttrFromPath ["z" "z"] x
7471 => error: cannot find attribute `z.z'
7572 */
76− getAttrFromPath = attrPath:
73+ getAttrFromPath = attrPath: set:
7774 let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'";
78− in attrByPath attrPath (abort errorMsg);
79−
80−
81− /* Update or set specific paths of an attribute set.
82−
83− Takes a list of updates to apply and an attribute set to apply them to,
84− and returns the attribute set with the updates applied. Updates are
85− represented as { path = ...; update = ...; } values, where `path` is a
86− list of strings representing the attribute path that should be updated,
87− and `update` is a function that takes the old value at that attribute path
88− as an argument and returns the new
89− value it should be.
90−
91− Properties:
92− - Updates to deeper attribute paths are applied before updates to more
93− shallow attribute paths
94− - Multiple updates to the same attribute path are applied in the order
95− they appear in the update list
96− - If any but the last `path` element leads into a value that is not an
97− attribute set, an error is thrown
98− - If there is an update for an attribute path that doesn't exist,
99− accessing the argument in the update function causes an error, but
100− intermediate attribute sets are implicitly created as needed
75+ in attrByPath attrPath (abort errorMsg) set;
10176
102− Example:
103− updateManyAttrsByPath [
104− {
105− path = [ "a" "b" ];
106− update = old: { d = old.c; };
107− }
108− {
109− path = [ "a" "b" "c" ];
110− update = old: old + 1;
111− }
112− {
113− path = [ "x" "y" ];
114− update = old: "xy";
115− }
116− ] { a.b.c = 0; }
117− => { a = { b = { d = 1; }; }; x = { y = "xy"; }; }
118− */
119− updateManyAttrsByPath = let
120− # When recursing into attributes, instead of updating the `path` of each
121− # update using `tail`, which needs to allocate an entirely new list,
122− # we just pass a prefix length to use and make sure to only look at the
123− # path without the prefix length, so that we can reuse the original list
124− # entries.
125− go = prefixLength: hasValue: value: updates:
126− let
127− # Splits updates into ones on this level (split.right)
128− # And ones on levels further down (split.wrong)
129− split = partition (el: length el.path == prefixLength) updates;
130−
131− # Groups updates on further down levels into the attributes they modify
132− nested = groupBy (el: elemAt el.path prefixLength) split.wrong;
133−
134− # Applies only nested modification to the input value
135− withNestedMods =
136− # Return the value directly if we don't have any nested modifications
137− if split.wrong == [] then
138− if hasValue then value
139− else
140− # Throw an error if there is no value. This `head` call here is
141− # safe, but only in this branch since `go` could only be called
142− # with `hasValue == false` for nested updates, in which case
143− # it's also always called with at least one update
144− let updatePath = (head split.right).path; in
145− throw
146− ( "updateManyAttrsByPath: Path '${showAttrPath updatePath}' does "
147− + "not exist in the given value, but the first update to this "
148− + "path tries to access the existing value.")
149− else
150− # If there are nested modifications, try to apply them to the value
151− if ! hasValue then
152− # But if we don't have a value, just use an empty attribute set
153− # as the value, but simplify the code a bit
154− mapAttrs (name: go (prefixLength + 1) false null) nested
155− else if isAttrs value then
156− # If we do have a value and it's an attribute set, override it
157− # with the nested modifications
158− value //
159− mapAttrs (name: go (prefixLength + 1) (value ? ${name}) value.${name}) nested
160− else
161− # However if it's not an attribute set, we can't apply the nested
162− # modifications, throw an error
163− let updatePath = (head split.wrong).path; in
164− throw
165− ( "updateManyAttrsByPath: Path '${showAttrPath updatePath}' needs to "
166− + "be updated, but path '${showAttrPath (take prefixLength updatePath)}' "
167− + "of the given value is not an attribute set, so we can't "
168− + "update an attribute inside of it.");
169−
170− # We get the final result by applying all the updates on this level
171− # after having applied all the nested updates
172− # We use foldl instead of foldl' so that in case of multiple updates,
173− # intermediate values aren't evaluated if not needed
174− in foldl (acc: el: el.update acc) withNestedMods split.right;
175−
176− in updates: value: go 0 true value updates;
17777
17878 /* Return the specified attributes from a set.
17979
@@ -251,12 +151,12 @@ rec {
251151 foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }]
252152 => { a = [ 2 3 ]; }
253153 */
254− foldAttrs = op: nul:
255− foldr (n: a:
256− foldr (name: o:
154+ foldAttrs = op: nul: list_of_attrs:
155+ fold (n: a:
156+ fold (name: o:
257157 o // { ${name} = op n.${name} (a.${name} or nul); }
258158 ) a (attrNames n)
259− ) {};
159+ ) {} list_of_attrs;
260160
261161
262162 /* Recursively collect sets that verify a given predicate named `pred'
@@ -295,7 +195,7 @@ rec {
295195 ]
296196 */
297197 cartesianProductOfSets = attrsOfLists:
298− foldl' (listOfAttrs: attrName:
198+ lib.foldl' (listOfAttrs: attrName:
299199 concatMap (attrs:
300200 map (listValue: attrs // { ${attrName} = listValue; }) attrsOfLists.${attrName}
301201 ) listOfAttrs
@@ -373,7 +273,7 @@ rec {
373273
374274
375275 /* Like `mapAttrsRecursive', but it takes an additional predicate
376− function that tells it whether to recurse into an attribute
276+ function that tells it whether to recursive into an attribute
377277 set. If it returns false, `mapAttrsRecursiveCond' does not
378278 recurse, but does apply the map function. If it returns true, it
379279 does recurse, and does not apply the map function.
@@ -392,14 +292,14 @@ rec {
392292 */
393293 mapAttrsRecursiveCond = cond: f: set:
394294 let
395− recurse = path:
295+ recurse = path: set:
396296 let
397297 g =
398298 name: value:
399299 if isAttrs value && cond value
400300 then recurse (path ++ [name]) value
401301 else f (path ++ [name]) value;
402− in mapAttrs g;
302+ in mapAttrs g set;
403303 in recurse [] set;
404304
405305
@@ -424,7 +324,7 @@ rec {
424324 isDerivation "foobar"
425325 => false
426326 */
427− isDerivation = x: x.type or null == "derivation";
327+ isDerivation = x: isAttrs x && x ? type && x.type == "derivation";
428328
429329 /* Converts a store path to a fake derivation. */
430330 toDerivation = path:
@@ -466,7 +366,7 @@ rec {
466366 value = f name (catAttrs name sets);
467367 }) names);
468368
469− /* Implementation note: Common names appear multiple times in the list of
369+ /* Implementation note: Common names appear multiple times in the list of
470370 names, hopefully this does not affect the system because the maximal
471371 laziness avoid computing twice the same expression and listToAttrs does
472372 not care about duplicated attribute names.
@@ -475,8 +375,7 @@ rec {
475375 zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}]
476376 => { a = ["x" "y"]; b = ["z"] }
477377 */
478− zipAttrsWith =
479− builtins.zipAttrsWith or (f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets);
378+ zipAttrsWith = f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets;
480379 /* Like `zipAttrsWith' with `(name: values: values)' as the function.
481380
482381 Example:
@@ -517,8 +416,8 @@ rec {
517416 let f = attrPath:
518417 zipAttrsWith (n: values:
519418 let here = attrPath ++ [n]; in
520− if length values == 1
521− || pred here (elemAt values 1) (head values) then
419+ if tail values == []
420+ || pred here (head (tail values)) (head values) then
522421 head values
523422 else
524423 f here values
@@ -544,7 +443,10 @@ rec {
544443 }
545444
546445 */
547− recursiveUpdate = recursiveUpdateUntil (path: lhs: rhs: !(isAttrs lhs && isAttrs rhs));
446+ recursiveUpdate = lhs: rhs:
447+ recursiveUpdateUntil (path: lhs: rhs:
448+ !(isAttrs lhs && isAttrs rhs)
449+ ) lhs rhs;
548450
549451 /* Returns true if the pattern is contained in the set. False otherwise.
550452
@@ -553,8 +455,8 @@ rec {
553455 => true
554456 */
555457 matchAttrs = pattern: attrs: assert isAttrs pattern;
556− all id (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
557− let pat = head values; val = elemAt values 1; in
458+ fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
459+ let pat = head values; val = head (tail values); in
558460 if length values == 1 then false
559461 else if isAttrs pat then isAttrs val && matchAttrs pat val
560462 else pat == val
@@ -574,20 +476,6 @@ rec {
574476 overrideExisting = old: new:
575477 mapAttrs (name: value: new.${name} or value) old;
576478
577− /* Turns a list of strings into a human-readable description of those
578− strings represented as an attribute path. The result of this function is
579− not intended to be machine-readable.
580−
581− Example:
582− showAttrPath [ "foo" "10" "bar" ]
583− => "foo.\"10\".bar"
584− showAttrPath []
585− => "<root attribute path>"
586− */
587− showAttrPath = path:
588− if path == [] then "<root attribute path>"
589− else concatMapStringsSep "." escapeNixIdentifier path;
590−
591479 /* Get a package output.
592480 If no output is found, fallback to `.out` and then to the default.
593481
@@ -596,7 +484,7 @@ rec {
596484 => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"
597485 */
598486 getOutput = output: pkg:
599− if ! pkg ? outputSpecified || ! pkg.outputSpecified
487+ if pkg.outputUnspecified or false
600488 then pkg.${output} or pkg.out or pkg
601489 else pkg;
602490
lib/customisation.nix+3−50
@@ -117,55 +117,8 @@ rec {
117117 callPackageWith = autoArgs: fn: args:
118118 let
119119 f = if lib.isFunction fn then fn else import fn;
120− fargs = lib.functionArgs f;
121−
122− # All arguments that will be passed to the function
123− # This includes automatic ones and ones passed explicitly
124− allArgs = builtins.intersectAttrs fargs autoArgs // args;
125−
126− # A list of argument names that the function requires, but
127− # wouldn't be passed to it
128− missingArgs = lib.attrNames
129− # Filter out arguments that have a default value
130− (lib.filterAttrs (name: value: ! value)
131− # Filter out arguments that would be passed
132− (removeAttrs fargs (lib.attrNames allArgs)));
133−
134− # Get a list of suggested argument names for a given missing one
135− getSuggestions = arg: lib.pipe (autoArgs // args) [
136− lib.attrNames
137− # Only use ones that are at most 2 edits away. While mork would work,
138− # levenshteinAtMost is only fast for 2 or less.
139− (lib.filter (lib.strings.levenshteinAtMost 2 arg))
140− # Put strings with shorter distance first
141− (lib.sort (x: y: lib.strings.levenshtein x arg < lib.strings.levenshtein y arg))
142− # Only take the first couple results
143− (lib.take 3)
144− # Quote all entries
145− (map (x: "\"" + x + "\""))
146− ];
147−
148− prettySuggestions = suggestions:
149− if suggestions == [] then ""
150− else if lib.length suggestions == 1 then ", did you mean ${lib.elemAt suggestions 0}?"
151− else ", did you mean ${lib.concatStringsSep ", " (lib.init suggestions)} or ${lib.last suggestions}?";
152−
153− errorForArg = arg:
154− let
155− loc = builtins.unsafeGetAttrPos arg fargs;
156− # loc' can be removed once lib/minver.nix is >2.3.4, since that includes
157− # https://github.com/NixOS/nix/pull/3468 which makes loc be non-null
158− loc' = if loc != null then loc.file + ":" + toString loc.line
159− else if ! lib.isFunction fn then
160− toString fn + lib.optionalString (lib.sources.pathIsDirectory fn) "/default.nix"
161− else "<unknown location>";
162− in "Function called without required argument \"${arg}\" at "
163− + "${loc'}${prettySuggestions (getSuggestions arg)}";
164−
165− # Only show the error for the first missing argument
166− error = errorForArg (lib.head missingArgs);
167−
168− in if missingArgs == [] then makeOverridable f allArgs else throw error;
120+ auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
121+ in makeOverridable f (auto // args);
169122
170123
171124 /* Like callPackage, but for a function that returns an attribute
@@ -199,7 +152,6 @@ rec {
199152 { name = outputName;
200153 value = commonAttrs // {
201154 inherit (drv.${outputName}) type outputName;
202− outputSpecified = true;
203155 drvPath = assert condition; drv.${outputName}.drvPath;
204156 outPath = assert condition; drv.${outputName}.outPath;
205157 };
@@ -207,6 +159,7 @@ rec {
207159
208160 outputsList = map outputToAttrListElement outputs;
209161 in commonAttrs // {
162+ outputUnspecified = true;
210163 drvPath = assert condition; drv.drvPath;
211164 outPath = assert condition; drv.outPath;
212165 };
lib/default.nix+15−25
@@ -11,9 +11,6 @@ let
1111 callLibs = file: import file { lib = self; };
1212 in {
1313
14− # interacting with flakes
15− flakes = callLibs ./flakes.nix;
16−
1714 # often used, or depending on very little
1815 trivial = callLibs ./trivial.nix;
1916 fixedPoints = callLibs ./fixed-points.nix;
@@ -62,7 +59,6 @@ let
6259 # linux kernel configuration
6360 kernel = callLibs ./kernel.nix;
6461
65− inherit (self.flakes) callLocklessFlake;
6662 inherit (builtins) add addErrorContext attrNames concatLists
6763 deepSeq elem elemAt filter genericClosure genList getAttr
6864 hasAttr head isAttrs isBool isInt isList isString length
@@ -70,10 +66,8 @@ let
7066 stringLength sub substring tail trace;
7167 inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor
7268 bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
73− importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum
74− info showWarnings nixpkgsVersion version isInOldestRelease
75− mod compare splitByAndCompare
76− functionArgs setFunctionArgs isFunction toFunction
69+ importJSON importTOML warn warnIf info showWarnings nixpkgsVersion version
70+ mod compare splitByAndCompare functionArgs setFunctionArgs isFunction
7771 toHexString toBaseDigits;
7872 inherit (self.fixedPoints) fix fix' converge extends composeExtensions
7973 composeManyExtensions makeExtensible makeExtensibleWithCustomName;
@@ -83,10 +77,9 @@ let
8377 mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond
8478 genAttrs isDerivation toDerivation optionalAttrs
8579 zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
86− recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin
80+ recursiveUpdate matchAttrs overrideExisting getOutput getBin
8781 getLib getDev getMan chooseDevOutputs zipWithNames zip
88− recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets
89− updateManyAttrsByPath;
82+ recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets;
9083 inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1
9184 concatMap flatten remove findSingle findFirst any all count
9285 optional optionals toList range partition zipListsWith zipLists
@@ -98,8 +91,7 @@ let
9891 concatImapStringsSep makeSearchPath makeSearchPathOutput
9992 makeLibraryPath makeBinPath optionalString
10093 hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
101− escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars
102− escapeRegex escapeXML replaceChars lowerChars
94+ escapeShellArg escapeShellArgs replaceChars lowerChars
10395 upperChars toLower toUpper addContextFrom splitString
10496 removePrefix removeSuffix versionOlder versionAtLeast
10597 getName getVersion
@@ -113,28 +105,26 @@ let
113105 makeScope makeScopeWithSplicing;
114106 inherit (self.meta) addMetaAttrs dontDistribute setName updateName
115107 appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
116− hiPrioSet getLicenseFromSpdxId getExe;
108+ hiPrioSet;
117109 inherit (self.sources) pathType pathIsDirectory cleanSourceFilter
118110 cleanSource sourceByRegex sourceFilesBySuffices
119111 commitIdFromGitRepo cleanSourceWith pathHasContext
120112 canCleanSource pathIsRegularFile pathIsGitRepo;
121− inherit (self.modules) evalModules setDefaultModuleLocation
122− unifyModuleSyntax applyModuleArgsIfFunction mergeModules
113+ inherit (self.modules) evalModules unifyModuleSyntax
114+ applyIfFunction mergeModules
123115 mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
124116 pushDownProperties dischargeProperties filterOverrides
125117 sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
126− mkOptionDefault mkDefault mkImageMediaOverride mkForce mkVMOverride
118+ mkOptionDefault mkDefault mkForce mkVMOverride mkStrict
127119 mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions
128120 mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
129− mkRenamedOptionModule mkRenamedOptionModuleWith
130− mkMergedOptionModule mkChangedOptionModule
131− mkAliasOptionModule mkDerivedConfig doRename;
121+ mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule
122+ mkAliasOptionModule doRename;
132123 inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
133− mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption
134− getValues getFiles
135− optionAttrSetToDocList optionAttrSetToDocList'
136− scrubOptionValue literalExpression literalExample literalDocBook
137− showOption showFiles unknownModule mkOption mkPackageOption;
124+ mergeDefaultOption mergeOneOption mergeEqualOption getValues
125+ getFiles optionAttrSetToDocList optionAttrSetToDocList'
126+ scrubOptionValue literalExample showOption showFiles
127+ unknownModule mkOption;
138128 inherit (self.types) isType setType defaultTypeMerge defaultFunctor
139129 isOptionType mkOptionType;
140130 inherit (self.asserts)
lib/deprecated.nix+5−5
@@ -77,11 +77,11 @@ rec {
7777 # Output : are reqs satisfied? It's asserted.
7878 checkReqs = attrSet: argList: condList:
7979 (
80− foldr lib.and true
80+ fold lib.and true
8181 (map (x: let name = (head x); in
8282
8383 ((checkFlag attrSet name) ->
84− (foldr lib.and true
84+ (fold lib.and true
8585 (map (y: let val=(getValue attrSet argList y); in
8686 (val!=null) && (val!=false))
8787 (tail x))))) condList));
@@ -177,7 +177,7 @@ rec {
177177 # merge attributes with custom function handling the case that the attribute
178178 # exists in both sets
179179 mergeAttrsWithFunc = f: set1: set2:
180− foldr (n: set: if set ? ${n}
180+ fold (n: set: if set ? ${n}
181181 then setAttr set n (f set.${n} set2.${n})
182182 else set )
183183 (set2 // set1) (attrNames set2);
@@ -196,7 +196,7 @@ rec {
196196 mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"],
197197 overrideSnd ? [ "buildPhase" ]
198198 }: attrs1: attrs2:
199− foldr (n: set:
199+ fold (n: set:
200200 setAttr set n ( if set ? ${n}
201201 then # merge
202202 if elem n mergeLists # attribute contains list, merge them by concatenating
@@ -224,7 +224,7 @@ rec {
224224 mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; }
225225 // (maybeAttr "mergeAttrBy" {} x)
226226 // (maybeAttr "mergeAttrBy" {} y); in
227− foldr lib.mergeAttrs {} [
227+ fold lib.mergeAttrs {} [
228228 x y
229229 (mapAttrs ( a: v: # merge special names using given functions
230230 if x ? ${a}
lib/fixed-points.nix+5−5
@@ -72,10 +72,10 @@ rec {
7272 # into one where changes made in the first are available in the
7373 # 'super' of the second
7474 composeExtensions =
75− f: g: final: prev:
76− let fApplied = f final prev;
77− prev' = prev // fApplied;
78− in fApplied // g final prev';
75+ f: g: self: super:
76+ let fApplied = f self super;
77+ super' = super // fApplied;
78+ in fApplied // g self super';
7979
8080 # Compose several extending functions of the type expected by 'extends' into
8181 # one where changes made in preceding functions are made available to
@@ -84,7 +84,7 @@ rec {
8484 # composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet
8585 # ^final ^prev ^overrides ^final ^prev ^overrides
8686 composeManyExtensions =
87− lib.foldr (x: y: composeExtensions x y) (final: prev: {});
87+ lib.foldr (x: y: composeExtensions x y) (self: super: {});
8888
8989 # Create an overridable, recursive attribute set. For example:
9090 #
lib/flake.nix+1−1
@@ -1,5 +1,5 @@
11{
22 description = "Library of low-level helper functions for nix expressions.";
33
4− outputs = { self }: { lib = import ./.; };
4+ outputs = { self }: { lib = import ./lib; };
55}
lib/flakes.nixdeleted−22
@@ -1,22 +0,0 @@
1−{ lib }:
2−
3−rec {
4−
5− /* imports a flake.nix without acknowledging its lock file, useful for
6− referencing subflakes from a parent flake. The second argument allows
7− specifying the inputs of this flake.
8−
9− Example:
10− callLocklessFlake {
11− path = ./directoryContainingFlake;
12− inputs = { inherit nixpkgs; };
13− }
14− */
15− callLocklessFlake = { path, inputs ? { } }:
16− let
17− self = { outPath = path; } //
18− ((import (path + "/flake.nix")).outputs (inputs // { self = self; }));
19− in
20− self;
21−
22−}
lib/generators.nix+5−77
@@ -10,7 +10,7 @@
1010 * are mostly generators themselves, called with
1111 * their respective default values; they can be reused.
1212 *
13− * Tests can be found in ./tests/misc.nix
13+ * Tests can be found in ./tests.nix
1414 * Documentation in the manual, #sec-generators
1515 */
1616{ lib }:
@@ -35,8 +35,6 @@ rec {
3535 ("generators.mkValueStringDefault: " +
3636 "${t} not supported: ${toPretty {} v}");
3737 in if isInt v then toString v
38− # convert derivations to store paths
39− else if lib.isDerivation v then toString v
4038 # we default to not quoting strings
4139 else if isString v then v
4240 # isString returns "1", which is not a good default
@@ -108,7 +106,7 @@ rec {
108106 * The mk* configuration attributes can generically change
109107 * the way sections and key-value strings are generated.
110108 *
111− * For more examples see the test cases in ./tests/misc.nix.
109+ * For more examples see the test cases in ./tests.nix.
112110 */
113111 toINI = {
114112 # apply transformations (e.g. escapes) to section names
@@ -130,51 +128,6 @@ rec {
130128 # map input to ini sections
131129 mapAttrsToStringsSep "\n" mkSection attrsOfAttrs;
132130
133− /* Generate an INI-style config file from an attrset
134− * specifying the global section (no header), and an
135− * attrset of sections to an attrset of key-value pairs.
136− *
137− * generators.toINIWithGlobalSection {} {
138− * globalSection = {
139− * someGlobalKey = "hi";
140− * };
141− * sections = {
142− * foo = { hi = "${pkgs.hello}"; ciao = "bar"; };
143− * baz = { "also, integers" = 42; };
144− * }
145− *
146− *> someGlobalKey=hi
147− *>
148− *> [baz]
149− *> also, integers=42
150− *>
151− *> [foo]
152− *> ciao=bar
153− *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10
154− *
155− * The mk* configuration attributes can generically change
156− * the way sections and key-value strings are generated.
157− *
158− * For more examples see the test cases in ./tests/misc.nix.
159− *
160− * If you don’t need a global section, you can also use
161− * `generators.toINI` directly, which only takes
162− * the part in `sections`.
163− */
164− toINIWithGlobalSection = {
165− # apply transformations (e.g. escapes) to section names
166− mkSectionName ? (name: libStr.escape [ "[" "]" ] name),
167− # format a setting line from key and value
168− mkKeyValue ? mkKeyValueDefault {} "=",
169− # allow lists as values for duplicate keys
170− listsAsDuplicateKeys ? false
171− }: { globalSection, sections }:
172− ( if globalSection == {}
173− then ""
174− else (toKeyValue { inherit mkKeyValue listsAsDuplicateKeys; } globalSection)
175− + "\n")
176− + (toINI { inherit mkSectionName mkKeyValue listsAsDuplicateKeys; } sections);
177−
178131 /* Generate a git-config file from an attrset.
179132 *
180133 * It has two major differences from the regular INI format:
@@ -216,7 +169,7 @@ rec {
216169 # converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI
217170 gitFlattenAttrs = let
218171 recurse = path: value:
219− if isAttrs value && !lib.isDerivation value then
172+ if isAttrs value then
220173 lib.mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value
221174 else if length path > 1 then {
222175 ${concatStringsSep "." (lib.reverseList (tail path))}.${head path} = value;
@@ -242,30 +195,6 @@ rec {
242195 */
243196 toYAML = {}@args: toJSON args;
244197
245− withRecursion =
246− args@{
247− /* If this option is not null, the given value will stop evaluating at a certain depth */
248− depthLimit
249− /* If this option is true, an error will be thrown, if a certain given depth is exceeded */
250− , throwOnDepthLimit ? true
251− }:
252− assert builtins.isInt depthLimit;
253− let
254− transform = depth:
255− if depthLimit != null && depth > depthLimit then
256− if throwOnDepthLimit
257− then throw "Exceeded maximum eval-depth limit of ${toString depthLimit} while trying to evaluate with `generators.withRecursion'!"
258− else const "<unevaluated>"
259− else id;
260− mapAny = with builtins; depth: v:
261− let
262− evalNext = x: mapAny (depth + 1) (transform (depth + 1) x);
263− in
264− if isAttrs v then mapAttrs (const evalNext) v
265− else if isList v then map evalNext v
266− else transform (depth + 1) v;
267− in
268− mapAny 0;
269198
270199 /* Pretty print a value, akin to `builtins.trace`.
271200 * Should probably be a builtin as well.
@@ -277,8 +206,7 @@ rec {
277206 allowPrettyValues ? false,
278207 /* If this option is true, the output is indented with newlines for attribute sets and lists */
279208 multiline ? true
280− }@args:
281− let
209+ }@args: let
282210 go = indent: v: with builtins;
283211 let isPath = v: typeOf v == "path";
284212 introSpace = if multiline then "\n${indent} " else " ";
@@ -320,7 +248,7 @@ rec {
320248 then v.__pretty v.val
321249 else if v == {} then "{ }"
322250 else if v ? type && v.type == "derivation" then
323− "<derivation ${v.drvPath or "???"}>"
251+ "<derivation ${v.drvPath}>"
324252 else "{" + introSpace
325253 + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList
326254 (name: value:
lib/licenses.nix+140−214
@@ -1,56 +1,44 @@
11{ lib }:
2+let
23
3−lib.mapAttrs (lname: lset: let
4− defaultLicense = rec {
5− shortName = lname;
6− free = true; # Most of our licenses are Free, explicitly declare unfree additions as such!
7− deprecated = false;
8− };
9−
10− mkLicense = licenseDeclaration: let
11− applyDefaults = license: defaultLicense // license;
12− applySpdx = license:
13− if license ? spdxId
14− then license // { url = "https://spdx.org/licenses/${license.spdxId}.html"; }
15− else license;
16− applyRedistributable = license: { redistributable = license.free; } // license;
17− in lib.pipe licenseDeclaration [
18− applyDefaults
19− applySpdx
20− applyRedistributable
21− ];
22−in mkLicense lset) ({
4+ spdx = lic: lic // {
5+ url = "https://spdx.org/licenses/${lic.spdxId}.html";
6+ };
7+
8+in
9+
10+lib.mapAttrs (n: v: v // { shortName = n; }) ({
2311 /* License identifiers from spdx.org where possible.
2412 * If you cannot find your license here, then look for a similar license or
2513 * add it to this list. The URL mentioned above is a good source for inspiration.
2614 */
2715
28− abstyles = {
16+ abstyles = spdx {
2917 spdxId = "Abstyles";
3018 fullName = "Abstyles License";
3119 };
3220
33− afl20 = {
21+ afl20 = spdx {
3422 spdxId = "AFL-2.0";
3523 fullName = "Academic Free License v2.0";
3624 };
3725
38− afl21 = {
26+ afl21 = spdx {
3927 spdxId = "AFL-2.1";
4028 fullName = "Academic Free License v2.1";
4129 };
4230
43− afl3 = {
31+ afl3 = spdx {
4432 spdxId = "AFL-3.0";
4533 fullName = "Academic Free License v3.0";
4634 };
4735
48− agpl3Only = {
36+ agpl3Only = spdx {
4937 spdxId = "AGPL-3.0-only";
5038 fullName = "GNU Affero General Public License v3.0 only";
5139 };
5240
53− agpl3Plus = {
41+ agpl3Plus = spdx {
5442 spdxId = "AGPL-3.0-or-later";
5543 fullName = "GNU Affero General Public License v3.0 or later";
5644 };
@@ -67,12 +55,7 @@ in mkLicense lset) ({
6755 free = false;
6856 };
6957
70− aom = {
71− fullName = "Alliance for Open Media Patent License 1.0";
72− url = "https://aomedia.org/license/patent-license/";
73− };
74−
75− apsl20 = {
58+ apsl20 = spdx {
7659 spdxId = "APSL-2.0";
7760 fullName = "Apple Public Source License 2.0";
7861 };
@@ -82,72 +65,72 @@ in mkLicense lset) ({
8265 url = "https://www.freedesktop.org/wiki/Arphic_Public_License/";
8366 };
8467
85− artistic1 = {
68+ artistic1 = spdx {
8669 spdxId = "Artistic-1.0";
8770 fullName = "Artistic License 1.0";
8871 };
8972
90− artistic2 = {
73+ artistic2 = spdx {
9174 spdxId = "Artistic-2.0";
9275 fullName = "Artistic License 2.0";
9376 };
9477
95− asl20 = {
78+ asl20 = spdx {
9679 spdxId = "Apache-2.0";
9780 fullName = "Apache License 2.0";
9881 };
9982
100− boost = {
83+ boost = spdx {
10184 spdxId = "BSL-1.0";
10285 fullName = "Boost Software License 1.0";
10386 };
10487
105− beerware = {
88+ beerware = spdx {
10689 spdxId = "Beerware";
10790 fullName = "Beerware License";
10891 };
10992
110− blueOak100 = {
93+ blueOak100 = spdx {
11194 spdxId = "BlueOak-1.0.0";
11295 fullName = "Blue Oak Model License 1.0.0";
11396 };
11497
115− bsd0 = {
98+ bsd0 = spdx {
11699 spdxId = "0BSD";
117100 fullName = "BSD Zero Clause License";
118101 };
119102
120− bsd1 = {
103+ bsd1 = spdx {
121104 spdxId = "BSD-1-Clause";
122105 fullName = "BSD 1-Clause License";
123106 };
124107
125− bsd2 = {
108+ bsd2 = spdx {
126109 spdxId = "BSD-2-Clause";
127110 fullName = ''BSD 2-clause "Simplified" License'';
128111 };
129112
130− bsd2Patent = {
113+ bsd2Patent = spdx {
131114 spdxId = "BSD-2-Clause-Patent";
132115 fullName = "BSD-2-Clause Plus Patent License";
133116 };
134117
135− bsd3 = {
118+ bsd3 = spdx {
136119 spdxId = "BSD-3-Clause";
137120 fullName = ''BSD 3-clause "New" or "Revised" License'';
138121 };
139122
140− bsdOriginal = {
123+ bsdOriginal = spdx {
141124 spdxId = "BSD-4-Clause";
142125 fullName = ''BSD 4-clause "Original" or "Old" License'';
143126 };
144127
145− bsdOriginalUC = {
128+ bsdOriginalUC = spdx {
146129 spdxId = "BSD-4-Clause-UC";
147130 fullName = "BSD 4-Clause University of California-Specific";
148131 };
149132
150− bsdProtection = {
133+ bsdProtection = spdx {
151134 spdxId = "BSD-Protection";
152135 fullName = "BSD Protection License";
153136 };
@@ -158,129 +141,119 @@ in mkLicense lset) ({
158141 free = false;
159142 };
160143
161− capec = {
162− fullName = "Common Attack Pattern Enumeration and Classification";
163− url = "https://capec.mitre.org/about/termsofuse.html";
164− };
165−
166− clArtistic = {
144+ clArtistic = spdx {
167145 spdxId = "ClArtistic";
168146 fullName = "Clarified Artistic License";
169147 };
170148
171− cc0 = {
149+ cc0 = spdx {
172150 spdxId = "CC0-1.0";
173151 fullName = "Creative Commons Zero v1.0 Universal";
174152 };
175153
176− cc-by-nc-sa-20 = {
154+ cc-by-nc-sa-20 = spdx {
177155 spdxId = "CC-BY-NC-SA-2.0";
178156 fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0";
179157 free = false;
180158 };
181159
182− cc-by-nc-sa-25 = {
160+ cc-by-nc-sa-25 = spdx {
183161 spdxId = "CC-BY-NC-SA-2.5";
184162 fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5";
185163 free = false;
186164 };
187165
188− cc-by-nc-sa-30 = {
166+ cc-by-nc-sa-30 = spdx {
189167 spdxId = "CC-BY-NC-SA-3.0";
190168 fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0";
191169 free = false;
192170 };
193171
194− cc-by-nc-sa-40 = {
172+ cc-by-nc-sa-40 = spdx {
195173 spdxId = "CC-BY-NC-SA-4.0";
196174 fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0";
197175 free = false;
198176 };
199177
200− cc-by-nc-30 = {
178+ cc-by-nc-30 = spdx {
201179 spdxId = "CC-BY-NC-3.0";
202180 fullName = "Creative Commons Attribution Non Commercial 3.0 Unported";
203181 free = false;
204182 };
205183
206− cc-by-nc-40 = {
184+ cc-by-nc-40 = spdx {
207185 spdxId = "CC-BY-NC-4.0";
208186 fullName = "Creative Commons Attribution Non Commercial 4.0 International";
209187 free = false;
210188 };
211189
212− cc-by-nd-30 = {
190+ cc-by-nd-30 = spdx {
213191 spdxId = "CC-BY-ND-3.0";
214192 fullName = "Creative Commons Attribution-No Derivative Works v3.00";
215193 free = false;
216194 };
217195
218− cc-by-sa-25 = {
196+ cc-by-sa-25 = spdx {
219197 spdxId = "CC-BY-SA-2.5";
220198 fullName = "Creative Commons Attribution Share Alike 2.5";
221199 };
222200
223− cc-by-30 = {
201+ cc-by-30 = spdx {
224202 spdxId = "CC-BY-3.0";
225203 fullName = "Creative Commons Attribution 3.0";
226204 };
227205
228− cc-by-sa-30 = {
206+ cc-by-sa-30 = spdx {
229207 spdxId = "CC-BY-SA-3.0";
230208 fullName = "Creative Commons Attribution Share Alike 3.0";
231209 };
232210
233− cc-by-40 = {
211+ cc-by-40 = spdx {
234212 spdxId = "CC-BY-4.0";
235213 fullName = "Creative Commons Attribution 4.0";
236214 };
237215
238− cc-by-sa-40 = {
216+ cc-by-sa-40 = spdx {
239217 spdxId = "CC-BY-SA-4.0";
240218 fullName = "Creative Commons Attribution Share Alike 4.0";
241219 };
242220
243− cddl = {
221+ cddl = spdx {
244222 spdxId = "CDDL-1.0";
245223 fullName = "Common Development and Distribution License 1.0";
246224 };
247225
248− cecill20 = {
226+ cecill20 = spdx {
249227 spdxId = "CECILL-2.0";
250228 fullName = "CeCILL Free Software License Agreement v2.0";
251229 };
252230
253− cecill21 = {
254− spdxId = "CECILL-2.1";
255− fullName = "CeCILL Free Software License Agreement v2.1";
256− };
257−
258− cecill-b = {
231+ cecill-b = spdx {
259232 spdxId = "CECILL-B";
260233 fullName = "CeCILL-B Free Software License Agreement";
261234 };
262235
263− cecill-c = {
236+ cecill-c = spdx {
264237 spdxId = "CECILL-C";
265238 fullName = "CeCILL-C Free Software License Agreement";
266239 };
267240
268− cpal10 = {
241+ cpal10 = spdx {
269242 spdxId = "CPAL-1.0";
270243 fullName = "Common Public Attribution License 1.0";
271244 };
272245
273− cpl10 = {
246+ cpl10 = spdx {
274247 spdxId = "CPL-1.0";
275248 fullName = "Common Public License 1.0";
276249 };
277250
278− curl = {
251+ curl = spdx {
279252 spdxId = "curl";
280253 fullName = "curl License";
281254 };
282255
283− doc = {
256+ doc = spdx {
284257 spdxId = "DOC";
285258 fullName = "DOC License";
286259 };
@@ -291,12 +264,12 @@ in mkLicense lset) ({
291264 free = false;
292265 };
293266
294− efl10 = {
267+ efl10 = spdx {
295268 spdxId = "EFL-1.0";
296269 fullName = "Eiffel Forum License v1.0";
297270 };
298271
299− efl20 = {
272+ efl20 = spdx {
300273 spdxId = "EFL-2.0";
301274 fullName = "Eiffel Forum License v2.0";
302275 };
@@ -307,12 +280,12 @@ in mkLicense lset) ({
307280 free = false;
308281 };
309282
310− epl10 = {
283+ epl10 = spdx {
311284 spdxId = "EPL-1.0";
312285 fullName = "Eclipse Public License 1.0";
313286 };
314287
315− epl20 = {
288+ epl20 = spdx {
316289 spdxId = "EPL-2.0";
317290 fullName = "Eclipse Public License 2.0";
318291 };
@@ -323,42 +296,42 @@ in mkLicense lset) ({
323296 free = false;
324297 };
325298
326− eupl11 = {
299+ eupl11 = spdx {
327300 spdxId = "EUPL-1.1";
328301 fullName = "European Union Public License 1.1";
329302 };
330303
331− eupl12 = {
304+ eupl12 = spdx {
332305 spdxId = "EUPL-1.2";
333306 fullName = "European Union Public License 1.2";
334307 };
335308
336− fdl11Only = {
309+ fdl11Only = spdx {
337310 spdxId = "GFDL-1.1-only";
338311 fullName = "GNU Free Documentation License v1.1 only";
339312 };
340313
341− fdl11Plus = {
314+ fdl11Plus = spdx {
342315 spdxId = "GFDL-1.1-or-later";
343316 fullName = "GNU Free Documentation License v1.1 or later";
344317 };
345318
346− fdl12Only = {
319+ fdl12Only = spdx {
347320 spdxId = "GFDL-1.2-only";
348321 fullName = "GNU Free Documentation License v1.2 only";
349322 };
350323
351− fdl12Plus = {
324+ fdl12Plus = spdx {
352325 spdxId = "GFDL-1.2-or-later";
353326 fullName = "GNU Free Documentation License v1.2 or later";
354327 };
355328
356− fdl13Only = {
329+ fdl13Only = spdx {
357330 spdxId = "GFDL-1.3-only";
358331 fullName = "GNU Free Documentation License v1.3 only";
359332 };
360333
361− fdl13Plus = {
334+ fdl13Plus = spdx {
362335 spdxId = "GFDL-1.3-or-later";
363336 fullName = "GNU Free Documentation License v1.3 or later";
364337 };
@@ -373,11 +346,6 @@ in mkLicense lset) ({
373346 fullName = "Unspecified free software license";
374347 };
375348
376− ftl = {
377− spdxId = "FTL";
378− fullName = "Freetype Project License";
379− };
380−
381349 g4sl = {
382350 fullName = "Geant4 Software License";
383351 url = "https://geant4.web.cern.ch/geant4/license/LICENSE.html";
@@ -389,27 +357,22 @@ in mkLicense lset) ({
389357 free = false;
390358 };
391359
392− generaluser = {
393− fullName = "GeneralUser GS License v2.0";
394− url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources
395− };
396−
397− gpl1Only = {
360+ gpl1Only = spdx {
398361 spdxId = "GPL-1.0-only";
399362 fullName = "GNU General Public License v1.0 only";
400363 };
401364
402− gpl1Plus = {
365+ gpl1Plus = spdx {
403366 spdxId = "GPL-1.0-or-later";
404367 fullName = "GNU General Public License v1.0 or later";
405368 };
406369
407− gpl2Only = {
370+ gpl2Only = spdx {
408371 spdxId = "GPL-2.0-only";
409372 fullName = "GNU General Public License v2.0 only";
410373 };
411374
412− gpl2Classpath = {
375+ gpl2Classpath = spdx {
413376 spdxId = "GPL-2.0-with-classpath-exception";
414377 fullName = "GNU General Public License v2.0 only (with Classpath exception)";
415378 };
@@ -424,17 +387,17 @@ in mkLicense lset) ({
424387 url = "https://www.mysql.com/about/legal/licensing/foss-exception";
425388 };
426389
427− gpl2Plus = {
390+ gpl2Plus = spdx {
428391 spdxId = "GPL-2.0-or-later";
429392 fullName = "GNU General Public License v2.0 or later";
430393 };
431394
432− gpl3Only = {
395+ gpl3Only = spdx {
433396 spdxId = "GPL-3.0-only";
434397 fullName = "GNU General Public License v3.0 only";
435398 };
436399
437− gpl3Plus = {
400+ gpl3Plus = spdx {
438401 spdxId = "GPL-3.0-or-later";
439402 fullName = "GNU General Public License v3.0 or later";
440403 };
@@ -444,12 +407,12 @@ in mkLicense lset) ({
444407 url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception";
445408 };
446409
447− hpnd = {
410+ hpnd = spdx {
448411 spdxId = "HPND";
449412 fullName = "Historic Permission Notice and Disclaimer";
450413 };
451414
452− hpndSellVariant = {
415+ hpndSellVariant = spdx {
453416 fullName = "Historical Permission Notice and Disclaimer - sell variant";
454417 spdxId = "HPND-sell-variant";
455418 };
@@ -460,44 +423,39 @@ in mkLicense lset) ({
460423 url = "https://old.calculate-linux.org/packages/licenses/iASL";
461424 };
462425
463− ijg = {
426+ ijg = spdx {
464427 spdxId = "IJG";
465428 fullName = "Independent JPEG Group License";
466429 };
467430
468− imagemagick = {
431+ imagemagick = spdx {
469432 fullName = "ImageMagick License";
470433 spdxId = "imagemagick";
471434 };
472435
473− imlib2 = {
474− spdxId = "Imlib2";
475− fullName = "Imlib2 License";
476− };
477−
478436 inria-compcert = {
479437 fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler";
480− url = "https://compcert.org/doc/LICENSE.txt";
438+ url = "http://compcert.inria.fr/doc/LICENSE"; # https is broken
481439 free = false;
482440 };
483441
484442 inria-icesl = {
485443 fullName = "INRIA Non-Commercial License Agreement for IceSL";
486− url = "https://icesl.loria.fr/assets/pdf/EULA_IceSL_binary.pdf";
444+ url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; # https is broken
487445 free = false;
488446 };
489447
490− ipa = {
448+ ipa = spdx {
491449 spdxId = "IPA";
492450 fullName = "IPA Font License";
493451 };
494452
495− ipl10 = {
453+ ipl10 = spdx {
496454 spdxId = "IPL-1.0";
497455 fullName = "IBM Public License v1.0";
498456 };
499457
500− isc = {
458+ isc = spdx {
501459 spdxId = "ISC";
502460 fullName = "ISC License";
503461 };
@@ -515,52 +473,52 @@ in mkLicense lset) ({
515473 free = false;
516474 };
517475
518− lgpl2Only = {
476+ lgpl2Only = spdx {
519477 spdxId = "LGPL-2.0-only";
520478 fullName = "GNU Library General Public License v2 only";
521479 };
522480
523− lgpl2Plus = {
481+ lgpl2Plus = spdx {
524482 spdxId = "LGPL-2.0-or-later";
525483 fullName = "GNU Library General Public License v2 or later";
526484 };
527485
528− lgpl21Only = {
486+ lgpl21Only = spdx {
529487 spdxId = "LGPL-2.1-only";
530488 fullName = "GNU Lesser General Public License v2.1 only";
531489 };
532490
533− lgpl21Plus = {
491+ lgpl21Plus = spdx {
534492 spdxId = "LGPL-2.1-or-later";
535493 fullName = "GNU Lesser General Public License v2.1 or later";
536494 };
537495
538− lgpl3Only = {
496+ lgpl3Only = spdx {
539497 spdxId = "LGPL-3.0-only";
540498 fullName = "GNU Lesser General Public License v3.0 only";
541499 };
542500
543− lgpl3Plus = {
501+ lgpl3Plus = spdx {
544502 spdxId = "LGPL-3.0-or-later";
545503 fullName = "GNU Lesser General Public License v3.0 or later";
546504 };
547505
548− lgpllr = {
506+ lgpllr = spdx {
549507 spdxId = "LGPLLR";
550508 fullName = "Lesser General Public License For Linguistic Resources";
551509 };
552510
553− libpng = {
511+ libpng = spdx {
554512 spdxId = "Libpng";
555513 fullName = "libpng License";
556514 };
557515
558− libpng2 = {
516+ libpng2 = spdx {
559517 spdxId = "libpng-2.0"; # Used since libpng 1.6.36.
560518 fullName = "PNG Reference Library version 2";
561519 };
562520
563− libtiff = {
521+ libtiff = spdx {
564522 spdxId = "libtiff";
565523 fullName = "libtiff License";
566524 };
@@ -570,22 +528,22 @@ in mkLicense lset) ({
570528 url = "https://opensource.franz.com/preamble.html";
571529 };
572530
573− llvm-exception = {
531+ llvm-exception = spdx {
574532 spdxId = "LLVM-exception";
575533 fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License
576534 };
577535
578− lppl12 = {
536+ lppl12 = spdx {
579537 spdxId = "LPPL-1.2";
580538 fullName = "LaTeX Project Public License v1.2";
581539 };
582540
583− lppl13c = {
541+ lppl13c = spdx {
584542 spdxId = "LPPL-1.3c";
585543 fullName = "LaTeX Project Public License v1.3c";
586544 };
587545
588− lpl-102 = {
546+ lpl-102 = spdx {
589547 spdxId = "LPL-1.02";
590548 fullName = "Lucent Public License v1.02";
591549 };
@@ -597,58 +555,43 @@ in mkLicense lset) ({
597555
598556 # spdx.org does not (yet) differentiate between the X11 and Expat versions
599557 # for details see https://en.wikipedia.org/wiki/MIT_License#Various_versions
600− mit = {
558+ mit = spdx {
601559 spdxId = "MIT";
602560 fullName = "MIT License";
603561 };
604− # https://spdx.org/licenses/MIT-feh.html
605− mit-feh = {
606− spdxId = "MIT-feh";
607− fullName = "feh License";
608− };
609−
610− mitAdvertising = {
611− spdxId = "MIT-advertising";
612− fullName = "Enlightenment License (e16)";
613− };
614562
615− mit0 = {
616− spdxId = "MIT-0";
617− fullName = "MIT No Attribution";
618− };
619−
620− mpl10 = {
563+ mpl10 = spdx {
621564 spdxId = "MPL-1.0";
622565 fullName = "Mozilla Public License 1.0";
623566 };
624567
625− mpl11 = {
568+ mpl11 = spdx {
626569 spdxId = "MPL-1.1";
627570 fullName = "Mozilla Public License 1.1";
628571 };
629572
630− mpl20 = {
573+ mpl20 = spdx {
631574 spdxId = "MPL-2.0";
632575 fullName = "Mozilla Public License 2.0";
633576 };
634577
635− mspl = {
578+ mspl = spdx {
636579 spdxId = "MS-PL";
637580 fullName = "Microsoft Public License";
638581 };
639582
640− nasa13 = {
583+ nasa13 = spdx {
641584 spdxId = "NASA-1.3";
642585 fullName = "NASA Open Source Agreement 1.3";
643586 free = false;
644587 };
645588
646− ncsa = {
589+ ncsa = spdx {
647590 spdxId = "NCSA";
648591 fullName = "University of Illinois/NCSA Open Source License";
649592 };
650593
651− nposl3 = {
594+ nposl3 = spdx {
652595 spdxId = "NPOSL-3.0";
653596 fullName = "Non-Profit Open Software License 3.0";
654597 };
@@ -665,53 +608,53 @@ in mkLicense lset) ({
665608 free = false;
666609 };
667610
668− odbl = {
611+ odbl = spdx {
669612 spdxId = "ODbL-1.0";
670613 fullName = "Open Data Commons Open Database License v1.0";
671614 };
672615
673− ofl = {
616+ ofl = spdx {
674617 spdxId = "OFL-1.1";
675618 fullName = "SIL Open Font License 1.1";
676619 };
677620
678− openldap = {
621+ openldap = spdx {
679622 spdxId = "OLDAP-2.8";
680623 fullName = "Open LDAP Public License v2.8";
681624 };
682625
683− openssl = {
626+ openssl = spdx {
684627 spdxId = "OpenSSL";
685628 fullName = "OpenSSL License";
686629 };
687630
688− osl2 = {
631+ osl2 = spdx {
689632 spdxId = "OSL-2.0";
690633 fullName = "Open Software License 2.0";
691634 };
692635
693− osl21 = {
636+ osl21 = spdx {
694637 spdxId = "OSL-2.1";
695638 fullName = "Open Software License 2.1";
696639 };
697640
698− osl3 = {
641+ osl3 = spdx {
699642 spdxId = "OSL-3.0";
700643 fullName = "Open Software License 3.0";
701644 };
702645
703− parity70 = {
646+ parity70 = spdx {
704647 spdxId = "Parity-7.0.0";
705648 fullName = "Parity Public License 7.0.0";
706649 url = "https://paritylicense.com/versions/7.0.0.html";
707650 };
708651
709− php301 = {
652+ php301 = spdx {
710653 spdxId = "PHP-3.01";
711654 fullName = "PHP License v3.01";
712655 };
713656
714− postgresql = {
657+ postgresql = spdx {
715658 spdxId = "PostgreSQL";
716659 fullName = "PostgreSQL License";
717660 };
@@ -722,7 +665,7 @@ in mkLicense lset) ({
722665 free = false;
723666 };
724667
725− psfl = {
668+ psfl = spdx {
726669 spdxId = "Python-2.0";
727670 fullName = "Python Software Foundation License version 2";
728671 url = "https://docs.python.org/license.html";
@@ -743,12 +686,12 @@ in mkLicense lset) ({
743686 url = "https://prosperitylicense.com/versions/3.0.0.html";
744687 };
745688
746− qhull = {
689+ qhull = spdx {
747690 spdxId = "Qhull";
748691 fullName = "Qhull License";
749692 };
750693
751− qpl = {
694+ qpl = spdx {
752695 spdxId = "QPL-1.0";
753696 fullName = "Q Public License 1.0";
754697 };
@@ -758,22 +701,22 @@ in mkLicense lset) ({
758701 url = "https://qwt.sourceforge.io/qwtlicense.html";
759702 };
760703
761− ruby = {
704+ ruby = spdx {
762705 spdxId = "Ruby";
763706 fullName = "Ruby License";
764707 };
765708
766− sendmail = {
709+ sendmail = spdx {
767710 spdxId = "Sendmail";
768711 fullName = "Sendmail License";
769712 };
770713
771− sgi-b-20 = {
714+ sgi-b-20 = spdx {
772715 spdxId = "SGI-B-2.0";
773716 fullName = "SGI Free Software License B v2.0";
774717 };
775718
776− sleepycat = {
719+ sleepycat = spdx {
777720 spdxId = "Sleepycat";
778721 fullName = "Sleepycat License";
779722 };
@@ -789,19 +732,9 @@ in mkLicense lset) ({
789732 fullName = "Server Side Public License";
790733 url = "https://www.mongodb.com/licensing/server-side-public-license";
791734 free = false;
792− # NOTE Debatable.
793− # The license a slightly modified AGPL but still considered unfree by the
794− # OSI for what seem like political reasons
795− redistributable = true; # Definitely redistributable though, it's an AGPL derivative
796− };
797−
798− stk = {
799− shortName = "stk";
800− fullName = "Synthesis Tool Kit 4.3";
801− url = "https://github.com/thestk/stk/blob/master/LICENSE";
802735 };
803736
804− tcltk = {
737+ tcltk = spdx {
805738 spdxId = "TCL";
806739 fullName = "TCL/TK License";
807740 };
@@ -819,27 +752,20 @@ in mkLicense lset) ({
819752 unfreeRedistributable = {
820753 fullName = "Unfree redistributable";
821754 free = false;
822− redistributable = true;
823755 };
824756
825757 unfreeRedistributableFirmware = {
826758 fullName = "Unfree redistributable firmware";
827− redistributable = true;
828759 # Note: we currently consider these "free" for inclusion in the
829760 # channel and NixOS images.
830761 };
831762
832− unicode-dfs-2015 = {
833− spdxId = "Unicode-DFS-2015";
834− fullName = "Unicode License Agreement - Data Files and Software (2015)";
835− };
836−
837− unicode-dfs-2016 = {
763+ unicode-dfs-2016 = spdx {
838764 spdxId = "Unicode-DFS-2016";
839765 fullName = "Unicode License Agreement - Data Files and Software (2016)";
840766 };
841767
842− unlicense = {
768+ unlicense = spdx {
843769 spdxId = "Unlicense";
844770 fullName = "The Unlicense";
845771 };
@@ -849,7 +775,7 @@ in mkLicense lset) ({
849775 url = "https://oss.oracle.com/licenses/upl/";
850776 };
851777
852− vim = {
778+ vim = spdx {
853779 spdxId = "Vim";
854780 fullName = "Vim License";
855781 };
@@ -860,17 +786,17 @@ in mkLicense lset) ({
860786 free = false;
861787 };
862788
863− vsl10 = {
789+ vsl10 = spdx {
864790 spdxId = "VSL-1.0";
865791 fullName = "Vovida Software License v1.0";
866792 };
867793
868− watcom = {
794+ watcom = spdx {
869795 spdxId = "Watcom-1.0";
870796 fullName = "Sybase Open Watcom Public License 1.0";
871797 };
872798
873− w3c = {
799+ w3c = spdx {
874800 spdxId = "W3C";
875801 fullName = "W3C Software Notice and License";
876802 };
@@ -880,12 +806,12 @@ in mkLicense lset) ({
880806 url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab";
881807 };
882808
883− wtfpl = {
809+ wtfpl = spdx {
884810 spdxId = "WTFPL";
885811 fullName = "Do What The F*ck You Want To Public License";
886812 };
887813
888− wxWindows = {
814+ wxWindows = spdx {
889815 spdxId = "wxWindows";
890816 fullName = "wxWindows Library Licence, Version 3.1";
891817 };
@@ -895,68 +821,68 @@ in mkLicense lset) ({
895821 url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken
896822 };
897823
898− zlib = {
824+ zlib = spdx {
899825 spdxId = "Zlib";
900826 fullName = "zlib License";
901827 };
902828
903− zpl20 = {
829+ zpl20 = spdx {
904830 spdxId = "ZPL-2.0";
905831 fullName = "Zope Public License 2.0";
906832 };
907833
908− zpl21 = {
834+ zpl21 = spdx {
909835 spdxId = "ZPL-2.1";
910836 fullName = "Zope Public License 2.1";
911837 };
912838} // {
913839 # TODO: remove legacy aliases
914− agpl3 = {
840+ agpl3 = spdx {
915841 spdxId = "AGPL-3.0";
916842 fullName = "GNU Affero General Public License v3.0";
917843 deprecated = true;
918844 };
919− fdl11 = {
845+ fdl11 = spdx {
920846 spdxId = "GFDL-1.1";
921847 fullName = "GNU Free Documentation License v1.1";
922848 deprecated = true;
923849 };
924− fdl12 = {
850+ fdl12 = spdx {
925851 spdxId = "GFDL-1.2";
926852 fullName = "GNU Free Documentation License v1.2";
927853 deprecated = true;
928854 };
929− fdl13 = {
855+ fdl13 = spdx {
930856 spdxId = "GFDL-1.3";
931857 fullName = "GNU Free Documentation License v1.3";
932858 deprecated = true;
933859 };
934− gpl1 = {
860+ gpl1 = spdx {
935861 spdxId = "GPL-1.0";
936862 fullName = "GNU General Public License v1.0";
937863 deprecated = true;
938864 };
939− gpl2 = {
865+ gpl2 = spdx {
940866 spdxId = "GPL-2.0";
941867 fullName = "GNU General Public License v2.0";
942868 deprecated = true;
943869 };
944− gpl3 = {
870+ gpl3 = spdx {
945871 spdxId = "GPL-3.0";
946872 fullName = "GNU General Public License v3.0";
947873 deprecated = true;
948874 };
949− lgpl2 = {
875+ lgpl2 = spdx {
950876 spdxId = "LGPL-2.0";
951877 fullName = "GNU Library General Public License v2";
952878 deprecated = true;
953879 };
954− lgpl21 = {
880+ lgpl21 = spdx {
955881 spdxId = "LGPL-2.1";
956882 fullName = "GNU Lesser General Public License v2.1";
957883 deprecated = true;
958884 };
959− lgpl3 = {
885+ lgpl3 = spdx {
960886 spdxId = "LGPL-3.0";
961887 fullName = "GNU Lesser General Public License v3.0";
962888 deprecated = true;
lib/lists.nix+13−11
@@ -4,7 +4,6 @@
44let
55 inherit (lib.strings) toInt;
66 inherit (lib.trivial) compare min;
7− inherit (lib.attrsets) mapAttrs;
87in
98rec {
109
@@ -341,15 +340,15 @@ rec {
341340 groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
342341 => { true = 12; false = 3; }
343342 */
344− groupBy' = op: nul: pred: lst: mapAttrs (name: foldl op nul) (groupBy pred lst);
343+ groupBy' = op: nul: pred: lst:
344+ foldl' (r: e:
345+ let
346+ key = pred e;
347+ in
348+ r // { ${key} = op (r.${key} or nul) e; }
349+ ) {} lst;
345350
346− groupBy = builtins.groupBy or (
347− pred: foldl' (r: e:
348− let
349− key = pred e;
350− in
351− r // { ${key} = (r.${key} or []) ++ [e]; }
352− ) {});
351+ groupBy = groupBy' (sum: e: sum ++ [e]) [];
353352
354353 /* Merges two lists of the same size together. If the sizes aren't the same
355354 the merging stops at the shortest. How both lists are merged is defined
@@ -643,7 +642,7 @@ rec {
643642 unique [ 3 2 3 4 ]
644643 => [ 3 2 4 ]
645644 */
646− unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [];
645+ unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [];
647646
648647 /* Intersects list 'e' and another list. O(nm) complexity.
649648
@@ -664,6 +663,9 @@ rec {
664663 /* Test if two lists have no common element.
665664 It should be slightly more efficient than (intersectLists a b == [])
666665 */
667− mutuallyExclusive = a: b: length a == 0 || !(any (x: elem x a) b);
666+ mutuallyExclusive = a: b:
667+ (builtins.length a) == 0 ||
668+ (!(builtins.elem (builtins.head a) b) &&
669+ mutuallyExclusive (builtins.tail a) b);
668670
669671}
lib/meta.nix+1−42
@@ -78,7 +78,7 @@ rec {
7878
7979 2. (modern) a pattern for the platform `parsed` field.
8080
81− We can inject these into a pattern for the whole of a structured platform,
81+ We can inject these into a patten for the whole of a structured platform,
8282 and then match that.
8383 */
8484 platformMatch = platform: elem: let
@@ -99,45 +99,4 @@ rec {
9999 availableOn = platform: pkg:
100100 lib.any (platformMatch platform) pkg.meta.platforms &&
101101 lib.all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []);
102−
103− /* Get the corresponding attribute in lib.licenses
104− from the SPDX ID.
105− For SPDX IDs, see
106− https://spdx.org/licenses
107−
108− Type:
109− getLicenseFromSpdxId :: str -> AttrSet
110−
111− Example:
112− lib.getLicenseFromSpdxId "MIT" == lib.licenses.mit
113− => true
114− lib.getLicenseFromSpdxId "mIt" == lib.licenses.mit
115− => true
116− lib.getLicenseFromSpdxId "MY LICENSE"
117− => trace: warning: getLicenseFromSpdxId: No license matches the given SPDX ID: MY LICENSE
118− => { shortName = "MY LICENSE"; }
119− */
120− getLicenseFromSpdxId =
121− let
122− spdxLicenses = lib.mapAttrs (id: ls: assert lib.length ls == 1; builtins.head ls)
123− (lib.groupBy (l: lib.toLower l.spdxId) (lib.filter (l: l ? spdxId) (lib.attrValues lib.licenses)));
124− in licstr:
125− spdxLicenses.${ lib.toLower licstr } or (
126− lib.warn "getLicenseFromSpdxId: No license matches the given SPDX ID: ${licstr}"
127− { shortName = licstr; }
128− );
129−
130− /* Get the path to the main program of a derivation with either
131− meta.mainProgram or pname or name
132−
133− Type: getExe :: derivation -> string
134−
135− Example:
136− getExe pkgs.hello
137− => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello"
138− getExe pkgs.mustache-go
139− => "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache"
140− */
141− getExe = x:
142− "${lib.getBin x}/bin/${x.meta.mainProgram or (lib.getName x)}";
143102}
lib/modules.nix+92−341
@@ -9,10 +9,12 @@ let
99 catAttrs
1010 concatLists
1111 concatMap
12− concatStringsSep
12+ count
1313 elem
1414 filter
1515 findFirst
16+ flip
17+ foldl
1618 foldl'
1719 getAttrFromPath
1820 head
@@ -37,7 +39,6 @@ let
3739 toList
3840 types
3941 warnIf
40− zipAttrsWith
4142 ;
4243 inherit (lib.options)
4344 isOption
@@ -46,63 +47,20 @@ let
4647 showFiles
4748 showOption
4849 unknownModule
49− literalExpression
5050 ;
51−
52− showDeclPrefix = loc: decl: prefix:
53− " - option(s) with prefix `${showOption (loc ++ [prefix])}' in module `${decl._file}'";
54− showRawDecls = loc: decls:
55− concatStringsSep "\n"
56− (sort (a: b: a < b)
57− (concatMap
58− (decl: map
59− (showDeclPrefix loc decl)
60− (attrNames decl.options)
61− )
62− decls
63− ));
64−
6551in
6652
6753rec {
6854
69− /*
70− Evaluate a set of modules. The result is a set with the attributes:
71−
72− ‘options’: The nested set of all option declarations,
73−
74− ‘config’: The nested set of all option values.
75−
76− ‘type’: A module system type representing the module set as a submodule,
77− to be extended by configuration from the containing module set.
78−
79− This is also available as the module argument ‘moduleType’.
80−
81− ‘extendModules’: A function similar to ‘evalModules’ but building on top
82− of the module set. Its arguments, ‘modules’ and ‘specialArgs’ are
83− added to the existing values.
84−
85− Using ‘extendModules’ a few times has no performance impact as long
86− as you only reference the final ‘options’ and ‘config’.
87− If you do reference multiple ‘config’ (or ‘options’) from before and
88− after ‘extendModules’, performance is the same as with multiple
89− ‘evalModules’ invocations, because the new modules' ability to
90− override existing configuration fundamentally requires a new
91− fixpoint to be constructed.
92−
93− This is also available as a module argument.
94−
95− ‘_module’: A portion of the configuration tree which is elided from
96− ‘config’. It contains some values that are mostly internal to the
97− module system implementation.
98−
55+ /* Evaluate a set of modules. The result is a set of two
56+ attributes: ‘options’: the nested set of all option declarations,
57+ and ‘config’: the nested set of all option values.
9958 !!! Please think twice before adding to this argument list! The more
10059 that is specified here instead of in the modules themselves the harder
10160 it is to transparently move a set of modules to be a submodule of another
10261 config (as the proper arguments need to be replicated at each call to
10362 evalModules) and the less declarative the module set is. */
104− evalModules = evalModulesArgs@
105− { modules
63+ evalModules = { modules
10664 , prefix ? []
10765 , # This should only be used for special arguments that need to be evaluated
10866 # when resolving module structure (like in imports). For everything else,
@@ -113,39 +71,13 @@ rec {
11371 args ? {}
11472 , # This would be remove in the future, Prefer _module.check option instead.
11573 check ? true
116− # Internal variable to avoid `_key` collisions regardless
117− # of `extendModules`. Used in `submoduleWith`.
118− # Test case: lib/tests/modules, "168767"
119− , extensionOffset ? 0
12074 }:
12175 let
122− withWarnings = x:
123− lib.warnIf (evalModulesArgs?args) "The args argument to evalModules is deprecated. Please set config._module.args instead."
124− lib.warnIf (evalModulesArgs?check) "The check argument to evalModules is deprecated. Please set config._module.check instead."
125− x;
126−
127− legacyModules =
128− optional (evalModulesArgs?args) {
129− config = {
130− _module.args = args;
131− };
132− }
133− ++ optional (evalModulesArgs?check) {
134− config = {
135− _module.check = mkDefault check;
136− };
137− };
138− regularModules = modules ++ legacyModules;
139−
14076 # This internal module declare internal options under the `_module'
14177 # attribute. These options are fragile, as they are used by the
14278 # module system to change the interpretation of modules.
143− #
144− # When extended with extendModules or moduleType, a fresh instance of
145− # this module is used, to avoid conflicts and allow chaining of
146− # extendModules.
14779 internalModule = rec {
148− _file = "lib/modules.nix";
80+ _file = ./modules.nix;
14981
15082 key = _file;
15183
@@ -157,106 +89,21 @@ rec {
15789 # support for that, in turn it's lazy in its values. This means e.g.
15890 # a `_module.args.pkgs = import (fetchTarball { ... }) {}` won't
15991 # start a download when `pkgs` wasn't evaluated.
160− type = types.lazyAttrsOf types.raw;
161− # Only render documentation once at the root of the option tree,
162− # not for all individual submodules.
163− # Allow merging option decls to make this internal regardless.
164− ${if prefix == []
165− then null # unset => visible
166− else "internal"} = true;
167− # TODO: Change the type of this option to a submodule with a
168− # freeformType, so that individual arguments can be documented
169− # separately
170− description = ''
171− Additional arguments passed to each module in addition to ones
172− like <literal>lib</literal>, <literal>config</literal>,
173− and <literal>pkgs</literal>, <literal>modulesPath</literal>.
174− </para>
175− <para>
176− This option is also available to all submodules. Submodules do not
177− inherit args from their parent module, nor do they provide args to
178− their parent module or sibling submodules. The sole exception to
179− this is the argument <literal>name</literal> which is provided by
180− parent modules to a submodule and contains the attribute name
181− the submodule is bound to, or a unique generated name if it is
182− not bound to an attribute.
183− </para>
184− <para>
185− Some arguments are already passed by default, of which the
186− following <emphasis>cannot</emphasis> be changed with this option:
187− <itemizedlist>
188− <listitem>
189− <para>
190− <varname>lib</varname>: The nixpkgs library.
191− </para>
192− </listitem>
193− <listitem>
194− <para>
195− <varname>config</varname>: The results of all options after merging the values from all modules together.
196− </para>
197− </listitem>
198− <listitem>
199− <para>
200− <varname>options</varname>: The options declared in all modules.
201− </para>
202− </listitem>
203− <listitem>
204− <para>
205− <varname>specialArgs</varname>: The <literal>specialArgs</literal> argument passed to <literal>evalModules</literal>.
206− </para>
207− </listitem>
208− <listitem>
209− <para>
210− All attributes of <varname>specialArgs</varname>
211− </para>
212− <para>
213− Whereas option values can generally depend on other option values
214− thanks to laziness, this does not apply to <literal>imports</literal>, which
215− must be computed statically before anything else.
216− </para>
217− <para>
218− For this reason, callers of the module system can provide <literal>specialArgs</literal>
219− which are available during import resolution.
220− </para>
221− <para>
222− For NixOS, <literal>specialArgs</literal> includes
223− <varname>modulesPath</varname>, which allows you to import
224− extra modules from the nixpkgs package tree without having to
225− somehow make the module aware of the location of the
226− <literal>nixpkgs</literal> or NixOS directories.
227− <programlisting>
228− { modulesPath, ... }: {
229− imports = [
230− (modulesPath + "/profiles/minimal.nix")
231− ];
232− }
233− </programlisting>
234− </para>
235− </listitem>
236− </itemizedlist>
237− </para>
238− <para>
239− For NixOS, the default value for this option includes at least this argument:
240− <itemizedlist>
241− <listitem>
242− <para>
243− <varname>pkgs</varname>: The nixpkgs package set according to
244− the <option>nixpkgs.pkgs</option> option.
245− </para>
246− </listitem>
247− </itemizedlist>
248− '';
92+ type = types.lazyAttrsOf types.unspecified;
93+ internal = true;
94+ description = "Arguments passed to each module.";
24995 };
25096
25197 _module.check = mkOption {
25298 type = types.bool;
25399 internal = true;
254− default = true;
100+ default = check;
255101 description = "Whether to check whether all option definitions have matching declarations.";
256102 };
257103
258104 _module.freeformType = mkOption {
259− type = types.nullOr types.optionType;
105+ # Disallow merging for now, but could be implemented nicely with a `types.optionType`
106+ type = types.nullOr (types.uniq types.attrs);
260107 internal = true;
261108 default = null;
262109 description = ''
@@ -273,17 +120,14 @@ rec {
273120 };
274121
275122 config = {
276− _module.args = {
277− inherit extendModules;
278− moduleType = type;
279− };
123+ _module.args = args;
280124 };
281125 };
282126
283127 merged =
284128 let collected = collectModules
285129 (specialArgs.modulesPath or "")
286− (regularModules ++ [ internalModule ])
130+ (modules ++ [ internalModule ])
287131 ({ inherit lib options config specialArgs; } // specialArgs);
288132 in mergeModules prefix (reverseList collected);
289133
@@ -318,51 +162,20 @@ rec {
318162 baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}";
319163 in
320164 if attrNames options == [ "_module" ]
321− then
322− let
323− optionName = showOption prefix;
324− in
325− if optionName == ""
326− then throw ''
327− ${baseMsg}
328−
329− It seems as if you're trying to declare an option by placing it into `config' rather than `options'!
330− ''
331− else
332− throw ''
333− ${baseMsg}
334−
335− However there are no options defined in `${showOption prefix}'. Are you sure you've
336− declared your options properly? This can happen if you e.g. declared your options in `types.submodule'
337− under `config' rather than `options'.
338− ''
165+ then throw ''
166+ ${baseMsg}
167+
168+ However there are no options defined in `${showOption prefix}'. Are you sure you've
169+ declared your options properly? This can happen if you e.g. declared your options in `types.submodule'
170+ under `config' rather than `options'.
171+ ''
339172 else throw baseMsg
340173 else null;
341174
342− checked = builtins.seq checkUnmatched;
343−
344− extendModules = extendArgs@{
345− modules ? [],
346− specialArgs ? {},
347− prefix ? [],
348− extensionOffset ? length modules,
349− }:
350− evalModules (evalModulesArgs // {
351− modules = regularModules ++ modules;
352− specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
353− prefix = extendArgs.prefix or evalModulesArgs.prefix;
354− inherit extensionOffset;
355− });
356−
357− type = lib.types.submoduleWith {
358− inherit modules specialArgs extensionOffset;
359− };
360−
361− result = withWarnings {
362− options = checked options;
363− config = checked (removeAttrs config [ "_module" ]);
364− _module = checked (config._module);
365− inherit extendModules type;
175+ result = builtins.seq checkUnmatched {
176+ inherit options;
177+ config = removeAttrs config [ "_module" ];
178+ inherit (config) _module;
366179 };
367180 in result;
368181
@@ -375,11 +188,11 @@ rec {
375188 # Like unifyModuleSyntax, but also imports paths and calls functions if necessary
376189 loadModule = args: fallbackFile: fallbackKey: m:
377190 if isFunction m || isAttrs m then
378− unifyModuleSyntax fallbackFile fallbackKey (applyModuleArgsIfFunction fallbackKey m args)
191+ unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args)
379192 else if isList m then
380193 let defs = [{ file = fallbackFile; value = m; }]; in
381194 throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}"
382− else unifyModuleSyntax (toString m) (toString m) (applyModuleArgsIfFunction (toString m) (import m) args);
195+ else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args);
383196
384197 /*
385198 Collects all modules recursively into the form
@@ -440,10 +253,6 @@ rec {
440253 in modulesPath: initialModules: args:
441254 filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args);
442255
443− /* Wrap a module with a default location for reporting errors. */
444− setDefaultModuleLocation = file: m:
445− { _file = file; imports = [ m ]; };
446−
447256 /* Massage a module into canonical form, that is, a set consisting
448257 of ‘options’, ‘config’ and ‘imports’ attributes. */
449258 unifyModuleSyntax = file: key: m:
@@ -476,7 +285,7 @@ rec {
476285 config = addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"]));
477286 };
478287
479− applyModuleArgsIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then
288+ applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then
480289 let
481290 # Module arguments are resolved in a strict manner when attribute set
482291 # deconstruction is used. As the arguments are now defined with the
@@ -553,11 +362,10 @@ rec {
553362 }
554363 */
555364 byName = attr: f: modules:
556− zipAttrsWith (n: concatLists)
557− (map (module: let subtree = module.${attr}; in
558− if !(builtins.isAttrs subtree) then
365+ foldl' (acc: module:
366+ if !(builtins.isAttrs module.${attr}) then
559367 throw ''
560− You're trying to declare a value of type `${builtins.typeOf subtree}'
368+ You're trying to declare a value of type `${builtins.typeOf module.${attr}}'
561369 rather than an attribute-set for the option
562370 `${builtins.concatStringsSep "." prefix}'!
563371
@@ -566,8 +374,11 @@ rec {
566374 this option by e.g. referring to `man 5 configuration.nix'!
567375 ''
568376 else
569− mapAttrs (n: f module) subtree
570− ) modules);
377+ acc // (mapAttrs (n: v:
378+ (acc.${n} or []) ++ f module v
379+ ) module.${attr}
380+ )
381+ ) {} modules;
571382 # an attrset 'name' => list of submodules that declare ‘name’.
572383 declsByName = byName "options" (module: option:
573384 [{ inherit (module) _file; options = option; }]
@@ -581,63 +392,28 @@ rec {
581392 [{ inherit (module) file; inherit value; }]
582393 ) configs;
583394
584− # Convert an option tree decl to a submodule option decl
585− optionTreeToOption = decl:
586− if isOption decl.options
587− then decl
588− else decl // {
589− options = mkOption {
590− type = types.submoduleWith {
591− modules = [ { options = decl.options; } ];
592− # `null` is not intended for use by modules. It is an internal
593− # value that means "whatever the user has declared elsewhere".
594− # This might become obsolete with https://github.com/NixOS/nixpkgs/issues/162398
595− shorthandOnlyDefinesConfig = null;
596− };
597− };
598− };
599−
600− resultsByName = mapAttrs (name: decls:
395+ resultsByName = flip mapAttrs declsByName (name: decls:
601396 # We're descending into attribute ‘name’.
602397 let
603398 loc = prefix ++ [name];
604399 defns = defnsByName.${name} or [];
605400 defns' = defnsByName'.${name} or [];
606− optionDecls = filter (m: isOption m.options) decls;
401+ nrOptions = count (m: isOption m.options) decls;
607402 in
608− if length optionDecls == length decls then
403+ if nrOptions == length decls then
609404 let opt = fixupOptionType loc (mergeOptionDecls loc decls);
610405 in {
611406 matchedOptions = evalOptionValue loc opt defns';
612407 unmatchedDefns = [];
613408 }
614− else if optionDecls != [] then
615− if all (x: x.options.type.name == "submodule") optionDecls
616− # Raw options can only be merged into submodules. Merging into
617− # attrsets might be nice, but ambiguous. Suppose we have
618− # attrset as a `attrsOf submodule`. User declares option
619− # attrset.foo.bar, this could mean:
620− # a. option `bar` is only available in `attrset.foo`
621− # b. option `foo.bar` is available in all `attrset.*`
622− # c. reject and require "<name>" as a reminder that it behaves like (b).
623− # d. magically combine (a) and (c).
624− # All of the above are merely syntax sugar though.
625− then
626− let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls));
627− in {
628− matchedOptions = evalOptionValue loc opt defns';
629− unmatchedDefns = [];
630− }
631− else
632− let
633− firstNonOption = findFirst (m: !isOption m.options) "" decls;
634− nonOptions = filter (m: !isOption m.options) decls;
635− in
636− throw "The option `${showOption loc}' in module `${(lib.head optionDecls)._file}' would be a parent of the following options, but its type `${(lib.head optionDecls).options.type.description or "<no description>"}' does not support nested options.\n${
637− showRawDecls loc nonOptions
638− }"
409+ else if nrOptions != 0 then
410+ let
411+ firstOption = findFirst (m: isOption m.options) "" decls;
412+ firstNonOption = findFirst (m: !isOption m.options) "" decls;
413+ in
414+ throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'."
639415 else
640− mergeModules' loc decls defns) declsByName;
416+ mergeModules' loc decls defns);
641417
642418 matchedOptions = mapAttrs (n: v: v.matchedOptions) resultsByName;
643419
@@ -651,19 +427,12 @@ rec {
651427 inherit matchedOptions;
652428
653429 # Transforms unmatchedDefnsByName into a list of definitions
654− unmatchedDefns =
655− if configs == []
656− then
657− # When no config values exist, there can be no unmatched config, so
658− # we short circuit and avoid evaluating more _options_ than necessary.
659− []
660− else
661− concatLists (mapAttrsToList (name: defs:
662− map (def: def // {
663− # Set this so we know when the definition first left unmatched territory
664− prefix = [name] ++ (def.prefix or []);
665− }) defs
666− ) unmatchedDefnsByName);
430+ unmatchedDefns = concatLists (mapAttrsToList (name: defs:
431+ map (def: def // {
432+ # Set this so we know when the definition first left unmatched territory
433+ prefix = [name] ++ (def.prefix or []);
434+ }) defs
435+ ) unmatchedDefnsByName);
667436 };
668437
669438 /* Merge multiple option declarations into a single declaration. In
@@ -679,9 +448,11 @@ rec {
679448 correspond to the definition of 'loc' in 'opt.file'. */
680449 mergeOptionDecls =
681450 let
451+ packSubmodule = file: m:
452+ { _file = file; imports = [ m ]; };
682453 coerceOption = file: opt:
683− if isFunction opt then setDefaultModuleLocation file opt
684− else setDefaultModuleLocation file { options = opt; };
454+ if isFunction opt then packSubmodule file opt
455+ else packSubmodule file { options = opt; };
685456 in loc: opts:
686457 foldl' (res: opt:
687458 let t = res.type;
@@ -702,9 +473,17 @@ rec {
702473 throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}."
703474 else
704475 let
476+ /* Add the modules of the current option to the list of modules
477+ already collected. The options attribute except either a list of
478+ submodules or a submodule. For each submodule, we add the file of the
479+ current option declaration as the file use for the submodule. If the
480+ submodule defines any filename, then we ignore the enclosing option file. */
481+ options' = toList opt.options.options;
482+
705483 getSubModules = opt.options.type.getSubModules or null;
706484 submodules =
707− if getSubModules != null then map (setDefaultModuleLocation opt._file) getSubModules ++ res.options
485+ if getSubModules != null then map (packSubmodule opt._file) getSubModules ++ res.options
486+ else if opt.options ? options then map (coerceOption opt._file) options' ++ res.options
708487 else res.options;
709488 in opt.options // res //
710489 { declarations = res.declarations ++ [opt._file];
@@ -748,8 +527,6 @@ rec {
748527 definitions = map (def: def.value) res.defsFinal;
749528 files = map (def: def.file) res.defsFinal;
750529 inherit (res) isDefined;
751− # This allows options to be correctly displayed using `${options.path.to.it}`
752− __toString = _: showOption loc;
753530 };
754531
755532 # Merge definitions of a value of a given type.
@@ -887,13 +664,26 @@ rec {
887664 compare = a: b: (a.priority or 1000) < (b.priority or 1000);
888665 in sort compare defs';
889666
890− # This calls substSubModules, whose entire purpose is only to ensure that
891− # option declarations in submodules have accurate position information.
892− # TODO: Merge this into mergeOptionDecls
667+ /* Hack for backward compatibility: convert options of type
668+ optionSet to options of type submodule. FIXME: remove
669+ eventually. */
893670 fixupOptionType = loc: opt:
894− if opt.type.getSubModules or null == null
895− then opt // { type = opt.type or types.unspecified; }
896− else opt // { type = opt.type.substSubModules opt.options; options = []; };
671+ let
672+ options = opt.options or
673+ (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
674+ f = tp:
675+ let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet");
676+ in
677+ if tp.name == "option set" || tp.name == "submodule" then
678+ throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}."
679+ else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options)
680+ else if optionSetIn "listOf" then types.listOf (types.submodule options)
681+ else if optionSetIn "nullOr" then types.nullOr (types.submodule options)
682+ else tp;
683+ in
684+ if opt.type.getSubModules or null == null
685+ then opt // { type = f (opt.type or types.unspecified); }
686+ else opt // { type = opt.type.substSubModules opt.options; options = []; };
897687
898688
899689 /* Properties. */
@@ -920,11 +710,12 @@ rec {
920710
921711 mkOptionDefault = mkOverride 1500; # priority of option defaults
922712 mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default
923− mkImageMediaOverride = mkOverride 60; # image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow user to mkForce
924713 mkForce = mkOverride 50;
925714 mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’
926715
927− mkFixStrictness = lib.warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id;
716+ mkStrict = builtins.trace "`mkStrict' is obsolete; use `mkOverride 0' instead." (mkOverride 0);
717+
718+ mkFixStrictness = id; # obsolete, no-op
928719
929720 mkOrder = priority: content:
930721 { _type = "order";
@@ -1025,26 +816,6 @@ rec {
1025816 use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'.";
1026817 };
1027818
1028− mkRenamedOptionModuleWith = {
1029− /* Old option path as list of strings. */
1030− from,
1031− /* New option path as list of strings. */
1032− to,
1033−
1034− /*
1035− Release number of the first release that contains the rename, ignoring backports.
1036− Set it to the upcoming release, matching the nixpkgs/.version file.
1037− */
1038− sinceRelease,
1039−
1040− }: doRename {
1041− inherit from to;
1042− visible = false;
1043− warn = lib.isInOldestRelease sinceRelease;
1044− use = lib.warnIf (lib.isInOldestRelease sinceRelease)
1045− "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'.";
1046− };
1047−
1048819 /* Return a module that causes a warning to be shown if any of the "from"
1049820 option is defined; the defined values can be used in the "mergeFn" to set
1050821 the "to" value.
@@ -1076,7 +847,7 @@ rec {
1076847 mkMergedOptionModule = from: to: mergeFn:
1077848 { config, options, ... }:
1078849 {
1079− options = foldl' recursiveUpdate {} (map (path: setAttrByPath path (mkOption {
850+ options = foldl recursiveUpdate {} (map (path: setAttrByPath path (mkOption {
1080851 visible = false;
1081852 # To use the value in mergeFn without triggering errors
1082853 default = "_mkMergedOptionModule";
@@ -1131,26 +902,6 @@ rec {
1131902 use = id;
1132903 };
1133904
1134− /* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b
1135−
1136− Create config definitions with the same priority as the definition of another option.
1137− This should be used for option definitions where one option sets the value of another as a convenience.
1138− For instance a config file could be set with a `text` or `source` option, where text translates to a `source`
1139− value using `mkDerivedConfig options.text (pkgs.writeText "filename.conf")`.
1140−
1141− It takes care of setting the right priority using `mkOverride`.
1142− */
1143− # TODO: make the module system error message include information about `opt` in
1144− # error messages about conflicts. E.g. introduce a variation of `mkOverride` which
1145− # adds extra location context to the definition object. This will allow context to be added
1146− # to all messages that report option locations "this value was derived from <full option name>
1147− # which was defined in <locations>". It can provide a trace of options that contributed
1148− # to definitions.
1149− mkDerivedConfig = opt: f:
1150− mkOverride
1151− (opt.highestPrio or defaultPriority)
1152− (f opt.value);
1153−
1154905 doRename = { from, to, visible, warn, use, withPriority ? true }:
1155906 { config, options, ... }:
1156907 let
@@ -1180,7 +931,7 @@ rec {
1180931
1181932 /* Use this function to import a JSON file as NixOS configuration.
1182933
1183− modules.importJSON :: path -> attrs
934+ importJSON -> path -> attrs
1184935 */
1185936 importJSON = file: {
1186937 _file = file;
@@ -1189,7 +940,7 @@ rec {
1189940
1190941 /* Use this function to import a TOML file as NixOS configuration.
1191942
1192− modules.importTOML :: path -> attrs
943+ importTOML -> path -> attrs
1193944 */
1194945 importTOML = file: {
1195946 _file = file;
lib/options.nix+19−84
@@ -11,7 +11,6 @@ let
1111 filter
1212 foldl'
1313 head
14− tail
1514 isAttrs
1615 isBool
1716 isDerivation
@@ -26,7 +25,6 @@ let
2625 take
2726 ;
2827 inherit (lib.attrsets)
29− attrByPath
3028 optionalAttrs
3129 ;
3230 inherit (lib.strings)
@@ -55,7 +53,7 @@ rec {
5553
5654 Example:
5755 mkOption { } // => { _type = "option"; }
58− mkOption { default = "foo"; } // => { _type = "option"; default = "foo"; }
56+ mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
5957 */
6058 mkOption =
6159 {
@@ -75,10 +73,12 @@ rec {
7573 apply ? null,
7674 # Whether the option is for NixOS developers only.
7775 internal ? null,
78− # Whether the option shows up in the manual. Default: true. Use false to hide the option and any sub-options from submodules. Use "shallow" to hide only sub-options.
76+ # Whether the option shows up in the manual.
7977 visible ? null,
8078 # Whether the option can be set only once
8179 readOnly ? null,
80+ # Deprecated, used by types.optionSet.
81+ options ? null
8282 } @ attrs:
8383 attrs // { _type = "option"; };
8484
@@ -98,49 +98,6 @@ rec {
9898 type = lib.types.bool;
9999 };
100100
101− /* Creates an Option attribute set for an option that specifies the
102− package a module should use for some purpose.
103−
104− Type: mkPackageOption :: pkgs -> string -> { default :: [string], example :: null | string | [string] } -> option
105−
106− The package is specified as a list of strings representing its attribute path in nixpkgs.
107−
108− Because of this, you need to pass nixpkgs itself as the first argument.
109−
110− The second argument is the name of the option, used in the description "The <name> package to use.".
111−
112− You can also pass an example value, either a literal string or a package's attribute path.
113−
114− You can omit the default path if the name of the option is also attribute path in nixpkgs.
115−
116− Example:
117− mkPackageOption pkgs "hello" { }
118− => { _type = "option"; default = «derivation /nix/store/3r2vg51hlxj3cx5vscp0vkv60bqxkaq0-hello-2.10.drv»; defaultText = { ... }; description = "The hello package to use."; type = { ... }; }
119−
120− Example:
121− mkPackageOption pkgs "GHC" {
122− default = [ "ghc" ];
123− example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
124− }
125− => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; }
126− */
127− mkPackageOption =
128− # Package set (a specific version of nixpkgs)
129− pkgs:
130− # Name for the package, shown in option description
131− name:
132− { default ? [ name ], example ? null }:
133− let default' = if !isList default then [ default ] else default;
134− in mkOption {
135− type = lib.types.package;
136− description = "The ${name} package to use.";
137− default = attrByPath default'
138− (throw "${concatStringsSep "." default'} cannot be found in pkgs") pkgs;
139− defaultText = literalExpression ("pkgs." + concatStringsSep "." default');
140− ${if example != null then "example" else null} = literalExpression
141− (if isList example then "pkgs." + concatStringsSep "." example else example);
142− };
143−
144101 /* This option accepts anything, but it does not produce any result.
145102
146103 This is useful for sharing a module across different module sets
@@ -170,13 +127,11 @@ rec {
170127 else if all isInt list && all (x: x == head list) list then head list
171128 else throw "Cannot merge definitions of `${showOption loc}'. Definition values:${showDefs defs}";
172129
173− mergeOneOption = mergeUniqueOption { message = ""; };
174−
175− mergeUniqueOption = { message }: loc: defs:
176− if length defs == 1
177− then (head defs).value
178− else assert length defs > 1;
179− throw "The option `${showOption loc}' is defined multiple times.\n${message}\nDefinition values:${showDefs defs}";
130+ mergeOneOption = loc: defs:
131+ if defs == [] then abort "This case should never happen."
132+ else if length defs != 1 then
133+ throw "The unique option `${showOption loc}' is defined multiple times. Definition values:${showDefs defs}"
134+ else (head defs).value;
180135
181136 /* "Merge" option definitions by checking that they all have the same value. */
182137 mergeEqualOption = loc: defs:
@@ -189,7 +144,7 @@ rec {
189144 if def.value != first.value then
190145 throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}"
191146 else
192− first) (head defs) (tail defs)).value;
147+ first) (head defs) defs).value;
193148
194149 /* Extracts values of all "value" keys of the given list.
195150
@@ -221,15 +176,12 @@ rec {
221176 docOption = rec {
222177 loc = opt.loc;
223178 name = showOption opt.loc;
224− description = opt.description or null;
179+ description = opt.description or (lib.warn "Option `${name}' has no description." "This option has no description.");
225180 declarations = filter (x: x != unknownModule) opt.declarations;
226181 internal = opt.internal or false;
227− visible =
228− if (opt?visible && opt.visible == "shallow")
229− then true
230− else opt.visible or true;
182+ visible = opt.visible or true;
231183 readOnly = opt.readOnly or false;
232− type = opt.type.description or "unspecified";
184+ type = opt.type.description or null;
233185 }
234186 // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; }
235187 // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }
@@ -239,9 +191,8 @@ rec {
239191 subOptions =
240192 let ss = opt.type.getSubOptions opt.loc;
241193 in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];
242− subOptionsVisible = docOption.visible && opt.visible or null != "shallow";
243194 in
244− [ docOption ] ++ optionals subOptionsVisible subOptions) (collect isOption options);
195+ [ docOption ] ++ optionals docOption.visible subOptions) (collect isOption options);
245196
246197
247198 /* This function recursively removes all derivation attributes from
@@ -260,25 +211,11 @@ rec {
260211 else x;
261212
262213
263− /* For use in the `defaultText` and `example` option attributes. Causes the
264− given string to be rendered verbatim in the documentation as Nix code. This
265− is necessary for complex values, e.g. functions, or values that depend on
266− other values or packages.
267− */
268− literalExpression = text:
269− if ! isString text then throw "literalExpression expects a string."
270− else { _type = "literalExpression"; inherit text; };
271−
272− literalExample = lib.warn "literalExample is deprecated, use literalExpression instead, or use literalDocBook for a non-Nix description." literalExpression;
273−
274−
275− /* For use in the `defaultText` and `example` option attributes. Causes the
276− given DocBook text to be inserted verbatim in the documentation, for when
277− a `literalExpression` would be too hard to read.
214+ /* For use in the `example` option attribute. It causes the given
215+ text to be included verbatim in documentation. This is necessary
216+ for example values that are not simple values, e.g., functions.
278217 */
279− literalDocBook = text:
280− if ! isString text then throw "literalDocBook expects a string."
281− else { _type = "literalDocBook"; inherit text; };
218+ literalExample = text: { _type = "literalExample"; inherit text; };
282219
283220 # Helper functions.
284221
@@ -309,9 +246,7 @@ rec {
309246 showDefs = defs: concatMapStrings (def:
310247 let
311248 # Pretty print the value for display, if successful
312− prettyEval = builtins.tryEval
313− (lib.generators.toPretty { }
314− (lib.generators.withRecursion { depthLimit = 10; throwOnDepthLimit = false; } def.value));
249+ prettyEval = builtins.tryEval (lib.generators.toPretty {} def.value);
315250 # Split it into its lines
316251 lines = filter (v: ! isList v) (builtins.split "\n" prettyEval.value);
317252 # Only display the first 5 lines, and indent them for better visibility
lib/sources.nix+66−170
@@ -1,7 +1,6 @@
11# Functions for copying sources to the Nix store.
22{ lib }:
33
4−# Tested in lib/tests/sources.sh
54let
65 inherit (builtins)
76 hasContext
@@ -12,34 +11,26 @@ let
1211 tryEval
1312 ;
1413 inherit (lib)
15− boolToString
1614 filter
1715 getAttr
1816 isString
1917 pathExists
2018 readFile
2119 ;
20+in
21+rec {
2222
23− /*
24− Returns the type of a path: regular (for file), symlink, or directory.
25− */
26− pathType = path: getAttr (baseNameOf path) (readDir (dirOf path));
23+ # Returns the type of a path: regular (for file), symlink, or directory
24+ pathType = p: getAttr (baseNameOf p) (readDir (dirOf p));
2725
28− /*
29− Returns true if the path exists and is a directory, false otherwise.
30− */
31− pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false;
26+ # Returns true if the path exists and is a directory, false otherwise
27+ pathIsDirectory = p: if pathExists p then (pathType p) == "directory" else false;
3228
33− /*
34− Returns true if the path exists and is a regular file, false otherwise.
35− */
36− pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false;
29+ # Returns true if the path exists and is a regular file, false otherwise
30+ pathIsRegularFile = p: if pathExists p then (pathType p) == "regular" else false;
3731
38− /*
39− A basic filter for `cleanSourceWith` that removes
40− directories of version control system, backup files (*~)
41− and some generated files.
42− */
32+ # Bring in a path as a source, filtering out all Subversion and CVS
33+ # directories, as well as backup files (*~).
4334 cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! (
4435 # Filter out version control software files/directories
4536 (baseName == ".git" || type == "directory" && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
@@ -52,89 +43,62 @@ let
5243 lib.hasSuffix ".o" baseName ||
5344 lib.hasSuffix ".so" baseName ||
5445 # Filter out nix-build result symlinks
55− (type == "symlink" && lib.hasPrefix "result" baseName) ||
56− # Filter out sockets and other types of files we can't have in the store.
57− (type == "unknown")
46+ (type == "symlink" && lib.hasPrefix "result" baseName)
5847 );
5948
60− /*
61− Filters a source tree removing version control files and directories using cleanSourceFilter.
62−
63− Example:
64− cleanSource ./.
65− */
49+ # Filters a source tree removing version control files and directories using cleanSourceWith
50+ #
51+ # Example:
52+ # cleanSource ./.
6653 cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; };
6754
68− /*
69− Like `builtins.filterSource`, except it will compose with itself,
70− allowing you to chain multiple calls together without any
71− intermediate copies being put in the nix store.
72−
73− Example:
74− lib.cleanSourceWith {
75− filter = f;
76− src = lib.cleanSourceWith {
77− filter = g;
78− src = ./.;
79− };
80− }
81− # Succeeds!
82−
83− builtins.filterSource f (builtins.filterSource g ./.)
84− # Fails!
85−
86− */
87− cleanSourceWith =
88− {
89− # A path or cleanSourceWith result to filter and/or rename.
90− src,
91− # Optional with default value: constant true (include everything)
92− # The function will be combined with the && operator such
93− # that src.filter is called lazily.
94− # For implementing a filter, see
95− # https://nixos.org/nix/manual/#builtin-filterSource
96− # Type: A function (path -> type -> bool)
97− filter ? _path: _type: true,
98− # Optional name to use as part of the store path.
99− # This defaults to `src.name` or otherwise `"source"`.
100− name ? null
101− }:
55+ # Like `builtins.filterSource`, except it will compose with itself,
56+ # allowing you to chain multiple calls together without any
57+ # intermediate copies being put in the nix store.
58+ #
59+ # lib.cleanSourceWith {
60+ # filter = f;
61+ # src = lib.cleanSourceWith {
62+ # filter = g;
63+ # src = ./.;
64+ # };
65+ # }
66+ # # Succeeds!
67+ #
68+ # builtins.filterSource f (builtins.filterSource g ./.)
69+ # # Fails!
70+ #
71+ # Parameters:
72+ #
73+ # src: A path or cleanSourceWith result to filter and/or rename.
74+ #
75+ # filter: A function (path -> type -> bool)
76+ # Optional with default value: constant true (include everything)
77+ # The function will be combined with the && operator such
78+ # that src.filter is called lazily.
79+ # For implementing a filter, see
80+ # https://nixos.org/nix/manual/#builtin-filterSource
81+ #
82+ # name: Optional name to use as part of the store path.
83+ # This defaults to `src.name` or otherwise `"source"`.
84+ #
85+ cleanSourceWith = { filter ? _path: _type: true, src, name ? null }:
10286 let
103− orig = toSourceAttributes src;
104− in fromSourceAttributes {
105− inherit (orig) origSrc;
106− filter = path: type: filter path type && orig.filter path type;
107− name = if name != null then name else orig.name;
87+ isFiltered = src ? _isLibCleanSourceWith;
88+ origSrc = if isFiltered then src.origSrc else src;
89+ filter' = if isFiltered then name: type: filter name type && src.filter name type else filter;
90+ name' = if name != null then name else if isFiltered then src.name else "source";
91+ in {
92+ inherit origSrc;
93+ filter = filter';
94+ outPath = builtins.path { filter = filter'; path = origSrc; name = name'; };
95+ _isLibCleanSourceWith = true;
96+ name = name';
10897 };
10998
110− /*
111− Add logging to a source, for troubleshooting the filtering behavior.
112− Type:
113− sources.trace :: sourceLike -> Source
114− */
115− trace =
116− # Source to debug. The returned source will behave like this source, but also log its filter invocations.
117− src:
118− let
119− attrs = toSourceAttributes src;
120− in
121− fromSourceAttributes (
122− attrs // {
123− filter = path: type:
124− let
125− r = attrs.filter path type;
126− in
127− builtins.trace "${attrs.name}.filter ${path} = ${boolToString r}" r;
128− }
129− ) // {
130− satisfiesSubpathInvariant = src ? satisfiesSubpathInvariant && src.satisfiesSubpathInvariant;
131− };
132−
133− /*
134− Filter sources by a list of regular expressions.
135−
136− Example: src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]
137− */
99+ # Filter sources by a list of regular expressions.
100+ #
101+ # E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]`
138102 sourceByRegex = src: regexes:
139103 let
140104 isFiltered = src ? _isLibCleanSourceWith;
@@ -146,34 +110,19 @@ let
146110 inherit src;
147111 };
148112
149− /*
150− Get all files ending with the specified suffices from the given
151− source directory or its descendants, omitting files that do not match
152− any suffix. The result of the example below will include files like
153− `./dir/module.c` and `./dir/subdir/doc.xml` if present.
154−
155− Type: sourceLike -> [String] -> Source
156−
157− Example:
158− sourceFilesBySuffices ./. [ ".xml" ".c" ]
159− */
160− sourceFilesBySuffices =
161− # Path or source containing the files to be returned
162− src:
163− # A list of file suffix strings
164− exts:
113+ # Get all files ending with the specified suffices from the given
114+ # directory or its descendants. E.g. `sourceFilesBySuffices ./dir
115+ # [".xml" ".c"]'.
116+ sourceFilesBySuffices = path: exts:
165117 let filter = name: type:
166118 let base = baseNameOf (toString name);
167119 in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;
168− in cleanSourceWith { inherit filter src; };
120+ in cleanSourceWith { inherit filter; src = path; };
169121
170122 pathIsGitRepo = path: (tryEval (commitIdFromGitRepo path)).success;
171123
172− /*
173− Get the commit id of a git repo.
174−
175− Example: commitIdFromGitRepo <nixpkgs/.git>
176− */
124+ # Get the commit id of a git repo
125+ # Example: commitIdFromGitRepo <nixpkgs/.git>
177126 commitIdFromGitRepo =
178127 let readCommitFromFile = file: path:
179128 let fileName = toString path + "/" + file;
@@ -228,57 +177,4 @@ let
228177 pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir);
229178
230179 canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src));
231−
232− # -------------------------------------------------------------------------- #
233− # Internal functions
234− #
235−
236− # toSourceAttributes : sourceLike -> SourceAttrs
237− #
238− # Convert any source-like object into a simple, singular representation.
239− # We don't expose this representation in order to avoid having a fifth path-
240− # like class of objects in the wild.
241− # (Existing ones being: paths, strings, sources and x//{outPath})
242− # So instead of exposing internals, we build a library of combinator functions.
243− toSourceAttributes = src:
244− let
245− isFiltered = src ? _isLibCleanSourceWith;
246− in
247− {
248− # The original path
249− origSrc = if isFiltered then src.origSrc else src;
250− filter = if isFiltered then src.filter else _: _: true;
251− name = if isFiltered then src.name else "source";
252− };
253−
254− # fromSourceAttributes : SourceAttrs -> Source
255− #
256− # Inverse of toSourceAttributes for Source objects.
257− fromSourceAttributes = { origSrc, filter, name }:
258− {
259− _isLibCleanSourceWith = true;
260− inherit origSrc filter name;
261− outPath = builtins.path { inherit filter name; path = origSrc; };
262− };
263−
264−in {
265− inherit
266− pathType
267− pathIsDirectory
268− pathIsRegularFile
269−
270− pathIsGitRepo
271− commitIdFromGitRepo
272−
273− cleanSource
274− cleanSourceWith
275− cleanSourceFilter
276− pathHasContext
277− canCleanSource
278−
279− sourceByRegex
280− sourceFilesBySuffices
281−
282− trace
283− ;
284180}
lib/strings.nix+8−212
@@ -17,7 +17,6 @@ rec {
1717 head
1818 isInt
1919 isList
20− isAttrs
2120 isString
2221 match
2322 parseDrvName
@@ -90,13 +89,13 @@ rec {
9089 => "usr/local/bin"
9190 */
9291 concatStringsSep = builtins.concatStringsSep or (separator: list:
93− lib.foldl' (x: y: x + y) "" (intersperse separator list));
92+ concatStrings (intersperse separator list));
9493
9594 /* Maps a function over a list of strings and then concatenates the
9695 result with the specified separator interspersed between
9796 elements.
9897
99− Type: concatMapStringsSep :: string -> (a -> string) -> [a] -> string
98+ Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string
10099
101100 Example:
102101 concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"]
@@ -113,7 +112,7 @@ rec {
113112 /* Same as `concatMapStringsSep`, but the mapping function
114113 additionally receives the position of its argument.
115114
116− Type: concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string
115+ Type: concatIMapStringsSep :: string -> (int -> string -> string) -> [string] -> string
117116
118117 Example:
119118 concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
@@ -254,7 +253,10 @@ rec {
254253 => false
255254 */
256255 hasInfix = infix: content:
257− builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
256+ let
257+ drop = x: substring 1 (stringLength x) x;
258+ in hasPrefix infix content
259+ || content != "" && hasInfix infix (drop content);
258260
259261 /* Convert a string to a list of characters (i.e. singleton strings).
260262 This allows you to, e.g., map a function over each character. However,
@@ -325,65 +327,6 @@ rec {
325327 */
326328 escapeShellArgs = concatMapStringsSep " " escapeShellArg;
327329
328− /* Test whether the given name is a valid POSIX shell variable name.
329−
330− Type: string -> bool
331−
332− Example:
333− isValidPosixName "foo_bar000"
334− => true
335− isValidPosixName "0-bad.jpg"
336− => false
337− */
338− isValidPosixName = name: match "[a-zA-Z_][a-zA-Z0-9_]*" name != null;
339−
340− /* Translate a Nix value into a shell variable declaration, with proper escaping.
341−
342− Supported value types are strings (mapped to regular variables), lists of strings
343− (mapped to Bash-style arrays) and attribute sets of strings (mapped to Bash-style
344− associative arrays). Note that "strings" include string-coercible values like paths.
345−
346− Strings are translated into POSIX sh-compatible code; lists and attribute sets
347− assume a shell that understands Bash syntax (e.g. Bash or ZSH).
348−
349− Type: string -> (string | listOf string | attrsOf string) -> string
350−
351− Example:
352− ''
353− ${toShellVar "foo" "some string"}
354− [[ "$foo" == "some string" ]]
355− ''
356− */
357− toShellVar = name: value:
358− lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" (
359− if isAttrs value then
360− "declare -A ${name}=(${
361− concatStringsSep " " (lib.mapAttrsToList (n: v:
362− "[${escapeShellArg n}]=${escapeShellArg v}"
363− ) value)
364− })"
365− else if isList value then
366− "declare -a ${name}=(${escapeShellArgs value})"
367− else
368− "${name}=${escapeShellArg value}"
369− );
370−
371− /* Translate an attribute set into corresponding shell variable declarations
372− using `toShellVar`.
373−
374− Type: attrsOf (string | listOf string | attrsOf string) -> string
375−
376− Example:
377− let
378− foo = "value";
379− bar = foo;
380− in ''
381− ${toShellVars { inherit foo bar; }}
382− [[ "$foo" == "$bar" ]]
383− ''
384− */
385− toShellVars = vars: concatStringsSep "\n" (lib.mapAttrsToList toShellVar vars);
386−
387330 /* Turn a string into a Nix expression representing that string
388331
389332 Type: string -> string
@@ -419,19 +362,6 @@ rec {
419362 if match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null
420363 then s else escapeNixString s;
421364
422− /* Escapes a string such that it is safe to include verbatim in an XML
423− document.
424−
425− Type: string -> string
426−
427− Example:
428− escapeXML ''"test" 'test' < & >''
429− => ""test" 'test' < & >"
430− */
431− escapeXML = builtins.replaceStrings
432− ["\"" "'" "<" ">" "&"]
433− [""" "'" "<" ">" "&"];
434−
435365 # Obsolete - use replaceStrings instead.
436366 replaceChars = builtins.replaceStrings or (
437367 del: new: s:
@@ -813,14 +743,7 @@ rec {
813743 sanitizeDerivationName pkgs.hello
814744 => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10"
815745 */
816− sanitizeDerivationName =
817− let okRegex = match "[[:alnum:]+_?=-][[:alnum:]+._?=-]*";
818− in
819− string:
820− # First detect the common case of already valid strings, to speed those up
821− if stringLength string <= 207 && okRegex string != null
822− then unsafeDiscardStringContext string
823− else lib.pipe string [
746+ sanitizeDerivationName = string: lib.pipe string [
824747 # Get rid of string context. This is safe under the assumption that the
825748 # resulting string is only used as a derivation name
826749 unsafeDiscardStringContext
@@ -838,131 +761,4 @@ rec {
838761 (x: if stringLength x == 0 then "unknown" else x)
839762 ];
840763
841− /* Computes the Levenshtein distance between two strings.
842− Complexity O(n*m) where n and m are the lengths of the strings.
843− Algorithm adjusted from https://stackoverflow.com/a/9750974/6605742
844−
845− Type: levenshtein :: string -> string -> int
846−
847− Example:
848− levenshtein "foo" "foo"
849− => 0
850− levenshtein "book" "hook"
851− => 1
852− levenshtein "hello" "Heyo"
853− => 3
854− */
855− levenshtein = a: b: let
856− # Two dimensional array with dimensions (stringLength a + 1, stringLength b + 1)
857− arr = lib.genList (i:
858− lib.genList (j:
859− dist i j
860− ) (stringLength b + 1)
861− ) (stringLength a + 1);
862− d = x: y: lib.elemAt (lib.elemAt arr x) y;
863− dist = i: j:
864− let c = if substring (i - 1) 1 a == substring (j - 1) 1 b
865− then 0 else 1;
866− in
867− if j == 0 then i
868− else if i == 0 then j
869− else lib.min
870− ( lib.min (d (i - 1) j + 1) (d i (j - 1) + 1))
871− ( d (i - 1) (j - 1) + c );
872− in d (stringLength a) (stringLength b);
873−
874− /* Returns the length of the prefix common to both strings.
875− */
876− commonPrefixLength = a: b:
877− let
878− m = lib.min (stringLength a) (stringLength b);
879− go = i: if i >= m then m else if substring i 1 a == substring i 1 b then go (i + 1) else i;
880− in go 0;
881−
882− /* Returns the length of the suffix common to both strings.
883− */
884− commonSuffixLength = a: b:
885− let
886− m = lib.min (stringLength a) (stringLength b);
887− go = i: if i >= m then m else if substring (stringLength a - i - 1) 1 a == substring (stringLength b - i - 1) 1 b then go (i + 1) else i;
888− in go 0;
889−
890− /* Returns whether the levenshtein distance between two strings is at most some value
891− Complexity is O(min(n,m)) for k <= 2 and O(n*m) otherwise
892−
893− Type: levenshteinAtMost :: int -> string -> string -> bool
894−
895− Example:
896− levenshteinAtMost 0 "foo" "foo"
897− => true
898− levenshteinAtMost 1 "foo" "boa"
899− => false
900− levenshteinAtMost 2 "foo" "boa"
901− => true
902− levenshteinAtMost 2 "This is a sentence" "this is a sentense."
903− => false
904− levenshteinAtMost 3 "This is a sentence" "this is a sentense."
905− => true
906−
907− */
908− levenshteinAtMost = let
909− infixDifferAtMost1 = x: y: stringLength x <= 1 && stringLength y <= 1;
910−
911− # This function takes two strings stripped by their common pre and suffix,
912− # and returns whether they differ by at most two by Levenshtein distance.
913− # Because of this stripping, if they do indeed differ by at most two edits,
914− # we know that those edits were (if at all) done at the start or the end,
915− # while the middle has to have stayed the same. This fact is used in the
916− # implementation.
917− infixDifferAtMost2 = x: y:
918− let
919− xlen = stringLength x;
920− ylen = stringLength y;
921− # This function is only called with |x| >= |y| and |x| - |y| <= 2, so
922− # diff is one of 0, 1 or 2
923− diff = xlen - ylen;
924−
925− # Infix of x and y, stripped by the left and right most character
926− xinfix = substring 1 (xlen - 2) x;
927− yinfix = substring 1 (ylen - 2) y;
928−
929− # x and y but a character deleted at the left or right
930− xdelr = substring 0 (xlen - 1) x;
931− xdell = substring 1 (xlen - 1) x;
932− ydelr = substring 0 (ylen - 1) y;
933− ydell = substring 1 (ylen - 1) y;
934− in
935− # A length difference of 2 can only be gotten with 2 delete edits,
936− # which have to have happened at the start and end of x
937− # Example: "abcdef" -> "bcde"
938− if diff == 2 then xinfix == y
939− # A length difference of 1 can only be gotten with a deletion on the
940− # right and a replacement on the left or vice versa.
941− # Example: "abcdef" -> "bcdez" or "zbcde"
942− else if diff == 1 then xinfix == ydelr || xinfix == ydell
943− # No length difference can either happen through replacements on both
944− # sides, or a deletion on the left and an insertion on the right or
945− # vice versa
946− # Example: "abcdef" -> "zbcdez" or "bcdefz" or "zabcde"
947− else xinfix == yinfix || xdelr == ydell || xdell == ydelr;
948−
949− in k: if k <= 0 then a: b: a == b else
950− let f = a: b:
951− let
952− alen = stringLength a;
953− blen = stringLength b;
954− prelen = commonPrefixLength a b;
955− suflen = commonSuffixLength a b;
956− presuflen = prelen + suflen;
957− ainfix = substring prelen (alen - presuflen) a;
958− binfix = substring prelen (blen - presuflen) b;
959− in
960− # Make a be the bigger string
961− if alen < blen then f b a
962− # If a has over k more characters than b, even with k deletes on a, b can't be reached
963− else if alen - blen > k then false
964− else if k == 1 then infixDifferAtMost1 ainfix binfix
965− else if k == 2 then infixDifferAtMost2 ainfix binfix
966− else levenshtein ainfix binfix <= k;
967− in f;
968764}
lib/systems/default.nix+1−4
@@ -8,7 +8,6 @@ rec {
88 platforms = import ./platforms.nix { inherit lib; };
99 examples = import ./examples.nix { inherit lib; };
1010 architectures = import ./architectures.nix { inherit lib; };
11− supported = import ./supported.nix { inherit lib; };
1211
1312 # Elaborate a `localSystem` or `crossSystem` so that it contains everything
1413 # necessary.
@@ -105,11 +104,9 @@ rec {
105104 else if final.isAarch64 then "arm64"
106105 else if final.isx86_32 then "i386"
107106 else if final.isx86_64 then "x86_64"
108− else if final.isMips32 then "mips"
109− else if final.isMips64 then "mips" # linux kernel does not distinguish mips32/mips64
107+ else if final.isMips then "mips"
110108 else if final.isPower then "powerpc"
111109 else if final.isRiscV then "riscv"
112− else if final.isS390 then "s390"
113110 else final.parsed.cpu.name;
114111
115112 qemuArch =
lib/systems/doubles.nix+8−18
@@ -26,22 +26,20 @@ let
2626
2727 # Linux
2828 "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
29− "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "mips64el-linux"
30− "powerpc64-linux" "powerpc64le-linux" "riscv32-linux"
31− "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux"
29+ "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux"
30+ "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux"
3231
3332 # MMIXware
3433 "mmix-mmixware"
3534
3635 # NetBSD
3736 "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd"
38− "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd"
39− "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd"
37+ "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd"
38+ "riscv64-netbsd" "x86_64-netbsd"
4039
4140 # none
42− "aarch64_be-none" "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none"
43− "msp430-none" "or1k-none" "m68k-none" "powerpc-none" "powerpcle-none"
44− "riscv32-none" "riscv64-none" "s390-none" "s390x-none" "vc4-none"
41+ "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none"
42+ "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none"
4543 "x86_64-none"
4644
4745 # OpenBSD
@@ -74,12 +72,8 @@ in {
7472 mips = filterDoubles predicates.isMips;
7573 mmix = filterDoubles predicates.isMmix;
7674 riscv = filterDoubles predicates.isRiscV;
77− riscv32 = filterDoubles predicates.isRiscV32;
78− riscv64 = filterDoubles predicates.isRiscV64;
7975 vc4 = filterDoubles predicates.isVc4;
8076 or1k = filterDoubles predicates.isOr1k;
81− m68k = filterDoubles predicates.isM68k;
82− s390 = filterDoubles predicates.isS390;
8377 js = filterDoubles predicates.isJavaScript;
8478
8579 bigEndian = filterDoubles predicates.isBigEndian;
@@ -89,11 +83,7 @@ in {
8983 darwin = filterDoubles predicates.isDarwin;
9084 freebsd = filterDoubles predicates.isFreeBSD;
9185 # Should be better, but MinGW is unclear.
92− gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; })
93− ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; })
94− ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; })
95− ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabin32; })
96− ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabi64; });
86+ gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
9787 illumos = filterDoubles predicates.isSunOS;
9888 linux = filterDoubles predicates.isLinux;
9989 netbsd = filterDoubles predicates.isNetBSD;
@@ -106,5 +96,5 @@ in {
10696
10797 embedded = filterDoubles predicates.isNone;
10898
109− mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux"];
99+ mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin"];
110100}
lib/systems/examples.nix−39
@@ -93,26 +93,6 @@ rec {
9393 config = "mipsel-unknown-linux-gnu";
9494 } // platforms.fuloong2f_n32;
9595
96− # MIPS ABI table transcribed from here: https://wiki.debian.org/Multiarch/Tuples
97−
98− # can execute on 32bit chip
99− mips-linux-gnu = { config = "mips-linux-gnu"; } // platforms.gcc_mips32r2_o32;
100− mipsel-linux-gnu = { config = "mipsel-linux-gnu"; } // platforms.gcc_mips32r2_o32;
101− mipsisa32r6-linux-gnu = { config = "mipsisa32r6-linux-gnu"; } // platforms.gcc_mips32r6_o32;
102− mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-linux-gnu"; } // platforms.gcc_mips32r6_o32;
103−
104− # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers
105− mips64-linux-gnuabin32 = { config = "mips64-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
106− mips64el-linux-gnuabin32 = { config = "mips64el-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
107− mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32;
108− mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32;
109−
110− # 64bit pointers
111− mips64-linux-gnuabi64 = { config = "mips64-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
112− mips64el-linux-gnuabi64 = { config = "mips64el-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
113− mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-linux-gnuabi64"; } // platforms.gcc_mips64r6_64;
114− mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-linux-gnuabi64"; } // platforms.gcc_mips64r6_64;
115−
11696 muslpi = raspberryPi // {
11797 config = "armv6l-unknown-linux-musleabihf";
11898 };
@@ -164,18 +144,6 @@ rec {
164144 libc = "newlib";
165145 };
166146
167− m68k = {
168− config = "m68k-unknown-linux-gnu";
169− };
170−
171− s390 = {
172− config = "s390-unknown-linux-gnu";
173− };
174−
175− s390x = {
176− config = "s390x-unknown-linux-gnu";
177− };
178−
179147 arm-embedded = {
180148 config = "arm-none-eabi";
181149 libc = "newlib";
@@ -278,12 +246,6 @@ rec {
278246 platform = {};
279247 };
280248
281− x86_64-darwin = {
282− config = "x86_64-apple-darwin";
283− xcodePlatform = "MacOSX";
284− platform = {};
285− };
286−
287249 #
288250 # Windows
289251 #
@@ -310,7 +272,6 @@ rec {
310272 libc = "nblibc";
311273 };
312274
313− # this is broken and never worked fully
314275 x86_64-netbsd-llvm = {
315276 config = "x86_64-unknown-netbsd";
316277 libc = "nblibc";
lib/systems/inspect.nix+1−11
@@ -13,19 +13,12 @@ rec {
1313 isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
1414 isPowerPC = { cpu = cpuTypes.powerpc; };
1515 isPower = { cpu = { family = "power"; }; };
16− isPower64 = { cpu = { family = "power"; bits = 64; }; };
1716 isx86 = { cpu = { family = "x86"; }; };
1817 isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
1918 isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
2019 isMips = { cpu = { family = "mips"; }; };
21− isMips32 = { cpu = { family = "mips"; bits = 32; }; };
22− isMips64 = { cpu = { family = "mips"; bits = 64; }; };
23− isMips64n32 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "n32"; }; };
24− isMips64n64 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "64"; }; };
2520 isMmix = { cpu = { family = "mmix"; }; };
2621 isRiscV = { cpu = { family = "riscv"; }; };
27− isRiscV32 = { cpu = { family = "riscv"; bits = 32; }; };
28− isRiscV64 = { cpu = { family = "riscv"; bits = 64; }; };
2922 isSparc = { cpu = { family = "sparc"; }; };
3023 isWasm = { cpu = { family = "wasm"; }; };
3124 isMsp430 = { cpu = { family = "msp430"; }; };
@@ -33,8 +26,6 @@ rec {
3326 isAvr = { cpu = { family = "avr"; }; };
3427 isAlpha = { cpu = { family = "alpha"; }; };
3528 isOr1k = { cpu = { family = "or1k"; }; };
36− isM68k = { cpu = { family = "m68k"; }; };
37− isS390 = { cpu = { family = "s390"; }; };
3829 isJavaScript = { cpu = cpuTypes.js; };
3930
4031 is32bit = { cpu = { bits = 32; }; };
@@ -63,8 +54,7 @@ rec {
6354 isNone = { kernel = kernels.none; };
6455
6556 isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
66− isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf ];
67− isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ];
57+ isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
6858 isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
6959
7060 isEfi = map (family: { cpu.family = family; })
lib/systems/parse.nix+4−29
@@ -95,8 +95,6 @@ rec {
9595
9696 mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; };
9797
98− m68k = { bits = 32; significantByte = bigEndian; family = "m68k"; };
99−
10098 powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
10199 powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };
102100 powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };
@@ -105,9 +103,6 @@ rec {
105103 riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };
106104 riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
107105
108− s390 = { bits = 32; significantByte = bigEndian; family = "s390"; };
109− s390x = { bits = 64; significantByte = bigEndian; family = "s390"; };
110−
111106 sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; };
112107 sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; };
113108
@@ -126,15 +121,6 @@ rec {
126121 js = { bits = 32; significantByte = littleEndian; family = "js"; };
127122 };
128123
129− # GNU build systems assume that older NetBSD architectures are using a.out.
130− gnuNetBSDDefaultExecFormat = cpu:
131− if (cpu.family == "arm" && cpu.bits == 32) ||
132− (cpu.family == "sparc" && cpu.bits == 32) ||
133− (cpu.family == "m68k" && cpu.bits == 32) ||
134− (cpu.family == "x86" && cpu.bits == 32)
135− then execFormats.aout
136− else execFormats.elf;
137−
138124 # Determine when two CPUs are compatible with each other. That is,
139125 # can code built for system B run on system A? For that to happen,
140126 # the programs that system B accepts must be a subset of the
@@ -290,7 +276,7 @@ rec {
290276
291277 kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
292278 # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as
293− # the normalized name for macOS.
279+ # the nnormalized name for macOS.
294280 macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; };
295281 ios = { execFormat = macho; families = { inherit darwin; }; };
296282 freebsd = { execFormat = elf; families = { inherit bsd; }; };
@@ -359,20 +345,13 @@ rec {
359345 ];
360346 };
361347 gnuabi64 = { abi = "64"; };
362− muslabi64 = { abi = "64"; };
363−
364− # NOTE: abi=n32 requires a 64-bit MIPS chip! That is not a typo.
365− # It is basically the 64-bit abi with 32-bit pointers. Details:
366− # https://www.linux-mips.org/pub/linux/mips/doc/ABI/MIPS-N32-ABI-Handbook.pdf
367− gnuabin32 = { abi = "n32"; };
368− muslabin32 = { abi = "n32"; };
369348
370349 musleabi = { float = "soft"; };
371350 musleabihf = { float = "hard"; };
372351 musl = {};
373352
374− uclibceabi = { float = "soft"; };
375− uclibceabihf = { float = "hard"; };
353+ uclibceabihf = { float = "soft"; };
354+ uclibceabi = { float = "hard"; };
376355 uclibc = {};
377356
378357 unknown = {};
@@ -484,12 +463,8 @@ rec {
484463 else "${cpu.name}-${kernel.name}";
485464
486465 tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let
487− optExecFormat =
488− lib.optionalString (kernel.name == "netbsd" &&
489− gnuNetBSDDefaultExecFormat cpu != kernel.execFormat)
490− kernel.execFormat.name;
491466 optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";
492− in "${cpu.name}-${vendor.name}-${kernel.name}${optExecFormat}${optAbi}";
467+ in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}";
493468
494469 ################################################################################
495470
lib/systems/platforms.nix+7−62
@@ -1,10 +1,3 @@
1−# Note: lib/systems/default.nix takes care of producing valid,
2−# fully-formed "platform" values (e.g. hostPlatform, buildPlatform,
3−# targetPlatform, etc) containing at least the minimal set of attrs
4−# required (see types.parsedPlatform in lib/systems/parse.nix). This
5−# file takes an already-valid platform and further elaborates it with
6−# optional fields; currently these are: linux-kernel, gcc, and rustc.
7−
81{ lib }:
92rec {
103 pc = {
@@ -27,17 +20,15 @@ rec {
2720 name = "PowerNV";
2821
2922 baseConfig = "powernv_defconfig";
30− target = "vmlinux";
23+ target = "zImage";
24+ installTarget = "install";
25+ file = "vmlinux";
3126 autoModules = true;
3227 # avoid driver/FS trouble arising from unusual page size
3328 extraConfig = ''
3429 PPC_64K_PAGES n
3530 PPC_4K_PAGES y
3631 IPV6 y
37−
38− ATA_BMDMA y
39− ATA_SFF y
40− VIRTIO_MENU y
4132 '';
4233 };
4334 };
@@ -242,7 +233,7 @@ rec {
242233 };
243234 };
244235
245− scaleway-c1 = armv7l-hf-multiplatform // {
236+ scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform {
246237 gcc = {
247238 cpu = "cortex-a9";
248239 fpu = "vfpv3";
@@ -324,12 +315,6 @@ rec {
324315 # Disable OABI to have seccomp_filter (required for systemd)
325316 # https://github.com/raspberrypi/firmware/issues/651
326317 OABI_COMPAT n
327−
328− # >=5.12 fails with:
329− # drivers/net/ethernet/micrel/ks8851_common.o: in function `ks8851_probe_common':
330− # ks8851_common.c:(.text+0x179c): undefined reference to `__this_module'
331− # See: https://lore.kernel.org/netdev/20210116164828.40545-1-marex@denx.de/T/
332− KS8851_MLL y
333318 '';
334319 };
335320 gcc = {
@@ -489,43 +474,6 @@ rec {
489474 };
490475 };
491476
492− # can execute on 32bit chip
493− gcc_mips32r2_o32 = { gcc = { arch = "mips32r2"; abi = "o32"; }; };
494− gcc_mips32r6_o32 = { gcc = { arch = "mips32r6"; abi = "o32"; }; };
495− gcc_mips64r2_n32 = { gcc = { arch = "mips64r2"; abi = "n32"; }; };
496− gcc_mips64r6_n32 = { gcc = { arch = "mips64r6"; abi = "n32"; }; };
497− gcc_mips64r2_64 = { gcc = { arch = "mips64r2"; abi = "64"; }; };
498− gcc_mips64r6_64 = { gcc = { arch = "mips64r6"; abi = "64"; }; };
499−
500− # based on:
501− # https://www.mail-archive.com/qemu-discuss@nongnu.org/msg05179.html
502− # https://gmplib.org/~tege/qemu.html#mips64-debian
503− mips64el-qemu-linux-gnuabi64 = {
504− linux-kernel = {
505− name = "mips64el";
506− baseConfig = "64r2el_defconfig";
507− target = "vmlinuz";
508− autoModules = false;
509− DTB = true;
510− # for qemu 9p passthrough filesystem
511− extraConfig = ''
512− MIPS_MALTA y
513− PAGE_SIZE_4KB y
514− CPU_LITTLE_ENDIAN y
515− CPU_MIPS64_R2 y
516− 64BIT y
517− CPU_MIPS64_R2 y
518−
519− NET_9P y
520− NET_9P_VIRTIO y
521− 9P_FS y
522− 9P_FS_POSIX_ACL y
523− PCI y
524− VIRTIO_PCI y
525− '';
526− };
527− };
528−
529477 ##
530478 ## Other
531479 ##
@@ -533,19 +481,16 @@ rec {
533481 riscv-multiplatform = {
534482 linux-kernel = {
535483 name = "riscv-multiplatform";
536− target = "Image";
484+ target = "vmlinux";
537485 autoModules = true;
538486 baseConfig = "defconfig";
539− DTB = true;
540487 extraConfig = ''
488+ FTRACE n
541489 SERIAL_OF_PLATFORM y
542490 '';
543491 };
544492 };
545493
546− # This function takes a minimally-valid "platform" and returns an
547− # attrset containing zero or more additional attrs which should be
548− # included in the platform in order to further elaborate it.
549494 select = platform:
550495 # x86
551496 /**/ if platform.isx86 then pc
@@ -568,5 +513,5 @@ rec {
568513
569514 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
570515
571− else { };
516+ else pc;
572517}
lib/systems/supported.nixdeleted−26
@@ -1,26 +0,0 @@
1−# Supported systems according to RFC0046's definition.
2−#
3−# https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
4−{ lib }:
5−rec {
6− # List of systems that are built by Hydra.
7− hydra = tier1 ++ tier2 ++ tier3 ++ [
8− "aarch64-darwin"
9− ];
10−
11− tier1 = [
12− "x86_64-linux"
13− ];
14−
15− tier2 = [
16− "aarch64-linux"
17− "x86_64-darwin"
18− ];
19−
20− tier3 = [
21− "armv6l-linux"
22− "armv7l-linux"
23− "i686-linux"
24− "mipsel-linux"
25− ];
26−}
lib/tests/flakes/subflakeTest/flake.nixdeleted−8
@@ -1,8 +0,0 @@
1−{
2− outputs = { self, subflake, callLocklessFlake }: rec {
3− x = (callLocklessFlake {
4− path = subflake;
5− inputs = {};
6− }).subflakeOutput;
7− };
8−}
lib/tests/flakes/subflakeTest/subflake/flake.nixdeleted−5
@@ -1,5 +0,0 @@
1−{
2− outputs = { self }: {
3− subflakeOutput = 1;
4− };
5−}
lib/tests/maintainers.nix+2−6
@@ -16,10 +16,6 @@ let
1616 email = lib.mkOption {
1717 type = types.str;
1818 };
19− matrix = lib.mkOption {
20− type = types.nullOr types.str;
21− default = null;
22− };
2319 github = lib.mkOption {
2420 type = types.nullOr types.str;
2521 default = null;
@@ -65,9 +61,9 @@ let
6561
6662 missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers);
6763
68− success = pkgs.runCommand "checked-maintainers-success" {} ">$out";
64+ success = pkgs.runCommandNoCC "checked-maintainers-success" {} ">$out";
6965
70− failure = pkgs.runCommand "checked-maintainers-failure" {
66+ failure = pkgs.runCommandNoCC "checked-maintainers-failure" {
7167 nativeBuildInputs = [ pkgs.curl pkgs.jq ];
7268 outputHash = "sha256:${lib.fakeSha256}";
7369 outputHAlgo = "sha256";
lib/tests/misc.nix+2−464
@@ -22,15 +22,6 @@ in
2222
2323runTests {
2424
25−# FLAKES
26−
27− testCallLocklessFlake = {
28− expr = callLocklessFlake {
29− path = ./flakes/subflakeTest;
30− inputs = { subflake = ./flakes/subflakeTest/subflake; inherit callLocklessFlake; };
31− };
32− expected = { x = 1; outPath = ./flakes/subflakeTest; };
33− };
3425
3526# TRIVIAL
3627
@@ -141,16 +132,6 @@ runTests {
141132 expected = [ 1 1 0 ];
142133 };
143134
144− testFunctionArgsFunctor = {
145− expr = functionArgs { __functor = self: { a, b }: null; };
146− expected = { a = false; b = false; };
147− };
148−
149− testFunctionArgsSetFunctionArgs = {
150− expr = functionArgs (setFunctionArgs (args: args.x) { x = false; });
151− expected = { x = false; };
152− };
153−
154135# STRINGS
155136
156137 testConcatMapStrings = {
@@ -255,61 +236,6 @@ runTests {
255236 };
256237 };
257238
258− testEscapeXML = {
259− expr = escapeXML ''"test" 'test' < & >'';
260− expected = ""test" 'test' < & >";
261− };
262−
263− testToShellVars = {
264− expr = ''
265− ${toShellVars {
266− STRing01 = "just a 'string'";
267− _array_ = [ "with" "more strings" ];
268− assoc."with some" = ''
269− strings
270− possibly newlines
271− '';
272− }}
273− '';
274− expected = ''
275− STRing01='just a '\'''string'\''''
276− declare -a _array_=('with' 'more strings')
277− declare -A assoc=(['with some']='strings
278− possibly newlines
279− ')
280− '';
281− };
282−
283− testHasInfixFalse = {
284− expr = hasInfix "c" "abde";
285− expected = false;
286− };
287−
288− testHasInfixTrue = {
289− expr = hasInfix "c" "abcde";
290− expected = true;
291− };
292−
293− testHasInfixDerivation = {
294− expr = hasInfix "hello" (import ../.. { system = "x86_64-linux"; }).hello;
295− expected = true;
296− };
297−
298− testHasInfixPath = {
299− expr = hasInfix "tests" ./.;
300− expected = true;
301− };
302−
303− testHasInfixPathStoreDir = {
304− expr = hasInfix builtins.storeDir ./.;
305− expected = true;
306− };
307−
308− testHasInfixToString = {
309− expr = hasInfix "a" { __toString = _: "a"; };
310− expected = true;
311− };
312−
313239# LISTS
314240
315241 testFilter = {
@@ -530,66 +456,6 @@ runTests {
530456 '';
531457 };
532458
533− testToINIWithGlobalSectionEmpty = {
534− expr = generators.toINIWithGlobalSection {} {
535− globalSection = {
536− };
537− sections = {
538− };
539− };
540− expected = ''
541− '';
542− };
543−
544− testToINIWithGlobalSectionGlobalEmptyIsTheSameAsToINI =
545− let
546− sections = {
547− "section 1" = {
548− attribute1 = 5;
549− x = "Me-se JarJar Binx";
550− };
551− "foo" = {
552− "he\\h=he" = "this is okay";
553− };
554− };
555− in {
556− expr =
557− generators.toINIWithGlobalSection {} {
558− globalSection = {};
559− sections = sections;
560− };
561− expected = generators.toINI {} sections;
562− };
563−
564− testToINIWithGlobalSectionFull = {
565− expr = generators.toINIWithGlobalSection {} {
566− globalSection = {
567− foo = "bar";
568− test = false;
569− };
570− sections = {
571− "section 1" = {
572− attribute1 = 5;
573− x = "Me-se JarJar Binx";
574− };
575− "foo" = {
576− "he\\h=he" = "this is okay";
577− };
578− };
579− };
580− expected = ''
581− foo=bar
582− test=false
583−
584− [foo]
585− he\h\=he=this is okay
586−
587− [section 1]
588− attribute1=5
589− x=Me-se JarJar Binx
590− '';
591− };
592−
593459 /* right now only invocation check */
594460 testToJSONSimple =
595461 let val = {
@@ -615,7 +481,7 @@ runTests {
615481
616482 testToPretty =
617483 let
618− deriv = derivation { name = "test"; builder = "/bin/sh"; system = "aarch64-linux"; };
484+ deriv = derivation { name = "test"; builder = "/bin/sh"; system = builtins.currentSystem; };
619485 in {
620486 expr = mapAttrs (const (generators.toPretty { multiline = false; })) rec {
621487 int = 42;
@@ -653,25 +519,6 @@ runTests {
653519 };
654520 };
655521
656− testToPrettyLimit =
657− let
658− a.b = 1;
659− a.c = a;
660− in {
661− expr = generators.toPretty { } (generators.withRecursion { throwOnDepthLimit = false; depthLimit = 2; } a);
662− expected = "{\n b = 1;\n c = {\n b = \"<unevaluated>\";\n c = {\n b = \"<unevaluated>\";\n c = \"<unevaluated>\";\n };\n };\n}";
663− };
664−
665− testToPrettyLimitThrow =
666− let
667− a.b = 1;
668− a.c = a;
669− in {
670− expr = (builtins.tryEval
671− (generators.toPretty { } (generators.withRecursion { depthLimit = 2; } a))).success;
672− expected = false;
673− };
674−
675522 testToPrettyMultiline = {
676523 expr = mapAttrs (const (generators.toPretty { })) rec {
677524 list = [ 3 4 [ false ] ];
@@ -768,11 +615,6 @@ runTests {
768615 expected = "foo";
769616 };
770617
771− testSanitizeDerivationNameUnicode = testSanitizeDerivationName {
772− name = "fö";
773− expected = "f-";
774− };
775−
776618 testSanitizeDerivationNameAscii = testSanitizeDerivationName {
777619 name = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
778620 expected = "-+--.-0123456789-=-?-ABCDEFGHIJKLMNOPQRSTUVWXYZ-_-abcdefghijklmnopqrstuvwxyz-";
@@ -815,7 +657,7 @@ runTests {
815657
816658 locs = filter (o: ! o.internal) (optionAttrSetToDocList options);
817659 in map (o: o.loc) locs;
818− expected = [ [ "_module" "args" ] [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
660+ expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
819661 };
820662
821663 testCartesianProductOfEmptySet = {
@@ -885,308 +727,4 @@ runTests {
885727 { a = 3; b = 30; c = 300; }
886728 ];
887729 };
888−
889− # The example from the showAttrPath documentation
890− testShowAttrPathExample = {
891− expr = showAttrPath [ "foo" "10" "bar" ];
892− expected = "foo.\"10\".bar";
893− };
894−
895− testShowAttrPathEmpty = {
896− expr = showAttrPath [];
897− expected = "<root attribute path>";
898− };
899−
900− testShowAttrPathVarious = {
901− expr = showAttrPath [
902− "."
903− "foo"
904− "2"
905− "a2-b"
906− "_bc'de"
907− ];
908− expected = ''".".foo."2".a2-b._bc'de'';
909− };
910−
911− testGroupBy = {
912− expr = groupBy (n: toString (mod n 5)) (range 0 16);
913− expected = {
914− "0" = [ 0 5 10 15 ];
915− "1" = [ 1 6 11 16 ];
916− "2" = [ 2 7 12 ];
917− "3" = [ 3 8 13 ];
918− "4" = [ 4 9 14 ];
919− };
920− };
921−
922− testGroupBy' = {
923− expr = groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ];
924− expected = { false = 3; true = 12; };
925− };
926−
927− # The example from the updateManyAttrsByPath documentation
928− testUpdateManyAttrsByPathExample = {
929− expr = updateManyAttrsByPath [
930− {
931− path = [ "a" "b" ];
932− update = old: { d = old.c; };
933− }
934− {
935− path = [ "a" "b" "c" ];
936− update = old: old + 1;
937− }
938− {
939− path = [ "x" "y" ];
940− update = old: "xy";
941− }
942− ] { a.b.c = 0; };
943− expected = { a = { b = { d = 1; }; }; x = { y = "xy"; }; };
944− };
945−
946− # If there are no updates, the value is passed through
947− testUpdateManyAttrsByPathNone = {
948− expr = updateManyAttrsByPath [] "something";
949− expected = "something";
950− };
951−
952− # A single update to the root path is just like applying the function directly
953− testUpdateManyAttrsByPathSingleIncrement = {
954− expr = updateManyAttrsByPath [
955− {
956− path = [ ];
957− update = old: old + 1;
958− }
959− ] 0;
960− expected = 1;
961− };
962−
963− # Multiple updates can be applied are done in order
964− testUpdateManyAttrsByPathMultipleIncrements = {
965− expr = updateManyAttrsByPath [
966− {
967− path = [ ];
968− update = old: old + "a";
969− }
970− {
971− path = [ ];
972− update = old: old + "b";
973− }
974− {
975− path = [ ];
976− update = old: old + "c";
977− }
978− ] "";
979− expected = "abc";
980− };
981−
982− # If an update doesn't use the value, all previous updates are not evaluated
983− testUpdateManyAttrsByPathLazy = {
984− expr = updateManyAttrsByPath [
985− {
986− path = [ ];
987− update = old: old + throw "nope";
988− }
989− {
990− path = [ ];
991− update = old: "untainted";
992− }
993− ] (throw "start");
994− expected = "untainted";
995− };
996−
997− # Deeply nested attributes can be updated without affecting others
998− testUpdateManyAttrsByPathDeep = {
999− expr = updateManyAttrsByPath [
1000− {
1001− path = [ "a" "b" "c" ];
1002− update = old: old + 1;
1003− }
1004− ] {
1005− a.b.c = 0;
1006−
1007− a.b.z = 0;
1008− a.y.z = 0;
1009− x.y.z = 0;
1010− };
1011− expected = {
1012− a.b.c = 1;
1013−
1014− a.b.z = 0;
1015− a.y.z = 0;
1016− x.y.z = 0;
1017− };
1018− };
1019−
1020− # Nested attributes are updated first
1021− testUpdateManyAttrsByPathNestedBeforehand = {
1022− expr = updateManyAttrsByPath [
1023− {
1024− path = [ "a" ];
1025− update = old: old // { x = old.b; };
1026− }
1027− {
1028− path = [ "a" "b" ];
1029− update = old: old + 1;
1030− }
1031− ] {
1032− a.b = 0;
1033− };
1034− expected = {
1035− a.b = 1;
1036− a.x = 1;
1037− };
1038− };
1039−
1040− ## Levenshtein distance functions and co.
1041− testCommonPrefixLengthEmpty = {
1042− expr = strings.commonPrefixLength "" "hello";
1043− expected = 0;
1044− };
1045−
1046− testCommonPrefixLengthSame = {
1047− expr = strings.commonPrefixLength "hello" "hello";
1048− expected = 5;
1049− };
1050−
1051− testCommonPrefixLengthDiffering = {
1052− expr = strings.commonPrefixLength "hello" "hey";
1053− expected = 2;
1054− };
1055−
1056− testCommonSuffixLengthEmpty = {
1057− expr = strings.commonSuffixLength "" "hello";
1058− expected = 0;
1059− };
1060−
1061− testCommonSuffixLengthSame = {
1062− expr = strings.commonSuffixLength "hello" "hello";
1063− expected = 5;
1064− };
1065−
1066− testCommonSuffixLengthDiffering = {
1067− expr = strings.commonSuffixLength "test" "rest";
1068− expected = 3;
1069− };
1070−
1071− testLevenshteinEmpty = {
1072− expr = strings.levenshtein "" "";
1073− expected = 0;
1074− };
1075−
1076− testLevenshteinOnlyAdd = {
1077− expr = strings.levenshtein "" "hello there";
1078− expected = 11;
1079− };
1080−
1081− testLevenshteinOnlyRemove = {
1082− expr = strings.levenshtein "hello there" "";
1083− expected = 11;
1084− };
1085−
1086− testLevenshteinOnlyTransform = {
1087− expr = strings.levenshtein "abcdef" "ghijkl";
1088− expected = 6;
1089− };
1090−
1091− testLevenshteinMixed = {
1092− expr = strings.levenshtein "kitchen" "sitting";
1093− expected = 5;
1094− };
1095−
1096− testLevenshteinAtMostZeroFalse = {
1097− expr = strings.levenshteinAtMost 0 "foo" "boo";
1098− expected = false;
1099− };
1100−
1101− testLevenshteinAtMostZeroTrue = {
1102− expr = strings.levenshteinAtMost 0 "foo" "foo";
1103− expected = true;
1104− };
1105−
1106− testLevenshteinAtMostOneFalse = {
1107− expr = strings.levenshteinAtMost 1 "car" "ct";
1108− expected = false;
1109− };
1110−
1111− testLevenshteinAtMostOneTrue = {
1112− expr = strings.levenshteinAtMost 1 "car" "cr";
1113− expected = true;
1114− };
1115−
1116− # We test levenshteinAtMost 2 particularly well because it uses a complicated
1117− # implementation
1118− testLevenshteinAtMostTwoIsEmpty = {
1119− expr = strings.levenshteinAtMost 2 "" "";
1120− expected = true;
1121− };
1122−
1123− testLevenshteinAtMostTwoIsZero = {
1124− expr = strings.levenshteinAtMost 2 "abcdef" "abcdef";
1125− expected = true;
1126− };
1127−
1128− testLevenshteinAtMostTwoIsOne = {
1129− expr = strings.levenshteinAtMost 2 "abcdef" "abddef";
1130− expected = true;
1131− };
1132−
1133− testLevenshteinAtMostTwoDiff0False = {
1134− expr = strings.levenshteinAtMost 2 "abcdef" "aczyef";
1135− expected = false;
1136− };
1137−
1138− testLevenshteinAtMostTwoDiff0Outer = {
1139− expr = strings.levenshteinAtMost 2 "abcdef" "zbcdez";
1140− expected = true;
1141− };
1142−
1143− testLevenshteinAtMostTwoDiff0DelLeft = {
1144− expr = strings.levenshteinAtMost 2 "abcdef" "bcdefz";
1145− expected = true;
1146− };
1147−
1148− testLevenshteinAtMostTwoDiff0DelRight = {
1149− expr = strings.levenshteinAtMost 2 "abcdef" "zabcde";
1150− expected = true;
1151− };
1152−
1153− testLevenshteinAtMostTwoDiff1False = {
1154− expr = strings.levenshteinAtMost 2 "abcdef" "bddez";
1155− expected = false;
1156− };
1157−
1158− testLevenshteinAtMostTwoDiff1DelLeft = {
1159− expr = strings.levenshteinAtMost 2 "abcdef" "bcdez";
1160− expected = true;
1161− };
1162−
1163− testLevenshteinAtMostTwoDiff1DelRight = {
1164− expr = strings.levenshteinAtMost 2 "abcdef" "zbcde";
1165− expected = true;
1166− };
1167−
1168− testLevenshteinAtMostTwoDiff2False = {
1169− expr = strings.levenshteinAtMost 2 "hello" "hxo";
1170− expected = false;
1171− };
1172−
1173− testLevenshteinAtMostTwoDiff2True = {
1174− expr = strings.levenshteinAtMost 2 "hello" "heo";
1175− expected = true;
1176− };
1177−
1178− testLevenshteinAtMostTwoDiff3 = {
1179− expr = strings.levenshteinAtMost 2 "hello" "ho";
1180− expected = false;
1181− };
1182−
1183− testLevenshteinAtMostThreeFalse = {
1184− expr = strings.levenshteinAtMost 3 "hello" "Holla!";
1185− expected = false;
1186− };
1187−
1188− testLevenshteinAtMostThreeTrue = {
1189− expr = strings.levenshteinAtMost 3 "hello" "Holla";
1190− expected = true;
1191− };
1192730}
lib/tests/modules.sh+121−180
@@ -1,11 +1,8 @@
1−#!/usr/bin/env bash
1+#!/bin/sh
22#
33# This script is used to test that the module system is working as expected.
44# By default it test the version of nixpkgs which is defined in the NIX_PATH.
55
6−set -o errexit -o noclobber -o nounset -o pipefail
7−shopt -s failglob inherit_errexit
8−
96# https://stackoverflow.com/a/246128/6605742
107DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
118
@@ -16,103 +13,101 @@ fail=0
1613
1714evalConfig() {
1815 local attr=$1
19− shift
20− local script="import ./default.nix { modules = [ $* ];}"
16+ shift;
17+ local script="import ./default.nix { modules = [ $@ ];}"
2118 nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace --read-write-mode
2219}
2320
2421reportFailure() {
2522 local attr=$1
26− shift
27− local script="import ./default.nix { modules = [ $* ];}"
23+ shift;
24+ local script="import ./default.nix { modules = [ $@ ];}"
2825 echo 2>&1 "$ nix-instantiate -E '$script' -A '$attr' --eval-only"
29− evalConfig "$attr" "$@" || true
30− ((++fail))
26+ evalConfig "$attr" "$@"
27+ fail=$((fail + 1))
3128}
3229
3330checkConfigOutput() {
3431 local outputContains=$1
35− shift
32+ shift;
3633 if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then
37− ((++pass))
34+ pass=$((pass + 1))
35+ return 0;
3836 else
3937 echo 2>&1 "error: Expected result matching '$outputContains', while evaluating"
4038 reportFailure "$@"
39+ return 1
4140 fi
4241}
4342
4443checkConfigError() {
4544 local errorContains=$1
4645 local err=""
47− shift
48− if err="$(evalConfig "$@" 2>&1 >/dev/null)"; then
46+ shift;
47+ if err==$(evalConfig "$@" 2>&1 >/dev/null); then
4948 echo 2>&1 "error: Expected error code, got exit code 0, while evaluating"
5049 reportFailure "$@"
50+ return 1
5151 else
5252 if echo "$err" | grep -zP --silent "$errorContains" ; then
53− ((++pass))
53+ pass=$((pass + 1))
54+ return 0;
5455 else
5556 echo 2>&1 "error: Expected error matching '$errorContains', while evaluating"
5657 reportFailure "$@"
58+ return 1
5759 fi
5860 fi
5961}
6062
6163# Check boolean option.
62−checkConfigOutput '^false$' config.enable ./declare-enable.nix
63−checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix
64−
65−checkConfigOutput '^1$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix
66−checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix
67−checkConfigOutput '^42$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix
68−checkConfigOutput '^420$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix
69−checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./define-shorthandOnlyDefinesConfig-true.nix
70−checkConfigError 'The option .bare-submodule.deep. in .*/declare-bare-submodule-deep-option.nix. is already declared in .*/declare-bare-submodule-deep-option-duplicate.nix' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./declare-bare-submodule-deep-option-duplicate.nix
64+checkConfigOutput "false" config.enable ./declare-enable.nix
65+checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./define-enable.nix
7166
7267# Check integer types.
7368# unsigned
74−checkConfigOutput '^42$' config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix
75−checkConfigError 'A definition for option .* is not of type.*unsigned integer.*. Definition values:\n\s*- In .*: -23' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix
69+checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix
70+checkConfigError 'A definition for option .* is not of type.*unsigned integer.*. Definition values:\n- In .*: -23' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix
7671# positive
77−checkConfigError 'A definition for option .* is not of type.*positive integer.*. Definition values:\n\s*- In .*: 0' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix
72+checkConfigError 'A definition for option .* is not of type.*positive integer.*. Definition values:\n- In .*: 0' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix
7873# between
79−checkConfigOutput '^42$' config.value ./declare-int-between-value.nix ./define-value-int-positive.nix
80−checkConfigError 'A definition for option .* is not of type.*between.*-21 and 43.*inclusive.*. Definition values:\n\s*- In .*: -23' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix
74+checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix
75+checkConfigError 'A definition for option .* is not of type.*between.*-21 and 43.*inclusive.*. Definition values:\n- In .*: -23' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix
8176
8277# Check either types
8378# types.either
84−checkConfigOutput '^42$' config.value ./declare-either.nix ./define-value-int-positive.nix
85−checkConfigOutput '^"24"$' config.value ./declare-either.nix ./define-value-string.nix
79+checkConfigOutput "42" config.value ./declare-either.nix ./define-value-int-positive.nix
80+checkConfigOutput "\"24\"" config.value ./declare-either.nix ./define-value-string.nix
8681# types.oneOf
87−checkConfigOutput '^42$' config.value ./declare-oneOf.nix ./define-value-int-positive.nix
88−checkConfigOutput '^\[ \]$' config.value ./declare-oneOf.nix ./define-value-list.nix
89−checkConfigOutput '^"24"$' config.value ./declare-oneOf.nix ./define-value-string.nix
82+checkConfigOutput "42" config.value ./declare-oneOf.nix ./define-value-int-positive.nix
83+checkConfigOutput "[ ]" config.value ./declare-oneOf.nix ./define-value-list.nix
84+checkConfigOutput "\"24\"" config.value ./declare-oneOf.nix ./define-value-string.nix
9085
9186# Check mkForce without submodules.
9287set -- config.enable ./declare-enable.nix ./define-enable.nix
93−checkConfigOutput '^true$' "$@"
94−checkConfigOutput '^false$' "$@" ./define-force-enable.nix
95−checkConfigOutput '^false$' "$@" ./define-enable-force.nix
88+checkConfigOutput "true" "$@"
89+checkConfigOutput "false" "$@" ./define-force-enable.nix
90+checkConfigOutput "false" "$@" ./define-enable-force.nix
9691
9792# Check mkForce with option and submodules.
9893checkConfigError 'attribute .*foo.* .* not found' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix
99−checkConfigOutput '^false$' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix
94+checkConfigOutput 'false' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix
10095set -- config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo-enable.nix
101−checkConfigOutput '^true$' "$@"
102−checkConfigOutput '^false$' "$@" ./define-force-attrsOfSub-foo-enable.nix
103−checkConfigOutput '^false$' "$@" ./define-attrsOfSub-force-foo-enable.nix
104−checkConfigOutput '^false$' "$@" ./define-attrsOfSub-foo-force-enable.nix
105−checkConfigOutput '^false$' "$@" ./define-attrsOfSub-foo-enable-force.nix
96+checkConfigOutput 'true' "$@"
97+checkConfigOutput 'false' "$@" ./define-force-attrsOfSub-foo-enable.nix
98+checkConfigOutput 'false' "$@" ./define-attrsOfSub-force-foo-enable.nix
99+checkConfigOutput 'false' "$@" ./define-attrsOfSub-foo-force-enable.nix
100+checkConfigOutput 'false' "$@" ./define-attrsOfSub-foo-enable-force.nix
106101
107102# Check overriding effect of mkForce on submodule definitions.
108103checkConfigError 'attribute .*bar.* .* not found' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix
109−checkConfigOutput '^false$' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar.nix
104+checkConfigOutput 'false' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar.nix
110105set -- config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar-enable.nix
111−checkConfigOutput '^true$' "$@"
106+checkConfigOutput 'true' "$@"
112107checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-force-attrsOfSub-foo-enable.nix
113108checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-attrsOfSub-force-foo-enable.nix
114−checkConfigOutput '^true$' "$@" ./define-attrsOfSub-foo-force-enable.nix
115−checkConfigOutput '^true$' "$@" ./define-attrsOfSub-foo-enable-force.nix
109+checkConfigOutput 'true' "$@" ./define-attrsOfSub-foo-force-enable.nix
110+checkConfigOutput 'true' "$@" ./define-attrsOfSub-foo-enable-force.nix
116111
117112# Check mkIf with submodules.
118113checkConfigError 'attribute .*foo.* .* not found' config.attrsOfSub.foo.enable ./declare-enable.nix ./declare-attrsOfSub-any-enable.nix
@@ -120,24 +115,24 @@ set -- config.attrsOfSub.foo.enable ./declare-enable.nix ./declare-attrsOfSub-an
120115checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-if-attrsOfSub-foo-enable.nix
121116checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-attrsOfSub-if-foo-enable.nix
122117checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-attrsOfSub-foo-if-enable.nix
123−checkConfigOutput '^false$' "$@" ./define-attrsOfSub-foo-enable-if.nix
124−checkConfigOutput '^true$' "$@" ./define-enable.nix ./define-if-attrsOfSub-foo-enable.nix
125−checkConfigOutput '^true$' "$@" ./define-enable.nix ./define-attrsOfSub-if-foo-enable.nix
126−checkConfigOutput '^true$' "$@" ./define-enable.nix ./define-attrsOfSub-foo-if-enable.nix
127−checkConfigOutput '^true$' "$@" ./define-enable.nix ./define-attrsOfSub-foo-enable-if.nix
118+checkConfigOutput 'false' "$@" ./define-attrsOfSub-foo-enable-if.nix
119+checkConfigOutput 'true' "$@" ./define-enable.nix ./define-if-attrsOfSub-foo-enable.nix
120+checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-if-foo-enable.nix
121+checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-foo-if-enable.nix
122+checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-foo-enable-if.nix
128123
129124# Check disabledModules with config definitions and option declarations.
130125set -- config.enable ./define-enable.nix ./declare-enable.nix
131−checkConfigOutput '^true$' "$@"
132−checkConfigOutput '^false$' "$@" ./disable-define-enable.nix
133−checkConfigError "The option .*enable.* does not exist. Definition values:\n\s*- In .*: true" "$@" ./disable-declare-enable.nix
126+checkConfigOutput "true" "$@"
127+checkConfigOutput "false" "$@" ./disable-define-enable.nix
128+checkConfigError "The option .*enable.* does not exist. Definition values:\n- In .*: true" "$@" ./disable-declare-enable.nix
134129checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix
135130checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix
136131
137132# Check _module.args.
138133set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix
139134checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@"
140−checkConfigOutput '^true$' "$@" ./define-_module-args-custom.nix
135+checkConfigOutput "true" "$@" ./define-_module-args-custom.nix
141136
142137# Check that using _module.args on imports cause infinite recursions, with
143138# the proper error context.
@@ -147,78 +142,71 @@ checkConfigError 'infinite recursion encountered' "$@"
147142
148143# Check _module.check.
149144set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix
150−checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*' "$@"
151−checkConfigOutput '^true$' "$@" ./define-module-check.nix
145+checkConfigError 'The option .* does not exist. Definition values:\n- In .*' "$@"
146+checkConfigOutput "true" "$@" ./define-module-check.nix
152147
153148# Check coerced value.
154−checkConfigOutput '^"42"$' config.value ./declare-coerced-value.nix
155−checkConfigOutput '^"24"$' config.value ./declare-coerced-value.nix ./define-value-string.nix
156−checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n\s*- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix
149+checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
150+checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
151+checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix
157152
158153# Check coerced value with unsound coercion
159−checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix
160−checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
161−checkConfigError 'json.exception.parse_error' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
154+checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
155+checkConfigError 'A definition for option .* is not of type .*. Definition values:\n- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
156+checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
162157
163158# Check mkAliasOptionModule.
164−checkConfigOutput '^true$' config.enable ./alias-with-priority.nix
165−checkConfigOutput '^true$' config.enableAlias ./alias-with-priority.nix
166−checkConfigOutput '^false$' config.enable ./alias-with-priority-can-override.nix
167−checkConfigOutput '^false$' config.enableAlias ./alias-with-priority-can-override.nix
159+checkConfigOutput "true" config.enable ./alias-with-priority.nix
160+checkConfigOutput "true" config.enableAlias ./alias-with-priority.nix
161+checkConfigOutput "false" config.enable ./alias-with-priority-can-override.nix
162+checkConfigOutput "false" config.enableAlias ./alias-with-priority-can-override.nix
168163
169164# submoduleWith
170165
171166## specialArgs should work
172−checkConfigOutput '^"foo"$' config.submodule.foo ./declare-submoduleWith-special.nix
167+checkConfigOutput "foo" config.submodule.foo ./declare-submoduleWith-special.nix
173168
174169## shorthandOnlyDefines config behaves as expected
175−checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
170+checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
176171checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix
177−checkConfigError "You're trying to declare a value of type \`bool'\n\s*rather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
178−checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
172+checkConfigError "You're trying to declare a value of type \`bool'\nrather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
173+checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
179174
180175## submoduleWith should merge all modules in one swoop
181−checkConfigOutput '^true$' config.submodule.inner ./declare-submoduleWith-modules.nix
182−checkConfigOutput '^true$' config.submodule.outer ./declare-submoduleWith-modules.nix
183−# Should also be able to evaluate the type name (which evaluates freeformType,
184−# which evaluates all the modules defined by the type)
185−checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-submoduleWith-modules.nix
186−
187−## submodules can be declared using (evalModules {...}).type
188−checkConfigOutput '^true$' config.submodule.inner ./declare-submodule-via-evalModules.nix
189−checkConfigOutput '^true$' config.submodule.outer ./declare-submodule-via-evalModules.nix
176+checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules.nix
177+checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix
190178# Should also be able to evaluate the type name (which evaluates freeformType,
191179# which evaluates all the modules defined by the type)
192−checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-submodule-via-evalModules.nix
180+checkConfigOutput "submodule" options.submodule.type.description ./declare-submoduleWith-modules.nix
193181
194182## Paths should be allowed as values and work as expected
195−checkConfigOutput '^true$' config.submodule.enable ./declare-submoduleWith-path.nix
183+checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix
196184
197185# Check that disabledModules works recursively and correctly
198−checkConfigOutput '^true$' config.enable ./disable-recursive/main.nix
199−checkConfigOutput '^true$' config.enable ./disable-recursive/{main.nix,disable-foo.nix}
200−checkConfigOutput '^true$' config.enable ./disable-recursive/{main.nix,disable-bar.nix}
201−checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix}
186+checkConfigOutput "true" config.enable ./disable-recursive/main.nix
187+checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix}
188+checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix}
189+checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix}
202190
203191# Check that imports can depend on derivations
204−checkConfigOutput '^true$' config.enable ./import-from-store.nix
192+checkConfigOutput "true" config.enable ./import-from-store.nix
205193
206194# Check that configs can be conditional on option existence
207−checkConfigOutput '^true$' config.enable ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
208−checkConfigOutput '^360$' config.value ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
209−checkConfigOutput '^7$' config.value ./define-option-dependently.nix ./declare-int-positive-value.nix
210−checkConfigOutput '^true$' config.set.enable ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
211−checkConfigOutput '^360$' config.set.value ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
212−checkConfigOutput '^7$' config.set.value ./define-option-dependently-nested.nix ./declare-int-positive-value-nested.nix
195+checkConfigOutput true config.enable ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
196+checkConfigOutput 360 config.value ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
197+checkConfigOutput 7 config.value ./define-option-dependently.nix ./declare-int-positive-value.nix
198+checkConfigOutput true config.set.enable ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
199+checkConfigOutput 360 config.set.value ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
200+checkConfigOutput 7 config.set.value ./define-option-dependently-nested.nix ./declare-int-positive-value-nested.nix
213201
214202# Check attrsOf and lazyAttrsOf. Only lazyAttrsOf should be lazy, and only
215203# attrsOf should work with conditional definitions
216204# In addition, lazyAttrsOf should honor an options emptyValue
217205checkConfigError "is not lazy" config.isLazy ./declare-attrsOf.nix ./attrsOf-lazy-check.nix
218−checkConfigOutput '^true$' config.isLazy ./declare-lazyAttrsOf.nix ./attrsOf-lazy-check.nix
219−checkConfigOutput '^true$' config.conditionalWorks ./declare-attrsOf.nix ./attrsOf-conditional-check.nix
220−checkConfigOutput '^false$' config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
221−checkConfigOutput '^"empty"$' config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
206+checkConfigOutput "true" config.isLazy ./declare-lazyAttrsOf.nix ./attrsOf-lazy-check.nix
207+checkConfigOutput "true" config.conditionalWorks ./declare-attrsOf.nix ./attrsOf-conditional-check.nix
208+checkConfigOutput "false" config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
209+checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
222210
223211
224212# Even with multiple assignments, a type error should be thrown if any of them aren't valid
@@ -227,109 +215,62 @@ checkConfigError 'A definition for option .* is not of type .*' \
227215
228216## Freeform modules
229217# Assigning without a declared option should work
230−checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix
218+checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.nix
231219# No freeform assigments shouldn't make it error
232−checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix
220+checkConfigOutput '{ }' config ./freeform-attrsOf.nix
233221# but only if the type matches
234222checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix
235223# and properties should be applied
236−checkConfigOutput '^"yes"$' config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix
224+checkConfigOutput yes config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix
237225# Options should still be declarable, and be able to have a type that doesn't match the freeform type
238−checkConfigOutput '^false$' config.enable ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix
239−checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix
226+checkConfigOutput false config.enable ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix
227+checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix
240228# and this should work too with nested values
241−checkConfigOutput '^false$' config.nest.foo ./freeform-attrsOf.nix ./freeform-nested.nix
242−checkConfigOutput '^"bar"$' config.nest.bar ./freeform-attrsOf.nix ./freeform-nested.nix
229+checkConfigOutput false config.nest.foo ./freeform-attrsOf.nix ./freeform-nested.nix
230+checkConfigOutput bar config.nest.bar ./freeform-attrsOf.nix ./freeform-nested.nix
243231# Check whether a declared option can depend on an freeform-typed one
244−checkConfigOutput '^null$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix
245−checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix
232+checkConfigOutput null config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix
233+checkConfigOutput 24 config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix
246234# Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf
247235checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix
248236checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix
249−checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix
250−# submodules in freeformTypes should have their locations annotated
251−checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix
252−# freeformTypes can get merged using `types.type`, including submodules
253−checkConfigOutput '^10$' config.free.xxx.foo ./freeform-submodules.nix
254−checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix
237+checkConfigOutput 24 config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix
255238
256239## types.anything
257240# Check that attribute sets are merged recursively
258−checkConfigOutput '^null$' config.value.foo ./types-anything/nested-attrs.nix
259−checkConfigOutput '^null$' config.value.l1.foo ./types-anything/nested-attrs.nix
260−checkConfigOutput '^null$' config.value.l1.l2.foo ./types-anything/nested-attrs.nix
261−checkConfigOutput '^null$' config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix
241+checkConfigOutput null config.value.foo ./types-anything/nested-attrs.nix
242+checkConfigOutput null config.value.l1.foo ./types-anything/nested-attrs.nix
243+checkConfigOutput null config.value.l1.l2.foo ./types-anything/nested-attrs.nix
244+checkConfigOutput null config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix
262245# Attribute sets that are coercible to strings shouldn't be recursed into
263−checkConfigOutput '^"foo"$' config.value.outPath ./types-anything/attrs-coercible.nix
246+checkConfigOutput foo config.value.outPath ./types-anything/attrs-coercible.nix
264247# Multiple lists aren't concatenated together
265248checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix
266249# Check that all equalizable atoms can be used as long as all definitions are equal
267−checkConfigOutput '^0$' config.value.int ./types-anything/equal-atoms.nix
268−checkConfigOutput '^false$' config.value.bool ./types-anything/equal-atoms.nix
269−checkConfigOutput '^""$' config.value.string ./types-anything/equal-atoms.nix
270−checkConfigOutput '^/$' config.value.path ./types-anything/equal-atoms.nix
271−checkConfigOutput '^null$' config.value.null ./types-anything/equal-atoms.nix
272−checkConfigOutput '^0.1$' config.value.float ./types-anything/equal-atoms.nix
250+checkConfigOutput 0 config.value.int ./types-anything/equal-atoms.nix
251+checkConfigOutput false config.value.bool ./types-anything/equal-atoms.nix
252+checkConfigOutput '""' config.value.string ./types-anything/equal-atoms.nix
253+checkConfigOutput / config.value.path ./types-anything/equal-atoms.nix
254+checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix
255+checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix
273256# Functions can't be merged together
274−checkConfigError "The option .value.multiple-lambdas.<function body>. has conflicting option types" config.applied.multiple-lambdas ./types-anything/functions.nix
275−checkConfigOutput '^<LAMBDA>$' config.value.single-lambda ./types-anything/functions.nix
276−checkConfigOutput '^null$' config.applied.merging-lambdas.x ./types-anything/functions.nix
277−checkConfigOutput '^null$' config.applied.merging-lambdas.y ./types-anything/functions.nix
257+checkConfigError "The option .* has conflicting definition values" config.value.multiple-lambdas ./types-anything/functions.nix
258+checkConfigOutput '<LAMBDA>' config.value.single-lambda ./types-anything/functions.nix
278259# Check that all mk* modifiers are applied
279260checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix
280−checkConfigOutput '^{ }$' config.value.mkiftrue ./types-anything/mk-mods.nix
281−checkConfigOutput '^1$' config.value.mkdefault ./types-anything/mk-mods.nix
282−checkConfigOutput '^{ }$' config.value.mkmerge ./types-anything/mk-mods.nix
283−checkConfigOutput '^true$' config.value.mkbefore ./types-anything/mk-mods.nix
284−checkConfigOutput '^1$' config.value.nested.foo ./types-anything/mk-mods.nix
285−checkConfigOutput '^"baz"$' config.value.nested.bar.baz ./types-anything/mk-mods.nix
261+checkConfigOutput '{ }' config.value.mkiftrue ./types-anything/mk-mods.nix
262+checkConfigOutput 1 config.value.mkdefault ./types-anything/mk-mods.nix
263+checkConfigOutput '{ }' config.value.mkmerge ./types-anything/mk-mods.nix
264+checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix
265+checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix
266+checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix
286267
287268## types.functionTo
288−checkConfigOutput '^"input is input"$' config.result ./functionTo/trivial.nix
289−checkConfigOutput '^"a b"$' config.result ./functionTo/merging-list.nix
290−checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n\s*- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix
291−checkConfigOutput '^"b a"$' config.result ./functionTo/list-order.nix
292−checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix
293−
294−# moduleType
295−checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix
296−checkConfigOutput '^"a b y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
297−checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix
298−
299−## emptyValue's
300−checkConfigOutput "[ ]" config.list.a ./emptyValues.nix
301−checkConfigOutput "{ }" config.attrs.a ./emptyValues.nix
302−checkConfigOutput "null" config.null.a ./emptyValues.nix
303−checkConfigOutput "{ }" config.submodule.a ./emptyValues.nix
304−# These types don't have empty values
305−checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix
306−checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix
307−
308−## types.raw
309−checkConfigOutput "{ foo = <CODE>; }" config.unprocessedNesting ./raw.nix
310−checkConfigOutput "10" config.processedToplevel ./raw.nix
311−checkConfigError "The option .multiple. is defined multiple times" config.multiple ./raw.nix
312−checkConfigOutput "bar" config.priorities ./raw.nix
313−
314−## Option collision
315−checkConfigError \
316− 'The option .set. in module .*/declare-set.nix. would be a parent of the following options, but its type .attribute set of signed integers. does not support nested options.\n\s*- option[(]s[)] with prefix .set.enable. in module .*/declare-enable-nested.nix.' \
317− config.set \
318− ./declare-set.nix ./declare-enable-nested.nix
319−
320−# Test that types.optionType merges types correctly
321−checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix
322−checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix
323−
324−# Test that types.optionType correctly annotates option locations
325−checkConfigError 'The option .theOption.nested. in .other.nix. is already declared in .optionTypeFile.nix.' config.theOption.nested ./optionTypeFile.nix
326−
327−# Test that types.optionType leaves types untouched as long as they don't need to be merged
328−checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix
329−
330−# Anonymous submodules don't get nixed by import resolution/deduplication
331−# because of an `extendModules` bug, issue 168767.
332−checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-imports.nix
269+checkConfigOutput "input is input" config.result ./functionTo/trivial.nix
270+checkConfigOutput "a b" config.result ./functionTo/merging-list.nix
271+checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix
272+checkConfigOutput "b a" config.result ./functionTo/list-order.nix
273+checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
333274
334275cat <<EOF
335276====== module tests ======
@@ -337,7 +278,7 @@ $pass Pass
337278$fail Fail
338279EOF
339280
340−if [ "$fail" -ne 0 ]; then
281+if test $fail -ne 0; then
341282 exit 1
342283fi
343284exit 0
lib/tests/modules/adhoc-freeformType-survives-type-merge.nixdeleted−14
@@ -1,14 +0,0 @@
1−{ lib, ... }: {
2− options.dummy = lib.mkOption { type = lib.types.anything; default = {}; };
3− freeformType =
4− let
5− a = lib.types.attrsOf (lib.types.submodule { options.bar = lib.mkOption { }; });
6− in
7− # modifying types like this breaks type merging.
8− # This test makes sure that type merging is not performed when only a single declaration exists.
9− # Don't modify types in practice!
10− a // {
11− merge = loc: defs: { freeformItems = a.merge loc defs; };
12− };
13− config.foo.bar = "ok";
14−}
lib/tests/modules/declare-attrsOf.nix+1−8
@@ -1,13 +1,6 @@
1−{ lib, ... }:
2−let
3− deathtrapArgs = lib.mapAttrs
4− (k: _: throw "The module system is too strict, accessing an unused option's ${k} mkOption-attribute.")
5− (lib.functionArgs lib.mkOption);
6−in
7−{
1+{ lib, ... }: {
82 options.value = lib.mkOption {
93 type = lib.types.attrsOf lib.types.str;
104 default = {};
115 };
12− options.testing-laziness-so-don't-read-me = lib.mkOption deathtrapArgs;
136}
lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nixdeleted−10
@@ -1,10 +0,0 @@
1−{ lib, ... }:
2−let
3− inherit (lib) mkOption types;
4−in
5−{
6− options.bare-submodule.deep = mkOption {
7− type = types.int;
8− default = 2;
9− };
10−}
lib/tests/modules/declare-bare-submodule-deep-option.nixdeleted−10
@@ -1,10 +0,0 @@
1−{ lib, ... }:
2−let
3− inherit (lib) mkOption types;
4−in
5−{
6− options.bare-submodule.deep = mkOption {
7− type = types.int;
8− default = 2;
9− };
10−}
lib/tests/modules/declare-bare-submodule-nested-option.nixdeleted−19
@@ -1,19 +0,0 @@
1−{ config, lib, ... }:
2−let
3− inherit (lib) mkOption types;
4−in
5−{
6− options.bare-submodule = mkOption {
7− type = types.submoduleWith {
8− shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig;
9− modules = [
10− {
11− options.nested = mkOption {
12− type = types.int;
13− default = 1;
14− };
15− }
16− ];
17− };
18− };
19−}
lib/tests/modules/declare-bare-submodule.nixdeleted−18
@@ -1,18 +0,0 @@
1−{ config, lib, ... }:
2−let
3− inherit (lib) mkOption types;
4−in
5−{
6− options.bare-submodule = mkOption {
7− type = types.submoduleWith {
8− modules = [ ];
9− shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig;
10− };
11− default = {};
12− };
13−
14− # config-dependent options: won't recommend, but useful for making this test parameterized
15− options.shorthandOnlyDefinesConfig = mkOption {
16− default = false;
17− };
18−}
lib/tests/modules/declare-set.nixdeleted−12
@@ -1,12 +0,0 @@
1−{ lib, ... }:
2−
3−{
4− options.set = lib.mkOption {
5− default = { };
6− example = { a = 1; };
7− type = lib.types.attrsOf lib.types.int;
8− description = ''
9− Some descriptive text
10− '';
11− };
12−}
lib/tests/modules/declare-submodule-via-evalModules.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ lib, ... }: {
2− options.submodule = lib.mkOption {
3− inherit (lib.evalModules {
4− modules = [
5− {
6− options.inner = lib.mkOption {
7− type = lib.types.bool;
8− default = false;
9− };
10− }
11− ];
12− }) type;
13− default = {};
14− };
15−
16− config.submodule = lib.mkMerge [
17− ({ lib, ... }: {
18− options.outer = lib.mkOption {
19− type = lib.types.bool;
20− default = false;
21− };
22− })
23− {
24− inner = true;
25− outer = true;
26− }
27− ];
28−}
lib/tests/modules/declare-variants.nixdeleted−9
@@ -1,9 +0,0 @@
1−{ lib, moduleType, ... }:
2−let inherit (lib) mkOption types;
3−in
4−{
5− options.variants = mkOption {
6− type = types.lazyAttrsOf moduleType;
7− default = {};
8− };
9−}
lib/tests/modules/define-bare-submodule-values.nixdeleted−4
@@ -1,4 +0,0 @@
1−{
2− bare-submodule.nested = 42;
3− bare-submodule.deep = 420;
4−}
lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nixdeleted−1
@@ -1 +0,0 @@
1−{ shorthandOnlyDefinesConfig = true; }
lib/tests/modules/define-variant.nixdeleted−22
@@ -1,22 +0,0 @@
1−{ config, lib, ... }:
2−let inherit (lib) types mkOption attrNames;
3−in
4−{
5− options = {
6− attrs = mkOption { type = types.attrsOf lib.types.int; };
7− result = mkOption { };
8− resultFoo = mkOption { };
9− resultFooBar = mkOption { };
10− resultFooFoo = mkOption { };
11− };
12− config = {
13− attrs.a = 1;
14− variants.foo.attrs.b = 1;
15− variants.bar.attrs.y = 1;
16− variants.foo.variants.bar.attrs.z = 1;
17− variants.foo.variants.foo.attrs.c = 3;
18− resultFoo = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.attrs);
19− resultFooBar = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.variants.bar.attrs);
20− resultFooFoo = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.variants.foo.attrs);
21− };
22−}
lib/tests/modules/emptyValues.nixdeleted−36
@@ -1,36 +0,0 @@
1−{ lib, ... }:
2−let
3− inherit (lib) types;
4−in {
5−
6− options = {
7− int = lib.mkOption {
8− type = types.lazyAttrsOf types.int;
9− };
10− list = lib.mkOption {
11− type = types.lazyAttrsOf (types.listOf types.int);
12− };
13− nonEmptyList = lib.mkOption {
14− type = types.lazyAttrsOf (types.nonEmptyListOf types.int);
15− };
16− attrs = lib.mkOption {
17− type = types.lazyAttrsOf (types.attrsOf types.int);
18− };
19− null = lib.mkOption {
20− type = types.lazyAttrsOf (types.nullOr types.int);
21− };
22− submodule = lib.mkOption {
23− type = types.lazyAttrsOf (types.submodule {});
24− };
25− };
26−
27− config = {
28− int.a = lib.mkIf false null;
29− list.a = lib.mkIf false null;
30− nonEmptyList.a = lib.mkIf false null;
31− attrs.a = lib.mkIf false null;
32− null.a = lib.mkIf false null;
33− submodule.a = lib.mkIf false null;
34− };
35−
36−}
lib/tests/modules/extendModules-168767-imports.nixdeleted−41
@@ -1,41 +0,0 @@
1−{ lib
2−, extendModules
3−, ...
4−}:
5−with lib;
6−{
7− imports = [
8−
9− {
10− options.sub = mkOption {
11− default = { };
12− type = types.submodule (
13− { config
14− , extendModules
15− , ...
16− }:
17− {
18− options.value = mkOption {
19− type = types.int;
20− };
21−
22− options.specialisation = mkOption {
23− default = { };
24− inherit
25− (extendModules {
26− modules = [{
27− specialisation = mkOverride 0 { };
28− }];
29− })
30− type;
31− };
32− }
33− );
34− };
35− }
36−
37− { config.sub.value = 1; }
38−
39−
40− ];
41−}
lib/tests/modules/freeform-nested.nix+1−8
@@ -1,14 +1,7 @@
1−{ lib, ... }:
2−let
3− deathtrapArgs = lib.mapAttrs
4− (k: _: throw "The module system is too strict, accessing an unused option's ${k} mkOption-attribute.")
5− (lib.functionArgs lib.mkOption);
6−in
7−{
1+{ lib, ... }: {
82 options.nest.foo = lib.mkOption {
93 type = lib.types.bool;
104 default = false;
115 };
12− options.nest.unused = lib.mkOption deathtrapArgs;
136 config.nest.bar = "bar";
147}
lib/tests/modules/freeform-submodules.nixdeleted−22
@@ -1,22 +0,0 @@
1−{ lib, options, ... }: with lib.types; {
2−
3− options.fooDeclarations = lib.mkOption {
4− default = (options.free.type.getSubOptions [])._freeformOptions.foo.declarations;
5− };
6−
7− options.free = lib.mkOption {
8− type = submodule {
9− config._module.freeformType = lib.mkMerge [
10− (attrsOf (submodule {
11− options.foo = lib.mkOption {};
12− }))
13− (attrsOf (submodule {
14− options.bar = lib.mkOption {};
15− }))
16− ];
17− };
18− };
19−
20− config.free.xxx.foo = 10;
21− config.free.yyy.bar = 10;
22−}
lib/tests/modules/optionTypeFile.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ config, lib, ... }: {
2−
3− _file = "optionTypeFile.nix";
4−
5− options.theType = lib.mkOption {
6− type = lib.types.optionType;
7− };
8−
9− options.theOption = lib.mkOption {
10− type = config.theType;
11− default = {};
12− };
13−
14− config.theType = lib.mkMerge [
15− (lib.types.submodule {
16− options.nested = lib.mkOption {
17− type = lib.types.int;
18− };
19− })
20− (lib.types.submodule {
21− _file = "other.nix";
22− options.nested = lib.mkOption {
23− type = lib.types.str;
24− };
25− })
26− ];
27−
28−}
lib/tests/modules/optionTypeMerging.nixdeleted−27
@@ -1,27 +0,0 @@
1−{ config, lib, ... }: {
2−
3− options.theType = lib.mkOption {
4− type = lib.types.optionType;
5− };
6−
7− options.theOption = lib.mkOption {
8− type = config.theType;
9− };
10−
11− config.theType = lib.mkMerge [
12− (lib.types.submodule {
13− options.int = lib.mkOption {
14− type = lib.types.int;
15− default = 10;
16− };
17− })
18− (lib.types.submodule {
19− options.str = lib.mkOption {
20− type = lib.types.str;
21− };
22− })
23− ];
24−
25− config.theOption.str = "hello";
26−
27−}
lib/tests/modules/raw.nixdeleted−30
@@ -1,30 +0,0 @@
1−{ lib, ... }: {
2−
3− options = {
4− processedToplevel = lib.mkOption {
5− type = lib.types.raw;
6− };
7− unprocessedNesting = lib.mkOption {
8− type = lib.types.raw;
9− };
10− multiple = lib.mkOption {
11− type = lib.types.raw;
12− };
13− priorities = lib.mkOption {
14− type = lib.types.raw;
15− };
16− };
17−
18− config = {
19− processedToplevel = lib.mkIf true 10;
20− unprocessedNesting.foo = throw "foo";
21− multiple = lib.mkMerge [
22− "foo"
23− "foo"
24− ];
25− priorities = lib.mkMerge [
26− "foo"
27− (lib.mkForce "bar")
28− ];
29− };
30−}
lib/tests/modules/types-anything/functions.nix+3−9
@@ -1,22 +1,16 @@
1−{ lib, config, ... }: {
1+{ lib, ... }: {
22
33 options.value = lib.mkOption {
44 type = lib.types.anything;
55 };
66
7− options.applied = lib.mkOption {
8− default = lib.mapAttrs (name: fun: fun null) config.value;
9− };
10−
117 config = lib.mkMerge [
128 {
139 value.single-lambda = x: x;
14− value.multiple-lambdas = x: { inherit x; };
15− value.merging-lambdas = x: { inherit x; };
10+ value.multiple-lambdas = x: x;
1611 }
1712 {
18− value.multiple-lambdas = x: [ x ];
19− value.merging-lambdas = y: { inherit y; };
13+ value.multiple-lambdas = x: x;
2014 }
2115 ];
2216
lib/tests/release.nix+1−9
@@ -3,7 +3,7 @@
33 pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }
44}:
55
6−pkgs.runCommand "nixpkgs-lib-tests" {
6+pkgs.runCommandNoCC "nixpkgs-lib-tests" {
77 buildInputs = [
88 pkgs.nix
99 (import ./check-eval.nix)
@@ -23,18 +23,10 @@ pkgs.runCommand "nixpkgs-lib-tests" {
2323 export NIX_STORE_DIR=$TEST_ROOT/store
2424 export PAGER=cat
2525 cacheDir=$TEST_ROOT/binary-cache
26−
27− mkdir -p $NIX_CONF_DIR
28− echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf
29−
3026 nix-store --init
3127
3228 cp -r ${../.} lib
33− echo "Running lib/tests/modules.sh"
3429 bash lib/tests/modules.sh
3530
36− echo "Running lib/tests/sources.sh"
37− TEST_LIB=$PWD/lib bash lib/tests/sources.sh
38−
3931 touch $out
4032''
lib/tests/sources.shdeleted−61
@@ -1,61 +0,0 @@
1−#!/usr/bin/env bash
2−set -euo pipefail
3−shopt -s inherit_errexit
4−
5−# Use
6−# || die
7−die() {
8− echo >&2 "test case failed: " "$@"
9− exit 1
10−}
11−
12−if test -n "${TEST_LIB:-}"; then
13− NIX_PATH=nixpkgs="$(dirname "$TEST_LIB")"
14−else
15− NIX_PATH=nixpkgs="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.."; pwd)"
16−fi
17−export NIX_PATH
18−
19−work="$(mktemp -d)"
20−clean_up() {
21− rm -rf "$work"
22−}
23−trap clean_up EXIT
24−cd "$work"
25−
26−touch {README.md,module.o,foo.bar}
27−
28−# nix-instantiate doesn't write out the source, only computing the hash, so
29−# this uses the experimental nix command instead.
30−
31−dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
32− cleanSource ./.
33−}")')"
34−(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
35−.
36−./foo.bar
37−./README.md
38−EOF
39−) || die "cleanSource 1"
40−
41−
42−dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
43− cleanSourceWith { src = '"$work"'; filter = path: type: ! hasSuffix ".bar" path; }
44−}")')"
45−(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
46−.
47−./module.o
48−./README.md
49−EOF
50−) || die "cleanSourceWith 1"
51−
52−dir="$(nix eval --impure --raw --expr '(with import <nixpkgs/lib>; "${
53− cleanSourceWith { src = cleanSource '"$work"'; filter = path: type: ! hasSuffix ".bar" path; }
54−}")')"
55−(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
56−.
57−./README.md
58−EOF
59−) || die "cleanSourceWith + cleanSource"
60−
61−echo >&2 tests ok
lib/tests/systems.nix+3−6
@@ -17,11 +17,8 @@ with lib.systems.doubles; lib.runTests {
1717
1818 testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];
1919 testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
20− testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
20+ testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ];
2121 testmmix = mseteq mmix [ "mmix-mmixware" ];
22− testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ];
23− testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ];
24− testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ];
2522 testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
2623
2724 testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
@@ -31,8 +28,8 @@ with lib.systems.doubles; lib.runTests {
3128 testredox = mseteq redox [ "x86_64-redox" ];
3229 testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
3330 testillumos = mseteq illumos [ "x86_64-solaris" ];
34− testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ];
35− testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
31+ testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ];
32+ testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
3633 testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
3734 testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
3835 testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);
lib/trivial.nix+10−128
@@ -61,11 +61,11 @@ rec {
6161 pipe = val: functions:
6262 let reverseApply = x: f: f x;
6363 in builtins.foldl' reverseApply val functions;
64−
65− # note please don’t add a function like `compose = flip pipe`.
66− # This would confuse users, because the order of the functions
67− # in the list is not clear. With pipe, it’s obvious that it
68− # goes first-to-last. With `compose`, not so much.
64+ /* note please don’t add a function like `compose = flip pipe`.
65+ This would confuse users, because the order of the functions
66+ in the list is not clear. With pipe, it’s obvious that it
67+ goes first-to-last. With `compose`, not so much.
68+ */
6969
7070 ## Named versions corresponding to some builtin operators.
7171
@@ -166,36 +166,12 @@ rec {
166166 /* Returns the current nixpkgs release number as string. */
167167 release = lib.strings.fileContents ../.version;
168168
169− /* The latest release that is supported, at the time of release branch-off,
170− if applicable.
171−
172− Ideally, out-of-tree modules should be able to evaluate cleanly with all
173− supported Nixpkgs versions (master, release and old release until EOL).
174− So if possible, deprecation warnings should take effect only when all
175− out-of-tree expressions/libs/modules can upgrade to the new way without
176− losing support for supported Nixpkgs versions.
177−
178− This release number allows deprecation warnings to be implemented such that
179− they take effect as soon as the oldest release reaches end of life. */
180− oldestSupportedRelease =
181− # Update on master only. Do not backport.
182− 2111;
183−
184− /* Whether a feature is supported in all supported releases (at the time of
185− release branch-off, if applicable). See `oldestSupportedRelease`. */
186− isInOldestRelease =
187− /* Release number of feature introduction as an integer, e.g. 2111 for 21.11.
188− Set it to the upcoming release, matching the nixpkgs/.version file.
189− */
190− release:
191− release <= lib.trivial.oldestSupportedRelease;
192−
193169 /* Returns the current nixpkgs release code name.
194170
195171 On each release the first letter is bumped and a new animal is chosen
196172 starting with that new letter.
197173 */
198− codeName = "Quokka";
174+ codeName = "Porcupine";
199175
200176 /* Returns the current nixpkgs version suffix as string. */
201177 versionSuffix =
@@ -327,84 +303,12 @@ rec {
327303 # TODO: figure out a clever way to integrate location information from
328304 # something like __unsafeGetAttrPos.
329305
330− /*
331− Print a warning before returning the second argument. This function behaves
332− like `builtins.trace`, but requires a string message and formats it as a
333− warning, including the `warning: ` prefix.
334−
335− To get a call stack trace and abort evaluation, set the environment variable
336− `NIX_ABORT_ON_WARN=true` and set the Nix options `--option pure-eval false --show-trace`
337−
338− Type: string -> a -> a
339− */
340− warn =
341− if lib.elem (builtins.getEnv "NIX_ABORT_ON_WARN") ["1" "true" "yes"]
342− then msg: builtins.trace "[1;31mwarning: ${msg}[0m" (abort "NIX_ABORT_ON_WARN=true; warnings are treated as unrecoverable errors.")
343− else msg: builtins.trace "[1;31mwarning: ${msg}[0m";
344−
345− /*
346− Like warn, but only warn when the first argument is `true`.
347−
348− Type: bool -> string -> a -> a
349− */
350− warnIf = cond: msg: if cond then warn msg else x: x;
351−
352− /*
353− Like warnIf, but negated (warn if the first argument is `false`).
354−
355− Type: bool -> string -> a -> a
356− */
357− warnIfNot = cond: msg: if cond then x: x else warn msg;
358−
359− /*
360− Like the `assert b; e` expression, but with a custom error message and
361− without the semicolon.
362−
363− If true, return the identity function, `r: r`.
364−
365− If false, throw the error message.
366−
367− Calls can be juxtaposed using function application, as `(r: r) a = a`, so
368− `(r: r) (r: r) a = a`, and so forth.
369−
370− Type: bool -> string -> a -> a
371−
372− Example:
373−
374− throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list."
375− lib.foldr (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.") (r: r) overlays
376− pkgs
377−
378− */
379− throwIfNot = cond: msg: if cond then x: x else throw msg;
380−
381− /*
382− Like throwIfNot, but negated (throw if the first argument is `true`).
383−
384− Type: bool -> string -> a -> a
385− */
386− throwIf = cond: msg: if cond then throw msg else x: x;
387−
388− /* Check if the elements in a list are valid values from a enum, returning the identity function, or throwing an error message otherwise.
389−
390− Example:
391− let colorVariants = ["bright" "dark" "black"]
392− in checkListOfEnum "color variants" [ "standard" "light" "dark" ] colorVariants;
393− =>
394− error: color variants: bright, black unexpected; valid ones: standard, light, dark
395−
396− Type: String -> List ComparableVal -> List ComparableVal -> a -> a
397− */
398− checkListOfEnum = msg: valid: given:
399− let
400− unexpected = lib.subtractLists valid given;
401− in
402− lib.throwIfNot (unexpected == [])
403− "${msg}: ${builtins.concatStringsSep ", " (builtins.map builtins.toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (builtins.map builtins.toString valid)}";
306+ warn = msg: builtins.trace "[1;31mwarning: ${msg}[0m";
307+ warnIf = cond: msg: if cond then warn msg else id;
404308
405309 info = msg: builtins.trace "INFO: ${msg}";
406310
407− showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings;
311+ showWarnings = warnings: res: lib.fold (w: x: warn w x) res warnings;
408312
409313 ## Function annotations
410314
@@ -430,10 +334,7 @@ rec {
430334 has the same return type and semantics as builtins.functionArgs.
431335 setFunctionArgs : (a → b) → Map String Bool.
432336 */
433− functionArgs = f:
434− if f ? __functor
435− then f.__functionArgs or (lib.functionArgs (f.__functor f))
436− else builtins.functionArgs f;
337+ functionArgs = f: f.__functionArgs or (builtins.functionArgs f);
437338
438339 /* Check whether something is a function or something
439340 annotated with function args.
@@ -441,25 +342,6 @@ rec {
441342 isFunction = f: builtins.isFunction f ||
442343 (f ? __functor && isFunction (f.__functor f));
443344
444− /*
445− Turns any non-callable values into constant functions.
446− Returns callable values as is.
447−
448− Example:
449−
450− nix-repl> lib.toFunction 1 2
451− 1
452−
453− nix-repl> lib.toFunction (x: x + 1) 2
454− 3
455− */
456− toFunction =
457− # Any value
458− v:
459− if isFunction v
460− then v
461− else k: v;
462−
463345 /* Convert the given positive integer to a string of its hexadecimal
464346 representation. For example:
465347
lib/types.nix+52−153
@@ -32,6 +32,7 @@ let
3232 last
3333 length
3434 tail
35+ unique
3536 ;
3637 inherit (lib.attrsets)
3738 attrNames
@@ -47,7 +48,6 @@ let
4748 mergeDefaultOption
4849 mergeEqualOption
4950 mergeOneOption
50− mergeUniqueOption
5151 showFiles
5252 showOption
5353 ;
@@ -61,11 +61,7 @@ let
6161 boolToString
6262 ;
6363
64− inherit (lib.modules)
65− mergeDefinitions
66− fixupOptionType
67− mergeOptionDecls
68− ;
64+ inherit (lib.modules) mergeDefinitions;
6965 outer_types =
7066rec {
7167 isType = type: x: (x._type or "") == type;
@@ -166,13 +162,6 @@ rec {
166162 # nixos/doc/manual/development/option-types.xml!
167163 types = rec {
168164
169− raw = mkOptionType rec {
170− name = "raw";
171− description = "raw value";
172− check = value: true;
173− merge = mergeOneOption;
174− };
175−
176165 anything = mkOptionType {
177166 name = "anything";
178167 description = "anything";
@@ -203,12 +192,6 @@ rec {
203192 else (listOf anything).merge;
204193 # This is the type of packages, only accept a single definition
205194 stringCoercibleSet = mergeOneOption;
206− lambda = loc: defs: arg: anything.merge
207− (loc ++ [ "<function body>" ])
208− (map (def: {
209− file = def.file;
210− value = def.value arg;
211− }) defs);
212195 # Otherwise fall back to only allowing all equal definitions
213196 }.${commonType} or mergeEqualOption;
214197 in mergeFunction loc defs;
@@ -304,26 +287,6 @@ rec {
304287 merge = mergeEqualOption;
305288 };
306289
307− nonEmptyStr = mkOptionType {
308− name = "nonEmptyStr";
309− description = "non-empty string";
310− check = x: str.check x && builtins.match "[ \t\n]*" x == null;
311− inherit (str) merge;
312− };
313−
314− # Allow a newline character at the end and trim it in the merge function.
315− singleLineStr =
316− let
317− inherit (strMatching "[^\n\r]*\n?") check merge;
318− in
319− mkOptionType {
320− name = "singleLineStr";
321− description = "(optionally newline-terminated) single-line string";
322− inherit check;
323− merge = loc: defs:
324− lib.removeSuffix "\n" (merge loc defs);
325− };
326−
327290 strMatching = pattern: mkOptionType {
328291 name = "strMatching ${escapeNixString pattern}";
329292 description = "string matching the pattern ${pattern}";
@@ -368,21 +331,13 @@ rec {
368331 emptyValue = { value = {}; };
369332 };
370333
371− # A package is a top-level store path (/nix/store/hash-name). This includes:
372− # - derivations
373− # - more generally, attribute sets with an `outPath` or `__toString` attribute
374− # pointing to a store path, e.g. flake inputs
375− # - strings with context, e.g. "${pkgs.foo}" or (toString pkgs.foo)
376− # - hardcoded store path literals (/nix/store/hash-foo) or strings without context
377− # ("/nix/store/hash-foo"). These get a context added to them using builtins.storePath.
334+ # derivation is a reserved keyword.
378335 package = mkOptionType {
379336 name = "package";
380337 check = x: isDerivation x || isStorePath x;
381338 merge = loc: defs:
382339 let res = mergeOneOption loc defs;
383− in if builtins.isPath res || (builtins.isString res && ! builtins.hasContext res)
384− then toDerivation res
385− else res;
340+ in if isDerivation res then res else toDerivation res;
386341 };
387342
388343 shellPackage = package // {
@@ -409,7 +364,7 @@ rec {
409364 ).optionalValue
410365 ) def.value
411366 ) defs)));
412− emptyValue = { value = []; };
367+ emptyValue = { value = {}; };
413368 getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
414369 getSubModules = elemType.getSubModules;
415370 substSubModules = m: listOf (elemType.substSubModules m);
@@ -421,7 +376,7 @@ rec {
421376 let list = addCheck (types.listOf elemType) (l: l != []);
422377 in list // {
423378 description = "non-empty " + list.description;
424− emptyValue = { }; # no .value attr, meaning unset
379+ # Note: emptyValue is left as is, because another module may define an element.
425380 };
426381
427382 attrsOf = elemType: mkOptionType rec {
@@ -489,18 +444,6 @@ rec {
489444 nestedTypes.elemType = elemType;
490445 };
491446
492− unique = { message }: type: mkOptionType rec {
493− name = "unique";
494− inherit (type) description check;
495− merge = mergeUniqueOption { inherit message; };
496− emptyValue = type.emptyValue;
497− getSubOptions = type.getSubOptions;
498− getSubModules = type.getSubModules;
499− substSubModules = m: uniq (type.substSubModules m);
500− functor = (defaultFunctor name) // { wrapped = type; };
501− nestedTypes.elemType = type;
502− };
503−
504447 # Null or value of ...
505448 nullOr = elemType: mkOptionType rec {
506449 name = "nullOr";
@@ -522,7 +465,7 @@ rec {
522465
523466 functionTo = elemType: mkOptionType {
524467 name = "functionTo";
525− description = "function that evaluates to a(n) ${elemType.description}";
468+ description = "function that evaluates to a(n) ${elemType.name}";
526469 check = isFunction;
527470 merge = loc: defs:
528471 fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue;
@@ -537,84 +480,29 @@ rec {
537480 modules = toList modules;
538481 };
539482
540− # The type of a type!
541− optionType = mkOptionType {
542− name = "optionType";
543− description = "optionType";
544− check = value: value._type or null == "option-type";
545− merge = loc: defs:
546− if length defs == 1
547− then (head defs).value
548− else let
549− # Prepares the type definitions for mergeOptionDecls, which
550− # annotates submodules types with file locations
551− optionModules = map ({ value, file }:
552− {
553− _file = file;
554− # There's no way to merge types directly from the module system,
555− # but we can cheat a bit by just declaring an option with the type
556− options = lib.mkOption {
557− type = value;
558− };
559− }
560− ) defs;
561− # Merges all the types into a single one, including submodule merging.
562− # This also propagates file information to all submodules
563− mergedOption = fixupOptionType loc (mergeOptionDecls loc optionModules);
564− in mergedOption.type;
565− };
566−
567483 submoduleWith =
568484 { modules
569485 , specialArgs ? {}
570486 , shorthandOnlyDefinesConfig ? false
571−
572− # Internal variable to avoid `_key` collisions regardless
573− # of `extendModules`. Wired through by `evalModules`.
574− # Test case: lib/tests/modules, "168767"
575− , extensionOffset ? 0
576487 }@attrs:
577488 let
578489 inherit (lib.modules) evalModules;
579490
580− shorthandToModule = if shorthandOnlyDefinesConfig == false
581− then value: value
582− else value: { config = value; };
583−
584− allModules = defs: imap1 (n: { value, file }:
585− if isFunction value
586− then setFunctionArgs
587− (args: lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (value args))
588− (functionArgs value)
589− else if isAttrs value
590− then
591− lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (shorthandToModule value)
491+ coerce = unify: value: if isFunction value
492+ then setFunctionArgs (args: unify (value args)) (functionArgs value)
493+ else unify (if shorthandOnlyDefinesConfig then { config = value; } else value);
494+
495+ allModules = defs: modules ++ imap1 (n: { value, file }:
496+ if isAttrs value || isFunction value then
497+ # Annotate the value with the location of its definition for better error messages
498+ coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value
592499 else value
593500 ) defs;
594501
595− base = evalModules {
596− inherit specialArgs;
597− modules = [{
598− # This is a work-around for the fact that some sub-modules,
599− # such as the one included in an attribute set, expects an "args"
600− # attribute to be given to the sub-module. As the option
601− # evaluation does not have any specific attribute name yet, we
602− # provide a default for the documentation and the freeform type.
603− #
604− # This is necessary as some option declaration might use the
605− # "name" attribute given as argument of the submodule and use it
606− # as the default of option declarations.
607− #
608− # We use lookalike unicode single angle quotation marks because
609− # of the docbook transformation the options receive. In all uses
610− # > and < wouldn't be encoded correctly so the encoded values
611− # would be used, and use of `<` and `>` would break the XML document.
612− # It shouldn't cause an issue since this is cosmetic for the manual.
613− _module.args.name = lib.mkOptionDefault "‹name›";
614− }] ++ modules;
615− };
616−
617− freeformType = base._module.freeformType;
502+ freeformType = (evalModules {
503+ inherit modules specialArgs;
504+ args.name = "‹name›";
505+ })._module.freeformType;
618506
619507 in
620508 mkOptionType rec {
@@ -622,14 +510,32 @@ rec {
622510 description = freeformType.description or name;
623511 check = x: isAttrs x || isFunction x || path.check x;
624512 merge = loc: defs:
625− (base.extendModules {
626− modules = [ { _module.args.name = last loc; } ] ++ allModules defs;
513+ (evalModules {
514+ modules = allModules defs;
515+ inherit specialArgs;
516+ args.name = last loc;
627517 prefix = loc;
628− extensionOffset = extensionOffset + length defs;
629518 }).config;
630519 emptyValue = { value = {}; };
631− getSubOptions = prefix: (base.extendModules
632− { inherit prefix; }).options // optionalAttrs (freeformType != null) {
520+ getSubOptions = prefix: (evalModules
521+ { inherit modules prefix specialArgs;
522+ # This is a work-around due to the fact that some sub-modules,
523+ # such as the one included in an attribute set, expects a "args"
524+ # attribute to be given to the sub-module. As the option
525+ # evaluation does not have any specific attribute name, we
526+ # provide a default one for the documentation.
527+ #
528+ # This is mandatory as some option declaration might use the
529+ # "name" attribute given as argument of the submodule and use it
530+ # as the default of option declarations.
531+ #
532+ # Using lookalike unicode single angle quotation marks because
533+ # of the docbook transformation the options receive. In all uses
534+ # > and < wouldn't be encoded correctly so the encoded values
535+ # would be used, and use of `<` and `>` would break the XML document.
536+ # It shouldn't cause an issue since this is cosmetic for the manual.
537+ args.name = "‹name›";
538+ }).options // optionalAttrs (freeformType != null) {
633539 # Expose the sub options of the freeform type. Note that the option
634540 # discovery doesn't care about the attribute name used here, so this
635541 # is just to avoid conflicts with potential options from the submodule
@@ -657,11 +563,7 @@ rec {
657563 then lhs.specialArgs // rhs.specialArgs
658564 else throw "A submoduleWith option is declared multiple times with the same specialArgs \"${toString (attrNames intersecting)}\"";
659565 shorthandOnlyDefinesConfig =
660− if lhs.shorthandOnlyDefinesConfig == null
661− then rhs.shorthandOnlyDefinesConfig
662− else if rhs.shorthandOnlyDefinesConfig == null
663− then lhs.shorthandOnlyDefinesConfig
664− else if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig
566+ if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig
665567 then lhs.shorthandOnlyDefinesConfig
666568 else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values";
667569 };
@@ -671,7 +573,6 @@ rec {
671573 # A value from a set of allowed ones.
672574 enum = values:
673575 let
674− inherit (lib.lists) unique;
675576 show = v:
676577 if builtins.isString v then ''"${v}"''
677578 else if builtins.isInt v then builtins.toString v
@@ -680,17 +581,7 @@ rec {
680581 in
681582 mkOptionType rec {
682583 name = "enum";
683− description =
684− # Length 0 or 1 enums may occur in a design pattern with type merging
685− # where an "interface" module declares an empty enum and other modules
686− # provide implementations, each extending the enum with their own
687− # identifier.
688− if values == [] then
689− "impossible (empty enum)"
690− else if builtins.length values == 1 then
691− "value ${show (builtins.head values)} (singular enum)"
692− else
693− "one of ${concatMapStringsSep ", " show values}";
584+ description = "one of ${concatMapStringsSep ", " show values}";
694585 check = flip elem values;
695586 merge = mergeEqualOption;
696587 functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); };
@@ -755,6 +646,14 @@ rec {
755646 nestedTypes.finalType = finalType;
756647 };
757648
649+ # Obsolete alternative to configOf. It takes its option
650+ # declarations from the ‘options’ attribute of containing option
651+ # declaration.
652+ optionSet = mkOptionType {
653+ name = "optionSet";
654+ description = "option set";
655+ deprecationMessage = "Use `types.submodule' instead";
656+ };
758657 # Augment the given type with an additional type check function.
759658 addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };
760659
maintainers/maintainer-list.nix+215−3120
This diff is too big to show here.
maintainers/scripts/check-maintainer-github-handles.sh+9−9
This diff is too big to show here.
maintainers/scripts/copy-tarballs.pl+1−15
This diff is too big to show here.
maintainers/scripts/db-to-md.shdeleted−88
This diff is too big to show here.
maintainers/scripts/dep-licenses.sh+1−1
This diff is too big to show here.
maintainers/scripts/doc/escape-code-markup.pydeleted−97
This diff is too big to show here.
maintainers/scripts/doc/replace-xrefs-by-empty-links.pydeleted−32
This diff is too big to show here.
maintainers/scripts/doc/unknown-code-language.luadeleted−12
This diff is too big to show here.
maintainers/scripts/feature-freeze-teams.pldeleted−98
This diff is too big to show here.
maintainers/scripts/find-tarballs.nix+1−1
This diff is too big to show here.
maintainers/scripts/haskell/dependencies.nixdeleted−10
This diff is too big to show here.
maintainers/scripts/haskell/hydra-report.hs+33−115
This diff is too big to show here.
maintainers/scripts/haskell/maintained-broken-pkgs.nixdeleted−22
This diff is too big to show here.
maintainers/scripts/haskell/maintainer-handles.nixdeleted−7
This diff is too big to show here.
maintainers/scripts/haskell/mark-broken.sh+6−8
This diff is too big to show here.
maintainers/scripts/haskell/merge-and-open-pr.shdeleted−122
This diff is too big to show here.
maintainers/scripts/haskell/regenerate-hackage-packages.sh+3−5
This diff is too big to show here.
maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh+1−1
This diff is too big to show here.
maintainers/scripts/haskell/test-configurations.nixdeleted−136
This diff is too big to show here.
maintainers/scripts/haskell/update-stackage.sh+24−26
This diff is too big to show here.
maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.shdeleted−22
This diff is too big to show here.
maintainers/scripts/luarocks-packages.csv+87−87
This diff is too big to show here.
maintainers/scripts/pluginupdate.py+212−358
This diff is too big to show here.
maintainers/scripts/rebuild-amount.sh+79−86
This diff is too big to show here.
maintainers/scripts/remove-old-aliases.pydeleted−211
This diff is too big to show here.
maintainers/scripts/update-luarocks-packages+125−207
This diff is too big to show here.
maintainers/scripts/update-luarocks-shell.nix+3−4
This diff is too big to show here.
maintainers/scripts/update-ruby-packages+1−4
This diff is too big to show here.
maintainers/scripts/update.nix+3−3
This diff is too big to show here.
maintainers/scripts/update.py+1−5
This diff is too big to show here.
maintainers/scripts/vanity.sh+19−19
This diff is too big to show here.
maintainers/team-list.nix+6−468
This diff is too big to show here.
nixos/default.nix+24−1
This diff is too big to show here.
nixos/doc/manual/READMEnew file+3
This diff is too big to show here.
nixos/doc/manual/README.mddeleted−3
This diff is too big to show here.
nixos/doc/manual/administration/boot-problems.section.mddeleted−41
This diff is too big to show here.
nixos/doc/manual/administration/boot-problems.xmlnew file+126
This diff is too big to show here.
nixos/doc/manual/administration/cleaning-store.chapter.mddeleted−62
This diff is too big to show here.
nixos/doc/manual/administration/cleaning-store.xmlnew file+63
This diff is too big to show here.
nixos/doc/manual/administration/container-networking.section.mddeleted−44
This diff is too big to show here.
nixos/doc/manual/administration/container-networking.xmlnew file+59
This diff is too big to show here.
nixos/doc/manual/administration/containers.chapter.mddeleted−28
This diff is too big to show here.
nixos/doc/manual/administration/containers.xmlnew file+34
This diff is too big to show here.
nixos/doc/manual/administration/control-groups.chapter.mddeleted−59
This diff is too big to show here.
nixos/doc/manual/administration/control-groups.xmlnew file+65
This diff is too big to show here.
nixos/doc/manual/administration/declarative-containers.section.mddeleted−48
This diff is too big to show here.
nixos/doc/manual/administration/declarative-containers.xmlnew file+60
This diff is too big to show here.
nixos/doc/manual/administration/imperative-containers.section.mddeleted−115
This diff is too big to show here.
nixos/doc/manual/administration/imperative-containers.xmlnew file+123
This diff is too big to show here.
nixos/doc/manual/administration/logging.chapter.mddeleted−38
This diff is too big to show here.
nixos/doc/manual/administration/logging.xmlnew file+43
This diff is too big to show here.
nixos/doc/manual/administration/maintenance-mode.section.mddeleted−11
This diff is too big to show here.
nixos/doc/manual/administration/maintenance-mode.xmlnew file+16
This diff is too big to show here.
nixos/doc/manual/administration/network-problems.section.mddeleted−21
This diff is too big to show here.
nixos/doc/manual/administration/network-problems.xmlnew file+27
This diff is too big to show here.
nixos/doc/manual/administration/rebooting.chapter.mddeleted−30
This diff is too big to show here.
nixos/doc/manual/administration/rebooting.xmlnew file+35
This diff is too big to show here.
nixos/doc/manual/administration/rollback.section.mddeleted−38
This diff is too big to show here.
nixos/doc/manual/administration/rollback.xmlnew file+41
This diff is too big to show here.
nixos/doc/manual/administration/running.xml+8−8
This diff is too big to show here.
nixos/doc/manual/administration/service-mgmt.chapter.mddeleted−120
This diff is too big to show here.
nixos/doc/manual/administration/service-mgmt.xmlnew file+140
This diff is too big to show here.
nixos/doc/manual/administration/store-corruption.section.mddeleted−28
This diff is too big to show here.
nixos/doc/manual/administration/store-corruption.xmlnew file+36
This diff is too big to show here.
nixos/doc/manual/administration/troubleshooting.chapter.mddeleted−12
This diff is too big to show here.
nixos/doc/manual/administration/troubleshooting.xmlnew file+16
This diff is too big to show here.
nixos/doc/manual/administration/user-sessions.chapter.mddeleted−43
This diff is too big to show here.
nixos/doc/manual/administration/user-sessions.xmlnew file+45
This diff is too big to show here.
nixos/doc/manual/configuration/abstractions.section.mddeleted−80
This diff is too big to show here.
nixos/doc/manual/configuration/abstractions.xmlnew file+101
This diff is too big to show here.
nixos/doc/manual/configuration/ad-hoc-network-config.section.mddeleted−13
This diff is too big to show here.
nixos/doc/manual/configuration/ad-hoc-network-config.xmlnew file+20
This diff is too big to show here.
nixos/doc/manual/configuration/ad-hoc-packages.section.mddeleted−51
This diff is too big to show here.
nixos/doc/manual/configuration/ad-hoc-packages.xmlnew file+61
This diff is too big to show here.
nixos/doc/manual/configuration/adding-custom-packages.section.mddeleted−74
This diff is too big to show here.
nixos/doc/manual/configuration/adding-custom-packages.xmlnew file+73
This diff is too big to show here.
nixos/doc/manual/configuration/config-file.section.mddeleted−175
This diff is too big to show here.
nixos/doc/manual/configuration/config-file.xmlnew file+216
This diff is too big to show here.
nixos/doc/manual/configuration/config-syntax.chapter.mddeleted−19
This diff is too big to show here.
nixos/doc/manual/configuration/config-syntax.xmlnew file+25
This diff is too big to show here.
nixos/doc/manual/configuration/configuration.xml+13−13
This diff is too big to show here.
nixos/doc/manual/configuration/customizing-packages.section.mddeleted−74
This diff is too big to show here.
nixos/doc/manual/configuration/customizing-packages.xmlnew file+86
This diff is too big to show here.
nixos/doc/manual/configuration/declarative-packages.section.mddeleted−46
This diff is too big to show here.
nixos/doc/manual/configuration/declarative-packages.xmlnew file+54
This diff is too big to show here.
nixos/doc/manual/configuration/file-systems.chapter.mddeleted−42
This diff is too big to show here.
nixos/doc/manual/configuration/file-systems.xmlnew file+57
This diff is too big to show here.
nixos/doc/manual/configuration/firewall.section.mddeleted−32
This diff is too big to show here.
nixos/doc/manual/configuration/firewall.xmlnew file+37
This diff is too big to show here.
nixos/doc/manual/configuration/gpu-accel.chapter.mddeleted−204
This diff is too big to show here.
nixos/doc/manual/configuration/gpu-accel.xmlnew file+263
This diff is too big to show here.
nixos/doc/manual/configuration/ipv4-config.section.mddeleted−35
This diff is too big to show here.
nixos/doc/manual/configuration/ipv4-config.xmlnew file+43
This diff is too big to show here.
nixos/doc/manual/configuration/ipv6-config.section.mddeleted−42
This diff is too big to show here.
nixos/doc/manual/configuration/ipv6-config.xmlnew file+54
This diff is too big to show here.
nixos/doc/manual/configuration/kubernetes.chapter.mddeleted−104
This diff is too big to show here.
nixos/doc/manual/configuration/kubernetes.xmlnew file+112
This diff is too big to show here.
nixos/doc/manual/configuration/linux-kernel.chapter.mddeleted−140
This diff is too big to show here.
nixos/doc/manual/configuration/linux-kernel.xmlnew file+138
This diff is too big to show here.
nixos/doc/manual/configuration/luks-file-systems.section.mddeleted−77
This diff is too big to show here.
nixos/doc/manual/configuration/luks-file-systems.xmlnew file+78
This diff is too big to show here.
nixos/doc/manual/configuration/modularity.section.mddeleted−133
This diff is too big to show here.
nixos/doc/manual/configuration/modularity.xmlnew file+146
This diff is too big to show here.
nixos/doc/manual/configuration/network-manager.section.mddeleted−42
This diff is too big to show here.
nixos/doc/manual/configuration/network-manager.xmlnew file+48
This diff is too big to show here.
nixos/doc/manual/configuration/networking.chapter.mddeleted−16
This diff is too big to show here.
nixos/doc/manual/configuration/networking.xmlnew file+20
This diff is too big to show here.
nixos/doc/manual/configuration/package-mgmt.chapter.mddeleted−18
This diff is too big to show here.
nixos/doc/manual/configuration/package-mgmt.xmlnew file+31
This diff is too big to show here.
nixos/doc/manual/configuration/profiles.chapter.mddeleted−34
This diff is too big to show here.
nixos/doc/manual/configuration/profiles.xmlnew file+39
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/all-hardware.section.mddeleted−11
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/all-hardware.xmlnew file+21
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/base.section.mddeleted−7
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/base.xmlnew file+15
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/clone-config.section.mddeleted−11
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/clone-config.xmlnew file+21
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/demo.section.mddeleted−4
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/demo.xmlnew file+14
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/docker-container.section.mddeleted−7
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/docker-container.xmlnew file+16
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/graphical.section.mddeleted−10
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/graphical.xmlnew file+20
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/hardened.section.mddeleted−20
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/hardened.xmlnew file+32
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/headless.section.mddeleted−9
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/headless.xmlnew file+19
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/installation-device.section.mddeleted−24
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/installation-device.xmlnew file+36
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/minimal.section.mddeleted−9
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/minimal.xmlnew file+17
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/qemu-guest.section.mddeleted−7
This diff is too big to show here.
nixos/doc/manual/configuration/profiles/qemu-guest.xmlnew file+17
This diff is too big to show here.
nixos/doc/manual/configuration/renaming-interfaces.section.mddeleted−51
This diff is too big to show here.
nixos/doc/manual/configuration/renaming-interfaces.xmlnew file+67
This diff is too big to show here.
nixos/doc/manual/configuration/ssh.section.mddeleted−19
This diff is too big to show here.
nixos/doc/manual/configuration/ssh.xmlnew file+27
This diff is too big to show here.
nixos/doc/manual/configuration/sshfs-file-systems.section.mddeleted−104
This diff is too big to show here.
nixos/doc/manual/configuration/subversion.chapter.mddeleted−102
This diff is too big to show here.
nixos/doc/manual/configuration/subversion.xmlnew file+140
This diff is too big to show here.
nixos/doc/manual/configuration/summary.section.mddeleted−46
This diff is too big to show here.
nixos/doc/manual/configuration/summary.xmlnew file+227
This diff is too big to show here.
nixos/doc/manual/configuration/user-mgmt.chapter.mddeleted−92
This diff is too big to show here.
nixos/doc/manual/configuration/user-mgmt.xmlnew file+88
This diff is too big to show here.
nixos/doc/manual/configuration/wayland.chapter.mddeleted−27
This diff is too big to show here.
nixos/doc/manual/configuration/wayland.xmlnew file+23
This diff is too big to show here.
nixos/doc/manual/configuration/wireless.section.mddeleted−67
This diff is too big to show here.
nixos/doc/manual/configuration/wireless.xmlnew file+70
This diff is too big to show here.
nixos/doc/manual/configuration/x-windows.chapter.mddeleted−337
This diff is too big to show here.
nixos/doc/manual/configuration/x-windows.xmlnew file+352
This diff is too big to show here.
nixos/doc/manual/configuration/xfce.chapter.mddeleted−52
This diff is too big to show here.
nixos/doc/manual/configuration/xfce.xmlnew file+59
This diff is too big to show here.
nixos/doc/manual/default.nix+6−19
This diff is too big to show here.
nixos/doc/manual/development/activation-script.section.mddeleted−72
This diff is too big to show here.
nixos/doc/manual/development/assertions.section.mddeleted−40
This diff is too big to show here.
nixos/doc/manual/development/assertions.xmlnew file+74
This diff is too big to show here.
nixos/doc/manual/development/building-nixos.chapter.mdnew file+18
This diff is too big to show here.
nixos/doc/manual/development/building-parts.chapter.mddeleted−74
This diff is too big to show here.
nixos/doc/manual/development/building-parts.xmlnew file+121
This diff is too big to show here.
nixos/doc/manual/development/development.xml+7−7
This diff is too big to show here.
nixos/doc/manual/development/freeform-modules.section.mddeleted−79
This diff is too big to show here.
nixos/doc/manual/development/freeform-modules.xmlnew file+68
This diff is too big to show here.
nixos/doc/manual/development/importing-modules.section.mddeleted−46
This diff is too big to show here.
nixos/doc/manual/development/importing-modules.xmlnew file+56
This diff is too big to show here.
nixos/doc/manual/development/linking-nixos-tests-to-packages.section.mddeleted−6
This diff is too big to show here.
nixos/doc/manual/development/meta-attributes.section.mddeleted−66
This diff is too big to show here.
nixos/doc/manual/development/meta-attributes.xmlnew file+63
This diff is too big to show here.
nixos/doc/manual/development/nixos-tests.chapter.mddeleted−13
This diff is too big to show here.
nixos/doc/manual/development/nixos-tests.xmlnew file+19
This diff is too big to show here.
nixos/doc/manual/development/option-declarations.section.mddeleted−221
This diff is too big to show here.
nixos/doc/manual/development/option-declarations.xmlnew file+199
This diff is too big to show here.
nixos/doc/manual/development/option-def.section.mddeleted−91
This diff is too big to show here.
nixos/doc/manual/development/option-def.xmlnew file+99
This diff is too big to show here.
nixos/doc/manual/development/option-types.section.mddeleted−583
This diff is too big to show here.
nixos/doc/manual/development/option-types.xmlnew file+914
This diff is too big to show here.
nixos/doc/manual/development/replace-modules.section.mddeleted−64
This diff is too big to show here.
nixos/doc/manual/development/replace-modules.xmlnew file+79
This diff is too big to show here.
nixos/doc/manual/development/running-nixos-tests-interactively.section.mddeleted−35
This diff is too big to show here.
nixos/doc/manual/development/running-nixos-tests-interactively.xmlnew file+49
This diff is too big to show here.
nixos/doc/manual/development/running-nixos-tests.section.mddeleted−31
This diff is too big to show here.
nixos/doc/manual/development/running-nixos-tests.xmlnew file+36
This diff is too big to show here.
nixos/doc/manual/development/settings-options.section.mddeleted−251
This diff is too big to show here.
nixos/doc/manual/development/settings-options.xmlnew file+226
This diff is too big to show here.
nixos/doc/manual/development/sources.chapter.mddeleted−77
This diff is too big to show here.
nixos/doc/manual/development/sources.xmlnew file+85
This diff is too big to show here.
nixos/doc/manual/development/testing-installer.chapter.mddeleted−18
This diff is too big to show here.
nixos/doc/manual/development/testing-installer.xmlnew file+22
This diff is too big to show here.
nixos/doc/manual/development/unit-handling.section.mddeleted−62
This diff is too big to show here.
nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.mddeleted−53
This diff is too big to show here.
nixos/doc/manual/development/writing-documentation.chapter.mddeleted−93
This diff is too big to show here.
nixos/doc/manual/development/writing-documentation.xmlnew file+150
This diff is too big to show here.
nixos/doc/manual/development/writing-modules.chapter.mddeleted−208
This diff is too big to show here.
nixos/doc/manual/development/writing-modules.xmlnew file+191
This diff is too big to show here.
nixos/doc/manual/development/writing-nixos-tests.section.mddeleted−382
This diff is too big to show here.
nixos/doc/manual/development/writing-nixos-tests.xmlnew file+484
This diff is too big to show here.
nixos/doc/manual/from_md/administration/boot-problems.section.xmldeleted−144
This diff is too big to show here.
nixos/doc/manual/from_md/administration/cleaning-store.chapter.xmldeleted−72
This diff is too big to show here.
nixos/doc/manual/from_md/administration/container-networking.section.xmldeleted−54
This diff is too big to show here.
nixos/doc/manual/from_md/administration/containers.chapter.xmldeleted−31
This diff is too big to show here.
nixos/doc/manual/from_md/administration/control-groups.chapter.xmldeleted−67
This diff is too big to show here.
nixos/doc/manual/from_md/administration/declarative-containers.section.xmldeleted−60
This diff is too big to show here.
nixos/doc/manual/from_md/administration/imperative-containers.section.xmldeleted−132
This diff is too big to show here.
nixos/doc/manual/from_md/administration/logging.chapter.xmldeleted−45
This diff is too big to show here.
nixos/doc/manual/from_md/administration/maintenance-mode.section.xmldeleted−14
This diff is too big to show here.
nixos/doc/manual/from_md/administration/network-problems.section.xmldeleted−25
This diff is too big to show here.
nixos/doc/manual/from_md/administration/rebooting.chapter.xmldeleted−38
This diff is too big to show here.
nixos/doc/manual/from_md/administration/rollback.section.xmldeleted−42
This diff is too big to show here.
nixos/doc/manual/from_md/administration/service-mgmt.chapter.xmldeleted−141
This diff is too big to show here.
nixos/doc/manual/from_md/administration/store-corruption.section.xmldeleted−34
This diff is too big to show here.
nixos/doc/manual/from_md/administration/troubleshooting.chapter.xmldeleted−12
This diff is too big to show here.
nixos/doc/manual/from_md/administration/user-sessions.chapter.xmldeleted−46
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/abstractions.section.xmldeleted−101
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xmldeleted−16
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xmldeleted−59
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xmldeleted−80
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/config-file.section.xmldeleted−231
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/config-syntax.chapter.xmldeleted−21
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/customizing-packages.section.xmldeleted−90
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/declarative-packages.section.xmldeleted−53
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/file-systems.chapter.xmldeleted−55
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/firewall.section.xmldeleted−39
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xmldeleted−239
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/ipv4-config.section.xmldeleted−43
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/ipv6-config.section.xmldeleted−47
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/kubernetes.chapter.xmldeleted−126
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xmldeleted−157
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/luks-file-systems.section.xmldeleted−84
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/modularity.section.xmldeleted−152
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/network-manager.section.xmldeleted−49
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/networking.chapter.xmldeleted−15
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xmldeleted−28
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles.chapter.xmldeleted−38
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xmldeleted−15
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/base.section.xmldeleted−10
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xmldeleted−16
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/demo.section.xmldeleted−10
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xmldeleted−12
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/graphical.section.xmldeleted−14
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/hardened.section.xmldeleted−25
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/headless.section.xmldeleted−15
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xmldeleted−32
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/minimal.section.xmldeleted−13
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xmldeleted−11
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xmldeleted−62
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/ssh.section.xmldeleted−23
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xmldeleted−139
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/subversion.chapter.xmldeleted−121
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/summary.section.xmldeleted−332
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xmldeleted−105
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/wayland.chapter.xmldeleted−31
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/wireless.section.xmldeleted−73
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/x-windows.chapter.xmldeleted−381
This diff is too big to show here.
nixos/doc/manual/from_md/configuration/xfce.chapter.xmldeleted−62
This diff is too big to show here.
nixos/doc/manual/from_md/development/activation-script.section.xmldeleted−150
This diff is too big to show here.
nixos/doc/manual/from_md/development/assertions.section.xmldeleted−58
This diff is too big to show here.
nixos/doc/manual/from_md/development/building-nixos.chapter.xmlnew file+33
This diff is too big to show here.
nixos/doc/manual/from_md/development/building-parts.chapter.xmldeleted−124
This diff is too big to show here.
nixos/doc/manual/from_md/development/freeform-modules.section.xmldeleted−87
This diff is too big to show here.
nixos/doc/manual/from_md/development/importing-modules.section.xmldeleted−47
This diff is too big to show here.
nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xmldeleted−10
This diff is too big to show here.
nixos/doc/manual/from_md/development/meta-attributes.section.xmldeleted−95
This diff is too big to show here.
nixos/doc/manual/from_md/development/nixos-tests.chapter.xmldeleted−14
This diff is too big to show here.
nixos/doc/manual/from_md/development/option-declarations.section.xmldeleted−327
This diff is too big to show here.
nixos/doc/manual/from_md/development/option-def.section.xmldeleted−104
This diff is too big to show here.
nixos/doc/manual/from_md/development/option-types.section.xmldeleted−1038
This diff is too big to show here.
nixos/doc/manual/from_md/development/replace-modules.section.xmldeleted−70
This diff is too big to show here.
nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xmldeleted−39
This diff is too big to show here.
nixos/doc/manual/from_md/development/running-nixos-tests.section.xmldeleted−34
This diff is too big to show here.
nixos/doc/manual/from_md/development/settings-options.section.xmldeleted−421
This diff is too big to show here.
nixos/doc/manual/from_md/development/sources.chapter.xmldeleted−90
This diff is too big to show here.
nixos/doc/manual/from_md/development/testing-installer.chapter.xmldeleted−22
This diff is too big to show here.
nixos/doc/manual/from_md/development/unit-handling.section.xmldeleted−131
This diff is too big to show here.
nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xmldeleted−122
This diff is too big to show here.
nixos/doc/manual/from_md/development/writing-documentation.chapter.xmldeleted−144
This diff is too big to show here.
nixos/doc/manual/from_md/development/writing-modules.chapter.xmldeleted−245
This diff is too big to show here.
nixos/doc/manual/from_md/development/writing-nixos-tests.section.xmldeleted−655
This diff is too big to show here.
nixos/doc/manual/from_md/installation/building-nixos.chapter.xmldeleted−106
This diff is too big to show here.
nixos/doc/manual/from_md/installation/changing-config.chapter.xmldeleted−117
This diff is too big to show here.
nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xmldeleted−41
This diff is too big to show here.
nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xmldeleted−388
This diff is too big to show here.
nixos/doc/manual/from_md/installation/installing-pxe.section.xmldeleted−42
This diff is too big to show here.
nixos/doc/manual/from_md/installation/installing-usb.section.xmldeleted−35
This diff is too big to show here.
nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xmldeleted−92
This diff is too big to show here.
nixos/doc/manual/from_md/installation/installing.chapter.xmldeleted−645
This diff is too big to show here.
nixos/doc/manual/from_md/installation/obtaining.chapter.xmldeleted−48
This diff is too big to show here.
nixos/doc/manual/from_md/installation/upgrading.chapter.xmldeleted−152
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1310.section.xmldeleted−6
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1404.section.xmldeleted−189
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1412.section.xmldeleted−466
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1509.section.xmldeleted−776
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1603.section.xmldeleted−695
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1609.section.xmldeleted−273
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1703.section.xmldeleted−818
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1709.section.xmldeleted−922
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1803.section.xmldeleted−879
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1809.section.xmldeleted−941
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1903.section.xmldeleted−790
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-1909.section.xmldeleted−1197
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-2003.section.xmldeleted−1497
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-2009.section.xmldeleted−2210
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-2105.section.xmldeleted−1567
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml+12−2077
This diff is too big to show here.
nixos/doc/manual/from_md/release-notes/rl-2205.section.xmldeleted−2470
This diff is too big to show here.
nixos/doc/manual/installation/building-nixos.chapter.mddeleted−77
This diff is too big to show here.
nixos/doc/manual/installation/changing-config.chapter.mddeleted−100
This diff is too big to show here.
nixos/doc/manual/installation/changing-config.xmlnew file+97
This diff is too big to show here.
nixos/doc/manual/installation/installation.xml+4−5
This diff is too big to show here.
nixos/doc/manual/installation/installing-behind-a-proxy.section.mddeleted−29
This diff is too big to show here.
nixos/doc/manual/installation/installing-behind-a-proxy.xmlnew file+48
This diff is too big to show here.
nixos/doc/manual/installation/installing-from-other-distro.section.mddeleted−279
This diff is too big to show here.
nixos/doc/manual/installation/installing-from-other-distro.xmlnew file+364
This diff is too big to show here.
nixos/doc/manual/installation/installing-pxe.section.mddeleted−32
This diff is too big to show here.
nixos/doc/manual/installation/installing-pxe.xmlnew file+50
This diff is too big to show here.
nixos/doc/manual/installation/installing-usb.section.mddeleted−31
This diff is too big to show here.
nixos/doc/manual/installation/installing-usb.xmlnew file+40
This diff is too big to show here.
nixos/doc/manual/installation/installing-virtualbox-guest.section.mddeleted−59
This diff is too big to show here.
nixos/doc/manual/installation/installing-virtualbox-guest.xmlnew file+103
This diff is too big to show here.
nixos/doc/manual/installation/installing.chapter.mddeleted−482
This diff is too big to show here.
nixos/doc/manual/installation/installing.xmlnew file+579
This diff is too big to show here.
nixos/doc/manual/installation/obtaining.chapter.mddeleted−26
This diff is too big to show here.
nixos/doc/manual/installation/obtaining.xmlnew file+54
This diff is too big to show here.
nixos/doc/manual/installation/upgrading.chapter.mddeleted−118
This diff is too big to show here.
nixos/doc/manual/installation/upgrading.xmlnew file+139
This diff is too big to show here.
nixos/doc/manual/man-nixos-install.xml+4−9
This diff is too big to show here.
nixos/doc/manual/man-nixos-rebuild.xml+11−68
This diff is too big to show here.
nixos/doc/manual/man-pages.xml+2−7
This diff is too big to show here.
nixos/doc/manual/md-to-db.sh+12−28
This diff is too big to show here.
nixos/doc/manual/preface.xml+6−7
This diff is too big to show here.
nixos/doc/manual/release-notes/release-notes.xml+15−16
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1310.section.mddeleted−3
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1310.xmlnew file+11
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1404.section.mddeleted−81
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1404.xmlnew file+179
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1412.section.mddeleted−171
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1412.xmlnew file+467
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1509.section.mddeleted−319
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1509.xmlnew file+750
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1603.section.mddeleted−282
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1603.xmlnew file+671
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1609.section.mddeleted−73
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1609.xmlnew file+277
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1703.section.mddeleted−303
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1703.xmlnew file+817
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1709.section.mddeleted−316
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1709.xmlnew file+899
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1803.section.mddeleted−286
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1803.xmlnew file+855
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1809.section.mddeleted−332
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1809.xmlnew file+933
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1903.section.mddeleted−214
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1903.xmlnew file+768
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1909.section.mddeleted−313
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-1909.xmlnew file+902
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-2003.section.mddeleted−507
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-2003.xmlnew file+1252
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-2009.section.mddeleted−747
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-2009.xmlnew file+1838
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-2105.section.mddeleted−428
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-2105.xmlnew file+1187
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-2111.section.md+4−570
This diff is too big to show here.
nixos/doc/manual/release-notes/rl-2205.section.mddeleted−878
This diff is too big to show here.
nixos/lib/build-vms.nix+10−17
This diff is too big to show here.
nixos/lib/default.nixdeleted−33
This diff is too big to show here.
nixos/lib/eval-cacheable-options.nixdeleted−53
This diff is too big to show here.
nixos/lib/eval-config-minimal.nixdeleted−49
This diff is too big to show here.
nixos/lib/eval-config.nix+16−54
This diff is too big to show here.
nixos/lib/make-disk-image.nix+24−67
This diff is too big to show here.
nixos/lib/make-ext4-fs.nix+5−3
This diff is too big to show here.
nixos/lib/make-iso9660-image.sh−1
This diff is too big to show here.
nixos/lib/make-multi-disk-zfs-image.nixdeleted−333
This diff is too big to show here.
nixos/lib/make-options-doc/default.nix+103−78
This diff is too big to show here.
nixos/lib/make-options-doc/generateAsciiDoc.pydeleted−37
This diff is too big to show here.
nixos/lib/make-options-doc/generateCommonMark.pydeleted−27
This diff is too big to show here.
nixos/lib/make-options-doc/mergeJSON.pydeleted−95
This diff is too big to show here.
nixos/lib/make-options-doc/options-to-docbook.xsl+20−30
This diff is too big to show here.
nixos/lib/make-options-doc/optionsJSONtoXML.nixdeleted−6
This diff is too big to show here.
nixos/lib/make-options-doc/sortXML.pydeleted−27
This diff is too big to show here.
nixos/lib/make-single-disk-zfs-image.nixdeleted−322
This diff is too big to show here.
nixos/lib/make-squashfs.nix+1−8
This diff is too big to show here.
nixos/lib/qemu-common.nixdeleted−32
This diff is too big to show here.
nixos/lib/qemu-flags.nixnew file+32
This diff is too big to show here.
nixos/lib/systemd-lib.nixdeleted−426
This diff is too big to show here.
nixos/lib/systemd-types.nixdeleted−69
This diff is too big to show here.
nixos/lib/systemd-unit-options.nixdeleted−711
This diff is too big to show here.
nixos/lib/test-driver/default.nixdeleted−32
This diff is too big to show here.
nixos/lib/test-driver/setup.pydeleted−13
This diff is too big to show here.
nixos/lib/test-driver/test-driver.pynew file+1006
This diff is too big to show here.
nixos/lib/test-driver/test_driver/__init__.pydeleted−128
This diff is too big to show here.
nixos/lib/test-driver/test_driver/driver.pydeleted−226
This diff is too big to show here.
nixos/lib/test-driver/test_driver/logger.pydeleted−105
This diff is too big to show here.
nixos/lib/test-driver/test_driver/machine.pydeleted−1023
This diff is too big to show here.
nixos/lib/test-driver/test_driver/polling_condition.pydeleted−77
This diff is too big to show here.
nixos/lib/test-driver/test_driver/vlan.pydeleted−58
This diff is too big to show here.
nixos/lib/testing-python.nix+258−180
This diff is too big to show here.
nixos/lib/utils.nix+6−78
This diff is too big to show here.
nixos/maintainers/scripts/azure-new/examples/basic/image.nix+1−1
This diff is too big to show here.
nixos/maintainers/scripts/azure-new/examples/basic/system.nix+1−1
This diff is too big to show here.
nixos/maintainers/scripts/ec2/amazon-image-zfs.nixdeleted−12
This diff is too big to show here.
nixos/maintainers/scripts/ec2/amazon-image.nix+28−98
This diff is too big to show here.
nixos/maintainers/scripts/ec2/create-amis.sh+45−83
This diff is too big to show here.
nixos/maintainers/scripts/lxd/lxd-image-inner.nixdeleted−102
This diff is too big to show here.
nixos/maintainers/scripts/lxd/lxd-image.nixdeleted−34
This diff is too big to show here.
nixos/maintainers/scripts/lxd/nix.tpldeleted−9
This diff is too big to show here.
nixos/maintainers/scripts/openstack/openstack-image-zfs.nixdeleted−101
This diff is too big to show here.
nixos/maintainers/scripts/openstack/openstack-image.nix+8−9
This diff is too big to show here.
nixos/modules/config/console.nix+11−30
This diff is too big to show here.
nixos/modules/config/fonts/fontconfig.nix+17−1
This diff is too big to show here.
nixos/modules/config/fonts/fontdir.nix+2−2
This diff is too big to show here.
nixos/modules/config/fonts/fonts.nix+21−46
This diff is too big to show here.
nixos/modules/config/gtk/gtk-icon-cache.nix−1
This diff is too big to show here.
nixos/modules/config/i18n.nix+1−7
This diff is too big to show here.
nixos/modules/config/krb5/default.nix+8−8
This diff is too big to show here.
nixos/modules/config/ldap.nix+1−1
This diff is too big to show here.
nixos/modules/config/malloc.nix+3−22
This diff is too big to show here.
nixos/modules/config/networking.nix+7−11
This diff is too big to show here.
nixos/modules/config/nsswitch.nix+6−9
This diff is too big to show here.
nixos/modules/config/power-management.nix+2−2
This diff is too big to show here.
nixos/modules/config/pulseaudio.nix+11−11
This diff is too big to show here.
nixos/modules/config/resolvconf.nix+4−2
This diff is too big to show here.
nixos/modules/config/shells-environment.nix+5−15
This diff is too big to show here.
nixos/modules/config/swap.nix+7−34
This diff is too big to show here.
nixos/modules/config/sysctl.nix+1−1
This diff is too big to show here.
nixos/modules/config/system-environment.nix+36−34
This diff is too big to show here.
nixos/modules/config/system-path.nix+9−19
This diff is too big to show here.
nixos/modules/config/terminfo.nix+1−25
This diff is too big to show here.
nixos/modules/config/unix-odbc-drivers.nix+1−1
This diff is too big to show here.
nixos/modules/config/update-users-groups.pl+16−29
This diff is too big to show here.
nixos/modules/config/users-groups.nix+27−64
This diff is too big to show here.
nixos/modules/config/xdg/mime.nix+2−64
This diff is too big to show here.
nixos/modules/config/xdg/portal.nix+12−23
This diff is too big to show here.
nixos/modules/config/xdg/portals/wlr.nixdeleted−67
This diff is too big to show here.
nixos/modules/hardware/all-firmware.nix+6−24
This diff is too big to show here.
nixos/modules/hardware/ckb-next.nix+1−1
This diff is too big to show here.
nixos/modules/hardware/corectrl.nixdeleted−62
This diff is too big to show here.
nixos/modules/hardware/cpu/intel-sgx.nixdeleted−69
This diff is too big to show here.
nixos/modules/hardware/device-tree.nix+5−5
This diff is too big to show here.
nixos/modules/hardware/digitalbitbox.nix+1−1
This diff is too big to show here.
nixos/modules/hardware/flirc.nixdeleted−12
This diff is too big to show here.
nixos/modules/hardware/gkraken.nixdeleted−18
This diff is too big to show here.
nixos/modules/hardware/gpgsmartcards.nixdeleted−37
This diff is too big to show here.
nixos/modules/hardware/hackrf.nixdeleted−23
This diff is too big to show here.
nixos/modules/hardware/keyboard/zsa.nix+3
This diff is too big to show here.
nixos/modules/hardware/network/b43.nix+4
This diff is too big to show here.
nixos/modules/hardware/onlykey/default.nix → nixos/modules/hardware/onlykey.nixrenamed
The content is the same.
nixos/modules/hardware/onlykey.udevnew file+4
This diff is too big to show here.
nixos/modules/hardware/onlykey/onlykey.udevdeleted−18
This diff is too big to show here.
nixos/modules/hardware/opengl.nix+2−2
This diff is too big to show here.
nixos/modules/hardware/openrazer.nix+5−18
This diff is too big to show here.
nixos/modules/hardware/opentabletdriver.nix+1−1
This diff is too big to show here.
nixos/modules/hardware/pcmcia.nix−1
This diff is too big to show here.
nixos/modules/hardware/printers.nix+11−6
This diff is too big to show here.
nixos/modules/hardware/raid/hpsa.nix+1−4
This diff is too big to show here.
nixos/modules/hardware/rtl-sdr.nix+4−8
This diff is too big to show here.
nixos/modules/hardware/sata.nix+1−1
This diff is too big to show here.
nixos/modules/hardware/sensor/iio.nix+1−1
This diff is too big to show here.
nixos/modules/hardware/system-76.nix+3−33
This diff is too big to show here.
nixos/modules/hardware/video/amdgpu-pro.nix+22−25
This diff is too big to show here.
nixos/modules/hardware/video/capture/mwprocapture.nix+5
This diff is too big to show here.
nixos/modules/hardware/video/nvidia.nix+24−59
This diff is too big to show here.
nixos/modules/hardware/video/uvcvideo/default.nix+1−1
This diff is too big to show here.
nixos/modules/hardware/video/webcam/facetimehd.nix+6−14
This diff is too big to show here.
nixos/modules/hardware/xone.nixdeleted−23
This diff is too big to show here.
nixos/modules/i18n/input-method/fcitx.nix+1−4
This diff is too big to show here.
nixos/modules/i18n/input-method/fcitx5.nix+18−32
This diff is too big to show here.
nixos/modules/i18n/input-method/ibus.nix+2−5
This diff is too big to show here.
nixos/modules/i18n/input-method/kime.nix+2−4
This diff is too big to show here.
nixos/modules/installer/cd-dvd/channel.nix+1−2
This diff is too big to show here.
nixos/modules/installer/cd-dvd/installation-cd-base.nix−16
This diff is too big to show here.
nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix+8−14
This diff is too big to show here.
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nixdeleted−59
This diff is too big to show here.
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nixdeleted−49
This diff is too big to show here.
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nixdeleted−20
This diff is too big to show here.
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix+5−3
This diff is too big to show here.
nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix+3−1
This diff is too big to show here.
nixos/modules/installer/cd-dvd/iso-image.nix+72−104
This diff is too big to show here.
nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix+1−1
This diff is too big to show here.
nixos/modules/installer/cd-dvd/system-tarball-pc.nix+1−1
This diff is too big to show here.
nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix+4−4
This diff is too big to show here.
nixos/modules/installer/cd-dvd/system-tarball.nix+2−2
This diff is too big to show here.
nixos/modules/installer/kexec/kexec-boot.nixdeleted−51
This diff is too big to show here.
nixos/modules/installer/netboot/netboot.nix+6−14
This diff is too big to show here.
nixos/modules/installer/sd-card/sd-image-aarch64.nix−15
This diff is too big to show here.
nixos/modules/installer/sd-card/sd-image-raspberrypi.nix+1−1
This diff is too big to show here.
nixos/modules/installer/sd-card/sd-image-riscv64-qemu-installer.nixdeleted−10
This diff is too big to show here.
nixos/modules/installer/sd-card/sd-image-riscv64-qemu.nixdeleted−32
This diff is too big to show here.
nixos/modules/installer/sd-card/sd-image-x86_64.nixdeleted−27
This diff is too big to show here.
nixos/modules/installer/sd-card/sd-image.nix+6−22
This diff is too big to show here.
nixos/modules/installer/tools/nix-fallback-paths.nix+4−5
This diff is too big to show here.
nixos/modules/installer/tools/nixos-build-vms/build-vms.nix+5−18
This diff is too big to show here.
nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh+3−4
This diff is too big to show here.
nixos/modules/installer/tools/nixos-enter.sh+1−33
This diff is too big to show here.
nixos/modules/installer/tools/nixos-generate-config.pl+6−24
This diff is too big to show here.
nixos/modules/installer/tools/nixos-install.sh+18−19
This diff is too big to show here.
pkgs/tools/nix/nixos-option/CMakeLists.txt → nixos/modules/installer/tools/nixos-option/CMakeLists.txtrenamed
The content is the same.
nixos/modules/installer/tools/nixos-option/default.nix+11−1
This diff is too big to show here.
pkgs/tools/nix/nixos-option/libnix-copy-paste.cc → nixos/modules/installer/tools/nixos-option/libnix-copy-paste.ccrenamed
The content is the same.
pkgs/tools/nix/nixos-option/libnix-copy-paste.hh → nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hhrenamed
The content is the same.
pkgs/tools/nix/nixos-option/nixos-option.cc → nixos/modules/installer/tools/nixos-option/nixos-option.ccrenamed
The content is the same.
nixos/modules/installer/tools/nixos-version.sh−1
This diff is too big to show here.
nixos/modules/installer/tools/tools.nix+6−30
This diff is too big to show here.
nixos/modules/installer/virtualbox-demo.nix+1−1
This diff is too big to show here.
nixos/modules/misc/crashdump.nix+1−1
This diff is too big to show here.
nixos/modules/misc/documentation.nix+53−129
This diff is too big to show here.
nixos/modules/misc/extra-arguments.nix+2−2
This diff is too big to show here.
nixos/modules/misc/ids.nix+57−70
This diff is too big to show here.
nixos/modules/misc/locate.nix+69−134
This diff is too big to show here.
nixos/modules/misc/man-db.nixdeleted−73
This diff is too big to show here.
nixos/modules/misc/mandoc.nixdeleted−61
This diff is too big to show here.
nixos/modules/misc/meta.nix+1−16
This diff is too big to show here.
nixos/modules/misc/nixpkgs.nix+10−18
This diff is too big to show here.
nixos/modules/misc/nixpkgs/test.nixdeleted−8
This diff is too big to show here.
nixos/modules/misc/version.nix+18−52
This diff is too big to show here.
nixos/modules/misc/wordlist.nixdeleted−59
This diff is too big to show here.
nixos/modules/module-list.nix+34−174
This diff is too big to show here.
nixos/modules/profiles/all-hardware.nix+2−5
This diff is too big to show here.
nixos/modules/profiles/base.nix−1
This diff is too big to show here.
nixos/modules/profiles/hardened.nix+1−1
This diff is too big to show here.
nixos/modules/profiles/headless.nix+1−1
This diff is too big to show here.
nixos/modules/profiles/installation-device.nix−10
This diff is too big to show here.
nixos/modules/profiles/minimal.nix−2
This diff is too big to show here.
nixos/modules/profiles/qemu-guest.nix+2−2
This diff is too big to show here.
nixos/modules/programs/_1password-gui.nixdeleted−68
This diff is too big to show here.
nixos/modules/programs/_1password.nixdeleted−44
This diff is too big to show here.
nixos/modules/programs/adb.nix+2−1
This diff is too big to show here.
nixos/modules/programs/appgate-sdp.nix+3−5
This diff is too big to show here.
nixos/modules/programs/atop.nix+4−11
This diff is too big to show here.
nixos/modules/programs/bandwhich.nix+1−3
This diff is too big to show here.
nixos/modules/programs/bash/bash-completion.nix+1−1
This diff is too big to show here.
nixos/modules/programs/bash/bash.nix+4−4
This diff is too big to show here.
nixos/modules/programs/bcc.nix+3−3
This diff is too big to show here.
nixos/modules/programs/calls.nixdeleted−27
This diff is too big to show here.
nixos/modules/programs/captive-browser.nix+19−45
This diff is too big to show here.
nixos/modules/programs/ccache.nix−2
This diff is too big to show here.
nixos/modules/programs/chromium.nix+2−13
This diff is too big to show here.
nixos/modules/programs/cnping.nixdeleted−21
This diff is too big to show here.
nixos/modules/programs/command-not-found/command-not-found.nix+6−6
This diff is too big to show here.
nixos/modules/programs/command-not-found/command-not-found.pl+12−37
This diff is too big to show here.
nixos/modules/programs/dconf.nix+1−1
This diff is too big to show here.
nixos/modules/programs/digitalbitbox/default.nix+1−1
This diff is too big to show here.
nixos/modules/programs/dmrconfig.nix+1−1
This diff is too big to show here.
nixos/modules/programs/environment.nix+2−9
This diff is too big to show here.
nixos/modules/programs/evince.nix+4−13
This diff is too big to show here.
nixos/modules/programs/extra-container.nixdeleted−17
This diff is too big to show here.
nixos/modules/programs/feedbackd.nix−1
This diff is too big to show here.
nixos/modules/programs/file-roller.nix+4−13
This diff is too big to show here.
nixos/modules/programs/firejail.nix+8−15
This diff is too big to show here.
nixos/modules/programs/flashrom.nixdeleted−26
This diff is too big to show here.
nixos/modules/programs/flexoptix-app.nix+1−1
This diff is too big to show here.
nixos/modules/programs/freetds.nix+1−1
This diff is too big to show here.
nixos/modules/programs/gamemode.nixdeleted−98
This diff is too big to show here.
nixos/modules/programs/git.nixdeleted−69
This diff is too big to show here.
nixos/modules/programs/gnupg.nix+1−4
This diff is too big to show here.
nixos/modules/programs/hamster.nix+1−1
This diff is too big to show here.
nixos/modules/programs/htop.nixdeleted−58
This diff is too big to show here.
nixos/modules/programs/iftop.nix+1−3
This diff is too big to show here.
nixos/modules/programs/iotop.nix+1−3
This diff is too big to show here.
nixos/modules/programs/java.nix+1−1
This diff is too big to show here.
nixos/modules/programs/k3b.nixdeleted−52
This diff is too big to show here.
nixos/modules/programs/k40-whisperer.nixdeleted−40
This diff is too big to show here.
nixos/modules/programs/kbdlight.nix+1−6
This diff is too big to show here.
nixos/modules/programs/kclock.nixdeleted−13
This diff is too big to show here.
nixos/modules/programs/kdeconnect.nixdeleted−35
This diff is too big to show here.
nixos/modules/programs/less.nix+6−9
This diff is too big to show here.
nixos/modules/programs/liboping.nix+1−3
This diff is too big to show here.
nixos/modules/programs/mininet.nix+2−2
This diff is too big to show here.
nixos/modules/programs/mosh.nix+1−1
This diff is too big to show here.
nixos/modules/programs/msmtp.nix−2
This diff is too big to show here.
nixos/modules/programs/mtr.nix+1−4
This diff is too big to show here.
nixos/modules/programs/nbd.nixdeleted−19
This diff is too big to show here.
nixos/modules/programs/neovim.nix+28−29
This diff is too big to show here.
nixos/modules/programs/nethoscope.nixdeleted−30
This diff is too big to show here.
nixos/modules/programs/nix-ld.nixdeleted−12
This diff is too big to show here.
nixos/modules/programs/nncp.nixdeleted−101
This diff is too big to show here.
nixos/modules/programs/noisetorch.nix+1−4
This diff is too big to show here.
nixos/modules/programs/npm.nix+2−3
This diff is too big to show here.
nixos/modules/programs/pantheon-tweaks.nixdeleted−19
This diff is too big to show here.
nixos/modules/programs/phosh.nix+10−13
This diff is too big to show here.
nixos/modules/programs/plotinus.nix+1−1
This diff is too big to show here.
nixos/modules/programs/proxychains.nix+1−1
This diff is too big to show here.
nixos/modules/programs/qt5ct.nix+1−1
This diff is too big to show here.
nixos/modules/programs/shadow.nix+8−15
This diff is too big to show here.
nixos/modules/programs/singularity.nix+1−6
This diff is too big to show here.
nixos/modules/programs/slock.nix+1−6
This diff is too big to show here.
nixos/modules/programs/spacefm.nix+6−6
This diff is too big to show here.
nixos/modules/programs/ssh.nix+18−72
This diff is too big to show here.
nixos/modules/programs/ssmtp.nixnew file+187
This diff is too big to show here.
nixos/modules/programs/starship.nixdeleted−51
This diff is too big to show here.
nixos/modules/programs/sway.nix+5−7
This diff is too big to show here.
nixos/modules/programs/thefuck.nix+6−7
This diff is too big to show here.
nixos/modules/programs/tilp2.nixnew file+28
This diff is too big to show here.
nixos/modules/programs/tmux.nix+1−14
This diff is too big to show here.
nixos/modules/programs/traceroute.nix+1−3
This diff is too big to show here.
nixos/modules/programs/tsm-client.nix+8−8
This diff is too big to show here.
nixos/modules/programs/udevil.nix+1−6
This diff is too big to show here.
nixos/modules/programs/vim.nix+2−2
This diff is too big to show here.
nixos/modules/programs/wavemon.nix+1−3
This diff is too big to show here.
nixos/modules/programs/weylus.nixdeleted−47
This diff is too big to show here.
nixos/modules/programs/wireshark.nix+1−1
This diff is too big to show here.
nixos/modules/programs/wshowkeys.nix+1−6
This diff is too big to show here.
nixos/modules/services/networking/x2goserver.nix → nixos/modules/programs/x2goserver.nixrenamed+9−24
This diff is too big to show here.
nixos/modules/programs/xonsh.nix+1−2
This diff is too big to show here.
nixos/modules/programs/xss-lock.nix+1−2
This diff is too big to show here.
nixos/modules/programs/xwayland.nix+8−13
This diff is too big to show here.
nixos/modules/programs/yabar.nix+1−2
This diff is too big to show here.
nixos/modules/programs/zsh/oh-my-zsh.nix+1−1
This diff is too big to show here.
nixos/modules/programs/zsh/zsh-autoenv.nix+1−1
This diff is too big to show here.
nixos/modules/programs/zsh/zsh-autosuggestions.nix+11−20
This diff is too big to show here.
nixos/modules/programs/zsh/zsh-syntax-highlighting.nix+2−2
This diff is too big to show here.
nixos/modules/programs/zsh/zsh.nix+6−14
This diff is too big to show here.
nixos/modules/rename.nix+44−63
This diff is too big to show here.
nixos/modules/security/acme.nixnew file+770
This diff is too big to show here.
nixos/modules/security/acme.xmlnew file+298
This diff is too big to show here.
nixos/modules/security/acme/default.nixdeleted−921
This diff is too big to show here.
nixos/modules/security/acme/doc.xmldeleted−413
This diff is too big to show here.
nixos/modules/security/acme/mk-cert-ownership-assertion.nixdeleted−4
This diff is too big to show here.
nixos/modules/security/apparmor/includes.nix+1−1
This diff is too big to show here.
nixos/modules/security/ca.nix+12−11
This diff is too big to show here.
nixos/modules/security/chromium-suid-sandbox.nix+1−6
This diff is too big to show here.
nixos/modules/security/dhparams.nix+3−5
This diff is too big to show here.
nixos/modules/security/doas.nix+5−8
This diff is too big to show here.
nixos/modules/security/duosec.nix+1−6
This diff is too big to show here.
nixos/modules/security/google_oslogin.nix+3−6
This diff is too big to show here.
nixos/modules/security/lock-kernel-modules.nix+9−19
This diff is too big to show here.
nixos/modules/security/misc.nix+2−2
This diff is too big to show here.
nixos/modules/security/pam.nix+152−436
This diff is too big to show here.
nixos/modules/security/pam_mount.nix+7−102
This diff is too big to show here.
nixos/modules/security/pam_usb.nix+2−12
This diff is too big to show here.
nixos/modules/security/polkit.nix+7−15
This diff is too big to show here.
nixos/modules/security/rtkit.nix+1−4
This diff is too big to show here.
nixos/modules/security/sudo.nix+3−3
This diff is too big to show here.
nixos/modules/security/systemd-confinement.nix+9−7
This diff is too big to show here.
nixos/modules/security/tpm2.nix+5−5
This diff is too big to show here.
nixos/modules/security/wrappers/default.nix+98−189
This diff is too big to show here.
nixos/modules/services/admin/meshcentral.nixdeleted−53
This diff is too big to show here.
nixos/modules/services/admin/oxidized.nix+2−2
This diff is too big to show here.
nixos/modules/services/admin/pgadmin.nixdeleted−127
This diff is too big to show here.
nixos/modules/services/amqp/activemq/default.nix+1−2
This diff is too big to show here.
nixos/modules/services/amqp/rabbitmq.nix+9−26
This diff is too big to show here.
nixos/modules/services/audio/alsa.nix+8−8
This diff is too big to show here.
nixos/modules/services/audio/botamusique.nix−1
This diff is too big to show here.
nixos/modules/services/audio/hqplayerd.nixdeleted−142
This diff is too big to show here.
nixos/modules/services/audio/icecast.nix−1
This diff is too big to show here.
nixos/modules/services/audio/jack.nix+7−7
This diff is too big to show here.
nixos/modules/services/audio/jmusicbot.nix+1−8
This diff is too big to show here.
nixos/modules/services/audio/liquidsoap.nix+3−3
This diff is too big to show here.
nixos/modules/services/audio/mopidy.nix+1−1
This diff is too big to show here.
nixos/modules/services/audio/mpd.nix+44−24
This diff is too big to show here.
nixos/modules/services/audio/mpdscribble.nix+1−12
This diff is too big to show here.
nixos/modules/services/audio/navidrome.nixdeleted−71
This diff is too big to show here.
nixos/modules/services/audio/networkaudiod.nixdeleted−19
This diff is too big to show here.
nixos/modules/services/audio/roon-bridge.nixdeleted−76
This diff is too big to show here.
nixos/modules/services/audio/roon-server.nix+4−9
This diff is too big to show here.
nixos/modules/services/audio/slimserver.nix+1−2
This diff is too big to show here.
nixos/modules/services/audio/snapserver.nix+23−31
This diff is too big to show here.
nixos/modules/services/audio/spotifyd.nix+1−26
This diff is too big to show here.
nixos/modules/services/audio/squeezelite.nix+21−17
This diff is too big to show here.
nixos/modules/services/audio/ympd.nix+1−1
This diff is too big to show here.
nixos/modules/services/backup/automysqlbackup.nix+2−3
This diff is too big to show here.
nixos/modules/services/backup/bacula.nix−3
This diff is too big to show here.
nixos/modules/services/backup/borgbackup.nix+23−77
This diff is too big to show here.
nixos/modules/services/backup/btrbk.nixdeleted−220
This diff is too big to show here.
nixos/modules/services/backup/duplicati.nix+9−26
This diff is too big to show here.
nixos/modules/services/backup/duplicity.nix+1−1
This diff is too big to show here.
nixos/modules/services/backup/mysql-backup.nix+3−4
This diff is too big to show here.
nixos/modules/services/backup/postgresql-backup.nix+9−44
This diff is too big to show here.
nixos/modules/services/backup/postgresql-wal-receiver.nix+5−5
This diff is too big to show here.
nixos/modules/services/backup/restic-rest-server.nix+1−5
This diff is too big to show here.
nixos/modules/services/backup/restic.nix+5−17
This diff is too big to show here.
nixos/modules/services/backup/sanoid.nix+152−143
This diff is too big to show here.
nixos/modules/services/backup/syncoid.nix+185−390
This diff is too big to show here.
nixos/modules/services/backup/tarsnap.nix+18−25
This diff is too big to show here.
nixos/modules/services/backup/tsm.nix+14−33
This diff is too big to show here.
nixos/modules/services/backup/znapzend.nix+8−8
This diff is too big to show here.
nixos/modules/services/backup/zrepl.nix−3
This diff is too big to show here.
nixos/modules/services/blockchain/ethereum/geth.nix+2−3
This diff is too big to show here.
nixos/modules/services/cluster/corosync/default.nixdeleted−112
This diff is too big to show here.
nixos/modules/services/cluster/hadoop/conf.nix+12−25
This diff is too big to show here.
nixos/modules/services/cluster/hadoop/default.nix+23−175
This diff is too big to show here.
nixos/modules/services/cluster/hadoop/hdfs.nix+44−175
This diff is too big to show here.
nixos/modules/services/cluster/hadoop/yarn.nix+29−155
This diff is too big to show here.
nixos/modules/services/cluster/k3s/default.nix+12−29
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/addon-manager.nix+3−7
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/addons/dashboard.nixnew file+332
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/addons/dns.nix+15−50
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/apiserver.nix+8−11
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/controller-manager.nix+1−10
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/default.nix+21−31
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/flannel.nix+2−4
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/kubelet.nix+3−14
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/pki.nix+1−5
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/proxy.nix+2−10
This diff is too big to show here.
nixos/modules/services/cluster/kubernetes/scheduler.nix+3−10
This diff is too big to show here.
nixos/modules/services/cluster/pacemaker/default.nixdeleted−52
This diff is too big to show here.
nixos/modules/services/cluster/spark/default.nixdeleted−162
This diff is too big to show here.
nixos/modules/services/computing/boinc/client.nix+2−2
This diff is too big to show here.
nixos/modules/services/computing/foldingathome/client.nix+1−1
This diff is too big to show here.
nixos/modules/services/computing/slurm/slurm.nix+9−18
This diff is too big to show here.
nixos/modules/services/continuous-integration/buildbot/master.nix+8−11
This diff is too big to show here.
nixos/modules/services/continuous-integration/buildbot/worker.nix+4−6
This diff is too big to show here.
nixos/modules/services/continuous-integration/buildkite-agents.nix+5−5
This diff is too big to show here.
nixos/modules/services/continuous-integration/github-runner.nix+37−58
This diff is too big to show here.
nixos/modules/services/continuous-integration/gitlab-runner.nix+9−22
This diff is too big to show here.
nixos/modules/services/continuous-integration/gocd-agent/default.nix+2−12
This diff is too big to show here.
nixos/modules/services/continuous-integration/gocd-server/default.nix+2−17
This diff is too big to show here.
nixos/modules/services/continuous-integration/hail.nix+1−1
This diff is too big to show here.
nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix+19−75
This diff is too big to show here.
nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix+4−4
This diff is too big to show here.
nixos/modules/services/continuous-integration/hydra/default.nix+14−18
This diff is too big to show here.
nixos/modules/services/continuous-integration/jenkins/default.nix+9−30
This diff is too big to show here.
nixos/modules/services/continuous-integration/jenkins/job-builder.nix+16−52
This diff is too big to show here.
nixos/modules/services/continuous-integration/jenkins/slave.nix+1−15
This diff is too big to show here.
nixos/modules/services/databases/aerospike.nix+1−1
This diff is too big to show here.
nixos/modules/services/databases/cassandra.nix+4−6
This diff is too big to show here.
nixos/modules/services/databases/clickhouse.nix+4−13
This diff is too big to show here.
nixos/modules/services/databases/cockroachdb.nix+30−38
This diff is too big to show here.
nixos/modules/services/databases/couchdb.nix+5−22
This diff is too big to show here.
nixos/modules/services/databases/firebird.nix+5−3
This diff is too big to show here.
nixos/modules/services/databases/hbase.nix+17−39
This diff is too big to show here.
nixos/modules/services/databases/influxdb.nix+4−4
This diff is too big to show here.
nixos/modules/services/databases/influxdb2.nixdeleted−66
This diff is too big to show here.
nixos/modules/services/databases/memcached.nix−2
This diff is too big to show here.
nixos/modules/services/databases/monetdb.nix+1−1
This diff is too big to show here.
nixos/modules/services/databases/mongodb.nix+2−4
This diff is too big to show here.
nixos/modules/services/databases/mysql.nix+201−191
This diff is too big to show here.
nixos/modules/services/databases/neo4j.nix+2−12
This diff is too big to show here.
nixos/modules/services/databases/openldap.nix+6−7
This diff is too big to show here.
nixos/modules/services/databases/opentsdb.nix+2−1
This diff is too big to show here.
nixos/modules/services/databases/pgmanage.nix+1−1
This diff is too big to show here.
nixos/modules/services/databases/postgresql.nix+10−13
This diff is too big to show here.
nixos/modules/services/databases/postgresql.xml+32−54
This diff is too big to show here.
nixos/modules/services/databases/redis.nix+222−275
This diff is too big to show here.
nixos/modules/services/databases/riak.nix+2−1
This diff is too big to show here.
nixos/modules/services/databases/victoriametrics.nix+1−9
This diff is too big to show here.
nixos/modules/services/databases/virtuoso.nixnew file+99
This diff is too big to show here.
nixos/modules/services/desktops/bamf.nix+2−2
This diff is too big to show here.
nixos/modules/services/desktops/cpupower-gui.nixdeleted−56
This diff is too big to show here.
nixos/modules/services/desktops/espanso.nix+1
This diff is too big to show here.
nixos/modules/services/desktops/flatpak.nix−2
This diff is too big to show here.
nixos/modules/services/desktops/geoclue2.nix+4−4
This diff is too big to show here.
nixos/modules/services/desktops/gnome/evolution-data-server.nix+1−1
This diff is too big to show here.
nixos/modules/services/desktops/gnome/glib-networking.nix+1−1
This diff is too big to show here.
nixos/modules/services/desktops/gnome/gnome-keyring.nix+1−3
This diff is too big to show here.
nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix+18−4
This diff is too big to show here.
nixos/modules/services/desktops/gnome/tracker-miners.nix−2
This diff is too big to show here.
nixos/modules/services/desktops/gnome/tracker.nix+1−24
This diff is too big to show here.
nixos/modules/services/desktops/gsignond.nix+1−1
This diff is too big to show here.
nixos/modules/services/desktops/gvfs.nix+2−3
This diff is too big to show here.
nixos/modules/services/desktops/pantheon/files.nixnew file+13
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/media-session/alsa-monitor.conf.json → nixos/modules/services/desktops/pipewire/alsa-monitor.conf.jsonrenamed
The content is the same.
nixos/modules/services/desktops/pipewire/media-session/bluez-monitor.conf.json → nixos/modules/services/desktops/pipewire/bluez-monitor.conf.jsonrenamed
The content is the same.
nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json → nixos/modules/services/desktops/pipewire/client-rt.conf.jsonrenamed+1−1
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/daemon/client.conf.json → nixos/modules/services/desktops/pipewire/client.conf.jsonrenamed
The content is the same.
nixos/modules/services/desktops/pipewire/daemon/jack.conf.jsondeleted−38
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/daemon/minimal.conf.jsondeleted−118
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.jsondeleted−100
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/jack.conf.jsonnew file+28
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/media-session/media-session.conf.json → nixos/modules/services/desktops/pipewire/media-session.conf.jsonrenamed−1
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/pipewire-media-session.nix+17−29
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.jsonnew file+41
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json → nixos/modules/services/desktops/pipewire/pipewire.conf.jsonrenamed+3−17
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/pipewire.nix+13−73
This diff is too big to show here.
nixos/modules/services/desktops/pipewire/media-session/v4l2-monitor.conf.json → nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.jsonrenamed
The content is the same.
nixos/modules/services/desktops/pipewire/wireplumber.nixdeleted−54
This diff is too big to show here.
nixos/modules/services/desktops/tumbler.nix+2−2
This diff is too big to show here.
nixos/modules/services/desktops/zeitgeist.nix+2−2
This diff is too big to show here.
nixos/modules/services/development/blackfire.nix+9−4
This diff is too big to show here.
nixos/modules/services/development/blackfire.xml+1−2
This diff is too big to show here.
nixos/modules/services/development/distccd.nixdeleted−155
This diff is too big to show here.
nixos/modules/services/development/hoogle.nix+4−5
This diff is too big to show here.
nixos/modules/services/development/jupyter/default.nix+5−4
This diff is too big to show here.
nixos/modules/services/development/jupyter/kernel-options.nix+4−4
This diff is too big to show here.
nixos/modules/services/development/jupyterhub/default.nix+8−20
This diff is too big to show here.
nixos/modules/services/development/lorri.nix+2−1
This diff is too big to show here.
nixos/modules/services/development/rstudio-server/default.nixdeleted−107
This diff is too big to show here.
nixos/modules/services/development/zammad.nixdeleted−323
This diff is too big to show here.
nixos/modules/services/display-managers/greetd.nix+4−9
This diff is too big to show here.
nixos/modules/services/editors/emacs.nix+1−1
This diff is too big to show here.
nixos/modules/services/editors/haste.nixdeleted−86
This diff is too big to show here.
nixos/modules/services/editors/infinoted.nix+2−2
This diff is too big to show here.
nixos/modules/services/finance/odoo.nixdeleted−122
This diff is too big to show here.
nixos/modules/services/games/asf.nixdeleted−236
This diff is too big to show here.
nixos/modules/services/games/crossfire-server.nixdeleted−179
This diff is too big to show here.
nixos/modules/services/games/deliantra-server.nixdeleted−172
This diff is too big to show here.
nixos/modules/services/games/factorio.nix+5−14
This diff is too big to show here.
nixos/modules/services/games/minecraft-server.nix+6−29
This diff is too big to show here.
nixos/modules/services/games/quake3-server.nix−1
This diff is too big to show here.
nixos/modules/services/games/terraria.nix+4−5
This diff is too big to show here.
nixos/modules/services/hardware/acpid.nix+1−1
This diff is too big to show here.
nixos/modules/services/hardware/actkbd.nix+2−2
This diff is too big to show here.
nixos/modules/services/hardware/auto-cpufreq.nix+2−8
This diff is too big to show here.
nixos/modules/services/hardware/bluetooth.nix+7−3
This diff is too big to show here.
nixos/modules/services/hardware/ddccontrol.nixdeleted−39
This diff is too big to show here.
nixos/modules/services/hardware/fancontrol.nix−1
This diff is too big to show here.
nixos/modules/services/hardware/freefall.nix+1−1
This diff is too big to show here.
nixos/modules/services/hardware/fwupd.nix+1−2
This diff is too big to show here.
nixos/modules/services/hardware/interception-tools.nix−1
This diff is too big to show here.
nixos/modules/services/hardware/joycond.nixdeleted−36
This diff is too big to show here.
nixos/modules/services/hardware/lirc.nix+1−1
This diff is too big to show here.
nixos/modules/services/hardware/pcscd.nix+2−2
This diff is too big to show here.
nixos/modules/services/hardware/power-profiles-daemon.nix−2
This diff is too big to show here.
nixos/modules/services/hardware/rasdaemon.nixdeleted−170
This diff is too big to show here.
nixos/modules/services/hardware/sane.nix+2−28
This diff is too big to show here.
nixos/modules/services/hardware/sane_extra_backends/brscan4.nix+4−4
This diff is too big to show here.
nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix+2−1
This diff is too big to show here.
nixos/modules/services/hardware/sane_extra_backends/brscan5.nixdeleted−110
This diff is too big to show here.
nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nixdeleted−77
This diff is too big to show here.
nixos/modules/services/hardware/spacenavd.nix+1
This diff is too big to show here.
nixos/modules/services/hardware/tcsd.nix+5−7
This diff is too big to show here.
nixos/modules/services/hardware/thermald.nix+2−4
This diff is too big to show here.
nixos/modules/services/hardware/thinkfan.nix+2−2
This diff is too big to show here.
nixos/modules/services/hardware/triggerhappy.nix+2−2
This diff is too big to show here.
nixos/modules/services/hardware/udev.nix+24−127
This diff is too big to show here.
nixos/modules/services/hardware/udisks2.nix−41
This diff is too big to show here.
nixos/modules/services/hardware/undervolt.nix+4−2
This diff is too big to show here.
nixos/modules/services/hardware/upower.nix+8−7
This diff is too big to show here.
nixos/modules/services/hardware/usbrelayd.nixdeleted−44
This diff is too big to show here.
nixos/modules/services/hardware/vdr.nix+2−2
This diff is too big to show here.
nixos/modules/services/home-automation/home-assistant.nixdeleted−552
This diff is too big to show here.
nixos/modules/services/logging/SystemdJournal2Gelf.nix−1
This diff is too big to show here.
nixos/modules/services/logging/awstats.nix+4−4
This diff is too big to show here.
nixos/modules/services/logging/filebeat.nixdeleted−253
This diff is too big to show here.
nixos/modules/services/logging/fluentd.nix+1−1
This diff is too big to show here.
nixos/modules/services/logging/graylog.nix+4−5
This diff is too big to show here.
nixos/modules/services/logging/journalbeat.nix+17−4
This diff is too big to show here.
nixos/modules/services/logging/journalwatch.nix−1
This diff is too big to show here.
nixos/modules/services/logging/klogd.nix+34−6
This diff is too big to show here.
nixos/modules/services/logging/logcheck.nix+2−6
This diff is too big to show here.
nixos/modules/services/logging/logrotate.nix+33−267
This diff is too big to show here.
nixos/modules/services/logging/logstash.nix+9−23
This diff is too big to show here.
nixos/modules/services/logging/promtail.nix+1−5
This diff is too big to show here.
nixos/modules/services/logging/syslog-ng.nix+2−2
This diff is too big to show here.
nixos/modules/services/mail/davmail.nix+1−1
This diff is too big to show here.
nixos/modules/services/mail/dovecot.nix+48−19
This diff is too big to show here.
nixos/modules/services/mail/exim.nix+3−8
This diff is too big to show here.
nixos/modules/services/mail/maddy.nixdeleted−273
This diff is too big to show here.
nixos/modules/services/mail/mail.nix+1−2
This diff is too big to show here.
nixos/modules/services/mail/mailman.nix+9−17
This diff is too big to show here.
nixos/modules/services/mail/nullmailer.nix+1−1
This diff is too big to show here.
nixos/modules/services/mail/offlineimap.nix+2−2
This diff is too big to show here.
nixos/modules/services/mail/opendkim.nix−1
This diff is too big to show here.
nixos/modules/services/mail/opensmtpd.nix+2−5
This diff is too big to show here.
nixos/modules/services/mail/postfix.nix+22−32
This diff is too big to show here.
nixos/modules/services/mail/postfixadmin.nixdeleted−199
This diff is too big to show here.
nixos/modules/services/mail/roundcube.nix+4−5
This diff is too big to show here.
nixos/modules/services/mail/rspamd.nix+11−9
This diff is too big to show here.
nixos/modules/services/mail/sympa.nix+4−4
This diff is too big to show here.
nixos/modules/services/matrix/matrix-synapse.nixdeleted−773
This diff is too big to show here.
nixos/modules/services/matrix/mjolnir.nixdeleted−242
This diff is too big to show here.
nixos/modules/services/matrix/mjolnir.xmldeleted−134
This diff is too big to show here.
nixos/modules/services/matrix/pantalaimon-options.nixdeleted−70
This diff is too big to show here.
nixos/modules/services/matrix/pantalaimon.nixdeleted−70
This diff is too big to show here.
nixos/modules/services/misc/airsonic.nix+8−32
This diff is too big to show here.
nixos/modules/services/misc/ananicy.nixdeleted−107
This diff is too big to show here.
nixos/modules/services/misc/ankisyncd.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/apache-kafka.nix+3−5
This diff is too big to show here.
nixos/modules/services/misc/autofs.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/autorandr.nix+2−309
This diff is too big to show here.
nixos/modules/services/misc/bees.nix+35−44
This diff is too big to show here.
nixos/modules/services/misc/cfdyndns.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/cgminer.nix+3−7
This diff is too big to show here.
nixos/modules/services/misc/clipcat.nixdeleted−31
This diff is too big to show here.
nixos/modules/services/misc/clipmenu.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/confd.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/couchpotato.nixnew file+42
This diff is too big to show here.
nixos/modules/services/misc/dendrite.nix+8−100
This diff is too big to show here.
nixos/modules/services/misc/dictd.nix+2−2
This diff is too big to show here.
nixos/modules/services/misc/disnix.nix+2−1
This diff is too big to show here.
nixos/modules/services/misc/docker-registry.nix+1−3
This diff is too big to show here.
nixos/modules/services/misc/dwm-status.nix+2−2
This diff is too big to show here.
nixos/modules/services/misc/dysnomia.nix−6
This diff is too big to show here.
nixos/modules/services/misc/etcd.nix+4−14
This diff is too big to show here.
nixos/modules/services/misc/etebase-server.nix+4−4
This diff is too big to show here.
nixos/modules/services/misc/ethminer.nix+4−4
This diff is too big to show here.
nixos/modules/services/misc/exhibitor.nix+1−4
This diff is too big to show here.
nixos/modules/services/misc/felix.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/freeswitch.nix+5−4
This diff is too big to show here.
nixos/modules/services/misc/gammu-smsd.nix+2−2
This diff is too big to show here.
nixos/modules/services/misc/geoip-updater.nixnew file+306
This diff is too big to show here.
nixos/modules/services/misc/geoipupdate.nixdeleted−187
This diff is too big to show here.
nixos/modules/services/misc/gitea.nix+36−52
This diff is too big to show here.
nixos/modules/services/misc/gitit.nix+27−27
This diff is too big to show here.
nixos/modules/services/misc/gitlab.nix+35−206
This diff is too big to show here.
nixos/modules/services/misc/gitolite.nix+5−7
This diff is too big to show here.
nixos/modules/services/misc/gitweb.nix−1
This diff is too big to show here.
nixos/modules/services/misc/gogs.nix+1−4
This diff is too big to show here.
nixos/modules/services/misc/gollum.nix−1
This diff is too big to show here.
nixos/modules/services/misc/gpsd.nix+1−2
This diff is too big to show here.
nixos/modules/services/misc/greenclip.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/headphones.nix+1−3
This diff is too big to show here.
nixos/modules/services/misc/heisenbridge.nixdeleted−222
This diff is too big to show here.
nixos/modules/services/misc/home-assistant.nixnew file+350
This diff is too big to show here.
nixos/modules/services/misc/ihaskell.nix+3−4
This diff is too big to show here.
nixos/modules/services/misc/input-remapper.nixdeleted−30
This diff is too big to show here.
nixos/modules/services/misc/jackett.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/jellyfin.nix+4−6
This diff is too big to show here.
nixos/modules/services/misc/klipper.nix+12−70
This diff is too big to show here.
nixos/modules/services/misc/leaps.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/libreddit.nixdeleted−66
This diff is too big to show here.
nixos/modules/services/misc/lidarr.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/mame.nix+1−3
This diff is too big to show here.
nixos/modules/services/misc/matrix-appservice-discord.nix+2−7
This diff is too big to show here.
nixos/modules/services/misc/matrix-appservice-irc.nix+1−4
This diff is too big to show here.
nixos/modules/services/misc/matrix-conduit.nixdeleted−149
This diff is too big to show here.
nixos/modules/services/matrix/matrix-synapse-log_config.yaml → nixos/modules/services/misc/matrix-synapse-log_config.yamlrenamed
The content is the same.
nixos/modules/services/misc/matrix-synapse.nixnew file+766
This diff is too big to show here.
nixos/modules/services/matrix/matrix-synapse.xml → nixos/modules/services/misc/matrix-synapse.xmlrenamed+17−18
This diff is too big to show here.
nixos/modules/services/misc/mautrix-facebook.nixdeleted−195
This diff is too big to show here.
nixos/modules/services/misc/mautrix-telegram.nix+3−6
This diff is too big to show here.
nixos/modules/services/misc/mbpfan.nix+61−59
This diff is too big to show here.
nixos/modules/services/misc/mediatomb.nix+7−10
This diff is too big to show here.
nixos/modules/services/misc/moonraker.nixdeleted−178
This diff is too big to show here.
nixos/modules/services/misc/mwlib.nixnew file+258
This diff is too big to show here.
nixos/modules/services/misc/mx-puppet-discord.nixdeleted−122
This diff is too big to show here.
nixos/modules/services/misc/n8n.nix+1−2
This diff is too big to show here.
nixos/modules/services/misc/nitter.nixdeleted−358
This diff is too big to show here.
nixos/modules/services/misc/nix-daemon.nix+283−509
This diff is too big to show here.
nixos/modules/services/misc/nix-gc.nix+3−9
This diff is too big to show here.
nixos/modules/services/misc/nix-optimise.nix+2−8
This diff is too big to show here.
nixos/modules/services/misc/nix-ssh-serve.nix+2−10
This diff is too big to show here.
nixos/modules/services/misc/nzbget.nix+18−36
This diff is too big to show here.
nixos/modules/services/misc/nzbhydra2.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/octoprint.nix+3−6
This diff is too big to show here.
nixos/modules/services/misc/owncast.nixdeleted−98
This diff is too big to show here.
nixos/modules/services/misc/packagekit.nix+2−4
This diff is too big to show here.
nixos/modules/services/misc/paperless.nix+67−204
This diff is too big to show here.
nixos/modules/services/misc/plex.nix+14−43
This diff is too big to show here.
nixos/modules/services/misc/prowlarr.nixdeleted−41
This diff is too big to show here.
nixos/modules/services/misc/redmine.nix+9−10
This diff is too big to show here.
nixos/modules/services/misc/ripple-data-api.nix+1−3
This diff is too big to show here.
nixos/modules/services/misc/rippled.nix+5−11
This diff is too big to show here.
nixos/modules/services/misc/rmfakecloud.nixdeleted−147
This diff is too big to show here.
nixos/modules/services/misc/safeeyes.nix−4
This diff is too big to show here.
nixos/modules/services/misc/sdrplay.nixdeleted−35
This diff is too big to show here.
nixos/modules/services/misc/sickbeard.nix+3−6
This diff is too big to show here.
nixos/modules/services/misc/signald.nixdeleted−105
This diff is too big to show here.
nixos/modules/services/misc/snapper.nix+19−42
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/builds.nixdeleted−236
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/default.nixdeleted−1386
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/dispatch.nixdeleted−127
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/git.nixdeleted−217
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/hg.nixdeleted−175
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/hub.nixdeleted−120
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/lists.nixdeleted−187
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/man.nixdeleted−124
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/meta.nixdeleted−213
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/paste.nixdeleted−135
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/service.nixdeleted−375
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/sourcehut.xmldeleted−119
This diff is too big to show here.
nixos/modules/services/misc/sourcehut/todo.nixdeleted−163
This diff is too big to show here.
nixos/modules/services/misc/ssm-agent.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/subsonic.nix+6−10
This diff is too big to show here.
nixos/modules/services/misc/synergy.nix+1−21
This diff is too big to show here.
nixos/modules/services/misc/taskserver/default.nix+10−15
This diff is too big to show here.
nixos/modules/services/misc/taskserver/doc.xml+1−1
This diff is too big to show here.
nixos/modules/services/misc/taskserver/helper-tool.py+5−5
This diff is too big to show here.
nixos/modules/services/misc/tautulli.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/tp-auto-kbbl.nixdeleted−58
This diff is too big to show here.
nixos/modules/services/misc/uhub.nix+153−85
This diff is too big to show here.
nixos/modules/services/misc/weechat.nix+5−9
This diff is too big to show here.
nixos/modules/services/misc/xmr-stak.nix+1−1
This diff is too big to show here.
nixos/modules/services/misc/xmrig.nixdeleted−76
This diff is too big to show here.
nixos/modules/services/home-automation/zigbee2mqtt.nix → nixos/modules/services/misc/zigbee2mqtt.nixrenamed+9−6
This diff is too big to show here.
nixos/modules/services/misc/zoneminder.nix+4−4
This diff is too big to show here.
nixos/modules/services/misc/zookeeper.nix+3−12
This diff is too big to show here.
nixos/modules/services/monitoring/alerta.nix+4
This diff is too big to show here.
nixos/modules/services/monitoring/arbtt.nix+2−1
This diff is too big to show here.
nixos/modules/services/monitoring/bosun.nix+2−1
This diff is too big to show here.
nixos/modules/services/monitoring/cadvisor.nix−2
This diff is too big to show here.
nixos/modules/services/monitoring/collectd.nix+28−56
This diff is too big to show here.
nixos/modules/services/monitoring/datadog-agent.nix+7−9
This diff is too big to show here.
nixos/modules/services/monitoring/grafana-reporter.nix+2−3
This diff is too big to show here.
nixos/modules/services/monitoring/grafana.nix+10−59
This diff is too big to show here.
nixos/modules/services/monitoring/graphite.nix+4−16
This diff is too big to show here.
nixos/modules/services/monitoring/heapster.nix+2−4
This diff is too big to show here.
nixos/modules/services/monitoring/incron.nix+2−7
This diff is too big to show here.
nixos/modules/services/monitoring/kapacitor.nix+4−1
This diff is too big to show here.
nixos/modules/services/monitoring/loki.nix+2−2
This diff is too big to show here.
nixos/modules/services/monitoring/mackerel-agent.nix+1
This diff is too big to show here.
nixos/modules/services/monitoring/metricbeat.nixdeleted−151
This diff is too big to show here.
nixos/modules/services/monitoring/mimir.nixdeleted−63
This diff is too big to show here.
nixos/modules/services/monitoring/munin.nix+5−7
This diff is too big to show here.
nixos/modules/services/monitoring/nagios.nix+6−7
This diff is too big to show here.
nixos/modules/services/monitoring/netdata.nix+42−82
This diff is too big to show here.
nixos/modules/services/monitoring/parsedmarc.mddeleted−113
This diff is too big to show here.
nixos/modules/services/monitoring/parsedmarc.nixdeleted−542
This diff is too big to show here.
nixos/modules/services/monitoring/parsedmarc.xmldeleted−125
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/alertmanager.nix+1−1
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/default.nix+384−1261
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters.nix+4−34
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters.xml−21
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/bird.nix+1−5
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nixdeleted−64
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/dmarc.nixdeleted−117
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix+1−20
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/fastly.nixdeleted−41
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/flow.nix+1−1
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/influxdb.nixdeleted−34
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/kea.nix+1−10
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/knot.nix+1−5
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/mail.nix+1−19
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix+2−2
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix−4
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/nginx.nix+5−5
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/node.nix+2−11
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/pihole.nix+2−2
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/postfix.nix−3
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/postgres.nix−4
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/process.nixdeleted−46
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/pve.nixdeleted−118
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix+21−19
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix−5
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/script.nixdeleted−64
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/smartctl.nixdeleted−75
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix−1
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/snmp.nix+9−7
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/sql.nix−4
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/systemd.nix+1−5
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/unbound.nix−4
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/varnish.nix+2−3
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix−5
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/pushgateway.nix+1−1
This diff is too big to show here.
nixos/modules/services/monitoring/scollector.nix+3−2
This diff is too big to show here.
nixos/modules/services/monitoring/smartd.nix+1−6
This diff is too big to show here.
nixos/modules/services/monitoring/teamviewer.nix+3−6
This diff is too big to show here.
nixos/modules/services/monitoring/telegraf.nix+6−9
This diff is too big to show here.
nixos/modules/services/monitoring/thanos.nix+5−8
This diff is too big to show here.
nixos/modules/services/monitoring/tuptime.nix−1
This diff is too big to show here.
nixos/modules/services/monitoring/unifi-poller.nix+4−80
This diff is too big to show here.
nixos/modules/services/monitoring/uptime.nix+3−7
This diff is too big to show here.
nixos/modules/services/monitoring/zabbix-agent.nix+6−9
This diff is too big to show here.
nixos/modules/services/monitoring/zabbix-proxy.nix+7−18
This diff is too big to show here.
nixos/modules/services/monitoring/zabbix-server.nix+6−17
This diff is too big to show here.
nixos/modules/services/network-filesystems/ceph.nix+22−12
This diff is too big to show here.
nixos/modules/services/network-filesystems/davfs2.nix−18
This diff is too big to show here.
nixos/modules/services/network-filesystems/drbd.nix+7−5
This diff is too big to show here.
nixos/modules/services/network-filesystems/glusterfs.nix+4−1
This diff is too big to show here.
nixos/modules/services/network-filesystems/ipfs.nix+62−100
This diff is too big to show here.
nixos/modules/services/network-filesystems/litestream/default.nixdeleted−100
This diff is too big to show here.
nixos/modules/services/network-filesystems/litestream/litestream.xmldeleted−65
This diff is too big to show here.
nixos/modules/services/network-filesystems/moosefs.nixdeleted−249
This diff is too big to show here.
nixos/modules/services/network-filesystems/openafs/client.nix+8−7
This diff is too big to show here.
nixos/modules/services/network-filesystems/openafs/server.nix+3−3
This diff is too big to show here.
nixos/modules/services/network-filesystems/orangefs/client.nix+1
This diff is too big to show here.
nixos/modules/services/network-filesystems/orangefs/server.nix+9−9
This diff is too big to show here.
nixos/modules/services/network-filesystems/rsyncd.nix+1−1
This diff is too big to show here.
nixos/modules/services/network-filesystems/samba.nix+6−17
This diff is too big to show here.
nixos/modules/services/network-filesystems/tahoe.nix+4−2
This diff is too big to show here.
nixos/modules/services/network-filesystems/webdav-server-rs.nixdeleted−144
This diff is too big to show here.
nixos/modules/services/network-filesystems/webdav.nixdeleted−107
This diff is too big to show here.
nixos/modules/services/network-filesystems/xtreemfs.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/3proxy.nix+16−3
This diff is too big to show here.
nixos/modules/services/networking/adguardhome.nix+5−67
This diff is too big to show here.
nixos/modules/services/networking/amuled.nix+2−6
This diff is too big to show here.
nixos/modules/services/networking/antennas.nixdeleted−80
This diff is too big to show here.
nixos/modules/services/networking/asterisk.nix+45−13
This diff is too big to show here.
nixos/modules/services/networking/atftpd.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/autossh.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/avahi-daemon.nix+5−5
This diff is too big to show here.
nixos/modules/services/networking/babeld.nix+1−7
This diff is too big to show here.
nixos/modules/services/networking/bee.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/biboumi.nix−1
This diff is too big to show here.
nixos/modules/services/networking/bind.nix+8−38
This diff is too big to show here.
nixos/modules/services/networking/bird.nix+75−90
This diff is too big to show here.
nixos/modules/services/networking/bitcoind.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/bitlbee.nix+16−8
This diff is too big to show here.
nixos/modules/services/networking/blockbook-frontend.nix+9−6
This diff is too big to show here.
nixos/modules/services/networking/blocky.nixdeleted−40
This diff is too big to show here.
nixos/modules/services/networking/charybdis.nix+1−8
This diff is too big to show here.
nixos/modules/services/networking/cjdns.nix+3−3
This diff is too big to show here.
nixos/modules/services/networking/cloudflare-dyndns.nixdeleted−93
This diff is too big to show here.
nixos/modules/services/networking/connman.nix+4−6
This diff is too big to show here.
nixos/modules/services/networking/consul.nix+10−40
This diff is too big to show here.
nixos/modules/services/networking/coredns.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/corerad.nix+4−4
This diff is too big to show here.
nixos/modules/services/networking/coturn.nix+37−68
This diff is too big to show here.
nixos/modules/services/networking/create_ap.nixdeleted−50
This diff is too big to show here.
nixos/modules/services/networking/croc.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/ddclient.nix+24−54
This diff is too big to show here.
nixos/modules/services/networking/dhcpcd.nix+1−22
This diff is too big to show here.
nixos/modules/services/networking/dhcpd.nix+50−49
This diff is too big to show here.
nixos/modules/services/networking/dnscache.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/dnscrypt-proxy2.nix+3−6
This diff is too big to show here.
nixos/modules/services/networking/dnscrypt-wrapper.nix−2
This diff is too big to show here.
nixos/modules/services/networking/dnsmasq.nix+1−3
This diff is too big to show here.
nixos/modules/services/networking/doh-proxy-rust.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/ejabberd.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/envoy.nixdeleted−84
This diff is too big to show here.
nixos/modules/services/networking/epmd.nix+3−17
This diff is too big to show here.
nixos/modules/services/networking/ergo.nix+2−4
This diff is too big to show here.
nixos/modules/services/networking/ergochat.nixdeleted−155
This diff is too big to show here.
nixos/modules/services/networking/eternal-terminal.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/ferm.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/firefox/sync-server.nixnew file+183
This diff is too big to show here.
nixos/modules/services/networking/firewall.nix+9−8
This diff is too big to show here.
nixos/modules/services/networking/flannel.nix+2−5
This diff is too big to show here.
nixos/modules/services/networking/freeradius.nix−2
This diff is too big to show here.
nixos/modules/services/networking/frr.nixdeleted−211
This diff is too big to show here.
nixos/modules/services/networking/gale.nixnew file+181
This diff is too big to show here.
nixos/modules/services/networking/ghostunnel.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/git-daemon.nix+1−2
This diff is too big to show here.
nixos/modules/services/networking/globalprotect-vpn.nixdeleted−43
This diff is too big to show here.
nixos/modules/services/networking/gnunet.nix+11−15
This diff is too big to show here.
nixos/modules/services/networking/go-neb.nix+4−30
This diff is too big to show here.
nixos/modules/services/networking/gobgpd.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/gogoclient.nixnew file+87
This diff is too big to show here.
nixos/modules/services/networking/hans.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/headscale.nixdeleted−490
This diff is too big to show here.
nixos/modules/services/networking/https-dns-proxy.nixdeleted−128
This diff is too big to show here.
nixos/modules/services/networking/hylafax/options.nix+13−11
This diff is too big to show here.
nixos/modules/services/networking/i2pd.nix+12−19
This diff is too big to show here.
nixos/modules/services/networking/icecream/daemon.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/icecream/scheduler.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/inspircd.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/iodine.nix+1−2
This diff is too big to show here.
nixos/modules/services/networking/ircd-hybrid/default.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/iscsi/initiator.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/iscsi/root-initiator.nix−9
This diff is too big to show here.
nixos/modules/services/networking/iwd.nix+6−43
This diff is too big to show here.
nixos/modules/services/networking/jibri/default.nixdeleted−417
This diff is too big to show here.
nixos/modules/services/networking/jibri/logging.properties-journaldeleted−32
This diff is too big to show here.
nixos/modules/services/networking/jicofo.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/jitsi-videobridge.nix+3−5
This diff is too big to show here.
nixos/modules/services/networking/kea.nixdeleted−449
This diff is too big to show here.
nixos/modules/services/networking/keepalived/vrrp-instance-options.nix+3−1
This diff is too big to show here.
nixos/modules/services/networking/keepalived/vrrp-script-options.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/kippo.nixnew file+117
This diff is too big to show here.
nixos/modules/services/networking/knot.nix+8−43
This diff is too big to show here.
nixos/modules/services/networking/kresd.nix+6−7
This diff is too big to show here.
nixos/modules/services/networking/lambdabot.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/libreswan.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/lxd-image-server.nixdeleted−133
This diff is too big to show here.
nixos/modules/services/networking/mailpile.nixnew file+74
This diff is too big to show here.
nixos/modules/services/networking/matterbridge.nix+3−3
This diff is too big to show here.
nixos/modules/services/networking/minidlna.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/miredo.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/monero.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/morty.nix+5−4
This diff is too big to show here.
nixos/modules/services/networking/mosquitto.mddeleted−102
This diff is too big to show here.
nixos/modules/services/networking/mosquitto.nix+175−541
This diff is too big to show here.
nixos/modules/services/networking/mosquitto.xmldeleted−147
This diff is too big to show here.
nixos/modules/services/networking/mozillavpn.nixdeleted−19
This diff is too big to show here.
nixos/modules/services/networking/mtr-exporter.nixdeleted−87
This diff is too big to show here.
nixos/modules/services/networking/mullvad-vpn.nix+1−5
This diff is too big to show here.
nixos/modules/services/networking/multipath.nixdeleted−557
This diff is too big to show here.
nixos/modules/services/networking/murmur.nix+4−4
This diff is too big to show here.
nixos/modules/services/networking/mxisd.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/namecoind.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/nar-serve.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/nat.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/nats.nixdeleted−158
This diff is too big to show here.
nixos/modules/services/networking/nbd.nixdeleted−159
This diff is too big to show here.
nixos/modules/services/networking/ncdns.nix+3−6
This diff is too big to show here.
nixos/modules/services/networking/ndppd.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/nebula.nix+8−6
This diff is too big to show here.
nixos/modules/services/networking/networkmanager.nix+88−162
This diff is too big to show here.
nixos/modules/services/networking/nftables.nix+12−7
This diff is too big to show here.
nixos/modules/services/networking/ngircd.nix+2−5
This diff is too big to show here.
nixos/modules/services/networking/nix-serve.nix+10−20
This diff is too big to show here.
nixos/modules/services/networking/nixops-dns.nix+1
This diff is too big to show here.
nixos/modules/services/networking/nntp-proxy.nix+18−18
This diff is too big to show here.
nixos/modules/services/networking/nomad.nix+7−20
This diff is too big to show here.
nixos/modules/services/networking/nsd.nix+16−11
This diff is too big to show here.
nixos/modules/services/networking/ntopng.nix+13−57
This diff is too big to show here.
nixos/modules/services/networking/ntp/chrony.nix+12−22
This diff is too big to show here.
nixos/modules/services/networking/ntp/ntpd.nix+7−8
This diff is too big to show here.
nixos/modules/services/networking/ntp/openntpd.nix+1−4
This diff is too big to show here.
nixos/modules/services/networking/nylon.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/ofono.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/onedrive.nix+2−1
This diff is too big to show here.
nixos/modules/services/networking/openconnect.nixdeleted−137
This diff is too big to show here.
nixos/modules/services/networking/openfire.nixnew file+56
This diff is too big to show here.
nixos/modules/services/networking/openvpn.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/ostinato.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/pdns-recursor.nix+8−13
This diff is too big to show here.
nixos/modules/services/networking/pleroma.nix+4−12
This diff is too big to show here.
nixos/modules/services/networking/pleroma.xml+121−177
This diff is too big to show here.
nixos/modules/services/networking/powerdns.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/pppd.nix+5−23
This diff is too big to show here.
nixos/modules/services/networking/privoxy.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/prosody.nix+2−3
This diff is too big to show here.
nixos/modules/services/networking/prosody.xml+1−1
This diff is too big to show here.
nixos/modules/services/networking/quassel.nix+3−6
This diff is too big to show here.
nixos/modules/services/networking/quicktun.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/quorum.nix+3−5
This diff is too big to show here.
nixos/modules/services/networking/racoon.nixnew file+45
This diff is too big to show here.
nixos/modules/services/networking/radicale.nix+5−9
This diff is too big to show here.
nixos/modules/services/networking/radvd.nix+1−4
This diff is too big to show here.
nixos/modules/services/networking/rdnssd.nix+1−3
This diff is too big to show here.
nixos/modules/services/networking/resilio.nix−1
This diff is too big to show here.
nixos/modules/services/networking/sabnzbd.nix+1−8
This diff is too big to show here.
nixos/modules/services/networking/seafile.nixdeleted−287
This diff is too big to show here.
nixos/modules/services/networking/searx.nix+4−3
This diff is too big to show here.
nixos/modules/services/networking/shadowsocks.nix+6−4
This diff is too big to show here.
nixos/modules/services/networking/shairport-sync.nix+2−29
This diff is too big to show here.
nixos/modules/services/networking/shellhub-agent.nix+17−26
This diff is too big to show here.
nixos/modules/services/networking/shorewall.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/shorewall6.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/shout.nix+2−4
This diff is too big to show here.
nixos/modules/services/networking/skydns.nix+1−2
This diff is too big to show here.
nixos/modules/services/networking/smartdns.nix+1−2
This diff is too big to show here.
nixos/modules/services/networking/smokeping.nix+21−61
This diff is too big to show here.
nixos/modules/services/networking/sniproxy.nix+17−6
This diff is too big to show here.
nixos/modules/services/networking/snowflake-proxy.nixdeleted−81
This diff is too big to show here.
nixos/modules/services/networking/softether.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/soju.nixdeleted−114
This diff is too big to show here.
nixos/modules/services/networking/solanum.nix+2−10
This diff is too big to show here.
nixos/modules/services/networking/spacecookie.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/spiped.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/squid.nix+4−23
This diff is too big to show here.
nixos/modules/services/networking/ssh/sshd.nix+23−44
This diff is too big to show here.
nixos/modules/services/networking/strongswan-swanctl/module.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix−10
This diff is too big to show here.
nixos/modules/services/networking/strongswan.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/stubby.nix+174−46
This diff is too big to show here.
nixos/modules/services/networking/stunnel.nix+2−3
This diff is too big to show here.
nixos/modules/services/networking/supplicant.nix+3−3
This diff is too big to show here.
nixos/modules/services/networking/supybot.nix+3−4
This diff is too big to show here.
nixos/modules/services/networking/syncplay.nix+3−19
This diff is too big to show here.
nixos/modules/services/networking/syncthing.nix+308−372
This diff is too big to show here.
nixos/modules/services/networking/tailscale.nix+3−20
This diff is too big to show here.
nixos/modules/services/networking/teamspeak3.nix+2−20
This diff is too big to show here.
nixos/modules/services/networking/tedicross.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/teleport.nixdeleted−99
This diff is too big to show here.
nixos/modules/services/networking/tetrd.nixdeleted−96
This diff is too big to show here.
nixos/modules/services/networking/thelounge.nix+8−39
This diff is too big to show here.
nixos/modules/services/networking/tinc.nix+8−11
This diff is too big to show here.
nixos/modules/services/networking/tinydns.nix+1−5
This diff is too big to show here.
nixos/modules/services/networking/tox-bootstrapd.nix+13−8
This diff is too big to show here.
nixos/modules/services/networking/tox-node.nix+6−1
This diff is too big to show here.
nixos/modules/services/networking/toxvpn.nix+2−4
This diff is too big to show here.
nixos/modules/services/networking/trickster.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/tvheadend.nix+1−3
This diff is too big to show here.
nixos/modules/services/networking/ucarp.nixdeleted−183
This diff is too big to show here.
nixos/modules/services/networking/unbound.nix+3−13
This diff is too big to show here.
nixos/modules/services/networking/unifi.nix+60−80
This diff is too big to show here.
nixos/modules/services/networking/v2ray.nix+7−15
This diff is too big to show here.
nixos/modules/services/networking/vsftpd.nix+2−5
This diff is too big to show here.
nixos/modules/services/networking/wakeonlan.nixnew file+56
This diff is too big to show here.
nixos/modules/services/networking/wasabibackend.nix+2−4
This diff is too big to show here.
nixos/modules/services/networking/websockify.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/wg-netmanager.nixdeleted−42
This diff is too big to show here.
nixos/modules/services/networking/wg-quick.nix+13−12
This diff is too big to show here.
nixos/modules/services/networking/wicd.nixnew file+40
This diff is too big to show here.
nixos/modules/services/networking/wireguard.nix+21−7
This diff is too big to show here.
nixos/modules/services/networking/wpa_supplicant.nix+87−341
This diff is too big to show here.
nixos/modules/services/networking/xandikos.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/xrdp.nix+3−17
This diff is too big to show here.
nixos/modules/services/networking/yggdrasil.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/yggdrasil.xml+1
This diff is too big to show here.
nixos/modules/services/networking/zeronet.nix+7−5
This diff is too big to show here.
nixos/modules/services/networking/zerotierone.nix+2−1
This diff is too big to show here.
nixos/modules/services/networking/znc/default.nix+5−5
This diff is too big to show here.
nixos/modules/services/networking/znc/options.nix+6−6
This diff is too big to show here.
nixos/modules/services/printing/cupsd.nix+1−1
This diff is too big to show here.
nixos/modules/services/scheduling/atd.nix+1−3
This diff is too big to show here.
nixos/modules/services/scheduling/cron.nix+2−7
This diff is too big to show here.
nixos/modules/services/scheduling/fcron.nix−3
This diff is too big to show here.
nixos/modules/services/search/elasticsearch.nix+12−43
This diff is too big to show here.
nixos/modules/services/search/hound.nix+11−13
This diff is too big to show here.
nixos/modules/services/search/kibana.nix+4−9
This diff is too big to show here.
nixos/modules/services/search/meilisearch.mddeleted−39
This diff is too big to show here.
nixos/modules/services/search/meilisearch.nixdeleted−132
This diff is too big to show here.
nixos/modules/services/search/meilisearch.xmldeleted−85
This diff is too big to show here.
nixos/modules/services/search/solr.nix+1−1
This diff is too big to show here.
nixos/modules/services/security/aesmd.nixdeleted−236
This diff is too big to show here.
nixos/modules/services/security/vaultwarden/backup.sh → nixos/modules/services/security/bitwarden_rs/backup.shrenamed+1−1
This diff is too big to show here.
nixos/modules/services/security/bitwarden_rs/default.nixnew file+161
This diff is too big to show here.
nixos/modules/services/security/certmgr.nix+2−2
This diff is too big to show here.
nixos/modules/services/security/cfssl.nix+43−56
This diff is too big to show here.
nixos/modules/services/security/clamav.nix+5−4
This diff is too big to show here.
nixos/modules/services/security/fail2ban.nix+6−24
This diff is too big to show here.
nixos/modules/services/security/fprintd.nix+2−2
This diff is too big to show here.
nixos/modules/services/security/fprot.nixnew file+82
This diff is too big to show here.
nixos/modules/services/security/haka.nix+1−1
This diff is too big to show here.
nixos/modules/services/security/haveged.nix+29−39
This diff is too big to show here.
nixos/modules/services/security/hockeypuck.nixdeleted−106
This diff is too big to show here.
nixos/modules/services/security/nginx-sso.nix+2−2
This diff is too big to show here.
nixos/modules/services/security/oauth2_proxy.nix+5−10
This diff is too big to show here.
nixos/modules/services/security/oauth2_proxy_nginx.nix−1
This diff is too big to show here.
nixos/modules/services/security/opensnitch.nixdeleted−125
This diff is too big to show here.
nixos/modules/services/security/physlock.nix+4−6
This diff is too big to show here.
nixos/modules/services/security/privacyidea.nix+8−12
This diff is too big to show here.
nixos/modules/services/security/shibboleth-sp.nix+1−1
This diff is too big to show here.
nixos/modules/services/security/sks.nix+2−2
This diff is too big to show here.
nixos/modules/services/security/sslmate-agent.nixdeleted−32
This diff is too big to show here.
nixos/modules/services/security/step-ca.nix+1−13
This diff is too big to show here.
nixos/modules/services/security/tor.nix+7−28
This diff is too big to show here.
nixos/modules/services/security/torsocks.nix−1
This diff is too big to show here.
nixos/modules/services/security/usbguard.nix+1−1
This diff is too big to show here.
nixos/modules/services/security/vault.nix+2−8
This diff is too big to show here.
nixos/modules/services/security/vaultwarden/default.nixdeleted−185
This diff is too big to show here.
nixos/modules/services/security/yubikey-agent.nix+2−8
This diff is too big to show here.
nixos/modules/services/system/cachix-agent/default.nixdeleted−57
This diff is too big to show here.
nixos/modules/services/system/cloud-init.nix+1−15
This diff is too big to show here.
nixos/modules/services/system/earlyoom.nix+97−134
This diff is too big to show here.
nixos/modules/services/system/kerberos/heimdal.nix+1−1
This diff is too big to show here.
nixos/modules/services/system/localtime.nix−2
This diff is too big to show here.
nixos/modules/services/system/nscd.nix+9−20
This diff is too big to show here.
nixos/modules/services/system/saslauthd.nix+1−1
This diff is too big to show here.
nixos/modules/services/system/self-deploy.nix+3−6
This diff is too big to show here.
nixos/modules/services/system/systembus-notify.nixdeleted−27
This diff is too big to show here.
nixos/modules/services/system/uptimed.nix+3−7
This diff is too big to show here.
nixos/modules/services/torrent/deluge.nix+2−9
This diff is too big to show here.
nixos/modules/services/torrent/flexget.nix+1−1
This diff is too big to show here.
nixos/modules/services/torrent/magnetico.nix+1−3
This diff is too big to show here.
nixos/modules/services/torrent/opentracker.nix+1−1
This diff is too big to show here.
nixos/modules/services/torrent/peerflix.nix+2−8
This diff is too big to show here.
nixos/modules/services/torrent/rtorrent.nix+2−4
This diff is too big to show here.
nixos/modules/services/torrent/transmission.nix+135−225
This diff is too big to show here.
nixos/modules/services/ttys/getty.nix+14−20
This diff is too big to show here.
nixos/modules/services/ttys/kmscon.nix+5−24
This diff is too big to show here.
nixos/modules/services/video/epgstation/default.nix+154−193
This diff is too big to show here.
nixos/modules/services/video/epgstation/streaming.json+108−129
This diff is too big to show here.
nixos/modules/services/video/mirakurun.nix+5−5
This diff is too big to show here.
nixos/modules/services/video/replay-sorcery.nixdeleted−72
This diff is too big to show here.
nixos/modules/services/video/rtsp-simple-server.nixdeleted−80
This diff is too big to show here.
nixos/modules/services/video/unifi-video.nixdeleted−271
This diff is too big to show here.
nixos/modules/services/wayland/cage.nix+2−7
This diff is too big to show here.
nixos/modules/services/web-apps/atlassian/confluence.nix+2−2
This diff is too big to show here.
nixos/modules/services/web-apps/atlassian/crowd.nix+2−2
This diff is too big to show here.
nixos/modules/services/web-apps/atlassian/jira.nix+2−3
This diff is too big to show here.
nixos/modules/services/web-apps/baget.nixdeleted−170
This diff is too big to show here.
nixos/modules/services/web-apps/bookstack.nix+73−154
This diff is too big to show here.
nixos/modules/services/web-apps/code-server.nixdeleted−139
This diff is too big to show here.
nixos/modules/services/web-apps/cryptpad.nix+2−2
This diff is too big to show here.
nixos/modules/services/web-apps/dex.nixdeleted−118
This diff is too big to show here.
nixos/modules/services/web-apps/discourse.nix+48−106
This diff is too big to show here.
nixos/modules/services/web-apps/discourse.xml+12−44
This diff is too big to show here.
nixos/modules/services/web-apps/documize.nix−1
This diff is too big to show here.
nixos/modules/services/web-apps/dokuwiki.nix+274−325
This diff is too big to show here.
nixos/modules/services/web-apps/engelsystem.nix+3−3
This diff is too big to show here.
nixos/modules/services/web-apps/ethercalc.nixdeleted−62
This diff is too big to show here.
nixos/modules/services/web-apps/fluidd.nixdeleted−66
This diff is too big to show here.
nixos/modules/services/web-apps/galene.nix+2−36
This diff is too big to show here.
nixos/modules/services/web-apps/gerrit.nix+1−4
This diff is too big to show here.
nixos/modules/services/web-apps/hedgedoc.nix+8−72
This diff is too big to show here.
nixos/modules/services/web-apps/hledger-web.nix+2−2
This diff is too big to show here.
nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix+1−19
This diff is too big to show here.
nixos/modules/services/web-apps/ihatemoney/default.nix+2−17
This diff is too big to show here.
nixos/modules/services/web-apps/invidious.nixdeleted−264
This diff is too big to show here.
nixos/modules/services/web-apps/invoiceplane.nixdeleted−305
This diff is too big to show here.
nixos/modules/services/web-apps/isso.nixdeleted−69
This diff is too big to show here.
nixos/modules/services/web-apps/jirafeau.nix+6−10
This diff is too big to show here.
nixos/modules/services/web-apps/jitsi-meet.nix+12−130
This diff is too big to show here.
nixos/modules/services/web-apps/jitsi-meet.xml+2−2
This diff is too big to show here.
nixos/modules/services/web-apps/keycloak.nix+599−546
This diff is too big to show here.
nixos/modules/services/web-apps/keycloak.xml+69−65
This diff is too big to show here.
nixos/modules/services/web-apps/lemmy.mddeleted−34
This diff is too big to show here.
nixos/modules/services/web-apps/lemmy.nixdeleted−236
This diff is too big to show here.
nixos/modules/services/web-apps/lemmy.xmldeleted−56
This diff is too big to show here.
nixos/modules/services/web-apps/limesurvey.nix+5−5
This diff is too big to show here.
nixos/modules/services/web-apps/mastodon.nix+11−50
This diff is too big to show here.
nixos/modules/services/web-apps/matomo.nix+15−44
This diff is too big to show here.
nixos/modules/services/web-apps/mattermost.nix+37−145
This diff is too big to show here.
nixos/modules/services/web-apps/mediawiki.nix+5−6
This diff is too big to show here.
nixos/modules/services/web-apps/miniflux.nix+29−49
This diff is too big to show here.
nixos/modules/services/web-apps/moinmoin.nixnew file+304
This diff is too big to show here.
nixos/modules/services/web-apps/moodle.nix+7−7
This diff is too big to show here.
nixos/modules/services/web-apps/netbox.nixdeleted−265
This diff is too big to show here.
nixos/modules/services/web-apps/nextcloud.nix+101−376
This diff is too big to show here.
nixos/modules/services/web-apps/nextcloud.xml+40−92
This diff is too big to show here.
nixos/modules/services/web-apps/nexus.nix−22
This diff is too big to show here.
nixos/modules/services/web-apps/nifi.nixdeleted−318
This diff is too big to show here.
nixos/modules/services/web-apps/node-red.nixdeleted−149
This diff is too big to show here.
nixos/modules/services/web-apps/openwebrx.nixdeleted−34
This diff is too big to show here.
nixos/modules/services/web-apps/peertube.nixdeleted−475
This diff is too big to show here.
nixos/modules/services/web-apps/pgpkeyserver-lite.nix+2−5
This diff is too big to show here.
nixos/modules/services/web-apps/pict-rs.mddeleted−88
This diff is too big to show here.
nixos/modules/services/web-apps/pict-rs.nixdeleted−50
This diff is too big to show here.
nixos/modules/services/web-apps/pict-rs.xmldeleted−162
This diff is too big to show here.
nixos/modules/services/web-apps/plantuml-server.nix+4−21
This diff is too big to show here.
nixos/modules/services/web-apps/plausible.nixdeleted−292
This diff is too big to show here.
nixos/modules/services/web-apps/plausible.xmldeleted−51
This diff is too big to show here.
nixos/modules/services/web-apps/powerdns-admin.nixdeleted−152
This diff is too big to show here.
nixos/modules/services/web-apps/prosody-filer.nixdeleted−86
This diff is too big to show here.
nixos/modules/services/web-apps/restya-board.nix+4−1
This diff is too big to show here.
nixos/modules/services/web-apps/rss-bridge.nix+4−2
This diff is too big to show here.
nixos/modules/services/web-apps/selfoss.nix+1
This diff is too big to show here.
nixos/modules/services/web-apps/shiori.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-apps/timetagger.nixdeleted−80
This diff is too big to show here.
nixos/modules/services/web-apps/trac.nixnew file+79
This diff is too big to show here.
nixos/modules/services/web-apps/trilium.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-apps/tt-rss.nix+88−97
This diff is too big to show here.
nixos/modules/services/web-apps/vikunja.nixdeleted−145
This diff is too big to show here.
nixos/modules/services/web-apps/whitebophir.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-apps/wordpress.nix+61−175
This diff is too big to show here.
nixos/modules/services/web-apps/youtrack.nix+2−3
This diff is too big to show here.
nixos/modules/services/web-apps/zabbix.nix+5−12
This diff is too big to show here.
nixos/modules/services/web-servers/agate.nixdeleted−148
This diff is too big to show here.
nixos/modules/services/web-servers/apache-httpd/default.nix+30−46
This diff is too big to show here.
nixos/modules/services/web-servers/apache-httpd/vhost-options.nix+6−26
This diff is too big to show here.
nixos/modules/services/web-servers/caddy.nixnew file+171
This diff is too big to show here.
nixos/modules/services/web-servers/caddy/default.nixdeleted−339
This diff is too big to show here.
nixos/modules/services/web-servers/caddy/vhost-options.nixdeleted−79
This diff is too big to show here.
nixos/modules/services/web-servers/darkhttpd.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-servers/hydron.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-servers/lighttpd/cgit.nix+5−7
This diff is too big to show here.
nixos/modules/services/web-servers/lighttpd/collectd.nix+1−5
This diff is too big to show here.
nixos/modules/services/web-servers/lighttpd/default.nix+2−14
This diff is too big to show here.
nixos/modules/services/web-servers/minio.nix+7−30
This diff is too big to show here.
nixos/modules/services/web-servers/molly-brown.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-servers/nginx/default.nix+31−110
This diff is too big to show here.
nixos/modules/services/web-servers/nginx/gitweb.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-servers/nginx/location-options.nix+2−2
This diff is too big to show here.
nixos/modules/services/web-servers/nginx/vhost-options.nix+10−50
This diff is too big to show here.
nixos/modules/services/web-servers/phpfpm/default.nix+5−5
This diff is too big to show here.
nixos/modules/services/web-servers/pomerium.nix+3−7
This diff is too big to show here.
nixos/modules/services/web-servers/shellinabox.nixnew file+122
This diff is too big to show here.
nixos/modules/services/web-servers/tomcat.nix+5−6
This diff is too big to show here.
nixos/modules/services/web-servers/traefik.nix+3−3
This diff is too big to show here.
nixos/modules/services/web-servers/trafficserver.nixnew file+318
This diff is too big to show here.
nixos/modules/services/web-servers/trafficserver/default.nixdeleted−310
This diff is too big to show here.
nixos/modules/services/web-servers/trafficserver/ip_allow.jsondeleted−36
This diff is too big to show here.
nixos/modules/services/web-servers/trafficserver/logging.jsondeleted−37
This diff is too big to show here.
nixos/modules/services/web-servers/ttyd.nix+2−2
This diff is too big to show here.
nixos/modules/services/web-servers/unit/default.nix+2−2
This diff is too big to show here.
nixos/modules/services/web-servers/uwsgi.nix+12−10
This diff is too big to show here.
nixos/modules/services/web-servers/varnish/default.nix+7−9
This diff is too big to show here.
nixos/modules/services/web-servers/zope2.nix+2−6
This diff is too big to show here.
nixos/modules/services/x11/clight.nix−8
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/cde.nix+3−4
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/cinnamon.nix+7−15
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/default.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/enlightenment.nix+3−24
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/gnome.nix+78−82
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/gnome.xml+24
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/kodi.nix+2−2
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/lumina.nix−4
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/lxqt.nix+3−12
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/mate.nix+38−10
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/none.nix+5−44
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/pantheon.nix+22−37
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/pantheon.xml+5−11
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/plasma5.nix+130−330
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/retroarch.nixdeleted−40
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/surf-display.nix+1−2
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/xfce.nix+3−10
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/xterm.nix+2−2
This diff is too big to show here.
nixos/modules/services/x11/display-managers/account-service-util.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/display-managers/default.nix+12−16
This diff is too big to show here.
nixos/modules/services/x11/display-managers/gdm.nix+56−45
This diff is too big to show here.
nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix+3−3
This diff is too big to show here.
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix+3−3
This diff is too big to show here.
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix+2−2
This diff is too big to show here.
nixos/modules/services/x11/display-managers/lightdm.nix+6−8
This diff is too big to show here.
nixos/modules/services/x11/display-managers/sddm.nix+9−10
This diff is too big to show here.
nixos/modules/services/x11/display-managers/set-session.py−3
This diff is too big to show here.
nixos/modules/services/x11/display-managers/startx.nix+3
This diff is too big to show here.
nixos/modules/services/x11/display-managers/sx.nixdeleted−34
This diff is too big to show here.
nixos/modules/services/x11/extra-layouts.nix+48−9
This diff is too big to show here.
nixos/modules/services/x11/hardware/libinput.nix+25−41
This diff is too big to show here.
nixos/modules/services/x11/hardware/synaptics.nix+1−6
This diff is too big to show here.
nixos/modules/services/x11/imwheel.nix+9−11
This diff is too big to show here.
nixos/modules/services/x11/picom.nix+3−13
This diff is too big to show here.
nixos/modules/services/x11/redshift.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/touchegg.nixdeleted−38
This diff is too big to show here.
nixos/modules/services/x11/unclutter-xfixes.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/unclutter.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/urxvtd.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/window-managers/awesome.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/window-managers/bspwm.nix+6−6
This diff is too big to show here.
nixos/modules/services/x11/window-managers/clfswm.nix+3−13
This diff is too big to show here.
nixos/modules/services/x11/window-managers/default.nix−1
This diff is too big to show here.
nixos/modules/services/x11/window-managers/exwm.nix+3−4
This diff is too big to show here.
nixos/modules/services/x11/window-managers/fvwm.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/window-managers/herbstluftwm.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/window-managers/i3.nix+3−3
This diff is too big to show here.
nixos/modules/services/x11/window-managers/mlvwm.nixdeleted−41
This diff is too big to show here.
nixos/modules/services/x11/window-managers/qtile.nix+4−11
This diff is too big to show here.
nixos/modules/services/x11/window-managers/wmderland.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/window-managers/xmonad.nix+15−51
This diff is too big to show here.
nixos/modules/services/x11/xautolock.nix+3−4
This diff is too big to show here.
nixos/modules/services/x11/xserver.nix+40−77
This diff is too big to show here.
nixos/modules/system/activation/activation-script.nix+46−77
This diff is too big to show here.
nixos/modules/system/activation/switch-to-configuration.plmode 100755 → 100644+254−697
This diff is too big to show here.
nixos/modules/system/activation/top-level.nix+35−100
This diff is too big to show here.
nixos/modules/system/boot/binfmt.nix+10−52
This diff is too big to show here.
nixos/modules/system/boot/initrd-openvpn.nix+1−1
This diff is too big to show here.
nixos/modules/system/boot/initrd-ssh.nix+1−1
This diff is too big to show here.
nixos/modules/system/boot/kernel.nix+13−16
This diff is too big to show here.
nixos/modules/system/boot/kernel_config.nix+1−1
This diff is too big to show here.
nixos/modules/system/boot/kexec.nix+3−3
This diff is too big to show here.
nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix+1−18
This diff is too big to show here.
nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh+3−9
This diff is too big to show here.
nixos/modules/system/boot/loader/grub/grub.nix+7−36
This diff is too big to show here.
nixos/modules/system/boot/loader/grub/install-grub.pl+86−115
This diff is too big to show here.
nixos/modules/system/boot/loader/grub/ipxe.nix+1−1
This diff is too big to show here.
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py+60−102
This diff is too big to show here.
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+3−152
This diff is too big to show here.
nixos/modules/system/boot/luksroot.nix+9−77
This diff is too big to show here.
nixos/modules/system/boot/modprobe.nix−2
This diff is too big to show here.
nixos/modules/system/boot/networkd.nix+14−328
This diff is too big to show here.
nixos/modules/system/boot/plymouth.nix+2−9
This diff is too big to show here.
nixos/modules/system/boot/resolved.nix+1−3
This diff is too big to show here.
nixos/modules/system/boot/stage-1-init.sh+40−41
This diff is too big to show here.
nixos/modules/system/boot/stage-1.nix+23−92
This diff is too big to show here.
nixos/modules/system/boot/stage-2-init.shmode 100755 → 100644+100−71
This diff is too big to show here.
nixos/modules/system/boot/stage-2.nix+39−2
This diff is too big to show here.
nixos/modules/system/boot/systemd-lib.nixnew file+237
This diff is too big to show here.
nixos/modules/system/boot/systemd-nspawn.nixnew file+133
This diff is too big to show here.
nixos/modules/system/boot/systemd-unit-options.nixnew file+536
This diff is too big to show here.
nixos/modules/system/boot/systemd.nix+673−87
This diff is too big to show here.
nixos/modules/system/boot/systemd/coredump.nixdeleted−57
This diff is too big to show here.
nixos/modules/system/boot/systemd/initrd-secrets.nixdeleted−36
This diff is too big to show here.
nixos/modules/system/boot/systemd/initrd.nixdeleted−502
This diff is too big to show here.
nixos/modules/system/boot/systemd/journald.nixdeleted−131
This diff is too big to show here.
nixos/modules/system/boot/systemd/logind.nixdeleted−114
This diff is too big to show here.
nixos/modules/system/boot/systemd/nspawn.nixdeleted−131
This diff is too big to show here.
nixos/modules/system/boot/systemd/shutdown.nixdeleted−58
This diff is too big to show here.
nixos/modules/system/boot/systemd/tmpfiles.nixdeleted−120
This diff is too big to show here.
nixos/modules/system/boot/systemd/user.nixdeleted−153
This diff is too big to show here.
nixos/modules/system/boot/timesyncd.nix+5−19
This diff is too big to show here.
nixos/modules/system/boot/tmp.nix+2−20
This diff is too big to show here.
nixos/modules/system/build.nixdeleted−21
This diff is too big to show here.
nixos/modules/system/etc/etc-activation.nixdeleted−12
This diff is too big to show here.
nixos/modules/system/etc/etc.nix+21−60
This diff is too big to show here.
nixos/modules/system/etc/make-etc.shnew file+45
This diff is too big to show here.
nixos/modules/system/etc/setup-etc.pl−6
This diff is too big to show here.
nixos/modules/system/etc/test.nixdeleted−70
This diff is too big to show here.
nixos/modules/tasks/auto-upgrade.nix+20−105
This diff is too big to show here.
nixos/modules/tasks/bcache.nix+6−16
This diff is too big to show here.
nixos/modules/tasks/encrypted-devices.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems.nix+17−72
This diff is too big to show here.
nixos/modules/tasks/filesystems/apfs.nixdeleted−22
This diff is too big to show here.
nixos/modules/tasks/filesystems/btrfs.nix+5−14
This diff is too big to show here.
nixos/modules/tasks/filesystems/cifs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/ecryptfs.nix+2−12
This diff is too big to show here.
nixos/modules/tasks/filesystems/exfat.nix+3−5
This diff is too big to show here.
nixos/modules/tasks/filesystems/ext.nix+4−10
This diff is too big to show here.
nixos/modules/tasks/filesystems/f2fs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/jfs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/nfs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/reiserfs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/unionfs-fuse.nix+2−13
This diff is too big to show here.
nixos/modules/tasks/filesystems/vfat.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/xfs.nix+2−2
This diff is too big to show here.
nixos/modules/tasks/filesystems/zfs.nix+7−85
This diff is too big to show here.
nixos/modules/tasks/lvm.nix+14−73
This diff is too big to show here.
nixos/modules/tasks/network-interfaces-scripted.nix−71
This diff is too big to show here.
nixos/modules/tasks/network-interfaces-systemd.nix+5−115
This diff is too big to show here.
nixos/modules/tasks/network-interfaces.nix+34−251
This diff is too big to show here.
nixos/modules/tasks/snapraid.nixdeleted−230
This diff is too big to show here.
nixos/modules/tasks/swraid.nix+9−35
This diff is too big to show here.
nixos/modules/tasks/trackpoint.nix+4−5
This diff is too big to show here.
nixos/modules/testing/test-instrumentation.nix+32−32
This diff is too big to show here.
nixos/modules/virtualisation/amazon-ec2-amis.nixdeleted−444
This diff is too big to show here.
nixos/modules/virtualisation/amazon-image.nix+10−33
This diff is too big to show here.
nixos/modules/virtualisation/amazon-options.nix+1−54
This diff is too big to show here.
nixos/modules/virtualisation/anbox.nix+1−1
This diff is too big to show here.
nixos/modules/virtualisation/azure-agent.nix+10−6
This diff is too big to show here.
nixos/modules/virtualisation/azure-common.nix+1−5
This diff is too big to show here.
nixos/modules/virtualisation/build-vm.nixdeleted−58
This diff is too big to show here.
nixos/modules/virtualisation/container-config.nix+1−1
This diff is too big to show here.
nixos/modules/virtualisation/containerd.nix+7−43
This diff is too big to show here.
nixos/modules/virtualisation/containers.nix+3−38
This diff is too big to show here.
nixos/modules/virtualisation/cri-o.nix+33−52
This diff is too big to show here.
nixos/modules/virtualisation/digital-ocean-init.nix+1−1
This diff is too big to show here.
nixos/modules/virtualisation/docker-rootless.nixdeleted−102
This diff is too big to show here.
nixos/modules/virtualisation/docker.nix+8−32
This diff is too big to show here.
nixos/modules/virtualisation/ec2-amis.nix+352−9
This diff is too big to show here.
nixos/modules/virtualisation/ecs-agent.nix+1−1
This diff is too big to show here.
nixos/modules/virtualisation/fetch-instance-ssh-keys.bashnew file+36
This diff is too big to show here.
nixos/modules/virtualisation/google-compute-config.nix+103−32
This diff is too big to show here.
nixos/modules/virtualisation/google-compute-image.nix+1−10
This diff is too big to show here.
nixos/modules/virtualisation/hyperv-guest.nix+1−1
This diff is too big to show here.
nixos/modules/virtualisation/kubevirt.nixdeleted−30
This diff is too big to show here.
nixos/modules/virtualisation/kvmgt.nix+1−1
This diff is too big to show here.
nixos/modules/virtualisation/libvirtd.nix+66−172
This diff is too big to show here.
nixos/modules/virtualisation/lxc-container.nix+13−161
This diff is too big to show here.
nixos/modules/virtualisation/lxd.nix+5−8
This diff is too big to show here.
nixos/modules/virtualisation/nixos-containers.nix+16−31
This diff is too big to show here.
nixos/modules/virtualisation/oci-containers.nix+20−48
This diff is too big to show here.
nixos/modules/virtualisation/openstack-config.nix+7−39
This diff is too big to show here.
nixos/modules/virtualisation/openstack-metadata-fetcher.nix+4−5
This diff is too big to show here.
nixos/modules/virtualisation/openstack-options.nixdeleted−71
This diff is too big to show here.
nixos/modules/virtualisation/openvswitch.nix+55−10
This diff is too big to show here.
nixos/modules/virtualisation/parallels-guest.nix+2−1
This diff is too big to show here.
nixos/modules/virtualisation/podman.nixnew file+125
This diff is too big to show here.
nixos/modules/virtualisation/podman/default.nixdeleted−187
This diff is too big to show here.
nixos/modules/virtualisation/podman/dnsname.nixdeleted−36
This diff is too big to show here.
nixos/modules/virtualisation/podman/network-socket-ghostunnel.nixdeleted−34
This diff is too big to show here.
nixos/modules/virtualisation/podman/network-socket.nixdeleted−95
This diff is too big to show here.
nixos/modules/virtualisation/proxmox-image.nixdeleted−169
This diff is too big to show here.
nixos/modules/virtualisation/proxmox-lxc.nixdeleted−64
This diff is too big to show here.
nixos/modules/virtualisation/qemu-guest-agent.nix+1−2
This diff is too big to show here.
nixos/modules/virtualisation/qemu-vm.nix+89−366
This diff is too big to show here.
nixos/modules/virtualisation/railcar.nix+4−3
This diff is too big to show here.
nixos/modules/virtualisation/spice-usb-redirection.nix+2−4
This diff is too big to show here.
nixos/modules/virtualisation/virtualbox-guest.nix+2−2
This diff is too big to show here.
nixos/modules/virtualisation/virtualbox-host.nix+2−10
This diff is too big to show here.
nixos/modules/virtualisation/virtualbox-image.nix+2−22
This diff is too big to show here.
nixos/modules/virtualisation/vmware-guest.nix+1−27
This diff is too big to show here.
nixos/modules/virtualisation/vmware-host.nixdeleted−166
This diff is too big to show here.
nixos/modules/virtualisation/waydroid.nixdeleted−75
This diff is too big to show here.
nixos/modules/virtualisation/xen-dom0.nix+5−4
This diff is too big to show here.
nixos/release-combined.nix+2−5
This diff is too big to show here.
nixos/release-small.nix+2−4
This diff is too big to show here.
nixos/release.nix+2−47
This diff is too big to show here.
nixos/tests/acme.nix+209−372
This diff is too big to show here.
nixos/tests/adguardhome.nixdeleted−57
This diff is too big to show here.
nixos/tests/aesmd.nixdeleted−62
This diff is too big to show here.
nixos/tests/agda.nix+5−2
This diff is too big to show here.
nixos/tests/airsonic.nix+5−1
This diff is too big to show here.
nixos/tests/all-terminfo.nixdeleted−31
This diff is too big to show here.
nixos/tests/all-tests.nix+37−185
This diff is too big to show here.
nixos/tests/amazon-init-shell.nix+1−1
This diff is too big to show here.
nixos/tests/ammonite.nixnew file+20
This diff is too big to show here.
nixos/tests/apfs.nixdeleted−54
This diff is too big to show here.
nixos/tests/apparmor.nix+1−1
This diff is too big to show here.
nixos/tests/atd.nix+1−1
This diff is too big to show here.
nixos/tests/atop.nix+16−6
This diff is too big to show here.
nixos/tests/avahi.nix+1−1
This diff is too big to show here.
nixos/tests/awscli.nixnew file+17
This diff is too big to show here.
nixos/tests/bat.nixnew file+12
This diff is too big to show here.
nixos/tests/bazarr.nix+1−1
This diff is too big to show here.
nixos/tests/bcachefs.nix+9−8
This diff is too big to show here.
nixos/tests/beanstalkd.nix+1−1
This diff is too big to show here.
nixos/tests/bees.nix+1−1
This diff is too big to show here.
nixos/tests/bind.nix+1−1
This diff is too big to show here.
nixos/tests/bird.nixdeleted−129
This diff is too big to show here.
nixos/tests/bitcoind.nix+1−1
This diff is too big to show here.
nixos/tests/bittorrent.nix+1−1
This diff is too big to show here.
nixos/tests/bitwarden.nixnew file+189
This diff is too big to show here.
nixos/tests/blockbook-frontend.nix+1−1
This diff is too big to show here.
nixos/tests/blocky.nixdeleted−34
This diff is too big to show here.
nixos/tests/boot-stage1.nix+1−3
This diff is too big to show here.
nixos/tests/boot.nix+18−61
This diff is too big to show here.
nixos/tests/borgbackup.nix+1−34
This diff is too big to show here.
nixos/tests/botamusique.nix−4
This diff is too big to show here.
nixos/tests/bpf.nixdeleted−29
This diff is too big to show here.
nixos/tests/breitbandmessung.nixdeleted−33
This diff is too big to show here.
nixos/tests/brscan5.nixdeleted−43
This diff is too big to show here.
nixos/tests/btrbk.nixdeleted−110
This diff is too big to show here.
nixos/tests/buildkite-agents.nix+1−1
This diff is too big to show here.
nixos/tests/caddy.nix+40−56
This diff is too big to show here.
nixos/tests/cage.nix+2−1
This diff is too big to show here.
nixos/tests/cagebreak.nix+2−1
This diff is too big to show here.
nixos/tests/calibre-web.nix+11−1
This diff is too big to show here.
nixos/tests/cassandra.nix+1
This diff is too big to show here.
nixos/tests/ceph-multi-node.nix+2−1
This diff is too big to show here.
nixos/tests/ceph-single-node-bluestore.nix+1
This diff is too big to show here.
nixos/tests/ceph-single-node.nix+1
This diff is too big to show here.
nixos/tests/cfssl.nix+1−1
This diff is too big to show here.
nixos/tests/chromium.nix+78−80
This diff is too big to show here.
nixos/tests/cifs-utils.nixnew file+12
This diff is too big to show here.
nixos/tests/clickhouse.nix+1−1
This diff is too big to show here.
nixos/tests/cloud-init.nix+2−27
This diff is too big to show here.
nixos/tests/cntr.nixdeleted−75
This diff is too big to show here.
nixos/tests/collectd.nixdeleted−38
This diff is too big to show here.
nixos/tests/common/acme/client/default.nix+2−4
This diff is too big to show here.
nixos/tests/common/acme/server/default.nix−5
This diff is too big to show here.
nixos/tests/common/ec2.nix−1
This diff is too big to show here.
nixos/tests/common/lxd/config.yamldeleted−24
This diff is too big to show here.
nixos/tests/common/wayland-cage.nixdeleted−13
This diff is too big to show here.
nixos/tests/containers-bridge.nix+3−2
This diff is too big to show here.
nixos/tests/containers-custom-pkgs.nix+1−1
This diff is too big to show here.
nixos/tests/containers-ephemeral.nix+5−4
This diff is too big to show here.
nixos/tests/containers-extra_veth.nix+3−2
This diff is too big to show here.
nixos/tests/containers-hosts.nix+2−1
This diff is too big to show here.
nixos/tests/containers-imperative.nix+12−11
This diff is too big to show here.
nixos/tests/containers-ip.nix+3−2
This diff is too big to show here.
nixos/tests/containers-macvlans.nix+2
This diff is too big to show here.
nixos/tests/containers-names.nix+1−1
This diff is too big to show here.
nixos/tests/containers-nested.nix+1−1
This diff is too big to show here.
nixos/tests/containers-physical_interfaces.nix+4
This diff is too big to show here.
nixos/tests/containers-portforward.nix+3−2
This diff is too big to show here.
nixos/tests/containers-tmpfs.nix+8−7
This diff is too big to show here.
nixos/tests/coturn.nixdeleted−29
This diff is too big to show here.
nixos/tests/couchdb.nix−3
This diff is too big to show here.
nixos/tests/cri-o.nix+1−1
This diff is too big to show here.
nixos/tests/croc.nix+1−1
This diff is too big to show here.
nixos/tests/cryptpad.nixdeleted−18
This diff is too big to show here.
nixos/tests/custom-ca.nix+79−104
This diff is too big to show here.
nixos/tests/deluge.nix+57−11
This diff is too big to show here.
nixos/tests/dex-oidc.nixdeleted−78
This diff is too big to show here.
nixos/tests/disable-installer-tools.nixdeleted−29
This diff is too big to show here.
nixos/tests/discourse.nix+2−6
This diff is too big to show here.
nixos/tests/dnsdist.nixdeleted−48
This diff is too big to show here.
nixos/tests/doas.nix+1−16
This diff is too big to show here.
nixos/tests/docker-rootless.nixdeleted−41
This diff is too big to show here.
nixos/tests/docker-tools-cross.nix+2−2
This diff is too big to show here.
nixos/tests/docker-tools.nix+9−50
This diff is too big to show here.
nixos/tests/documize.nix+1−1
This diff is too big to show here.
nixos/tests/doh-proxy-rust.nix+1−1
This diff is too big to show here.
nixos/tests/dokuwiki.nix+25−60
This diff is too big to show here.
nixos/tests/domination.nixdeleted−26
This diff is too big to show here.
nixos/tests/dovecot.nix+1−1
This diff is too big to show here.
nixos/tests/drbd.nixdeleted−87
This diff is too big to show here.
nixos/tests/earlyoom.nixdeleted−16
This diff is too big to show here.
nixos/tests/ec2.nix−5
This diff is too big to show here.
nixos/tests/ecryptfs.nix+1−1
This diff is too big to show here.
nixos/tests/elk.nix+40−131
This diff is too big to show here.
nixos/tests/emacs-daemon.nix+2−2
This diff is too big to show here.
nixos/tests/empty-filedeleted
No changes to the content.
nixos/tests/enlightenment.nix+5−4
This diff is too big to show here.
nixos/tests/env.nix+1−1
This diff is too big to show here.
nixos/tests/envoy.nixdeleted−33
This diff is too big to show here.
nixos/tests/ergochat.nixdeleted−97
This diff is too big to show here.
nixos/tests/etebase-server.nix+1−1
This diff is too big to show here.
nixos/tests/etesync-dav.nix+2−2
This diff is too big to show here.
nixos/tests/fancontrol.nix+1−1
This diff is too big to show here.
nixos/tests/fcitx/default.nix+2−1
This diff is too big to show here.
nixos/tests/fenics.nix+2−1
This diff is too big to show here.
nixos/tests/firefox.nix+11−9
This diff is too big to show here.
nixos/tests/fish.nix+1−1
This diff is too big to show here.
nixos/tests/fluentd.nix+1−1
This diff is too big to show here.
nixos/tests/fluidd.nixdeleted−21
This diff is too big to show here.
nixos/tests/fontconfig-default-fonts.nix+1−1
This diff is too big to show here.
nixos/tests/frr.nixdeleted−104
This diff is too big to show here.
nixos/tests/fsck.nix+1−1
This diff is too big to show here.
nixos/tests/ft2-clone.nix+2−2
This diff is too big to show here.
nixos/tests/gerrit.nix+1
This diff is too big to show here.
nixos/tests/geth.nix+2−2
This diff is too big to show here.
nixos/tests/ghostunnel.nix+3−2
This diff is too big to show here.
nixos/tests/gitlab.nix+28−312
This diff is too big to show here.
nixos/tests/gitolite-fcgiwrap.nix+2−2
This diff is too big to show here.
nixos/tests/gnome-xorg.nix+2−17
This diff is too big to show here.
nixos/tests/gnome.nix+2−17
This diff is too big to show here.
nixos/tests/go-neb.nix+6−6
This diff is too big to show here.
nixos/tests/gocd-agent.nix+1−1
This diff is too big to show here.
nixos/tests/google-oslogin/default.nix+2−2
This diff is too big to show here.
nixos/tests/google-oslogin/server.nix+4−2
This diff is too big to show here.
nixos/tests/google-oslogin/server.pymode 100755 → 100644
Only the mode changed.
nixos/tests/gotify-server.nix+1−1
This diff is too big to show here.
nixos/tests/grafana.nix+4−4
This diff is too big to show here.
nixos/tests/graphite.nix+1
This diff is too big to show here.
nixos/tests/graylog.nix+2−2
This diff is too big to show here.
nixos/tests/grocy.nix+2−2
This diff is too big to show here.
nixos/tests/grub.nix+1−1
This diff is too big to show here.
nixos/tests/hadoop/default.nixdeleted−7
This diff is too big to show here.
nixos/tests/hadoop/hadoop.nixdeleted−255
This diff is too big to show here.
nixos/tests/hadoop/hdfs.nix+27−57
This diff is too big to show here.
nixos/tests/hadoop/yarn.nix+23−22
This diff is too big to show here.
nixos/tests/handbrake.nixnew file+31
This diff is too big to show here.
nixos/tests/haproxy.nix+1
This diff is too big to show here.
nixos/tests/hardened.nix+31−6
This diff is too big to show here.
nixos/tests/haste-server.nixdeleted−23
This diff is too big to show here.
nixos/tests/hbase.nixdeleted−30
This diff is too big to show here.
nixos/tests/herbstluftwm.nix+2−1
This diff is too big to show here.
nixos/tests/hibernate.nix+8−21
This diff is too big to show here.
nixos/tests/hitch/default.nix+1−1
This diff is too big to show here.
nixos/tests/hocker-fetchdocker/default.nix+1−1
This diff is too big to show here.
nixos/tests/hockeypuck.nixdeleted−63
This diff is too big to show here.
nixos/tests/home-assistant.nix+34−85
This diff is too big to show here.
nixos/tests/hostname.nix+1−1
This diff is too big to show here.
nixos/tests/hound.nix+1−1
This diff is too big to show here.
nixos/tests/hydra/common.nix+1−1
This diff is too big to show here.
nixos/tests/hydra/default.nix+2−2
This diff is too big to show here.
nixos/tests/i3wm.nix+1−1
This diff is too big to show here.
nixos/tests/ihatemoney.nixnew file+62
This diff is too big to show here.
nixos/tests/ihatemoney/default.nixdeleted−78
This diff is too big to show here.
nixos/tests/ihatemoney/rates.jsondeleted−39
This diff is too big to show here.
nixos/tests/ihatemoney/server.crtdeleted−28
This diff is too big to show here.
nixos/tests/ihatemoney/server.keydeleted−52
This diff is too big to show here.
nixos/tests/incron.nix+1−1
This diff is too big to show here.
nixos/tests/initrd-network.nix+1−1
This diff is too big to show here.
nixos/tests/initrd-secrets.nix+3−9
This diff is too big to show here.
nixos/tests/input-remapper.nixdeleted−52
This diff is too big to show here.
nixos/tests/installed-tests/appstream-qt.nixdeleted−9
This diff is too big to show here.
nixos/tests/installed-tests/appstream.nixdeleted−9
This diff is too big to show here.
nixos/tests/installed-tests/default.nix+1−4
This diff is too big to show here.
nixos/tests/installed-tests/flatpak.nix−1
This diff is too big to show here.
nixos/tests/installed-tests/fwupd.nix+1
This diff is too big to show here.
nixos/tests/installed-tests/gjs.nix−6
This diff is too big to show here.
nixos/tests/installed-tests/power-profiles-daemon.nixdeleted−9
This diff is too big to show here.
nixos/tests/installer-systemd-stage-1.nixdeleted−33
This diff is too big to show here.
nixos/tests/installer.nix+37−44
This diff is too big to show here.
nixos/tests/invidious.nixdeleted−81
This diff is too big to show here.
nixos/tests/invoiceplane.nixdeleted−82
This diff is too big to show here.
nixos/tests/ipfs.nix−5
This diff is too big to show here.
nixos/tests/iscsi-multipath-root.nixdeleted−267
This diff is too big to show here.
nixos/tests/iscsi-root.nix+5−5
This diff is too big to show here.
nixos/tests/isso.nixdeleted−30
This diff is too big to show here.
nixos/tests/jellyfin.nix+1−1
This diff is too big to show here.
nixos/tests/jenkins-cli.nixdeleted−30
This diff is too big to show here.
nixos/tests/jenkins.nix+2−85
This diff is too big to show here.
nixos/tests/jibri.nixdeleted−69
This diff is too big to show here.
nixos/tests/jitsi-meet.nix+8−2
This diff is too big to show here.
nixos/tests/k3s-single-node-docker.nixdeleted−84
This diff is too big to show here.
nixos/tests/k3s-single-node.nixdeleted−82
This diff is too big to show here.
nixos/tests/k3s.nixnew file+78
This diff is too big to show here.
nixos/tests/kafka.nix+4−2
This diff is too big to show here.
nixos/tests/kbd-setfont-decompress.nixdeleted−21
This diff is too big to show here.
nixos/tests/kbd-update-search-paths-patch.nixdeleted−19
This diff is too big to show here.
nixos/tests/kea.nixdeleted−73
This diff is too big to show here.
nixos/tests/keepassxc.nix+9−43
This diff is too big to show here.
nixos/tests/kerberos/heimdal.nix+2−2
This diff is too big to show here.
nixos/tests/kerberos/mit.nix+1−1
This diff is too big to show here.
nixos/tests/kernel-generic.nix+15−18
This diff is too big to show here.
nixos/tests/kernel-latest-ath-user-regd.nix+1−1
This diff is too big to show here.
nixos/tests/kexec.nix+19−44
This diff is too big to show here.
nixos/tests/keycloak.nix+14−33
This diff is too big to show here.
nixos/tests/keymap.nix+1−1
This diff is too big to show here.
nixos/tests/knot.nix−6
This diff is too big to show here.
nixos/tests/krb5/deprecated-config.nix+1−1
This diff is too big to show here.
nixos/tests/krb5/example-config.nix+1−1
This diff is too big to show here.
nixos/tests/ksm.nix+1−1
This diff is too big to show here.
nixos/tests/kubernetes/base.nix+4−3
This diff is too big to show here.
nixos/tests/kubernetes/default.nix+5−13
This diff is too big to show here.
nixos/tests/kubernetes/dns.nix+3−3
This diff is too big to show here.
nixos/tests/kubernetes/e2e.nix+1−1
This diff is too big to show here.
nixos/tests/kubernetes/rbac.nix+9−9
This diff is too big to show here.
nixos/tests/libinput.nixdeleted−38
This diff is too big to show here.
nixos/tests/libreddit.nixdeleted−19
This diff is too big to show here.
nixos/tests/libresprite.nixdeleted−30
This diff is too big to show here.
nixos/tests/libreswan.nix+1−1
This diff is too big to show here.
nixos/tests/lightdm.nix+1−1
This diff is too big to show here.
nixos/tests/limesurvey.nix+1−1
This diff is too big to show here.
nixos/tests/litestream.nixdeleted−93
This diff is too big to show here.
nixos/tests/login.nix+1−1
This diff is too big to show here.
nixos/tests/logrotate.nixdeleted−152
This diff is too big to show here.
nixos/tests/loki.nix+1−1
This diff is too big to show here.
nixos/tests/lorri/default.nix+1−1
This diff is too big to show here.
nixos/tests/lsd.nixnew file+12
This diff is too big to show here.
nixos/tests/lvm2/default.nixdeleted−45
This diff is too big to show here.
nixos/tests/lvm2/systemd-stage-1.nixdeleted−104
This diff is too big to show here.
nixos/tests/lvm2/thinpool.nixdeleted−32
This diff is too big to show here.
nixos/tests/lvm2/vdo.nixdeleted−27
This diff is too big to show here.
nixos/tests/lxd-image-server.nixdeleted−94
This diff is too big to show here.
nixos/tests/lxd-nftables.nix+1−1
This diff is too big to show here.
nixos/tests/lxd.nix+64−41
This diff is too big to show here.
nixos/tests/maddy.nixdeleted−58
This diff is too big to show here.
nixos/tests/maestral.nixdeleted−72
This diff is too big to show here.
nixos/tests/magic-wormhole-mailbox-server.nix+1−1
This diff is too big to show here.
nixos/tests/magnetico.nix+1−1
This diff is too big to show here.
nixos/tests/mailcatcher.nix+3−8
This diff is too big to show here.
nixos/tests/mailhog.nix+1−1
This diff is too big to show here.
nixos/tests/make-test-python.nix+1−1
This diff is too big to show here.
nixos/tests/man.nixdeleted−100
This diff is too big to show here.
nixos/tests/matomo.nix+2−2
This diff is too big to show here.
nixos/tests/matrix-appservice-irc.nix+63−125
This diff is too big to show here.
nixos/tests/matrix-conduit.nixdeleted−95
This diff is too big to show here.
nixos/tests/matrix-synapse.nix+9−140
This diff is too big to show here.
nixos/tests/matrix/mjolnir.nixdeleted−170
This diff is too big to show here.
nixos/tests/matrix/pantalaimon.nixdeleted−88
This diff is too big to show here.
nixos/tests/mattermost.nixdeleted−124
This diff is too big to show here.
nixos/tests/mediawiki.nix+1−1
This diff is too big to show here.
nixos/tests/meilisearch.nixdeleted−60
This diff is too big to show here.
nixos/tests/memcached.nix+1−1
This diff is too big to show here.
nixos/tests/metabase.nix+1
This diff is too big to show here.
nixos/tests/minecraft.nix+1−1
This diff is too big to show here.
nixos/tests/minidlna.nix+2−4
This diff is too big to show here.
nixos/tests/miniflux.nix+13−25
This diff is too big to show here.
nixos/tests/minio.nix+1−4
This diff is too big to show here.
nixos/tests/misc.nix+6−7
This diff is too big to show here.
nixos/tests/mod_perl.nixdeleted−53
This diff is too big to show here.
nixos/tests/moinmoin.nixnew file+28
This diff is too big to show here.
nixos/tests/mongodb.nix−4
This diff is too big to show here.
nixos/tests/moodle.nix+1−1
This diff is too big to show here.
nixos/tests/moonraker.nixdeleted−45
This diff is too big to show here.
nixos/tests/moosefs.nixdeleted−89
This diff is too big to show here.
nixos/tests/mosquitto.nix+51−166
This diff is too big to show here.
nixos/tests/mpd.nix+1−1
This diff is too big to show here.
nixos/tests/mpv.nixdeleted−28
This diff is too big to show here.
nixos/tests/mtp.nixdeleted−109
This diff is too big to show here.
nixos/tests/mumble.nix+2−2
This diff is too big to show here.
nixos/tests/musescore.nix+2−2
This diff is too big to show here.
nixos/tests/mutable-users.nix−28
This diff is too big to show here.
nixos/tests/mysql/common.nixdeleted−10
This diff is too big to show here.
nixos/tests/mysql/mariadb-galera-mariabackup.nixnew file+223
This diff is too big to show here.
nixos/tests/mysql/mariadb-galera-rsync.nix+216
This diff is too big to show here.
nixos/tests/mysql/mariadb-galera.nix−250
This diff is too big to show here.
nixos/tests/mysql/mysql-autobackup.nix+33−48
This diff is too big to show here.
nixos/tests/mysql/mysql-backup.nix+44−60
This diff is too big to show here.
nixos/tests/mysql/mysql-replication.nix+74−84
This diff is too big to show here.
nixos/tests/mysql/mysql.nix+174−134
This diff is too big to show here.
nixos/tests/nagios.nix+1−1
This diff is too big to show here.
nixos/tests/nano.nix+44
This diff is too big to show here.
nixos/tests/nar-serve.nix+1−1
This diff is too big to show here.
nixos/tests/nats.nix−63
This diff is too big to show here.
nixos/tests/navidrome.nix−12
This diff is too big to show here.
nixos/tests/nbd.nix−103
This diff is too big to show here.
nixos/tests/ncdns.nix+9−6
This diff is too big to show here.
nixos/tests/networking-proxy.nix+1
This diff is too big to show here.
nixos/tests/networking.nix+14−223
This diff is too big to show here.
nixos/tests/nextcloud/basic.nix+3−13
This diff is too big to show here.
nixos/tests/nextcloud/default.nix+8−20
This diff is too big to show here.
nixos/tests/nextcloud/with-mysql-and-memcached.nix+18−8
This diff is too big to show here.
nixos/tests/nextcloud/with-postgresql-and-redis.nix+2−5
This diff is too big to show here.
nixos/tests/nexus.nix+1−1
This diff is too big to show here.
nixos/tests/nfs/simple.nix+1−1
This diff is too big to show here.
nixos/tests/nginx-etag.nix+2−1
This diff is too big to show here.
nixos/tests/nginx-modsecurity.nix−39
This diff is too big to show here.
nixos/tests/nginx-pubhtml.nix+1−1
This diff is too big to show here.
nixos/tests/nginx-sandbox.nix+1−1
This diff is too big to show here.
nixos/tests/nginx-sso.nix+1−1
This diff is too big to show here.
nixos/tests/nginx-variants.nix+2−2
This diff is too big to show here.
nixos/tests/nginx.nix+2−2
This diff is too big to show here.
nixos/tests/nitter.nix−18
This diff is too big to show here.
nixos/tests/nix-ld.nix−20
This diff is too big to show here.
nixos/tests/nix-serve-ssh.nix−45
This diff is too big to show here.
nixos/tests/nix-serve.nix−22
This diff is too big to show here.
nixos/tests/nix-ssh-serve.nix+45
This diff is too big to show here.
nixos/tests/nixops/default.nix−114
This diff is too big to show here.
nixos/tests/nixops/legacy/base-configuration.nix−31
This diff is too big to show here.
nixos/tests/nixops/legacy/nixops.nix−15
This diff is too big to show here.
nixos/tests/nixos-generate-config.nix+1−1
This diff is too big to show here.
nixos/tests/node-red.nix−31
This diff is too big to show here.
nixos/tests/noto-fonts.nix−44
This diff is too big to show here.
nixos/tests/novacomd.nix+1−1
This diff is too big to show here.
nixos/tests/nsd.nix−1
This diff is too big to show here.
nixos/tests/nzbget.nix+1−17
This diff is too big to show here.
nixos/tests/odoo.nix−27
This diff is too big to show here.
nixos/tests/oh-my-zsh.nix+1−1
This diff is too big to show here.
nixos/tests/openarena.nix+2−2
This diff is too big to show here.
nixos/tests/openldap.nix+3−3
This diff is too big to show here.
nixos/tests/openresty-lua.nix−55
This diff is too big to show here.
nixos/tests/opensmtpd-rspamd.nix+1
This diff is too big to show here.
nixos/tests/openssh.nix+6−12
This diff is too big to show here.
nixos/tests/opentabletdriver.nix+1−1
This diff is too big to show here.
nixos/tests/os-prober.nix+10−10
This diff is too big to show here.
nixos/tests/osrm-backend.nix+1−1
This diff is too big to show here.
nixos/tests/overlayfs.nix+31−28
This diff is too big to show here.
nixos/tests/owncast.nix−42
This diff is too big to show here.
nixos/tests/pacemaker.nix−110
This diff is too big to show here.
nixos/tests/packagekit.nix+1−1
This diff is too big to show here.
nixos/tests/pam-oath-login.nix+3−3
This diff is too big to show here.
nixos/tests/pam-u2f.nix+2−2
This diff is too big to show here.
nixos/tests/pam/pam-file-contents.nix−25
This diff is too big to show here.
nixos/tests/pam/pam-ussh.nix−70
This diff is too big to show here.
nixos/tests/pam/test_chfn.py−27
This diff is too big to show here.
nixos/tests/pantheon.nix+8−7
This diff is too big to show here.
nixos/tests/paperless.nix+17−25
This diff is too big to show here.
nixos/tests/parsedmarc/default.nix−235
This diff is too big to show here.
nixos/tests/pdns-recursor.nix+1−4
This diff is too big to show here.
nixos/tests/pgadmin4-standalone.nix−43
This diff is too big to show here.
nixos/tests/pgadmin4.nix−132
This diff is too big to show here.
nixos/tests/php/default.nix+2−3
This diff is too big to show here.
nixos/tests/php/fpm.nix+16−18
This diff is too big to show here.
nixos/tests/php/httpd.nix+9−11
This diff is too big to show here.
nixos/tests/php/pcre.nix+10−12
This diff is too big to show here.
nixos/tests/pict-rs.nix−17
This diff is too big to show here.
nixos/tests/plasma5-systemd-start.nix−42
This diff is too big to show here.
nixos/tests/plasma5.nix+6−5
This diff is too big to show here.
nixos/tests/plausible.nix−49
This diff is too big to show here.
nixos/tests/pleroma.nix+20−4
This diff is too big to show here.
nixos/tests/plikd.nix+1−1
This diff is too big to show here.
nixos/tests/plotinus.nix+2−2
This diff is too big to show here.
nixos/tests/podman.nix+110
This diff is too big to show here.
nixos/tests/podman/default.nix−144
This diff is too big to show here.
nixos/tests/podman/dnsname.nix−42
This diff is too big to show here.
nixos/tests/podman/tls-ghostunnel.nix−150
This diff is too big to show here.
nixos/tests/pomerium.nix+3−3
This diff is too big to show here.
nixos/tests/postfix-raise-smtpd-tls-security-level.nix+1−1
This diff is too big to show here.
nixos/tests/postfix.nix+1−1
This diff is too big to show here.
nixos/tests/postfixadmin.nix−31
This diff is too big to show here.
nixos/tests/postgresql-wal-receiver.nix+1−1
This diff is too big to show here.
nixos/tests/postgresql.nix+3−50
This diff is too big to show here.
nixos/tests/power-profiles-daemon.nix+1−1
This diff is too big to show here.
nixos/tests/powerdns-admin.nix−117
This diff is too big to show here.
nixos/tests/powerdns.nix−1
This diff is too big to show here.
nixos/tests/predictable-interface-names.nix+1−1
This diff is too big to show here.
nixos/tests/printing.nix+10−2
This diff is too big to show here.
nixos/tests/privacyidea.nix+2−1
This diff is too big to show here.
nixos/tests/privoxy.nix+1−1
This diff is too big to show here.
nixos/tests/prometheus-exporters.nix+92−227
This diff is too big to show here.
nixos/tests/prometheus.nix+1−91
This diff is too big to show here.
nixos/tests/prowlarr.nix−18
This diff is too big to show here.
nixos/tests/pt2-clone.nix+2−2
This diff is too big to show here.
nixos/tests/pulseaudio.nix−71
This diff is too big to show here.
nixos/tests/qboot.nix+1−1
This diff is too big to show here.
nixos/tests/quorum.nix+9−32
This diff is too big to show here.
nixos/tests/rabbitmq.nix+2−8
This diff is too big to show here.
nixos/tests/radicale.nix+1−1
This diff is too big to show here.
nixos/tests/rasdaemon.nix−34
This diff is too big to show here.
nixos/tests/redis.nix+17−19
This diff is too big to show here.
nixos/tests/redmine.nix+1−1
This diff is too big to show here.
nixos/tests/restart-by-activation-script.nix−73
This diff is too big to show here.
nixos/tests/retroarch.nix−49
This diff is too big to show here.
nixos/tests/riak.nix+1−1
This diff is too big to show here.
nixos/tests/rspamd.nix+10−5
This diff is too big to show here.
nixos/tests/rss2email.nix+1−1
This diff is too big to show here.
nixos/tests/rstudio-server.nix−24
This diff is too big to show here.
nixos/tests/rsyslogd.nix+2−2
This diff is too big to show here.
nixos/tests/run-in-machine.nix+23
This diff is too big to show here.
nixos/tests/sabnzbd.nix−22
This diff is too big to show here.
nixos/tests/samba-wsdd.nix+1−1
This diff is too big to show here.
nixos/tests/samba.nix+2−1
This diff is too big to show here.
nixos/tests/sanoid.nix+3−16
This diff is too big to show here.
nixos/tests/sddm.nix+2−2
This diff is too big to show here.
nixos/tests/seafile.nix−121
This diff is too big to show here.
nixos/tests/service-runner.nix+1−1
This diff is too big to show here.
nixos/tests/sfxr-qt.nix−32
This diff is too big to show here.
nixos/tests/shattered-pixel-dungeon.nix+2−3
This diff is too big to show here.
nixos/tests/shiori.nix+3−2
This diff is too big to show here.
nixos/tests/signal-desktop.nix+8−23
This diff is too big to show here.
nixos/tests/simple.nix+1−1
This diff is too big to show here.
nixos/tests/slurm.nix+1−1
This diff is too big to show here.
nixos/tests/snapcast.nix+2−11
This diff is too big to show here.
nixos/tests/snapper.nix+1−1
This diff is too big to show here.
nixos/tests/soapui.nix−24
This diff is too big to show here.
nixos/tests/sogo.nix+1−1
This diff is too big to show here.
nixos/tests/solanum.nix−8
This diff is too big to show here.
nixos/tests/solr.nix+1−1
This diff is too big to show here.
nixos/tests/sourcehut.nix−212
This diff is too big to show here.
nixos/tests/spark/default.nix−27
This diff is too big to show here.
nixos/tests/spark/spark_sample.py−40
This diff is too big to show here.
nixos/tests/spike.nix+22
This diff is too big to show here.
nixos/tests/ssh-keys.nix+1−1
This diff is too big to show here.
nixos/tests/sssd-ldap.nix+81−79
This diff is too big to show here.
nixos/tests/sssd.nix+1−1
This diff is too big to show here.
nixos/tests/starship.nix−42
This diff is too big to show here.
nixos/tests/step-ca.nix−77
This diff is too big to show here.
nixos/tests/sudo.nix+1−5
This diff is too big to show here.
nixos/tests/sway.nix+22−54
This diff is too big to show here.
nixos/tests/switch-test.nix+6−1016
This diff is too big to show here.
nixos/tests/sympa.nix+2−1
This diff is too big to show here.
nixos/tests/syncthing-init.nix+9−9
This diff is too big to show here.
nixos/tests/syncthing-relay.nix+1−1
This diff is too big to show here.
nixos/tests/syncthing.nix+2−2
This diff is too big to show here.
nixos/tests/systemd-analyze.nix+1−1
This diff is too big to show here.
nixos/tests/systemd-binfmt.nix+20−86
This diff is too big to show here.
nixos/tests/systemd-boot.nix+5−169
This diff is too big to show here.
nixos/tests/systemd-confinement.nix+24−45
This diff is too big to show here.
nixos/tests/systemd-cryptenroll.nix−54
This diff is too big to show here.
nixos/tests/systemd-escaping.nix−45
This diff is too big to show here.
nixos/tests/systemd-initrd-btrfs-raid.nix−45
This diff is too big to show here.
nixos/tests/systemd-initrd-luks-keyfile.nix−53
This diff is too big to show here.
nixos/tests/systemd-initrd-luks-password.nix−48
This diff is too big to show here.
nixos/tests/systemd-initrd-simple.nix−44
This diff is too big to show here.
nixos/tests/systemd-initrd-swraid.nix−50
This diff is too big to show here.
nixos/tests/systemd-journal.nix+1−1
This diff is too big to show here.
nixos/tests/systemd-machinectl.nix−85
This diff is too big to show here.
nixos/tests/systemd-misc.nix−62
This diff is too big to show here.
nixos/tests/systemd-networkd-dhcpserver-static-leases.nix−81
This diff is too big to show here.
nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix+12−5
This diff is too big to show here.
nixos/tests/systemd-networkd-vrf.nix−2
This diff is too big to show here.
nixos/tests/systemd-networkd.nix−10
This diff is too big to show here.
nixos/tests/systemd-shutdown.nix−26
This diff is too big to show here.
nixos/tests/systemd-unit-path.nix+47
This diff is too big to show here.
nixos/tests/systemd.nix+2−17
This diff is too big to show here.
nixos/tests/taskserver.nix−1
This diff is too big to show here.
nixos/tests/teeworlds.nix+2−2
This diff is too big to show here.
nixos/tests/telegraf.nix+1−1
This diff is too big to show here.
nixos/tests/teleport.nix−99
This diff is too big to show here.
nixos/tests/terminal-emulators.nix−207
This diff is too big to show here.
nixos/tests/thelounge.nix−29
This diff is too big to show here.
nixos/tests/tigervnc.nix−53
This diff is too big to show here.
nixos/tests/tinydns.nix+1−15
This diff is too big to show here.
nixos/tests/tinywl.nix−57
This diff is too big to show here.
nixos/tests/tomcat.nix−21
This diff is too big to show here.
nixos/tests/tor.nix+15−10
This diff is too big to show here.
nixos/tests/trac.nix+19
This diff is too big to show here.
nixos/tests/traefik.nix−2
This diff is too big to show here.
nixos/tests/trafficserver.nix−1
This diff is too big to show here.
nixos/tests/transmission.nix+1−1
This diff is too big to show here.
nixos/tests/tsm-client-gui.nix−57
This diff is too big to show here.
nixos/tests/tuptime.nix+1−1
This diff is too big to show here.
nixos/tests/turbovnc-headless-server.nix+4−5
This diff is too big to show here.
nixos/tests/tuxguitar.nix−24
This diff is too big to show here.
nixos/tests/txredisapi.nix−29
This diff is too big to show here.
nixos/tests/ucarp.nix−66
This diff is too big to show here.
nixos/tests/ucg.nix+18
This diff is too big to show here.
nixos/tests/udisks2.nix+2−2
This diff is too big to show here.
nixos/tests/unbound.nix+2−11
This diff is too big to show here.
nixos/tests/unifi.nix−36
This diff is too big to show here.
nixos/tests/usbguard.nix+2−2
This diff is too big to show here.
nixos/tests/user-activation-scripts.nix−33
This diff is too big to show here.
nixos/tests/uwsgi.nix+1−1
This diff is too big to show here.
nixos/tests/v2ray.nix+1−1
This diff is too big to show here.
nixos/tests/vault-postgresql.nix+3−2
This diff is too big to show here.
nixos/tests/vault.nix+3−4
This diff is too big to show here.
nixos/tests/vaultwarden.nix−187
This diff is too big to show here.
nixos/tests/vector.nix+1−1
This diff is too big to show here.
nixos/tests/vengi-tools.nix−29
This diff is too big to show here.
nixos/tests/vikunja.nix−65
This diff is too big to show here.
nixos/tests/virtualbox.nix+2−2
This diff is too big to show here.
nixos/tests/vscodium.nix+35−66
This diff is too big to show here.
nixos/tests/vsftpd.nix−42
This diff is too big to show here.
nixos/tests/wasabibackend.nix+1−1
This diff is too big to show here.
nixos/tests/web-apps/mastodon.nix−170
This diff is too big to show here.
nixos/tests/web-apps/netbox.nix−30
This diff is too big to show here.
nixos/tests/web-apps/nifi.nix−30
This diff is too big to show here.
nixos/tests/web-apps/peertube.nix−131
This diff is too big to show here.
nixos/tests/web-servers/agate.nix−29
This diff is too big to show here.
nixos/tests/web-servers/unit-php.nix+29−19
This diff is too big to show here.
nixos/tests/wiki-js.nix+4−4
This diff is too big to show here.
nixos/tests/wine.nix−48
This diff is too big to show here.
nixos/tests/wireguard/wg-quick.nix+1−1
This diff is too big to show here.
nixos/tests/without-nix.nix−32
This diff is too big to show here.
nixos/tests/wmderland.nix+1−1
This diff is too big to show here.
nixos/tests/wordpress.nix+23−56
This diff is too big to show here.
nixos/tests/wpa_supplicant.nix−96
This diff is too big to show here.
nixos/tests/xandikos.nix+4−4
This diff is too big to show here.
nixos/tests/xautolock.nix+1−1
This diff is too big to show here.
nixos/tests/xfce.nix+3−2
This diff is too big to show here.
nixos/tests/xmonad-xdg-autostart.nix−35
This diff is too big to show here.
nixos/tests/xmonad.nix+17−84
This diff is too big to show here.
nixos/tests/xmpp/prosody-mysql.nix+33−65
This diff is too big to show here.
nixos/tests/xmpp/prosody.nix+2−3
This diff is too big to show here.
nixos/tests/xmpp/xmpp-sendmessage.nix+4−1
This diff is too big to show here.
nixos/tests/xrdp.nix+2−2
This diff is too big to show here.
nixos/tests/xss-lock.nix+1−1
This diff is too big to show here.
nixos/tests/xterm.nix+2−2
This diff is too big to show here.
nixos/tests/xxh.nix−67
This diff is too big to show here.
nixos/tests/yabar.nix+2−2
This diff is too big to show here.
nixos/tests/yggdrasil.nix+11−7
This diff is too big to show here.
nixos/tests/yq.nix+12
This diff is too big to show here.
nixos/tests/zammad.nix−60
This diff is too big to show here.
nixos/tests/zfs.nix+1−74
This diff is too big to show here.
nixos/tests/zigbee2mqtt.nix+1−1
This diff is too big to show here.
nixos/tests/zoneminder.nix+1−1
This diff is too big to show here.
nixos/tests/zrepl.nix−66
This diff is too big to show here.
nixos/tests/zsh-history.nix+1−1
This diff is too big to show here.
pkgs/applications/accessibility/contrast/default.nix+14−14
This diff is too big to show here.
pkgs/applications/accessibility/espeakup/default.nix−46
This diff is too big to show here.
pkgs/applications/accessibility/squeekboard/default.nix+6−9
This diff is too big to show here.
pkgs/applications/accessibility/svkbd/default.nix+2−2
This diff is too big to show here.
pkgs/applications/accessibility/wvkbd/default.nix−36
This diff is too big to show here.
pkgs/applications/audio/CHOWTapeModel/default.nix+33−41
This diff is too big to show here.
pkgs/applications/audio/ChowCentaur/default.nix−53
This diff is too big to show here.
pkgs/applications/audio/ChowKick/default.nix−106
This diff is too big to show here.
pkgs/applications/audio/ChowPhaser/default.nix−76
This diff is too big to show here.
pkgs/applications/audio/LibreArp/default.nix−53
This diff is too big to show here.
pkgs/applications/audio/LibreArp/lv2.nix−53
This diff is too big to show here.
pkgs/applications/audio/MMA/default.nix+6−6
This diff is too big to show here.
pkgs/applications/audio/a2jmidid/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/aacgain/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/adlplug/default.nix+14−76
This diff is too big to show here.
pkgs/applications/audio/aeolus/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/aether-lv2/default.nix−33
This diff is too big to show here.
pkgs/applications/audio/airwave/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/aj-snapshot/default.nix+5−4
This diff is too big to show here.
pkgs/applications/audio/amberol/default.nix−75
This diff is too big to show here.
pkgs/applications/audio/ams/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/ardour/5.nix+161
This diff is too big to show here.
pkgs/applications/audio/ardour/default.nix+5−5
This diff is too big to show here.
pkgs/applications/audio/ashuffle/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/audacious/default.nix+8−10
This diff is too big to show here.
pkgs/applications/audio/audacity/default.nix+52−99
This diff is too big to show here.
pkgs/applications/audio/audio-recorder/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/aumix/default.nix+13−28
This diff is too big to show here.
pkgs/applications/audio/axoloti/libusb1.nix+6−7
This diff is too big to show here.
pkgs/applications/audio/bambootracker/default.nix+21−9
This diff is too big to show here.
pkgs/applications/audio/bchoppr/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/bespokesynth/default.nix−148
This diff is too big to show here.
pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix+3−7
This diff is too big to show here.
pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix−80
This diff is too big to show here.
pkgs/applications/audio/bjumblr/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/blanket/default.nix−69
This diff is too big to show here.
pkgs/applications/audio/boops/default.nix−28
This diff is too big to show here.
pkgs/applications/audio/bristol/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/bschaffl/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/bsequencer/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/bshapr/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/bslizr/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/bucklespring/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/cadence/default.nix+38−48
This diff is too big to show here.
pkgs/applications/audio/callaudiod/default.nix+5−7
This diff is too big to show here.
pkgs/applications/audio/cantata/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/cardinal/default.nix−67
This diff is too big to show here.
pkgs/applications/audio/carla/default.nix+5−13
This diff is too big to show here.
pkgs/applications/audio/caudec/default.nix+10−6
This diff is too big to show here.
pkgs/applications/audio/cava/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/cdparanoia/default.nix+6−16
This diff is too big to show here.
pkgs/applications/audio/chuck/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/cider/default.nix−30
This diff is too big to show here.
pkgs/applications/audio/clementine/default.nix+12−5
This diff is too big to show here.
pkgs/applications/audio/clerk/default.nix+10−33
This diff is too big to show here.
pkgs/applications/audio/cmt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/cmus/default.nix+6−6
This diff is too big to show here.
pkgs/applications/audio/cmusfm/default.nix+10−16
This diff is too big to show here.
pkgs/applications/audio/cozy-audiobooks/default.nix+87
This diff is too big to show here.
pkgs/applications/audio/cozy/default.nix−92
This diff is too big to show here.
pkgs/applications/audio/crip/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/csound/default.nix+9−6
This diff is too big to show here.
pkgs/applications/audio/cyanrip/default.nix−34
This diff is too big to show here.
pkgs/applications/audio/deadbeef/default.nix+4−3
This diff is too big to show here.
pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix−39
This diff is too big to show here.
pkgs/applications/audio/denemo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/dfasma/default.nix+3−1
This diff is too big to show here.
pkgs/applications/audio/diopser/default.nix−76
This diff is too big to show here.
pkgs/applications/audio/dirt/default.nix+1−2
This diff is too big to show here.
pkgs/applications/audio/distrho/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/dr14_tmeter/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/dragonfly-reverb/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/drumgizmo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/drumkv1/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/easyeffects/default.nix−113
This diff is too big to show here.
pkgs/applications/audio/ecasound/default.nix+2−13
This diff is too big to show here.
pkgs/applications/audio/eflite/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/ensemble-chorus/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/espeak-ng/default.nix−10
This diff is too big to show here.
pkgs/applications/audio/espeak/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/espeak/edit.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/eteroj.lv2/default.nix+23
This diff is too big to show here.
pkgs/applications/audio/exaile/default.nix−107
This diff is too big to show here.
pkgs/applications/audio/faust/faust2.nix+4−12
This diff is too big to show here.
pkgs/applications/audio/faust/faust2alqt.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/faust/faust2alsa.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/faust/faust2jack.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/faust/faust2jaqt.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/faust/faustlive.nix+14−14
This diff is too big to show here.
pkgs/applications/audio/faustPhysicalModeling/default.nix−39
This diff is too big to show here.
pkgs/applications/audio/faustStk/default.nix−39
This diff is too big to show here.
pkgs/applications/audio/flac/default.nix+10−2
This diff is too big to show here.
pkgs/applications/audio/fluidsynth/default.nix+25−9
This diff is too big to show here.
pkgs/applications/audio/fmit/default.nix+5−3
This diff is too big to show here.
pkgs/applications/audio/fomp/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/foo-yc20/default.nix+29
This diff is too big to show here.
pkgs/applications/audio/freac/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/freewheeling/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/freqtweak/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/friture/default.nix+8−21
This diff is too big to show here.
pkgs/applications/audio/friture/factorial.patch+13
This diff is too big to show here.
pkgs/applications/audio/friture/unlock_constraints.patch+34
This diff is too big to show here.
pkgs/applications/audio/ft2-clone/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/furnace/default.nix−100
This diff is too big to show here.
pkgs/applications/audio/game-music-emu/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/gbsplay/default.nix+13−17
This diff is too big to show here.
pkgs/applications/audio/geonkick/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/giada/default.nix+26−40
This diff is too big to show here.
pkgs/applications/audio/gigedit/default.nix+3−20
This diff is too big to show here.
pkgs/applications/audio/gmu/default.nix+3−22
This diff is too big to show here.
pkgs/applications/audio/gnaural/default.nix−33
This diff is too big to show here.
pkgs/applications/audio/gnome-podcasts/default.nix+3−15
This diff is too big to show here.
pkgs/applications/audio/goattracker/default.nix+8−7
This diff is too big to show here.
pkgs/applications/audio/google-play-music-desktop-player/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/gpodder/default.nix+5−15
This diff is too big to show here.
pkgs/applications/audio/gpodder/disable-autoupdate.patch+29−8
This diff is too big to show here.
pkgs/applications/audio/grandorgue/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/greg/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/gspeech/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/gtklick/default.nix+34
This diff is too big to show here.
pkgs/applications/audio/gtkpod/default.nix+4−5
This diff is too big to show here.
pkgs/applications/audio/guitarix/default.nix+2−4
This diff is too big to show here.
pkgs/applications/audio/gwc/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/gxplugins-lv2/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/helio-workstation/default.nix+7−7
This diff is too big to show here.
pkgs/applications/audio/helm/default.nix+12−7
This diff is too big to show here.
pkgs/applications/audio/helvum/default.nix+13−36
This diff is too big to show here.
pkgs/applications/audio/hivelytracker/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/hqplayer-desktop/default.nix−92
This diff is too big to show here.
pkgs/applications/audio/hushboard/default.nix−73
This diff is too big to show here.
pkgs/applications/audio/hybridreverb2/default.nix+10−45
This diff is too big to show here.
pkgs/applications/audio/hydrogen/0.nix+6−28
This diff is too big to show here.
pkgs/applications/audio/hydrogen/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/iannix/default.nix+4−2
This diff is too big to show here.
pkgs/applications/audio/in-formant/default.nix−45
This diff is too big to show here.
pkgs/applications/audio/indicator-sound-switcher/default.nix−62
This diff is too big to show here.
pkgs/applications/audio/industrializer/default.nix+5−3
This diff is too big to show here.
pkgs/applications/audio/jaaa/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/jack-rack/default.nix+4−5
This diff is too big to show here.
pkgs/applications/audio/jackmeter/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/jackmix/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/jacktrip/default.nix−61
This diff is too big to show here.
pkgs/applications/audio/jamesdsp/default.nix−95
This diff is too big to show here.
pkgs/applications/audio/jamin/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/jamulus/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/japa/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/jconvolver/default.nix−114
This diff is too big to show here.
pkgs/applications/audio/jellycli/default.nix−33
This diff is too big to show here.
pkgs/applications/audio/jellycli/fix-test-dir.patch−13
This diff is too big to show here.
pkgs/applications/audio/jmusicbot/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/kapitonov-plugins-pack/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/kid3/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/kmetronome/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/ladspa-plugins/default.nix+7−17
This diff is too big to show here.
pkgs/applications/audio/lash/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/lastfmsubmitd/default.nix+21
This diff is too big to show here.
pkgs/applications/audio/librespot/cargo-lock.patch+3817
This diff is too big to show here.
pkgs/applications/audio/librespot/default.nix+19−13
This diff is too big to show here.
pkgs/applications/audio/lingot/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/linuxband/default.nix+37
This diff is too big to show here.
pkgs/applications/audio/linuxsampler/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/lmms/default.nix+5−5
This diff is too big to show here.
pkgs/applications/audio/lollypop/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/losslessaudiochecker/default.nix−29
This diff is too big to show here.
pkgs/applications/audio/lsp-plugins/default.nix+3−10
This diff is too big to show here.
pkgs/applications/audio/lv2lint/default.nix−22
This diff is too big to show here.
pkgs/applications/audio/lyrebird/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/mamba/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/mbrola/default.nix−3
This diff is too big to show here.
pkgs/applications/audio/meters_lv2/default.nix+36−43
This diff is too big to show here.
pkgs/applications/audio/mhwaveedit/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/mi2ly/default.nix+25−16
This diff is too big to show here.
pkgs/applications/audio/mi2ly/default.upstream+3
This diff is too big to show here.
pkgs/applications/audio/mid2key/default.nix+5−8
This diff is too big to show here.
pkgs/applications/audio/midas/generic.nix+7−6
This diff is too big to show here.
pkgs/applications/audio/midi-visualizer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/mikmod/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/milkytracker/default.nix+4−10
This diff is too big to show here.
pkgs/applications/audio/mimic/default.nix+7−15
This diff is too big to show here.
pkgs/applications/audio/mimms/default.nix+31
This diff is too big to show here.
pkgs/applications/audio/miniaudicle/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/mixxx/default.nix+34−118
This diff is too big to show here.
pkgs/applications/audio/mmtc/default.nix+7−6
This diff is too big to show here.
pkgs/applications/audio/moc/default.nix+4−6
This diff is too big to show here.
pkgs/applications/audio/mod-arpeggiator-lv2/default.nix−26
This diff is too big to show here.
pkgs/applications/audio/mod-distortion/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/molot-lite/default.nix+18−15
This diff is too big to show here.
pkgs/applications/audio/mopidy/default.nix−6
This diff is too big to show here.
pkgs/applications/audio/mopidy/iris.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/mopidy/jellyfin.nix−25
This diff is too big to show here.
pkgs/applications/audio/mopidy/mopidy.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/mopidy/mpd.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/mopidy/mpris.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/mopidy/muse.nix−29
This diff is too big to show here.
pkgs/applications/audio/mopidy/spotify.nix+7−9
This diff is too big to show here.
pkgs/applications/audio/mopidy/youtube.nix+15−43
This diff is too big to show here.
pkgs/applications/audio/mopidy/ytmusic.nix−35
This diff is too big to show here.
pkgs/applications/audio/mousai/default.nix+2−12
This diff is too big to show here.
pkgs/applications/audio/mousai/paths.patch−13
This diff is too big to show here.
pkgs/applications/audio/mp3blaster/default.nix+1−11
This diff is too big to show here.
pkgs/applications/audio/mp3gain/default.nix+3−4
This diff is too big to show here.
pkgs/applications/audio/mp3info/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/mpc/default.nix+13−41
This diff is too big to show here.
pkgs/applications/audio/mpdevil/default.nix+3−4
This diff is too big to show here.
pkgs/applications/audio/mpg123/default.nix+13−36
This diff is too big to show here.
pkgs/applications/audio/mpg321/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/munt/default.nix+38
This diff is too big to show here.
pkgs/applications/audio/munt/libmt32emu.nix−38
This diff is too big to show here.
pkgs/applications/audio/munt/mt32emu-qt.nix−75
This diff is too big to show here.
pkgs/applications/audio/munt/mt32emu-smf2wav.nix−50
This diff is too big to show here.
pkgs/applications/audio/muse/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/musescore/darwin.nix+1
This diff is too big to show here.
pkgs/applications/audio/musescore/default.nix+7−8
This diff is too big to show here.
pkgs/applications/audio/musikcube/default.nix+6−21
This diff is too big to show here.
pkgs/applications/audio/mympd/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/ncmpc/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/ncspot/default.nix+17−15
This diff is too big to show here.
pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch−2007
This diff is too big to show here.
pkgs/applications/audio/netease-cloud-music-gtk/default.nix−60
This diff is too big to show here.
pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh−20
This diff is too big to show here.
pkgs/applications/audio/netease-music-tui/default.nix+5−5
This diff is too big to show here.
pkgs/applications/audio/new-session-manager/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/noise-repellent/default.nix+9−11
This diff is too big to show here.
pkgs/applications/audio/noisetorch/default.nix+18−11
This diff is too big to show here.
pkgs/applications/audio/noisetorch/version.patch+37
This diff is too big to show here.
pkgs/applications/audio/non/default.nix+7−7
This diff is too big to show here.
pkgs/applications/audio/nootka/default.nix+4−5
This diff is too big to show here.
pkgs/applications/audio/nootka/unstable.nix+7−25
This diff is too big to show here.
pkgs/applications/audio/ocenaudio/default.nix+5−5
This diff is too big to show here.
pkgs/applications/audio/odin2/default.nix−79
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/eteroj.nix−10
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/generic.nix−37
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/jit.nix−12
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/mephisto.nix−17
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix−10
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/moony.nix−13
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/orbit.nix−12
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix−13
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/router.nix−11
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/sherlock.nix−12
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/synthpod.nix−13
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/vm.nix−10
This diff is too big to show here.
pkgs/applications/audio/openmpt123/default.nix+31
This diff is too big to show here.
pkgs/applications/audio/opus-tools/default.nix+2−4
This diff is too big to show here.
pkgs/applications/audio/orca-c/default.nix+2−5
This diff is too big to show here.
pkgs/applications/audio/osdlyrics/default.nix−87
This diff is too big to show here.
pkgs/applications/audio/osmid/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/oxefmsynth/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/padthv1/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/pamix/default.nix+1−15
This diff is too big to show here.
pkgs/applications/audio/pamixer/default.nix+6−6
This diff is too big to show here.
pkgs/applications/audio/paprefs/default.nix+4−6
This diff is too big to show here.
pkgs/applications/audio/parlatype/default.nix+68
This diff is too big to show here.
pkgs/applications/audio/patchage/default.nix+11−33
This diff is too big to show here.
pkgs/applications/audio/pavucontrol/default.nix+15−24
This diff is too big to show here.
pkgs/applications/audio/pd-plugins/zexy/default.nix+1−2
This diff is too big to show here.
pkgs/applications/audio/petrifoo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/pianobar/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/pianobooster/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/pianoteq/default.nix−200
This diff is too big to show here.
pkgs/applications/audio/picard/default.nix+3−6
This diff is too big to show here.
pkgs/applications/audio/picoloop/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/pifi/Gemfile+2
This diff is too big to show here.
pkgs/applications/audio/pifi/Gemfile.lock+39
This diff is too big to show here.
pkgs/applications/audio/pifi/default.nix+18
This diff is too big to show here.
pkgs/applications/audio/pifi/gemset.nix+137
This diff is too big to show here.
pkgs/applications/audio/pipecontrol/default.nix−50
This diff is too big to show here.
pkgs/applications/audio/pithos/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/plexamp/default.nix+7−6
This diff is too big to show here.
pkgs/applications/audio/plujain-ramp/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/pmidi/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/pocket-casts/default.nix−55
This diff is too big to show here.
pkgs/applications/audio/polyphone/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/praat/default.nix+13−17
This diff is too big to show here.
pkgs/applications/audio/psst/default.nix−39
This diff is too big to show here.
pkgs/applications/audio/pt2-clone/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/ptcollab/default.nix+10−15
This diff is too big to show here.
pkgs/applications/audio/puddletag/default.nix+9−46
This diff is too big to show here.
pkgs/applications/audio/pulseaudio-ctl/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch−25
This diff is too big to show here.
pkgs/applications/audio/pulseaudio-dlna/default.nix+33−54
This diff is too big to show here.
pkgs/applications/audio/pulseaudio-modules-bt/default.nix+91
This diff is too big to show here.
pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch+11
This diff is too big to show here.
pkgs/applications/audio/pulseeffects/default.nix+127
This diff is too big to show here.
pkgs/applications/audio/puredata/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/pyradio/default.nix−30
This diff is too big to show here.
pkgs/applications/audio/qjackctl/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/qmidiarp/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/qmidinet/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/qmidiroute/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/qmmp/default.nix+5−5
This diff is too big to show here.
pkgs/applications/audio/qpwgraph/default.nix−34
This diff is too big to show here.
pkgs/applications/audio/qsynth/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/qtractor/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/quadrafuzz/default.nix−43
This diff is too big to show here.
pkgs/applications/audio/quodlibet/default.nix+8−4
This diff is too big to show here.
pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch+12
This diff is too big to show here.
pkgs/applications/audio/r128gain/default.nix+8−2
This diff is too big to show here.
pkgs/applications/audio/radiotray-ng/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/rakarrack/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/reaper/default.nix+7−10
This diff is too big to show here.
pkgs/applications/audio/redux/default.nix−49
This diff is too big to show here.
pkgs/applications/audio/renoise/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/rhvoice/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/rhythmbox/default.nix+5−50
This diff is too big to show here.
pkgs/applications/audio/rofi-pulse-select/default.nix−40
This diff is too big to show here.
pkgs/applications/audio/roomeqwizard/default.nix−118
This diff is too big to show here.
pkgs/applications/audio/rosegarden/default.nix+10−28
This diff is too big to show here.
pkgs/applications/audio/rubyripper/default.nix+11−23
This diff is too big to show here.
pkgs/applications/audio/rymcast/default.nix−32
This diff is too big to show here.
pkgs/applications/audio/samplv1/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/sayonara/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/sc68/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/schismtracker/default.nix+9−17
This diff is too big to show here.
pkgs/applications/audio/scream/default.nix+4−7
This diff is too big to show here.
pkgs/applications/audio/seq24/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/seq66/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/setbfree/default.nix+6−8
This diff is too big to show here.
pkgs/applications/audio/sfizz/default.nix+12−15
This diff is too big to show here.
pkgs/applications/audio/sfxr-qt/default.nix+3−29
This diff is too big to show here.
pkgs/applications/audio/sfxr-qt/test-export-square-wave/default.nix−6
This diff is too big to show here.
pkgs/applications/audio/sfxr-qt/test-export-square-wave/input.sfxj−29
This diff is too big to show here.
pkgs/applications/audio/shortwave/default.nix+15−13
This diff is too big to show here.
pkgs/applications/audio/sidplayfp/default.nix+4−11
This diff is too big to show here.
pkgs/applications/audio/sisco.lv2/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/snapcast/default.nix+6−10
This diff is too big to show here.
pkgs/applications/audio/snd/default.nix+4−7
This diff is too big to show here.
pkgs/applications/audio/sndpeek/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/songrec/default.nix−40
This diff is too big to show here.
pkgs/applications/audio/sonic-lineup/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/sonic-pi/default.nix+39−62
This diff is too big to show here.
pkgs/applications/audio/sonic-visualiser/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/sonixd/default.nix−27
This diff is too big to show here.
pkgs/applications/audio/sony-headphones-client/default.nix−44
This diff is too big to show here.
pkgs/applications/audio/sooperlooper/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/sorcer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/sound-juicer/default.nix−10
This diff is too big to show here.
pkgs/applications/audio/soundconverter/default.nix−85
This diff is too big to show here.
pkgs/applications/audio/soundkonverter/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/soundscape-renderer/default.nix+11−13
This diff is too big to show here.
pkgs/applications/audio/soundtracker/default.nix+11−29
This diff is too big to show here.
pkgs/applications/audio/soundwireserver/default.nix−40
This diff is too big to show here.
pkgs/applications/audio/spectmorph/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/split2flac/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/spot/default.nix+9−14
This diff is too big to show here.
pkgs/applications/audio/spotify-qt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/spotify-tui/default.nix+3−4
This diff is too big to show here.
pkgs/applications/audio/spotify/default.nix+12−17
This diff is too big to show here.
pkgs/applications/audio/spotifyd/default.nix+11−12
This diff is too big to show here.
pkgs/applications/audio/sptlrx/default.nix−24
This diff is too big to show here.
pkgs/applications/audio/squeezelite/default.nix+30−48
This diff is too big to show here.
pkgs/applications/audio/squishyball/default.nix+11−21
This diff is too big to show here.
pkgs/applications/audio/stochas/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/strawberry/default.nix+20−29
This diff is too big to show here.
pkgs/applications/audio/sublime-music/default.nix+7−14
This diff is too big to show here.
pkgs/applications/audio/sunvox/default.nix+5−5
This diff is too big to show here.
pkgs/applications/audio/surge-XT/default.nix−93
This diff is too big to show here.
pkgs/applications/audio/swh-lv2/default.nix+4−6
This diff is too big to show here.
pkgs/applications/audio/synaesthesia/default.nix−33
This diff is too big to show here.
pkgs/applications/audio/synthv1/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/tageditor/default.nix+2
This diff is too big to show here.
pkgs/applications/audio/tagutil/default.nix−45
This diff is too big to show here.
pkgs/applications/audio/tauon/default.nix−122
This diff is too big to show here.
pkgs/applications/audio/tenacity/default.nix−148
This diff is too big to show here.
pkgs/applications/audio/termusic/default.nix−28
This diff is too big to show here.
pkgs/applications/audio/timemachine/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/tonelib-gfx/default.nix−58
This diff is too big to show here.
pkgs/applications/audio/tonelib-jam/default.nix−61
This diff is too big to show here.
pkgs/applications/audio/tonelib-metal/default.nix−60
This diff is too big to show here.
pkgs/applications/audio/tonelib-zoom/default.nix−63
This diff is too big to show here.
pkgs/applications/audio/tony/default.nix+4−5
This diff is too big to show here.
pkgs/applications/audio/transcode/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/transcribe/default.nix+13−50
This diff is too big to show here.
pkgs/applications/audio/traverso/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/tunefish/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/uade123/default.nix+13−62
This diff is too big to show here.
pkgs/applications/audio/uhhyou.lv2/default.nix+5−5
This diff is too big to show here.
pkgs/applications/audio/vcv-rack/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/vgmstream/default.nix−42
This diff is too big to show here.
pkgs/applications/audio/vgmstream/update.sh−77
This diff is too big to show here.
pkgs/applications/audio/vimpc/default.nix−11
This diff is too big to show here.
pkgs/applications/audio/viper4linux-gui/default.nix−82
This diff is too big to show here.
pkgs/applications/audio/viper4linux/default.nix−61
This diff is too big to show here.
pkgs/applications/audio/virtual-ans/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/vkeybd/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/vmpk/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/vocal/default.nix+4−22
This diff is too big to show here.
pkgs/applications/audio/wavegain/default.nix+2−15
This diff is too big to show here.
pkgs/applications/audio/whipper/default.nix+2−20
This diff is too big to show here.
pkgs/applications/audio/x42-avldrums/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/x42-plugins/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/xmp/default.nix+4−5
This diff is too big to show here.
pkgs/applications/audio/xsynth-dssi/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/yoshimi/default.nix+18−49
This diff is too big to show here.
pkgs/applications/audio/zam-plugins/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/zita-ajbridge/default.nix+4−5
This diff is too big to show here.
pkgs/applications/audio/zita-at1/default.nix+2−3
This diff is too big to show here.
pkgs/applications/audio/zita-njbridge/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/zrythm/default.nix−174
This diff is too big to show here.
pkgs/applications/audio/zynaddsubfx/default.nix+3−16
This diff is too big to show here.
pkgs/applications/backup/areca/default.nix+3−6
This diff is too big to show here.
pkgs/applications/backup/deja-dup/default.nix+12−12
This diff is too big to show here.
pkgs/applications/backup/deja-dup/fix-paths.patch+3−3
This diff is too big to show here.
pkgs/applications/backup/pika-backup/default.nix+3−12
This diff is too big to show here.
pkgs/applications/backup/restique/default.nix−41
This diff is too big to show here.
pkgs/applications/backup/urbackup-client/default.nix−23
This diff is too big to show here.
pkgs/applications/backup/vorta/default.nix+13−59
This diff is too big to show here.
pkgs/applications/blockchains/aeon/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/alfis/default.nix−56
This diff is too big to show here.
pkgs/applications/blockchains/besu/default.nix−29
This diff is too big to show here.
pkgs/applications/blockchains/bisq-desktop/default.nix−101
This diff is too big to show here.
pkgs/applications/blockchains/bisq-desktop/update.sh−22
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-abc.nix+50
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-abc/default.nix−76
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-classic.nix+56
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-classic/default.nix−76
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-gold.nix
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-knots.nix+41
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-knots/default.nix−83
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-unlimited.nix+66
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-unlimited/default.nix−66
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin.nix+104
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin/default.nix−108
This diff is too big to show here.
pkgs/applications/blockchains/btcpayserver/default.nix+38−14
This diff is too big to show here.
pkgs/applications/blockchains/btcpayserver/deps.nix+602−687
This diff is too big to show here.
pkgs/applications/blockchains/btcpayserver/update.sh+1−2
This diff is too big to show here.
pkgs/applications/blockchains/cgminer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/charge-lnd/default.nix−39
This diff is too big to show here.
pkgs/applications/blockchains/chia-plotter/default.nix−72
This diff is too big to show here.
pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch−63
This diff is too big to show here.
pkgs/applications/blockchains/chia/default.nix+12−38
This diff is too big to show here.
pkgs/applications/blockchains/chia/dependencies.patch+13
This diff is too big to show here.
pkgs/applications/blockchains/clightning.nix+63
This diff is too big to show here.
pkgs/applications/blockchains/clightning/default.nix−71
This diff is too big to show here.
pkgs/applications/blockchains/crypto-org-wallet.nix+33
This diff is too big to show here.
pkgs/applications/blockchains/crypto-org-wallet/default.nix−33
This diff is too big to show here.
pkgs/applications/blockchains/cryptop/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/dashpay.nix+44
This diff is too big to show here.
pkgs/applications/blockchains/dashpay/default.nix−44
This diff is too big to show here.
pkgs/applications/blockchains/dcrd.nix
This diff is too big to show here.
pkgs/applications/blockchains/dcrwallet.nix
This diff is too big to show here.
pkgs/applications/blockchains/dero.nix+25
This diff is too big to show here.
pkgs/applications/blockchains/digibyte.nix
This diff is too big to show here.
pkgs/applications/blockchains/dogecoin.nix+41
This diff is too big to show here.
pkgs/applications/blockchains/dogecoin/default.nix−41
This diff is too big to show here.
pkgs/applications/blockchains/eclair/default.nix−38
This diff is too big to show here.
pkgs/applications/blockchains/electrs.nix+30
This diff is too big to show here.
pkgs/applications/blockchains/electrs/default.nix−42
This diff is too big to show here.
pkgs/applications/blockchains/electrs/update.sh−40
This diff is too big to show here.
pkgs/applications/blockchains/elements/default.nix−84
This diff is too big to show here.
pkgs/applications/blockchains/ergo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/erigon.nix−34
This diff is too big to show here.
pkgs/applications/blockchains/ethabi/default.nix+1
This diff is too big to show here.
pkgs/applications/blockchains/exodus/default.nix+5−6
This diff is too big to show here.
pkgs/applications/blockchains/faraday/default.nix+4−4
This diff is too big to show here.
pkgs/applications/blockchains/fix-bitcoin-qt-build.patch
This diff is too big to show here.
pkgs/applications/blockchains/fulcrum/default.nix−36
This diff is too big to show here.
pkgs/applications/blockchains/go-ethereum.nix+59
This diff is too big to show here.
pkgs/applications/blockchains/go-ethereum/default.nix−61
This diff is too big to show here.
pkgs/applications/blockchains/groestlcoin/default.nix−93
This diff is too big to show here.
pkgs/applications/blockchains/ledger-live-desktop/default.nix+5−18
This diff is too big to show here.
pkgs/applications/blockchains/ledger-live-desktop/systemd.patch−14
This diff is too big to show here.
pkgs/applications/blockchains/lightning-loop/default.nix−27
This diff is too big to show here.
pkgs/applications/blockchains/lightning-pool/default.nix−27
This diff is too big to show here.
pkgs/applications/blockchains/lightwalletd/default.nix−37
This diff is too big to show here.
pkgs/applications/blockchains/litecoin.nix+55
This diff is too big to show here.
pkgs/applications/blockchains/litecoin/default.nix−54
This diff is too big to show here.
pkgs/applications/blockchains/lnd.nix+40
This diff is too big to show here.
pkgs/applications/blockchains/lnd/default.nix−40
This diff is too big to show here.
pkgs/applications/blockchains/lndconnect/default.nix+1−1
This diff is too big to show here.
pkgs/applications/blockchains/lndmanage.nix+44
This diff is too big to show here.
pkgs/applications/blockchains/lndmanage/default.nix−44
This diff is too big to show here.
pkgs/applications/blockchains/masari.nix
This diff is too big to show here.
pkgs/applications/blockchains/monero-cli/default.nix−60
This diff is too big to show here.
pkgs/applications/blockchains/monero-cli/use-system-libraries.patch−52
This diff is too big to show here.
pkgs/applications/blockchains/monero-gui/default.nix+19−14
This diff is too big to show here.
pkgs/applications/blockchains/monero/default.nix+68
This diff is too big to show here.
pkgs/applications/blockchains/monero/use-system-libraries.patch+69
This diff is too big to show here.
pkgs/applications/blockchains/mycrypto/default.nix+4−4
This diff is too big to show here.
pkgs/applications/blockchains/namecoin.nix+48
This diff is too big to show here.
pkgs/applications/blockchains/namecoin/default.nix−47
This diff is too big to show here.
pkgs/applications/blockchains/nano-wallet/default.nix+3−4
This diff is too big to show here.
pkgs/applications/blockchains/nbxplorer/default.nix+36−12
This diff is too big to show here.
pkgs/applications/blockchains/nbxplorer/deps.nix+243−263
This diff is too big to show here.
pkgs/applications/blockchains/nbxplorer/update.sh+1−1
This diff is too big to show here.
pkgs/applications/blockchains/nbxplorer/util/create-deps.sh+3−4
This diff is too big to show here.
pkgs/applications/blockchains/nbxplorer/util/update-common.sh+4−5
This diff is too big to show here.
pkgs/applications/blockchains/nearcore/default.nix−42
This diff is too big to show here.
pkgs/applications/blockchains/openethereum/default.nix+6−6
This diff is too big to show here.
pkgs/applications/blockchains/oxen/default.nix−68
This diff is too big to show here.
pkgs/applications/blockchains/parity-ui/default.nix+48
This diff is too big to show here.
pkgs/applications/blockchains/parity-ui/env.nix+19
This diff is too big to show here.
pkgs/applications/blockchains/particl-core/default.nix−56
This diff is too big to show here.
pkgs/applications/blockchains/particl/particl-core.nix+53
This diff is too big to show here.
pkgs/applications/blockchains/pivx.nix+59
This diff is too big to show here.
pkgs/applications/blockchains/pivx/default.nix−78
This diff is too big to show here.
pkgs/applications/blockchains/polkadot/default.nix+4−27
This diff is too big to show here.
pkgs/applications/blockchains/quorum.nix
This diff is too big to show here.
pkgs/applications/blockchains/snarkos/default.nix−61
This diff is too big to show here.
pkgs/applications/blockchains/solana/default.nix−61
This diff is too big to show here.
pkgs/applications/blockchains/solana/pin.json−5
This diff is too big to show here.
pkgs/applications/blockchains/solana/update.sh−33
This diff is too big to show here.
pkgs/applications/blockchains/stellar-core.nix+46
This diff is too big to show here.
pkgs/applications/blockchains/stellar-core/default.nix−50
This diff is too big to show here.
pkgs/applications/blockchains/sumokoin.nix
This diff is too big to show here.
pkgs/applications/blockchains/tessera.nix
This diff is too big to show here.
pkgs/applications/blockchains/trezor-suite/default.nix+6−6
This diff is too big to show here.
pkgs/applications/blockchains/turbo-geth.nix+30
This diff is too big to show here.
pkgs/applications/blockchains/vertcoin.nix
This diff is too big to show here.
pkgs/applications/blockchains/wasabibackend/create_deps.sh+98
This diff is too big to show here.
pkgs/applications/blockchains/wasabibackend/default.nix+72−22
This diff is too big to show here.
pkgs/applications/blockchains/wasabibackend/deps.nix+955−202
This diff is too big to show here.
pkgs/applications/blockchains/wasabiwallet/default.nix+5−6
This diff is too big to show here.
pkgs/applications/blockchains/whirlpool-gui/default.nix+104
This diff is too big to show here.
pkgs/applications/blockchains/wownero.nix+60
This diff is too big to show here.
pkgs/applications/blockchains/wownero/default.nix−61
This diff is too big to show here.
pkgs/applications/blockchains/zcash/default.nix+6−6
This diff is too big to show here.
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix+7−8
This diff is too big to show here.
pkgs/applications/display-managers/lightdm/default.nix+1−1
This diff is too big to show here.
pkgs/applications/display-managers/ly/default.nix+1−1
This diff is too big to show here.
pkgs/applications/display-managers/sddm/default.nix−7
This diff is too big to show here.
pkgs/applications/display-managers/sddm/sddm-default-session.patch−71
This diff is too big to show here.
pkgs/applications/editors/aewan/default.nix+1−12
This diff is too big to show here.
pkgs/applications/editors/android-studio/common.nix+18−23
This diff is too big to show here.
pkgs/applications/editors/android-studio/default.nix+8−8
This diff is too big to show here.
pkgs/applications/editors/apostrophe/default.nix+8−14
This diff is too big to show here.
pkgs/applications/editors/aseprite/skia.nix+1−10
This diff is too big to show here.
pkgs/applications/editors/atom/default.nix+4−4
This diff is too big to show here.
pkgs/applications/editors/atom/env.nix+4−5
This diff is too big to show here.
pkgs/applications/editors/bless/default.nix+6−12
This diff is too big to show here.
pkgs/applications/editors/bluefish/default.nix+8−25
This diff is too big to show here.
pkgs/applications/editors/bluej/default.nix+10−37
This diff is too big to show here.
pkgs/applications/editors/bonzomatic/default.nix+5−5
This diff is too big to show here.
pkgs/applications/editors/bviplus/default.nix+1−13
This diff is too big to show here.
pkgs/applications/editors/code-browser/default.nix+20−31
This diff is too big to show here.
pkgs/applications/editors/cpeditor/default.nix−40
This diff is too big to show here.
pkgs/applications/editors/cudatext/default.nix+3−5
This diff is too big to show here.
pkgs/applications/editors/cudatext/deps.json+22−22
This diff is too big to show here.
pkgs/applications/editors/cudatext/update.sh−23
This diff is too big to show here.
pkgs/applications/editors/deadpixi-sam/default.nix+7−9
This diff is too big to show here.
pkgs/applications/editors/eclipse/build-eclipse.nix+7−7
This diff is too big to show here.
pkgs/applications/editors/eclipse/default.nix+14−18
This diff is too big to show here.
pkgs/applications/editors/eclipse/plugins.nix+3−98
This diff is too big to show here.
pkgs/applications/editors/ed/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/edbrowse/0001-small-fixes.patch−20
This diff is too big to show here.
pkgs/applications/editors/edbrowse/default.nix+20−58
This diff is too big to show here.
pkgs/applications/editors/elvis/default.nix+7−10
This diff is too big to show here.
pkgs/applications/editors/em/default.nix−29
This diff is too big to show here.
pkgs/applications/editors/emacs/27.nix+7
This diff is too big to show here.
pkgs/applications/editors/emacs/28.nix−5
This diff is too big to show here.
pkgs/applications/editors/emacs/at-fdcwd.patch+15
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix−18
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix−27
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix−34
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix−22
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix+51
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix+9−12
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix+17−22
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix−23
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix−17
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix+232−1056
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix+5−52
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix+4−5
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix+12−30
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/ement/default.nix−44
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch−28
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix+13−21
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix−34
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/fetchelpa.nix−21
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix+13−16
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix−26
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix−30
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix+15−20
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/ido-ubiquitous/default.nix+27
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix−25
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix−26
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix+3−10
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix+3−5
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/llvm-mode/default.nix−17
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix+127−121
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix+68−90
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix−23
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix−2393
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix−37
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/org-generated.nix+33
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix+31
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/org-packages.nix+32
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix−19
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/plz/default.nix−31
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix−23
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix+22
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json+8920−13981
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix+25−19
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix+9−11
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix+18−5
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix+5−2
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix+16
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json−32
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix−44
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/update-defaults.py−74
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix−89
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tsc/src.json−10
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tsc/update.py−122
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/update−10
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/update-from-overlay+4
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/update-manual−7
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/update-manual.nix−11
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/update-nongnu−4
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/update-org+4
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/urweb-mode/default.nix−27
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix−28
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/zeitgeist/default.nix+25
This diff is too big to show here.
pkgs/applications/editors/emacs/generic.nix+15−41
This diff is too big to show here.
pkgs/applications/editors/emacs/macport.nix+4−5
This diff is too big to show here.
pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch+14
This diff is too big to show here.
pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch+11
This diff is too big to show here.
pkgs/applications/editors/featherpad/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/focuswriter/default.nix+2
This diff is too big to show here.
pkgs/applications/editors/fte/default.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/geany/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/ghostwriter/default.nix+3−19
This diff is too big to show here.
pkgs/applications/editors/glow/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/gnome-builder/default.nix+21−24
This diff is too big to show here.
pkgs/applications/editors/gobby/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/gophernotes/default.nix+3−3
This diff is too big to show here.
pkgs/applications/editors/greenfoot/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/helix/default.nix−37
This diff is too big to show here.
pkgs/applications/editors/heme/default.nix+29
This diff is too big to show here.
pkgs/applications/editors/hexcurse/default.nix−16
This diff is too big to show here.
pkgs/applications/editors/hexdino/default.nix+6−6
This diff is too big to show here.
pkgs/applications/editors/jetbrains/common.nix+91
This diff is too big to show here.
pkgs/applications/editors/jetbrains/darwin.nix−36
This diff is too big to show here.
pkgs/applications/editors/jetbrains/default.nix+114−132
This diff is too big to show here.
pkgs/applications/editors/jetbrains/linux.nix−93
This diff is too big to show here.
pkgs/applications/editors/jetbrains/update.pl+92
This diff is too big to show here.
pkgs/applications/editors/jetbrains/update.py−100
This diff is too big to show here.
pkgs/applications/editors/jetbrains/versions.json−296
This diff is too big to show here.
pkgs/applications/editors/jove/default.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/jucipp/default.nix+4−3
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix−73
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn−1
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix−1107
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/clojupyter/update.sh−16
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/octave/default.nix−61
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/octave/kernel.nix−28
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/wolfram/default.nix−22
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix−32
This diff is too big to show here.
pkgs/applications/editors/kakoune/default.nix+12−5
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/aliases.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names+19−20
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/update-shell.nix−15
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/update.py+39−44
This diff is too big to show here.
pkgs/applications/editors/kdevelop5/kdev-php.nix+3−3
This diff is too big to show here.
pkgs/applications/editors/kdevelop5/kdev-python.nix+3−3
This diff is too big to show here.
pkgs/applications/editors/kdevelop5/kdevelop.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/kile/default.nix+2−3
This diff is too big to show here.
pkgs/applications/editors/kodestudio/default.nix+3−3
This diff is too big to show here.
pkgs/applications/editors/lapce/default.nix−99
This diff is too big to show here.
pkgs/applications/editors/leo-editor/default.nix+7−6
This diff is too big to show here.
pkgs/applications/editors/libresprite/default.nix−111
This diff is too big to show here.
pkgs/applications/editors/lifeograph/default.nix−40
This diff is too big to show here.
pkgs/applications/editors/lighttable/default.nix+4−4
This diff is too big to show here.
pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch−91
This diff is too big to show here.
pkgs/applications/editors/lite-xl/default.nix−52
This diff is too big to show here.
pkgs/applications/editors/manuskript/default.nix+3−3
This diff is too big to show here.
pkgs/applications/editors/marker/default.nix+3−6
This diff is too big to show here.
pkgs/applications/editors/mg/default.nix+3−7
This diff is too big to show here.
pkgs/applications/editors/micro/default.nix+5−7
This diff is too big to show here.
pkgs/applications/editors/micro/test-with-expect.nix−30
This diff is too big to show here.
pkgs/applications/editors/mindforger/build.patch
This diff is too big to show here.
pkgs/applications/editors/mindforger/default.nix+8−31
This diff is too big to show here.
pkgs/applications/editors/mle/default.nix+1−11
This diff is too big to show here.
pkgs/applications/editors/moe/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/monodevelop/default.nix+81
This diff is too big to show here.
pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch+57
This diff is too big to show here.
pkgs/applications/editors/music/tuxguitar/default.nix+7−7
This diff is too big to show here.
pkgs/applications/editors/nano/default.nix+4−6
This diff is too big to show here.
pkgs/applications/editors/nano/nanorc/default.nix+2
This diff is too big to show here.
pkgs/applications/editors/nano/test-with-expect.nix−35
This diff is too big to show here.
pkgs/applications/editors/ne/default.nix+3−3
This diff is too big to show here.
pkgs/applications/editors/neovim/default.nix+22−20
This diff is too big to show here.
pkgs/applications/editors/neovim/neovide/Cargo.lock+3292
This diff is too big to show here.
pkgs/applications/editors/neovim/neovide/default.nix+44−63
This diff is too big to show here.
pkgs/applications/editors/neovim/neovide/skia-externals.json+10−10
This diff is too big to show here.
pkgs/applications/editors/neovim/neovim-override.vim−7
This diff is too big to show here.
pkgs/applications/editors/neovim/neovim-qt.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/neovim/neovim-remote.nix+3−2
This diff is too big to show here.
pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock+3−3
This diff is too big to show here.
pkgs/applications/editors/neovim/ruby_provider/gemset.nix+6−12
This diff is too big to show here.
pkgs/applications/editors/neovim/tests.nix−174
This diff is too big to show here.
pkgs/applications/editors/neovim/utils.nix+14−15
This diff is too big to show here.
pkgs/applications/editors/neovim/wrapper.nix+15−24
This diff is too big to show here.
pkgs/applications/editors/netbeans/default.nix+5−5
This diff is too big to show here.
pkgs/applications/editors/nvi/default.nix+43−27
This diff is too big to show here.
pkgs/applications/editors/nvpy/default.nix+7−11
This diff is too big to show here.
pkgs/applications/editors/oed/default.nix−32
This diff is too big to show here.
pkgs/applications/editors/okteta/default.nix+2−4
This diff is too big to show here.
pkgs/applications/editors/oni2/common.nix−251
This diff is too big to show here.
pkgs/applications/editors/oni2/default.nix−16
This diff is too big to show here.
pkgs/applications/editors/oni2/esy_skia_use_nixpkgs.patch−13
This diff is too big to show here.
pkgs/applications/editors/oni2/extensions.lock−497
This diff is too big to show here.
pkgs/applications/editors/oni2/extensions.nix−629
This diff is too big to show here.
pkgs/applications/editors/oni2/node.lock−376
This diff is too big to show here.
pkgs/applications/editors/oni2/node.nix−453
This diff is too big to show here.
pkgs/applications/editors/pinegrow/default.nix−80
This diff is too big to show here.
pkgs/applications/editors/poke/default.nix+7−27
This diff is too big to show here.
pkgs/applications/editors/quartus-prime/default.nix+101−9
This diff is too big to show here.
pkgs/applications/editors/quartus-prime/quartus.nix−97
This diff is too big to show here.