5c024a4...master · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

21801 files changed+984387−514001

since splitsnapshots

unifiedsplit

18801 more files changed are not listed.

.editorconfig+5−14

@@ -55,13 +55,15 @@ trim_trailing_whitespace = unset

5555[*.lock]

5656indent_size = unset

5757

58−[eggs.nix]

58+# trailing whitespace is an actual syntax element of classic Markdown/

59+# CommonMark to enforce a line break

60+[*.md]

5961trim_trailing_whitespace = unset

6062

61−[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]

63+[eggs.nix]

6264trim_trailing_whitespace = unset

6365

64−[nixos/tests/systemd-networkd-vrf.nix]

66+[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]

6567trim_trailing_whitespace = unset

6668

6769[pkgs/build-support/dotnetenv/Wrapper/**]

@@ -70,10 +72,6 @@ indent_style = unset

7072insert_final_newline = unset

7173trim_trailing_whitespace = unset

7274

73−[pkgs/build-support/upstream-updater/**]

74−indent_style = unset

75−trim_trailing_whitespace = unset

76−

7775[pkgs/development/compilers/elm/registry.dat]

7876end_of_line = unset

7977insert_final_newline = unset

@@ -87,10 +85,3 @@ trim_trailing_whitespace = unset

8785

8886[pkgs/tools/misc/timidity/timidity.cfg]

8987trim_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-revsnew file+32

@@ -0,0 +1,32 @@

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+109−46

@@ -6,6 +6,10 @@

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.

913

1014# This file

1115/.github/CODEOWNERS @edolstra

@@ -19,7 +23,7 @@

1923

2024# Libraries

2125/lib @edolstra @nbp @infinisil

22−/lib/systems @nbp @ericson2314 @matthewbauer

26+/lib/systems @alyssais @nbp @ericson2314 @matthewbauer

2327/lib/generators.nix @edolstra @nbp @Profpatsch

2428/lib/cli.nix @edolstra @nbp @Profpatsch

2529/lib/debug.nix @edolstra @nbp @Profpatsch

@@ -34,19 +38,25 @@

3438/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer

3539/pkgs/stdenv/generic @Ericson2314 @matthewbauer

3640/pkgs/stdenv/cross @Ericson2314 @matthewbauer

37−/pkgs/build-support/cc-wrapper @Ericson2314 @orivej

38−/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej

41+/pkgs/build-support/cc-wrapper @Ericson2314

42+/pkgs/build-support/bintools-wrapper @Ericson2314

3943/pkgs/build-support/setup-hooks @Ericson2314

40−/pkgs/build-support/setup-hooks/auto-patchelf.sh @aszlig

44+/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus

45+/pkgs/build-support/setup-hooks/auto-patchelf.py @layus

4146

4247# Nixpkgs build-support

4348/pkgs/build-support/writers @lassulus @Profpatsch

4449

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+

4556# NixOS Internals

4657/nixos/default.nix @nbp @infinisil

4758/nixos/lib/from-env.nix @nbp @infinisil

4859/nixos/lib/eval-config.nix @nbp @infinisil

49−/nixos/doc @ryantm

5060/nixos/doc/manual/configuration/abstractions.xml @nbp

5161/nixos/doc/manual/configuration/config-file.xml @nbp

5262/nixos/doc/manual/configuration/config-syntax.xml @nbp

@@ -60,10 +70,17 @@

6070/nixos/doc/manual/development/writing-modules.xml @nbp

6171/nixos/doc/manual/man-nixos-option.xml @nbp

6272/nixos/modules/installer/tools/nixos-option.sh @nbp

73+/nixos/modules/system @dasJ

6374

6475# NixOS integration test driver

6576/nixos/lib/test-driver @tfc

6677

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+

6784# Updaters

6885## update.nix

6986/maintainers/scripts/update.nix @jtojnar

@@ -78,8 +95,7 @@

7895/pkgs/development/python-modules @FRidh @jonringer

7996/doc/languages-frameworks/python.section.md @FRidh

8097/pkgs/development/tools/poetry2nix @adisbladis

81−/pkgs/development/interpreters/python/hooks @FRidh @jonringer @DavHau

82−/pkgs/development/interpreters/python/conda @DavHau

98+/pkgs/development/interpreters/python/hooks @FRidh @jonringer

8399

84100# Haskell

85101/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @expipiplus1

@@ -91,13 +107,13 @@

91107/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1

92108

93109# Perl

94−/pkgs/development/interpreters/perl @volth @stigtsp

95−/pkgs/top-level/perl-packages.nix @volth @stigtsp

96−/pkgs/development/perl-modules @volth @stigtsp

110+/pkgs/development/interpreters/perl @stigtsp @zakame

111+/pkgs/top-level/perl-packages.nix @stigtsp @zakame

112+/pkgs/development/perl-modules @stigtsp @zakame

97113

98114# R

99−/pkgs/applications/science/math/R @peti

100−/pkgs/development/r-modules @peti

115+/pkgs/applications/science/math/R @jbedo

116+/pkgs/development/r-modules @jbedo

101117

102118# Ruby

103119/pkgs/development/interpreters/ruby @marsam

@@ -105,11 +121,8 @@

105121

106122# Rust

107123/pkgs/development/compilers/rust @Mic92 @LnL7 @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

124+/pkgs/build-support/rust @zowoq

125+/doc/languages-frameworks/rust.section.md @zowoq

113126

114127# C compilers

115128/pkgs/development/compilers/gcc @matthewbauer

@@ -119,14 +132,14 @@

119132/pkgs/top-level/unix-tools.nix @matthewbauer

120133/pkgs/development/tools/xcbuild @matthewbauer

121134

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

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

130143

131144# Jetbrains

132145/pkgs/applications/editors/jetbrains @edwtjo

@@ -154,12 +167,30 @@

154167/nixos/tests/hardened.nix @joachifm

155168/pkgs/os-specific/linux/kernel/hardened-config.nix @joachifm

156169

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+

157178# Network Time Daemons

158179/pkgs/tools/networking/chrony @thoughtpolice

159180/pkgs/tools/networking/ntp @thoughtpolice

160181/pkgs/tools/networking/openntpd @thoughtpolice

161182/nixos/modules/services/networking/ntp @thoughtpolice

162183

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+

163194# Dhall

164195/pkgs/development/dhall-modules @Gabriel439 @Profpatsch @ehmry

165196/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry

@@ -168,7 +199,7 @@

168199/pkgs/development/idris-modules @Infinisil

169200

170201# Bazel

171−/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch

202+/pkgs/development/tools/build-managers/bazel @Profpatsch

172203

173204# NixOS modules for e-mail and dns services

174205/nixos/modules/services/mail/mailman.nix @peti

@@ -177,18 +208,18 @@

177208/nixos/modules/services/mail/rspamd.nix @peti

178209

179210# Emacs

180−/pkgs/applications/editors/emacs-modes @adisbladis

181−/pkgs/applications/editors/emacs @adisbladis

182−/pkgs/top-level/emacs-packages.nix @adisbladis

211+/pkgs/applications/editors/emacs/elisp-packages @adisbladis

212+/pkgs/applications/editors/emacs @adisbladis

213+/pkgs/top-level/emacs-packages.nix @adisbladis

183214

184215# Neovim

185216/pkgs/applications/editors/neovim @jonringer @teto

186217

187218# VimPlugins

188−/pkgs/misc/vim-plugins @jonringer @softinio

219+/pkgs/applications/editors/vim/plugins @jonringer

189220

190221# VsCode Extensions

191−/pkgs/misc/vscode-extensions @jonringer

222+/pkgs/applications/editors/vscode/extensions @jonringer

192223

193224# Prometheus exporter modules and tests

194225/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz

@@ -196,33 +227,65 @@

196227/nixos/tests/prometheus-exporters.nix @WilliButz

197228

198229# PHP interpreter, packages, extensions, tests and documentation

199−/doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz

200−/nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz

201−/pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz

202−/pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz

203−/pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz

204−/pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz

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

205236

206237# Podman, CRI-O modules and related

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

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

212243

213244# Docker tools

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

245+/pkgs/build-support/docker @roberth

246+/nixos/tests/docker-tools* @roberth

247+/doc/builders/images/dockertools.section.md @roberth

218248

219249# Blockchains

220250/pkgs/applications/blockchains @mmahut @RaghavSood

221251

222252# Go

253+/doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq

223254/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq

224255/pkgs/development/go-modules @kalbasit @Mic92 @zowoq

225256/pkgs/development/go-packages @kalbasit @Mic92 @zowoq

226257

258+# GNOME

259+/pkgs/desktops/gnome @jtojnar @hedning

260+/pkgs/desktops/gnome/extensions @piegamesde @jtojnar @hedning

261+

227262# Cinnamon

228263/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.mddeleted−83

@@ -1,83 +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−* 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−## Criteria for Backporting changes

63−

64−Anything that does not cause user or downstream dependency regressions can be backported. This includes:

65−- New Packages / Modules

66−- Security / Patch updates

67−- Version updates which include new functionality (but no breaking changes)

68−- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)

69−- Security critical applications (E.g. `firefox`)

70−

71−## Generating 21.11 Release Notes

72−

73−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.

74−

75−Steps for updating 21.11 Release notes:

76−

77−1. Edit `nixos/doc/manual/release-notes/rl-2111.section.md` with the desired changes

78−2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2111.section.xml`

79−3. Include changes to `rl-2111.section.md` and `rl-2111.section.xml` in the same commit.

80−

81−## Reviewing contributions

82−

83−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+10−13

@@ -7,37 +7,34 @@ assignees: ''

88---

10−**Describe the bug**

10+### Describe the bug

1111A clear and concise description of what the bug is.

1212

13−**To Reproduce**

13+### Steps 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−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:

37+```console

38+[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"

39+output here

4340```

.github/ISSUE_TEMPLATE/out_of_date_package_report.md+3−3

@@ -13,10 +13,10 @@ assignees: ''

1313

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 the current version of the package

19+The "new_version" is 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 than above for checking the master branch

32+The current version can be found easily with the same process as 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+30−19

@@ -1,30 +1,41 @@

1+###### Description of changes

13<!--

2−To help with the large amounts of pull requests, we would appreciate your

3−reviews of other pull requests, especially simple package updates. Just leave a

4−comment describing what you have tested in the relevant package/service.

5−Reviewing helps to reduce the average time-to-merge for everyone.

6−Thanks a lot if you do!

7−List of open PRs: https://github.com/NixOS/nixpkgs/pulls

8−Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions

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.

96-->

107

11−###### Motivation for this change

12−

13−

148###### Things done

159

1610

1711

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)

1912- 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−- [21.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#generating-2111-release-notes)

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)

2726 - [ ] (Package updates) Added a release notes entry if the change is major or breaking

2827 - [ ] (Module updates) Added a release notes entry if the change is significant

2928 - [ ] (Module addition) Added a release notes entry if adding a new NixOS module

30−- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

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+

32+<!--

33+To help with the large amounts of pull requests, we would appreciate your

34+reviews of other pull requests, especially simple package updates. Just leave a

35+comment describing what you have tested in the relevant package/service.

36+Reviewing helps to reduce the average time-to-merge for everyone.

37+Thanks a lot if you do!

38+

39+List of open PRs: https://github.com/NixOS/nixpkgs/pulls

40+Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions

41+-->

.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/) or on the [#nixos IRC channel](https://webchat.freenode.net/#nixos).

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).

88## Suggestions for PRs

.github/labeler.yml+11−6

@@ -5,10 +5,6 @@

55 - pkgs/development/libraries/agda/**/*

66 - pkgs/top-level/agda-packages.nix

8−"6.topic: bsd":

9− - pkgs/os-specific/bsd/**/*

10− - pkgs/stdenv/freebsd/**/*

11−

128"6.topic: cinnamon":

139 - pkgs/desktops/cinnamon/**/*

1410

@@ -16,7 +12,7 @@

1612 - nixos/modules/services/editors/emacs.nix

1713 - nixos/modules/services/editors/emacs.xml

1814 - nixos/tests/emacs-daemon.nix

19− - pkgs/applications/editors/emacs-modes/**/*

15+ - pkgs/applications/editors/emacs/elisp-packages/**/*

2016 - pkgs/applications/editors/emacs/**/*

2117 - pkgs/build-support/emacs/**/*

2218 - pkgs/top-level/emacs-packages.nix

@@ -70,6 +66,13 @@

7066

7167"6.topic: nixos":

7268 - 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

7376

7477"6.topic: ocaml":

7578 - doc/languages-frameworks/ocaml.section.md

@@ -135,7 +138,9 @@

135138"6.topic: vim":

136139 - doc/languages-frameworks/vim.section.md

137140 - pkgs/applications/editors/vim/**/*

138− - pkgs/misc/vim-plugins/**/*

141+ - pkgs/applications/editors/vim/plugins/**/*

142+ - nixos/modules/programs/neovim.nix

143+ - pkgs/applications/editors/neovim/**/*

139144

140145"6.topic: xfce":

141146 - nixos/doc/manual/configuration/xfce.xml

.github/workflows/backport.yml+15−3

@@ -2,22 +2,34 @@ name: Backport

22on:

33 pull_request_target:

44 types: [closed, labeled]

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+

511jobs:

612 backport:

713 name: Backport Pull Request

814 if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))

915 runs-on: ubuntu-latest

1016 steps:

11− - uses: actions/checkout@v2

17+ - uses: actions/checkout@v3

1218 with:

1319 # required to find all branches

1420 fetch-depth: 0

1521 ref: ${{ github.event.pull_request.head.sha }}

1622 - name: Create backport PRs

1723 # should be kept in sync with `version`

18− uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd

24+ uses: zeebe-io/backport-action@v0.0.5

1925 with:

26+ # Config README: https://github.com/zeebe-io/backport-action#backport-action

2027 github_token: ${{ secrets.GITHUB_TOKEN }}

2128 github_workspace: ${{ github.workspace }}

2229 # should be kept in sync with `uses`

23− version: 9b8949dcd4295d364b0939f07d0c7593598d26cd

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.

.github/workflows/basic-eval.ymlnew file+26

@@ -0,0 +1,26 @@

1+name: Basic evaluation checks

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−1

@@ -22,7 +22,7 @@ jobs:

2222 if: steps.ismerge.outputs.ismerge != 'true'

2323 - name: Warn if the commit was a direct push

2424 if: steps.ismerge.outputs.ismerge != 'true'

25− uses: peter-evans/commit-comment@v1

25+ uses: peter-evans/commit-comment@v2

2626 with:

2727 body: |

2828 @${{ github.actor }}, you pushed a commit directly to master/release branch

.github/workflows/editorconfig.yml+10−13

@@ -11,36 +11,33 @@ on:

1111jobs:

1212 tests:

1313 runs-on: ubuntu-latest

14− if: github.repository_owner == 'NixOS'

14+ if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip editorconfig]')"

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

2120 gh api \

2221 repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \

2322 | jq '.[] | select(.status != "removed") | .filename' \

24− >> $GITHUB_ENV

25− echo 'EOF' >> $GITHUB_ENV

26− - uses: actions/checkout@v2

23+ > "$HOME/changed_files"

24+ - name: print list of changed files

25+ run: |

26+ cat "$HOME/changed_files"

27+ - uses: actions/checkout@v3

2728 with:

2829 # pull_request_target checks out the base branch by default

2930 ref: refs/pull/${{ github.event.pull_request.number }}/merge

30− if: env.PR_DIFF

31− - uses: cachix/install-nix-action@v13

32− if: env.PR_DIFF

31+ - uses: cachix/install-nix-action@v17

3332 with:

3433 # nixpkgs commit is pinned so that it doesn't break

35− nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz

34+ # editorconfig-checker 2.4.0

35+ nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz

3636 - name: install editorconfig-checker

3737 run: nix-env -iA editorconfig-checker -f '<nixpkgs>'

38− if: env.PR_DIFF

3938 - name: Checking EditorConfig

40− if: env.PR_DIFF

4139 run: |

42− echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size

40+ cat "$HOME/changed_files" | xargs -r editorconfig-checker -disable-indent-size

4341 - if: ${{ failure() }}

4442 run: |

4543 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+6−1

@@ -4,6 +4,11 @@ on:

44 pull_request_target:

55 types: [edited, opened, synchronize, reopened]

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+

712permissions:

813 contents: read

914 pull-requests: write

@@ -13,7 +18,7 @@ jobs:

1318 runs-on: ubuntu-latest

1419 if: github.repository_owner == 'NixOS'

1520 steps:

16− - uses: actions/labeler@v3

21+ - uses: actions/labeler@v4

1722 with:

1823 repo-token: ${{ secrets.GITHUB_TOKEN }}

1924 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@v2

17+ - uses: actions/checkout@v3

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@v13

21+ - uses: cachix/install-nix-action@v17

2222 with:

2323 # explicitly enable sandbox

2424 extra_nix_config: sandbox = true

25− - uses: cachix/cachix-action@v9

25+ - uses: cachix/cachix-action@v10

2626 with:

27− # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.

27+ # This cache is for the nixpkgs repo checks 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@v2

17+ - uses: actions/checkout@v3

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@v13

21+ - uses: cachix/install-nix-action@v17

2222 with:

2323 # explicitly enable sandbox

2424 extra_nix_config: sandbox = true

25− - uses: cachix/cachix-action@v9

25+ - uses: cachix/cachix-action@v10

2626 with:

27− # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.

27+ # This cache is for the nixpkgs repo checks 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.ymldeleted−41

@@ -1,41 +0,0 @@

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+2−2

@@ -15,11 +15,11 @@ jobs:

1515 runs-on: ubuntu-latest

1616 if: github.repository_owner == 'NixOS'

1717 steps:

18− - uses: actions/checkout@v2

18+ - uses: actions/checkout@v3

1919 with:

2020 # pull_request_target checks out the base branch by default

2121 ref: refs/pull/${{ github.event.pull_request.number }}/merge

22− - uses: cachix/install-nix-action@v12

22+ - uses: cachix/install-nix-action@v17

2323 - name: Check DocBook files generated from Markdown are consistent

2424 run: |

2525 nixos/doc/manual/md-to-db.sh

.github/workflows/no-channel.ymlnew file+21

@@ -0,0 +1,21 @@

1+name: "No channel PR"

3+on:

4+ pull_request:

5+ branches:

6+ - 'nixos-**'

7+ - 'nixpkgs-**'

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,6 +3,11 @@ name: "set pending status"

33on:

44 pull_request_target:

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+

611jobs:

712 action:

813 runs-on: ubuntu-latest

.github/workflows/periodic-merge-24h.ymlnew file+57

@@ -0,0 +1,57 @@

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.

8+name: "Periodic Merges (24h)"

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.ymlnew file+51

@@ -0,0 +1,51 @@

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.

8+name: "Periodic Merges (6h)"

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/update-terraform-providers.ymlnew file+48

@@ -0,0 +1,48 @@

1+name: "Update terraform-providers"

3+on:

4+ schedule:

5+ - cron: "14 3 * * 1"

6+ workflow_dispatch:

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,8 +2,12 @@

22,*

33.*.swp

44.*.swo

5+.idea/

6+.vscode/

7+outputs/

58result

69result-*

10+source/

711/doc/NEWS.html

812/doc/NEWS.txt

913/doc/manual.html

@@ -20,3 +24,6 @@ __pycache__

2024

2125# generated by pkgs/common-updater/update-script.nix

2226update-git-commits.txt

27+

28+# JetBrains IDEA module declaration file

29+/nixpkgs.iml

.version+1−1

@@ -1 +1 @@

1−21.11

1+22.05

CONTRIBUTING.mdnew file+130

@@ -0,0 +1,130 @@

1+# How to contribute

3+Note: contributing implies licensing those contributions

4+under the terms of [COPYING](COPYING), which is an MIT-like license.

6+## Opening issues

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 @@

33Permission is hereby granted, free of charge, to any person obtaining

44a copy of this software and associated documentation files (the

README.md+15−9

@@ -1,14 +1,19 @@

11<p align="center">

2− <a href="https://nixos.org/nixos"><img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="NixOS logo" /></a>

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>

38</p>

510<p align="center">

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>

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>

813</p>

914

1015[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over

11−60,000 software packages that can be installed with the

16+80,000 software packages that can be installed with the

1217[Nix](https://nixos.org/nix/) package manager. It also implements

1318[NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution.

1419

@@ -46,14 +51,14 @@ Nixpkgs and NixOS are built and tested by our continuous integration

4651system, [Hydra](https://hydra.nixos.org/).

4752

4853* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)

49−* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05)

54+* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11)

5055* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)

51−* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents)

56+* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents)

5257

5358Artifacts successfully built with Hydra are published to cache at

5459https://cache.nixos.org/. When successful build and test criteria are

5560met, the Nixpkgs expressions are distributed via [Nix

56−channels](https://nixos.org/nix/manual/#sec-channels).

61+channels](https://nixos.org/manual/nix/stable/package-management/channels.html).

5762

5863# Contributing

5964

@@ -87,7 +92,7 @@ Most contributions are based on and merged into these branches:

8792 deemed of sufficiently high quality

8893

8994For more information about contributing to the project, please visit

90−the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

95+the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).

9196

9297# Donations

9398

@@ -97,7 +102,8 @@ Foundation](https://nixos.org/nixos/foundation.html). To ensure the

97102continuity and expansion of the NixOS infrastructure, we are looking

98103for donations to our organization.

99104

100−You can donate to the NixOS foundation by using Open Collective:

105+You can donate to the NixOS foundation through [SEPA bank

106+transfers](https://nixos.org/donate.html) or by using Open Collective:

101107

102108<a href="https://opencollective.com/nixos#support"><img src="https://opencollective.com/nixos/tiers/supporter.svg?width=890" /></a>

103109

doc/Makefile+7−2

@@ -3,12 +3,17 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$'

33PANDOC ?= pandoc

55pandoc_media_dir = media

6−# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh).

6+# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh) and conversion script (/maintainers/scripts/db-to-md.sh).

77# TODO: Remove raw-attribute when we can get rid of DocBook altogether.

88pandoc_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)

911pandoc_flags = --extract-media=$(pandoc_media_dir) \

1012 --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \

11− --lua-filter=labelless-link-is-xref.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 \

1217 -f commonmark$(pandoc_commonmark_enabled_extensions)+smart

1318

1419.PHONY: all

doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.luanew file+23

@@ -0,0 +1,23 @@

1+--[[

2+Converts Code AST nodes produced by pandoc’s DocBook reader

3+from citerefentry elements into AST for corresponding role

4+for reStructuredText.

6+We use subset of MyST syntax (CommonMark with features from rST)

7+so let’s use the rST AST for rST features.

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.luanew file+34

@@ -0,0 +1,34 @@

1+--[[

2+Converts Link AST nodes with empty label to DocBook xref elements.

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.

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.luanew file+36

@@ -0,0 +1,36 @@

1+--[[

2+Converts AST for reStructuredText roles into corresponding

3+DocBook elements.

5+Currently, only a subset of roles is supported.

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.luanew file+17

@@ -0,0 +1,17 @@

1+--[[

2+Turns a manpage reference into a link, when a mapping is defined below.

3+]]

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.luanew file+29

@@ -0,0 +1,29 @@

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.

6+This is to emulate MyST syntax in Pandoc.

7+(MyST is a CommonMark flavour with rST features mixed in.)

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.luanew file+25

@@ -0,0 +1,25 @@

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.

5+This is to emulate MyST syntax in Pandoc.

6+(MyST is a CommonMark flavour with rST features mixed in.)

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+49−12

@@ -1,8 +1,16 @@

11# Fetchers {#chap-pkgs-fetchers}

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.

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.

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.

5+## Caveats

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.

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.

614

715```nix

816{ stdenv, fetchurl }:

@@ -16,11 +24,11 @@ stdenv.mkDerivation {

1624}

1725```

1826

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.

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.

2028

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.

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.

2230

23−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`.

31+Most other fetchers return a directory rather than a single file.

2432

2533## `fetchsvn` {#fetchsvn}

2634

@@ -30,7 +38,25 @@ Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha25

3038

3139Used 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`.

3240

33−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.

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.

42+

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+```

3460

3561## `fetchfossil` {#fetchfossil}

3662

@@ -46,19 +72,23 @@ Used with Mercurial. Expects `url`, `rev`, and `sha256`.

4672

4773A 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.

4874

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.

78+

4979## `fetchFromGitHub` {#fetchfromgithub}

5080

51−`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.

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.

5282

5383`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.

5484

5585## `fetchFromGitLab` {#fetchfromgitlab}

5686

57−This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above.

87+This is used with GitLab repositories. The arguments expected are very similar to `fetchFromGitHub` above.

5888

5989## `fetchFromGitiles` {#fetchfromgitiles}

6090

61−This is used with Gitiles repositories. The arguments expected are similar to fetchgit.

91+This is used with Gitiles repositories. The arguments expected are similar to `fetchgit`.

6292

6393## `fetchFromBitbucket` {#fetchfrombitbucket}

6494

@@ -66,12 +96,19 @@ This is used with BitBucket repositories. The arguments expected are very simila

6696

6797## `fetchFromSavannah` {#fetchfromsavannah}

6898

69−This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above.

99+This is used with Savannah repositories. The arguments expected are very similar to `fetchFromGitHub` above.

70100

71101## `fetchFromRepoOrCz` {#fetchfromrepoorcz}

72102

73−This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.

103+This is used with repo.or.cz repositories. The arguments expected are very similar to `fetchFromGitHub` above.

74104

75105## `fetchFromSourcehut` {#fetchfromsourcehut}

76106

77−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!

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`.

111+

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`.

doc/builders/images/dockertools.section.md+14−8

@@ -58,7 +58,7 @@ After the new layer has been created, its closure (to which `contents`, `config`

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−and now the Docker CLI will display a reasonable date and sort the images as expected:

90+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,6 +151,12 @@ 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+

154160### Behavior of `contents` in the final image {#dockerTools-buildLayeredImage-arg-contents}

155161

156162Each path directly listed in `contents` will have a symlink in the root of the image.

@@ -189,9 +195,9 @@ pkgs.dockerTools.buildLayeredImage {

189195

190196Increasing the `maxLayers` increases the number of layers which have a chance to be shared between different images.

191197

192−Modern Docker installations support up to 128 layers, however older versions support as few as 42.

198+Modern Docker installations support up to 128 layers, but older versions support as few as 42.

193199

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.

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.

195201

196202The 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.

197203

@@ -207,7 +213,7 @@ The image produced by running the output script can be piped directly into `dock

207213$(nix-build) | docker load

208214```

209215

210−Alternatively, the image be piped via `gzip` into `skopeo`, e.g. to copy it into a registry:

216+Alternatively, the image be piped via `gzip` into `skopeo`, e.g., to copy it into a registry:

211217

212218```ShellSession

213219$(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}

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.

55## buildContainer {#ssec-pkgs-ociTools-buildContainer}

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.

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+1−1

@@ -33,7 +33,7 @@ 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

3838``` {#ex-snapTools-buildSnap-firefox .nix}

3939let

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

55## Basic usage {#sec-citrix-base}

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.

9−## Citrix Selfservice {#sec-citrix-selfservice}

9+## Citrix Self-service {#sec-citrix-selfservice}

1010

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.

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.

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+1−1

@@ -1,6 +1,6 @@

11# Elm {#sec-elm}

3−To start a development environment do

3+To start a development environment, run:

55```ShellSession

66nix-shell -p elmPackages.elm elmPackages.elm-format

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 provide 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 provides 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 presonal 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 personal 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 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'`.

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'`.

107107

108108```nix

109109overrides = self: super: rec {

110110 haskell-mode = self.melpaPackages.haskell-mode;

111111 ...

112112};

113−((emacsPackagesFor emacs).overrideScope' overrides).emacs.pkgs.withPackages

113+((emacsPackagesFor emacs).overrideScope' overrides).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.mdnew file+18

@@ -0,0 +1,18 @@

1+# /etc files {#etc}

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.

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.

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.

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+9−7

@@ -2,11 +2,12 @@

33## Build wrapped Firefox with extensions and policies {#build-wrapped-firefox-with-extensions-and-policies}

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:

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:

77```nix

88{

9− myFirefox = wrapFirefox firefox-unwrapped {

9+ # Nix firefox addons only work with the firefox-esr package.

10+ myFirefox = wrapFirefox firefox-esr-unwrapped {

1011 nixExtensions = [

1112 (fetchFirefoxAddon {

1213 name = "ublock"; # Has to be unique!

@@ -39,11 +40,12 @@ The `wrapFirefox` function allows to pass policies, preferences and extension th

3940}

4041```

4142

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.

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.

4647

4748## Troubleshooting {#sec-firefox-troubleshooting}

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.

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.

4950

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 initialised with some plugins as well as completions, configuration

39+Fish shells initialized 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 uses `AC_CHECK_HEADERS` or

27+This happens on autoconf based projects that use `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 proejcts do define

30+on macOS if the `FUSE_USE_VERSION` macro is undefined. Many projects 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.

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).

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 customiz

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,6 +17,7 @@

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" />

2021 <xi:include href="nginx.section.xml" />

2122 <xi:include href="opengl.section.xml" />

2223 <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

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`).

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:

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 `all-packages.nix` (e.g., create an attribute `kernel_2_6_22`).

19+2. Add the new kernel to the `kernels` attribute set in `linux-kernels.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 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`).

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`).

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 -i ncurses

32+ $ nix-env -f "<nixpkgs>" -iA 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 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 linuxKernel.kernels.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 `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.

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.

doc/builders/packages/locales.section.md+2−2

@@ -1,5 +1,5 @@

11# Locales {#locales}

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.

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 @@

55## ETags on static files served from the Nix store {#sec-nginx-etag}

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).

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).

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+1−1

@@ -12,4 +12,4 @@ The NixOS desktop or other non-headless configurations are the primary target fo

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

55- `fzf` : `fzf-share`

7−E.g. `fzf` can then used in the `.bashrc` like this:

7+E.g. `fzf` can then be used in the `.bashrc` like this:

99```bash

1010source "$(fzf-share)/completion.bash"

doc/builders/packages/steam.section.md+8−17

@@ -2,20 +2,20 @@

33## Steam in Nix {#sec-steam-nix}

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`.

77Nix problems and constraints:

9−- We don't have `/bin/bash` and many scripts point there. Similarly for `/usr/bin/python`.

9+- We don't have `/bin/bash` and many scripts point there. Same thing for `/usr/bin/python`.

1010- We don't have the dynamic loader in `/lib`.

11−- The `steam.sh` script in \$HOME can not be patched, as it is checked and rewritten by steam.

11+- The `steam.sh` script in `$HOME` cannot 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 workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr.

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.

1919

2020## Troubleshooting {#sec-steam-troub}

2121

@@ -32,7 +32,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a

3232- **Using the FOSS Radeon or nouveau (nvidia) drivers**

3333

3434 - 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 conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error

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:

3636

3737 ```

3838 steam.sh: line 713: 7842 Segmentation fault (core dumped)

@@ -42,13 +42,13 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a

4242

4343- **Java**

4444

45− 1. There is no java in steam chrootenv by default. If you get a message like

45+ 1. There is no java in steam chrootenv by default. If you get a message like:

4646

4747 ```

4848 /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found

4949 ```

5050

51− you need to add

51+ you need to add:

5252

5353 ```nix

5454 steam.override { withJava = true; };

@@ -56,16 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a

5656

5757## steam-run {#sec-steam-run}

5858

59−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

60−

61−```nix

62−pkgs.steam.override ({

63− nativeOnly = true;

64− newStdcpp = true;

65−}).run

66−```

67−

68−to your configuration, rebuild, and run the game with

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:

6960

7061```

7162steam-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.

55## Configuring urxvt {#sec-urxvt-conf}

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:

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}

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:

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 freenode chat.freenode.org

44+ /server add libera irc.libera.chat

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/special/fhs-environments.section.md+4

@@ -18,6 +18,8 @@

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.

2123

2224One can create a simple environment using a `shell.nix` like that:

2325

@@ -43,3 +45,5 @@ One can create a simple environment using a `shell.nix` like that:

4345```

4446

4547Running `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+26−6

@@ -1,17 +1,37 @@

11# pkgs.mkShell {#sec-pkgs-mkShell}

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`.

3+`pkgs.mkShell` is a specialized `stdenv.mkDerivation` that removes some

4+repetition when using it with `nix-shell` (or `nix develop`).

76## Usage {#sec-pkgs-mkShell-usage}

8+Here is a common usage example:

910```nix

1011{ pkgs ? import <nixpkgs> {} }:

1112pkgs.mkShell {

12− # specify which packages to add to the shell environment

1313 packages = [ pkgs.gnumake ];

14− # add all the dependencies, of the given packages, to the shell environment

15− inputsFrom = with pkgs; [ hello gnutar ];

14+

15+ inputsFrom = [ pkgs.hello pkgs.gnutar ];

16+

17+ shellHook = ''

18+ export DEBUG=1

19+ '';

1620}

1721```

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.mdnew file+82

@@ -0,0 +1,82 @@

1+# Testers {#chap-testers}

2+This chapter describes several testing builders which are available in the <literal>testers</literal> namespace.

4+## `testVersion` {#tester-testVersion}

6+Checks the command output contains the specified version

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+127−3

@@ -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 roundrip 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 round-trip and can speed up a build.

3939

4040::: {.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`.

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,9 +47,133 @@ 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+

50154## `symlinkJoin` {#trivial-builder-symlinkJoin}

51155

52156This 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+```

53177

54178## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile}

55179

@@ -95,5 +219,5 @@ produces an output path `/nix/store/<hash>-runtime-references` containing

95219/nix/store/<hash>-hello-2.10

96220```

97221

98−but none of `hello`'s dependencies, because those are not referenced directly

222+but none of `hello`'s dependencies because those are not referenced directly

99223by `hi`'s output.

doc/contributing/coding-conventions.chapter.md+73−12

@@ -181,6 +181,21 @@

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+

184199- Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.

185200

186201## Package naming {#sec-package-naming}

@@ -199,17 +214,17 @@ Most of the time, these are the same. For instance, the package `e2fsprogs` has

199214

200215There are a few naming guidelines:

201216

202−- The `name` attribute _should_ be identical to the upstream package name.

217+- The `pname` attribute _should_ be identical to the upstream package name.

203218

204−- The `name` attribute _must not_ contain uppercase letters — e.g., `"mplayer-1.0rc2"` instead of `"MPlayer-1.0rc2"`.

219+- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer" instead of `"MPlayer"`.

205220

206−- The version part of the `name` attribute _must_ start with a digit (following a dash) — e.g., `"hello-0.3.1rc2"`.

221+- The `version` attribute _must_ start with a digit e.g`"0.3.1rc2".

207222

208−- 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"`.

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.

209224

210−- 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.

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.

211226

212−- 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)

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)

213228

214229## File naming and organisation {#sec-organisation}

215230

@@ -520,15 +535,16 @@ If you do need to do create this sort of patch file, one way to do so is with gi

5205354. Use git to create a diff, and pipe the output to a patch file:

521536

522537 ```ShellSession

523− $ git diff > nixpkgs/pkgs/the/package/0001-changes.patch

538+ $ git diff -a > nixpkgs/pkgs/the/package/0001-changes.patch

524539 ```

525540

526541If 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`:

527542

543+- `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it.

528544- `stripLen`: Remove the first `stripLen` components of pathnames in the patch.

529545- `extraPrefix`: Prefix pathnames by this string.

530−- `excludes`: Exclude files matching this pattern.

531−- `includes`: Include only files matching this pattern.

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).

532548- `revert`: Revert the patch.

533549

534550Note 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.

@@ -537,9 +553,34 @@ Note that because the checksum is computed after applying these effects, using o

537553

538554Tests are important to ensure quality and make reviews and automatic updates easy.

539555

540−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`.

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+```

541582

542−### Writing package tests {#ssec-package-tests-writing}

583+### Writing larger package tests {#ssec-package-tests-writing}

543584

544585This is an example using the `phoronix-test-suite` package with the current best practices.

545586

@@ -568,7 +609,7 @@ let

568609 inherit (phoronix-test-suite) pname version;

569610in

570611

571−runCommand "${pname}-tests" { meta.timeout = 3; }

612+runCommand "${pname}-tests" { meta.timeout = 60; }

572613 ''

573614 # automatic initial setup to prevent interactive questions

574615 ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null

@@ -602,3 +643,23 @@ Here are examples of package tests:

602643- [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix)

603644- [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix)

604645- [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+7

@@ -52,6 +52,13 @@ Additionally, the following syntax extensions are currently used:

5252

5353 This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing).

5454

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+

5562- []{#ssec-contributing-markup-admonitions}

5663 **Admonitions**, set off from the text to bring attention to something.

5764

doc/contributing/reviewing-contributions.chapter.md+5−4

@@ -103,7 +103,8 @@ Sample template for a new package review is provided below.

103103- [ ] `meta.maintainers` is set

104104- [ ] build time only dependencies are declared in `nativeBuildInputs`

105105- [ ] source is fetched using the appropriate function

106−- [ ] phases are respected

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`.

107108- [ ] patches that are remotely available are fetched with `fetchpatch`

108109

109110##### Possible improvements

@@ -121,10 +122,10 @@ Reviewing process:

121122 - [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.

122123- Ensure that the module tests, if any, are succeeding.

123124- Ensure that the introduced options are correct.

124− - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated).

125+ - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).

125126 - Description, default and example should be provided.

126127- Ensure that option changes are backward compatible.

127− - `mkRenamedOptionModule` and `mkAliasOptionModule` functions provide way to make option changes backward compatible.

128+ - `mkRenamedOptionModuleWith` provides a way to make option changes backward compatible.

128129- Ensure that removed options are declared with `mkRemovedOptionModule`

129130- Ensure that changes that are not backward compatible are mentioned in release notes.

130131- Ensure that documentations affected by the change is updated.

@@ -156,7 +157,7 @@ Reviewing process:

156157

157158- Ensure that the module tests, if any, are succeeding.

158159- Ensure that the introduced options are correct.

159− - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated).

160+ - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).

160161 - Description, default and example should be provided.

161162- Ensure that module `meta` field is present

162163 - Maintainers should be declared in `meta.maintainers`.

doc/contributing/submitting-changes.chapter.md+22−12

@@ -43,13 +43,13 @@

4343 - nixpkgs:

4444

4545 - update pkg

46− - `nix-env -i pkg-name -f <path to your local nixpkgs folder>`

46+ - `nix-env -iA pkg-attribute-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 -i pkg-name -f <path to your local nixpkgs folder>`

49+ - `nix-env -iA pkg-attribute-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>/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.

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.

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/.github/CONTRIBUTING.md#submitting-changes).

65+- Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#submitting-changes).

6666

6767## Submitting security fixes {#submitting-changes-submitting-security-fixes}

6868

@@ -96,9 +96,9 @@ We use jbidwatcher as an example for a discontinued project here.

9696

97971. Have Nixpkgs checked out locally and up to date.

98981. Create a new branch for your change, e.g. `git checkout -b jbidwatcher`

99−1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`

99+1. Remove the actual package including its directory, e.g. `git rm -rf pkgs/applications/misc/jbidwatcher`

1001001. 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/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)

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.)

102102

103103 For example in this case:

104104

@@ -193,7 +193,7 @@ It’s important to test any executables generated by a build when you change or

193193

194194### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards}

195195

196−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.

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.

197197

198198## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests}

199199

@@ -227,7 +227,7 @@ digraph {

227227}

228228```

229229

230−[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.

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.

231231

232232

233233### Master branch {#submitting-changes-master-branch}

@@ -246,11 +246,21 @@ If the branch is already in a broken state, please refrain from adding extra new

246246

247247### Stable release branches {#submitting-changes-stable-release-branches}

248248

249−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.

249+The same staging workflow applies to stable release branches, but the main branch is called `release-*` instead of `master`.

250250

251−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.

251+Example branch names: `release-21.11`, `staging-21.11`, `staging-next-21.11`.

252252

253−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.

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}

256+

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.

258+

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.

254264

255265Here is an example of a cherry-picked commit message with good reason description:

256266

doc/doc-support/lib-function-docs.nix+1

@@ -22,5 +22,6 @@ 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'

2526 '';

2627}

doc/functions/generators.section.md+1−1

@@ -49,7 +49,7 @@ str\:ange:"very::strange"

4949merge:"diff3"

5050```

5151

52−::: note

52+::: {.note}

5353Nix store paths can be converted to strings by enclosing a derivation attribute like so: `"${drv}"`.

5454:::

5555

doc/functions/library.xml+2

@@ -25,4 +25,6 @@

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" />

2830</section>

doc/functions/library/attrsets.xml+4−4

@@ -166,7 +166,7 @@ lib.attrsets.setAttrByPath [ "a" "b" ] 3

166166 <xi:include href="./locations.xml" xpointer="lib.attrsets.getAttrFromPath" />

167167

168168 <para>

169− Like [](#function-library-lib.attrsets.attrByPath) except without a default, and it will throw if the value doesn't exist.

169+ Like <xref linkend="function-library-lib.attrsets.attrByPath" /> except without a default, and it will throw if the value doesn't exist.

170170 </para>

171171

172172 <variablelist>

@@ -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,13 +1474,13 @@ lib.attrsets.zipAttrsWith

14741474 <section xml:id="function-library-lib.attrsets.zipAttrs">

14751475 <title><function>lib.attrsets.zipAttrs</function></title>

14761476

1477− <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal>

1477+ <subtitle><literal>zipAttrs :: [ AttrSet ] -> AttrSet</literal>

14781478 </subtitle>

14791479

14801480 <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" />

14811481

14821482 <para>

1483− Merge sets of attributes and combine each attribute value in to a list. Similar to [](#function-library-lib.attrsets.zipAttrsWith) where the merge function returns a list of all values.

1483+ Merge sets of attributes and combine each attribute value in to a list. Similar to <xref linkend="function-library-lib.attrsets.zipAttrsWith" /> where the merge function returns a list of all values.

14841484 </para>

14851485

14861486 <variablelist>

doc/hooks/index.xmlnew file+10

@@ -0,0 +1,10 @@

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.mdnew file+59

@@ -0,0 +1,59 @@

2+# `postgresqlTestHook` {#sec-postgresqlTestHook}

4+This hook starts a PostgreSQL server during the `checkPhase`. Example:

6+```nix

7+{ stdenv, postgresql, postgresqlTestHook }:

8+stdenv.mkDerivation {

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/labelless-link-is-xref.luadeleted−24

@@ -1,24 +0,0 @@

1−local function starts_with(start, str)

2− return str:sub(1, #start) == start

3−end

4−

5−local function escape_xml_arg(arg)

6− amps = arg:gsub('&', '&')

7− amps_quotes = amps:gsub('"', '"')

8− amps_quotes_lt = amps_quotes:gsub('<', '<')

9−

10− return amps_quotes_lt

11−end

12−

13−function Link(elem)

14− has_no_content = #elem.content == 0

15− targets_anchor = starts_with('#', elem.target)

16− has_no_attributes = elem.title == '' and elem.identifier == '' and #elem.classes == 0 and #elem.attributes == 0

17−

18− if has_no_content and targets_anchor and has_no_attributes then

19− -- xref expects idref without the pound-sign

20− target_without_hash = elem.target:sub(2, #elem.target)

21−

22− return pandoc.RawInline('docbook', '<xref linkend="' .. escape_xml_arg(target_without_hash) .. '" />')

23− end

24−end

doc/languages-frameworks/agda.section.md+63−1

@@ -158,7 +158,23 @@ This can be overridden.

158158

159159By 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.

160160

161−## Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs}

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}

162178

163179To 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:

164180

@@ -192,3 +208,49 @@ mkDerivation {

192208This 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`.

193209

194210When 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/beam.section.md+133−55

@@ -68,74 +68,128 @@ 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 {#mixrelease---elixir-phoenix-example}

71+#### mixRelease - Elixir Phoenix example {#mix-release-elixir-phoenix-example}

7272

73−Here is how your `default.nix` file would look.

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.

74100

75101```nix

76−with import <nixpkgs> { };

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+```

77126

78−let

79− packages = beam.packagesWith beam.interpreters.erlang;

80− src = builtins.fetchgit {

81− url = "ssh://git@github.com/your_id/your_repo";

82− rev = "replace_with_your_commit";

83− };

127+You will need to run the build process once to fix the sha256 to correspond to your new git src.

84128

85− pname = "your_project";

86− version = "0.0.1";

87− mixEnv = "prod";

129+###### FOD {#fixed-output-derivation}

88130

89− mixFodDeps = packages.fetchMixDeps {

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 {

90139 pname = "mix-deps-${pname}";

91− inherit src mixEnv version;

92− # nix will complain and tell you the right value to replace this with

140+ inherit src version;

93141 sha256 = lib.fakeSha256;

94− # if you have build time environment variables add them here

95− MY_ENV_VAR="my_value";

96142 };

143+```

97144

98− nodeDependencies = (pkgs.callPackage ./assets/default.nix { }).shell.nodeDependencies;

145+The first build will complain about the sha256 value, you can replace with the suggested value after that.

99146

100− frontEndFiles = stdenvNoCC.mkDerivation {

101− pname = "frontend-${pname}";

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.

102148

103− nativeBuildInputs = [ nodejs ];

149+##### mixRelease - example {#mix-release-example}

104150

105− inherit version src;

151+Here is how your `default.nix` file would look for a phoenix project.

106152

107− buildPhase = ''

108− cp -r ./assets $TEMPDIR

153+```nix

154+with import <nixpkgs> { };

109155

110− mkdir -p $TEMPDIR/assets/node_modules/.cache

111− cp -r ${nodeDependencies}/lib/node_modules $TEMPDIR/assets

112− export PATH="${nodeDependencies}/bin:$PATH"

156+let

157+ # beam.interpreters.erlangR23 is available if you need a particular version

158+ packages = beam.packagesWith beam.interpreters.erlang;

113159

114− cd $TEMPDIR/assets

115− webpack --config ./webpack.config.js

116− cd ..

117− '';

160+ pname = "your_project";

161+ version = "0.0.1";

118162

119− installPhase = ''

120− cp -r ./priv/static $out/

121− '';

163+ src = builtins.fetchgit {

164+ url = "ssh://git@github.com/your_id/your_repo";

165+ rev = "replace_with_your_commit";

166+ };

122167

123− outputHashAlgo = "sha256";

124− outputHashMode = "recursive";

168+ # if using mix2nix you can use the mixNixDeps attribute

169+ mixFodDeps = packages.fetchMixDeps {

170+ pname = "mix-deps-${pname}";

171+ inherit src version;

125172 # nix will complain and tell you the right value to replace this with

126− outputHash = lib.fakeSha256;

127−

128− impureEnvVars = lib.fetchers.proxyImpureEnvVars;

173+ sha256 = lib.fakeSha256;

174+ # if you have build time environment variables add them here

175+ MY_ENV_VAR="my_value";

129176 };

130177

178+ nodeDependencies = (pkgs.callPackage ./assets/default.nix { }).shell.nodeDependencies;

131179

132180in packages.mixRelease {

133− inherit src pname version mixEnv mixFodDeps;

181+ inherit src pname version mixFodDeps;

134182 # if you have build time environment variables add them here

135183 MY_ENV_VAR="my_value";

136− preInstall = ''

137− mkdir -p ./priv/static

138− cp -r ${frontEndFiles} ./priv/static

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

139193 '';

140194}

141195```

@@ -165,6 +219,8 @@ in

165219 systemd.services.${release_name} = {

166220 wantedBy = [ "multi-user.target" ];

167221 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.

168224 requires = [ "network-online.target" "postgresql.service" ];

169225 description = "my app";

170226 environment = {

@@ -201,6 +257,7 @@ in

201257 path = [ pkgs.bash ];

202258 };

203259

260+ # in case you have migration scripts or you want to use a remote shell

204261 environment.systemPackages = [ release ];

205262}

206263```

@@ -212,19 +269,38 @@ in

212269Usually, 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:

213270

214271```nix

215−{ pkgs ? import "<nixpkgs"> {} }:

272+{ pkgs ? import <nixpkgs> {} }:

216273

217274with pkgs;

218−

219275let

220−

221− elixir = beam.packages.erlangR22.elixir_1_9;

222−

276+ elixir = beam.packages.erlangR24.elixir_1_12;

223277in

224278mkShell {

225279 buildInputs = [ elixir ];

280+}

281+```

282+

283+### Using an overlay

226284

227− ERL_INCLUDE_PATH="${erlang}/lib/erlang/usr/include";

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:

286+

287+#### `shell.nix`

288+

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 ]; };

298+in

299+with pkgs;

300+mkShell {

301+ buildInputs = [

302+ elixir_1_13

303+ ];

228304}

229305```

230306

@@ -239,10 +315,10 @@ let

239315 # define packages to install

240316 basePackages = [

241317 git

242− # replace with beam.packages.erlang.elixir_1_11 if you need

318+ # replace with beam.packages.erlang.elixir_1_13 if you need

243319 beam.packages.erlang.elixir

244− nodejs-15_x

245− postgresql_13

320+ nodejs

321+ postgresql_14

246322 # only used for frontend dependencies

247323 # you are free to use yarn2nix as well

248324 nodePackages.node2nix

@@ -260,10 +336,12 @@ let

260336 mkdir -p .nix-mix .nix-hex

261337 export MIX_HOME=$PWD/.nix-mix

262338 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"

263342 export PATH=$MIX_HOME/bin:$HEX_HOME/bin:$PATH

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

343+ export LANG=C.UTF-8

344+ # keep your shell history in iex

267345 export ERL_AFLAGS="-kernel shell_history enabled"

268346

269347 # postges related

doc/languages-frameworks/chicken.section.mdnew file+49

@@ -0,0 +1,49 @@

1+# CHICKEN {#sec-chicken}

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".

7+## Using Eggs

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−2

@@ -28,11 +28,13 @@ 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), 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,

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,

3334* `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.

3435* `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"`,

3536* `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.

3638* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.

3739* `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.

3840* `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−2

@@ -4,12 +4,12 @@

55This section uses [Mint](https://github.com/mint-lang/mint) as an example for how to build a Crystal package.

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

8−

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.

98```bash

109$ git clone https://github.com/mint-lang/mint

1110$ cd mint

1211$ git checkout 0.5.0

12+$ if [ ! -f shard.lock ]; then nix-shell -p shards --run "shards lock"; fi

1313$ nix-shell -p crystal2nix --run crystal2nix

1414```

1515

doc/languages-frameworks/cuda.section.mdnew file+34

@@ -0,0 +1,34 @@

1+# CUDA {#cuda}

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`.

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+46−15

@@ -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−```bash

53+```ShellSession

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−```bash

116+```ShellSession

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−```bash

124+```ShellSession

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− ```bash

138+ ```ShellSession

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− ```bash

146+ ```ShellSession

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− ```bash

154+ ```ShellSession

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−```bash

171+```ShellSession

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−```bash

202+```ShellSession

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−```bash

305+```ShellSession

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−```bash

332+```ShellSession

333333$ dhall-to-nixpkgs directory ~/proj/dhall-semver

334334{ buildDhallDirectoryPackage, Prelude }:

335335 buildDhallDirectoryPackage {

336336 name = "proj";

337− src = /Users/gabriel/proj/dhall-semver;

337+ src = ~/proj/dhall-semver;

338338 file = "package.dhall";

339339 source = false;

340340 document = false;

@@ -342,6 +342,37 @@ $ 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+

345376## Overriding dependency versions {#ssec-dhall-overriding-dependency-versions}

346377

347378Suppose that we change our `true.dhall` example expression to depend on an older

@@ -359,7 +390,7 @@ in Prelude.Bool.not False

359390

360391If we try to rebuild that expression the build will fail:

361392

362−```

393+```ShellSession

363394$ nix build --file ./example.nix dhallPackages.true

364395builder for '/nix/store/0f1hla7ff1wiaqyk1r2ky4wnhnw114fi-true.drv' failed with exit code 1; last 10 log lines:

365396

@@ -385,7 +416,7 @@ importing the URL.

385416However, we can override the default Prelude version by using `dhall-to-nixpkgs`

386417to create a Dhall package for our desired Prelude:

387418

388−```bash

419+```ShellSession

389420$ dhall-to-nixpkgs github https://github.com/dhall-lang/dhall-lang.git \

390421 --name Prelude \

391422 --directory Prelude \

@@ -396,7 +427,7 @@ $ dhall-to-nixpkgs github https://github.com/dhall-lang/dhall-lang.git \

396427… and then referencing that package in our Dhall overlay, by either overriding

397428the Prelude globally for all packages, like this:

398429

399−```bash

430+```nix

400431 dhallOverrides = self: super: {

401432 true = self.callPackage ./true.nix { };

402433

@@ -407,7 +438,7 @@ the Prelude globally for all packages, like this:

407438… or selectively overriding the Prelude dependency for just the `true` package,

408439like this:

409440

410−```bash

441+```nix

411442 dhallOverrides = self: super: {

412443 true = self.callPackage ./true.nix {

413444 Prelude = self.callPackage ./Prelude.nix { };

doc/languages-frameworks/dotnet.section.md+63−6

@@ -28,8 +28,7 @@ mkShell {

2828 packages = [

2929 (with dotnetCorePackages; combinePackages [

3030 sdk_3_1

31− sdk_3_0

32− sdk_2_1

31+ sdk_5_0

3332 ])

3433 ];

3534}

@@ -64,12 +63,70 @@ $ dotnet --info

6463

6564The `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.

6665

67−## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore {#dotnetcorepackages.sdk-vs-dotnetcorepackages.net-vs-dotnetcorepackages.netcore-vs-dotnetcorepackages.aspnetcore}

66+## dotnetCorePackages.sdk vs dotnetCorePackages.runtime vs dotnetCorePackages.aspnetcore {#dotnetcorepackages.sdk-vs-dotnetcorepackages.runtime-vs-dotnetcorepackages.aspnetcore}

6867

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.

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.

7069

7170## Packaging a Dotnet Application {#packaging-a-dotnet-application}

7271

73−Ideally, we would like to build against the sdk, then only have the dotnet runtime available in the runtime closure.

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`.

118+

119+ projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.

74120

75−TODO: Create closure-friendly way to package dotnet applications

121+ dotnet-sdk = dotnetCorePackages.sdk_3_1;

122+ dotnet-runtime = dotnetCorePackages.net_5_0;

123+ dotnetFlags = [ "--runtime linux-x64" ];

124+

125+ executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.

126+ executables = []; # Don't install any executables.

127+

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+```

doc/languages-frameworks/emscripten.section.md+2−2

@@ -15,12 +15,12 @@ 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 -i emscripten`

18+ * `nix-env -f "<nixpkgs>" -iA 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`.

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:

2424 * build and install all packages:

2525 * `nix-env -iA emscriptenPackages`

2626

doc/languages-frameworks/gnome.section.md+17−3

@@ -42,7 +42,21 @@ Unlike other libraries mentioned in this section, GdkPixbuf only supports a sing

4242

4343### Icons {#ssec-gnome-icons}

4444

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 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.

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+```

4660

4761To 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.

4862

@@ -92,13 +106,13 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti

92106

93107- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`.

94108

95−- []{#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.

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.

96110

97111- []{#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;`.

98112

99113- []{#ssec-gnome-hooks-dconf} `dconf.lib` is a dependency of `wrapGAppsHook`, which then also adds it to the `GIO_EXTRA_MODULES` variable.

100114

101−- []{#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`.

115+- []{#ssec-gnome-hooks-hicolor-icon-theme} `hicolor-icon-theme`’s setup hook will add icon themes to `XDG_ICON_DIRS`.

102116

103117- []{#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`.

104118

doc/languages-frameworks/go.section.md+21−15

@@ -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−- `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.

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.

1616

1717```nix

1818pet = buildGoModule rec {

@@ -28,14 +28,11 @@ pet = buildGoModule rec {

2828

2929 vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j";

3030

31− runVend = true;

32−

3331 meta = with lib; {

3432 description = "Simple command-line snippet manager, written in Go";

3533 homepage = "https://github.com/knqyf263/pet";

3634 license = licenses.mit;

3735 maintainers = with maintainers; [ kalbasit ];

38− platforms = platforms.linux ++ platforms.darwin;

3936 };

4037}

4138```

@@ -112,16 +109,6 @@ done

112109

113110Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used:

114111

115−### `buildFlagsArray` and `buildFlags`: {#ex-goBuildFlags-noarray}

116−

117−These attributes set build flags supported by `go build`. We recommend using `buildFlagsArray`.

118−

119−```nix

120− buildFlagsArray = [

121− "-tags=release"

122− ];

123−```

124−

125112### `ldflags` {#var-go-ldflags}

126113

127114Arguments 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:

@@ -134,10 +121,29 @@ Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build

134121 ];

135122```

136123

124+### `tags` {#var-go-tags}

125+

126+Arguments to pass to the Go via the `-tags` argument of `go build`. For example:

127+

128+```nix

129+ tags = [

130+ "production"

131+ "sqlite"

132+ ];

133+```

134+

135+```nix

136+ tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ];

137+```

138+

137139### `deleteVendor` {#var-go-deleteVendor}

138140

139141Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.

140142

141143### `subPackages` {#var-go-subPackages}

142144

143−Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built.

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.

doc/languages-frameworks/hy.section.mdnew file+31

@@ -0,0 +1,31 @@

1+# Hy {#sec-language-hy}

3+## Installation {#ssec-hy-installation}

5+### Installation without packages {#installation-without-packages}

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`.

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+1−4

@@ -5,10 +5,7 @@

55The easiest way to get a working idris version is to install the `idris` attribute:

77```ShellSession

8−$ # On NixOS

9−$ nix-env -i nixos.idris

10−$ # On non-NixOS

11−$ nix-env -i nixpkgs.idris

8+$ nix-env -f "<nixpkgs>" -iA idris

129```

1310

1411This 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`:

doc/languages-frameworks/index.xml+7−1

@@ -9,20 +9,26 @@

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" />

1213 <xi:include href="coq.section.xml" />

1314 <xi:include href="crystal.section.xml" />

15+ <xi:include href="cuda.section.xml" />

1416 <xi:include href="dhall.section.xml" />

17+ <xi:include href="dotnet.section.xml" />

1518 <xi:include href="emscripten.section.xml" />

1619 <xi:include href="gnome.section.xml" />

1720 <xi:include href="go.section.xml" />

1821 <xi:include href="haskell.section.xml" />

22+ <xi:include href="hy.section.xml" />

1923 <xi:include href="idris.section.xml" />

2024 <xi:include href="ios.section.xml" />

2125 <xi:include href="java.section.xml" />

26+ <xi:include href="javascript.section.xml" />

2227 <xi:include href="lua.section.xml" />

2328 <xi:include href="maven.section.xml" />

24− <xi:include href="node.section.xml" />

29+ <xi:include href="nim.section.xml" />

2530 <xi:include href="ocaml.section.xml" />

31+ <xi:include href="octave.section.xml" />

2632 <xi:include href="perl.section.xml" />

2733 <xi:include href="php.section.xml" />

2834 <xi:include href="python.section.xml" />

doc/languages-frameworks/java.section.md+9

@@ -72,6 +72,15 @@ 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+

7584Note all JDKs passthru `home`, so if your application requires

7685environment variables like `JAVA_HOME` being set, that can be done in a

7786generic fashion with the `--set` argument of `makeWrapper`:

doc/languages-frameworks/javascript.section.mdnew file+278

@@ -0,0 +1,278 @@

1+# Javascript {#language-javascript}

3+## Introduction {#javascript-introduction}

5+This contains instructions on how to package javascript applications.

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.

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+4−6

@@ -128,7 +128,7 @@ Let's present the luarocks way first and the manual one in a second time.

128128

129129### Packaging a library on luarocks {#packaging-a-library-on-luarocks}

130130

131−[Luarocks.org](www.luarocks.org) is the main repository of lua packages.

131+[Luarocks.org](https://luarocks.org/) is the main repository of lua packages.

132132The site proposes two types of packages, the rockspec and the src.rock

133133(equivalent of a [rockspec](https://github.com/luarocks/luarocks/wiki/Rockspec-format) but with the source).

134134These packages can have different build types such as `cmake`, `builtin` etc .

@@ -139,11 +139,9 @@ the whitelist maintainers/scripts/luarocks-packages.csv and updated by running m

139139[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).

140140The automation only goes so far though and some packages need to be customized.

141141These customizations go in `pkgs/development/lua-modules/overrides.nix`.

142−For instance if the rockspec defines `external_dependencies`, these need to be manually added in its rockspec file then it won't work.

142+For instance if the rockspec defines `external_dependencies`, these need to be manually added to the overrides.nix.

143143

144144You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`.

145−Nix rely on luarocks to install lua packages, basically it runs:

146−`luarocks make --deps-mode=none --tree $out`

147145

148146#### Packaging a library manually {#packaging-a-library-manually}

149147

@@ -161,8 +159,8 @@ are not packaged for luarocks. You can see a few examples at `pkgs/top-level/lua

161159

162160### Lua interpreters {#lua-interpreters}

163161

164−Versions 5.1, 5.2 and 5.3 of the lua interpreter are available as

165−respectively `lua5_1`, `lua5_2` and `lua5_3`. Luajit is available too.

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.

166164The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua-5`.

167165

168166#### Attributes on lua interpreters packages {#attributes-on-lua-interpreters-packages}

doc/languages-frameworks/nim.section.mdnew file+91

@@ -0,0 +1,91 @@

1+# Nim {#nim}

3+## Overview {#nim-overview}

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.

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.mddeleted−51

@@ -1,51 +0,0 @@

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+86−25

@@ -1,63 +1,116 @@

11# OCaml {#sec-language-ocaml}

3+## User guide {#sec-language-ocaml-user-guide}

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`.

7+If you don't care about the exact compiler version, `ocamlPackages` is a top-level alias pointing to a recent version of OCaml.

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+

329OCaml 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`.

430

531Given 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`.

632

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.

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.

859

960```nix

10−{ lib

11−, fetchFromGitHub

12−, buildDunePackage

13−, alcotest

14−, result

15−, bigstringaf

16−}:

61+{ lib,

62+ fetchFromGitHub,

63+ buildDunePackage,

64+ ocaml,

65+ ocaml-syntax-shims,

66+ alcotest,

67+ result,

68+ bigstringaf,

69+ ppx_let }:

1770

1871buildDunePackage rec {

1972 pname = "angstrom";

20− version = "0.10.0";

73+ version = "0.15.0";

74+ duneVersion = "2";

2175

22− minimumOCamlVersion = "4.03";

76+ minimalOCamlVersion = "4.04";

2377

2478 src = fetchFromGitHub {

2579 owner = "inhabitedtype";

2680 repo = pname;

2781 rev = version;

28− sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";

82+ sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh";

2983 };

3084

31− buildInputs = [ alcotest ];

85+ checkInputs = [ alcotest ppx_let ];

86+ buildInputs = [ ocaml-syntax-shims ];

3287 propagatedBuildInputs = [ bigstringaf result ];

33− doCheck = true;

88+ doCheck = lib.versionAtLeast ocaml.version "4.05";

3489

35− meta = with lib; {

90+ meta = {

3691 homepage = "https://github.com/inhabitedtype/angstrom";

3792 description = "OCaml parser combinators built for speed and memory efficiency";

38− license = licenses.bsd3;

39− maintainers = with maintainers; [ sternenseemann ];

93+ license = lib.licenses.bsd3;

94+ maintainers = with lib.maintainers; [ sternenseemann ];

4095 };

41−}

4296```

4397

4498Here 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.

4599

46100```nix

47−{ lib

48−, fetchurl

49−, buildDunePackage

50−}:

101+{ lib, fetchurl, buildDunePackage }:

51102

52103buildDunePackage rec {

53104 pname = "wtf8";

54− version = "1.0.1";

105+ version = "1.0.2";

55106

56− minimumOCamlVersion = "4.01";

107+ useDune2 = true;

108+

109+ minimalOCamlVersion = "4.02";

57110

58111 src = fetchurl {

59− url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";

60− sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";

112+ url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";

113+ sha256 = "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp";

61114 };

62115

63116 meta = with lib; {

@@ -68,3 +121,11 @@ buildDunePackage rec {

68121 };

69122}

70123```

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.mdnew file+92

@@ -0,0 +1,92 @@

1+# Octave {#sec-octave}

3+## Introduction {#ssec-octave-introduction}

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.

8+## Structure {#ssec-octave-structure}

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+5−9

@@ -58,13 +58,7 @@ in `all-packages.nix`. You can test building a Perl package as follows:

5858$ nix-build -A perlPackages.ClassC3

5959```

6060

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`.)

61+To install it with `nix-env` instead: `nix-env -f. -iA perlPackages.ClassC3`.

6862

6963So what does `buildPerlPackage` do? It does the following:

7064

@@ -122,7 +116,7 @@ ImageExifTool = buildPerlPackage {

122116 };

123117

124118 buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;

125− postInstall = lib.optional stdenv.isDarwin ''

119+ postInstall = lib.optionalString stdenv.isDarwin ''

126120 shortenPerlShebang $out/bin/exiftool

127121 '';

128122};

@@ -135,9 +129,11 @@ This will remove the `-I` flags from the shebang line, rewrite them in the `use

135129Nix 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:

136130

137131```ShellSession

138−$ nix-env -i nix-generate-from-cpan

132+$ nix-env -f "<nixpkgs>" -iA nix-generate-from-cpan

139133```

140134

135+Substitute `<nixpkgs>` by the path of a nixpkgs clone to use the latest version.

136+

141137This 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:

142138

143139```ShellSession

doc/languages-frameworks/python.section.md+91−13

@@ -8,7 +8,7 @@

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.8. The attribute `python` refers to

11+interpreter, which is currently CPython 3.9. 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.

@@ -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, dateutil, pytest }:

442+{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, python-dateutil, pytest }:

443443

444444buildPythonPackage rec {

445445 pname = "datashape";

@@ -451,7 +451,7 @@ buildPythonPackage rec {

451451 };

452452

453453 checkInputs = [ pytest ];

454− propagatedBuildInputs = [ numpy multipledispatch dateutil ];

454+ propagatedBuildInputs = [ numpy multipledispatch python-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−`dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a

466+`python-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

@@ -764,8 +764,8 @@ and in this case the `python38` interpreter is automatically used.

764764

765765### Interpreters {#interpreters}

766766

767−Versions 2.7, 3.6, 3.7, 3.8 and 3.9 of the CPython interpreter are available as

768−respectively `python27`, `python36`, `python37`, `python38` and `python39`. The

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

769769aliases `python2` and `python3` correspond to respectively `python27` and

770770`python39`. The attribute `python` maps to `python2`. The PyPy interpreters

771771compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with

@@ -830,16 +830,17 @@ attribute set is created for each available Python interpreter. The available

830830sets are

831831

832832* `pkgs.python27Packages`

833−* `pkgs.python36Packages`

834833* `pkgs.python37Packages`

835834* `pkgs.python38Packages`

836835* `pkgs.python39Packages`

836+* `pkgs.python310Packages`

837+* `pkgs.python311Packages`

837838* `pkgs.pypyPackages`

838839

839840and the aliases

840841

841842* `pkgs.python2Packages` pointing to `pkgs.python27Packages`

842−* `pkgs.python3Packages` pointing to `pkgs.python38Packages`

843+* `pkgs.python3Packages` pointing to `pkgs.python39Packages`

843844* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`

844845

845846#### `buildPythonPackage` function {#buildpythonpackage-function}

@@ -978,6 +979,31 @@ with import <nixpkgs> {};

978979in python.withPackages(ps: [ps.blaze])).env

979980```

980981

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+

9811007#### `buildPythonApplication` function {#buildpythonapplication-function}

9821008

9831009The `buildPythonApplication` function is practically the same as

@@ -995,18 +1021,18 @@ called with `callPackage` and passed `python` or `pythonPackages` (possibly

9951021specifying an interpreter version), like this:

9961022

9971023```nix

998−{ lib, python3Packages }:

1024+{ lib, python3 }:

9991025

1000−python3Packages.buildPythonApplication rec {

1026+python3.pkgs.buildPythonApplication rec {

10011027 pname = "luigi";

10021028 version = "2.7.9";

10031029

1004− src = python3Packages.fetchPypi {

1030+ src = python3.pkgs.fetchPypi {

10051031 inherit pname version;

10061032 sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";

10071033 };

10081034

1009− propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];

1035+ propagatedBuildInputs = with python3.pkgs; [ tornado python-daemon ];

10101036

10111037 meta = with lib; {

10121038 ...

@@ -1513,7 +1539,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul

15131539 python = super.python.override {

15141540 packageOverrides = python-self: python-super: {

15151541 twisted = python-super.twisted.overrideAttrs (oldAttrs: {

1516− src = super.fetchPipy {

1542+ src = super.fetchPypi {

15171543 pname = "twisted";

15181544 version = "19.10.0";

15191545 sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";

@@ -1602,3 +1628,55 @@ The following rules are desired to be respected:

16021628 If necessary, `pname` has to be given a different value within `fetchPypi`.

16031629* Attribute names in `python-packages.nix` should be sorted alphanumerically to

16041630 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/r.section.md+12−8

@@ -96,6 +96,11 @@ re-enter the shell.

9696

9797## Updating the package set {#updating-the-package-set}

9898

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:

103+

99104```bash

100105nix-shell generate-shell.nix

101106

@@ -112,12 +117,11 @@ Rscript generate-r-packages.R bioc-experiment > bioc-experiment-packages.nix.new

112117mv bioc-experiment-packages.nix.new bioc-experiment-packages.nix

113118```

114119

115−`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefor the renaming.

116−

117−## Testing if the Nix-expression could be evaluated {#testing-if-the-nix-expression-could-be-evaluated}

118−

119−```bash

120−nix-build test-evaluation.nix --dry-run

121−```

120+`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefore

121+the renaming.

122122

123−If this exits fine, the expression is ok. If not, you have to edit `default.nix`

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.

doc/languages-frameworks/ruby.section.md+14−1

@@ -8,7 +8,7 @@ In the Nixpkgs tree, Ruby packages can be found throughout, depending on what th

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_6.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_7.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

@@ -201,6 +201,19 @@ $ 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+

204217### Adding a gem to the default gemset {#adding-a-gem-to-the-default-gemset}

205218

206219Now 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.

doc/languages-frameworks/rust.section.md+161−85

@@ -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 Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay).

16+or use a community maintained [Rust overlay](#using-community-rust-overlays).

1717

1818## Compiling Rust applications with Cargo {#compiling-rust-applications-with-cargo}

1919

2020Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:

2121

2222```nix

23−{ lib, rustPlatform }:

23+{ lib, fetchFromGitHub, rustPlatform }:

2424

2525rustPlatform.buildRustPackage rec {

2626 pname = "ripgrep";

@@ -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 rec {

119+rustPlatform.buildRustPackage {

120120 pname = "myproject";

121121 version = "1.0.0";

122122

123123 cargoLock = {

124124 lockFile = ./Cargo.lock;

125− }

125+ };

126126

127127 # ...

128128}

@@ -131,6 +131,36 @@ rustPlatform.buildRustPackage rec {

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+

134164The output hash of each dependency that uses a git source must be

135165specified in the `outputHashes` attribute. For example:

136166

@@ -144,7 +174,7 @@ rustPlatform.buildRustPackage rec {

144174 outputHashes = {

145175 "finalfusion-0.14.0" = "17f4bsdzpcshwh74w5z119xjy2if6l2wgyjy56v621skr2r8y904";

146176 };

147− }

177+ };

148178

149179 # ...

150180}

@@ -156,6 +186,33 @@ added. To find the correct hash, you can first use `lib.fakeSha256` or

156186`lib.fakeHash` as a stub hash. Building the package (and thus the

157187vendored dependencies) will then inform you of the correct hash.

158188

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+

159216### Cross compilation {#cross-compilation}

160217

161218By default, Rust packages are compiled for the host platform, just like any

@@ -207,22 +264,6 @@ where they are known to differ. But there are ways to customize the argument:

207264 --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""}

208265 ```

209266

210−Finally, as an ad-hoc escape hatch, a computed target (string or JSON file

211−path) can be passed directly to `buildRustPackage`:

212−

213−```nix

214−pkgs.rustPlatform.buildRustPackage {

215− /* ... */

216− target = "x86_64-fortanix-unknown-sgx";

217−}

218−```

219−

220−This is useful to avoid rebuilding Rust tools, since they are actually target

221−agnostic and don't need to be rebuilt. But in the future, we should always

222−build the Rust tools and standard library crates separately so there is no

223−reason not to take the `stdenv.hostPlatform.rustc`-modifying approach, and the

224−ad-hoc escape hatch to `buildRustPackage` can be removed.

225−

226267Note that currently custom targets aren't compiled with `std`, so `cargo test`

227268will fail. This can be ignored by adding `doCheck = false;` to your derivation.

228269

@@ -247,12 +288,12 @@ rustPlatform.buildRustPackage {

247288Please note that the code will be compiled twice here: once in `release` mode

248289for the `buildPhase`, and again in `debug` mode for the `checkPhase`.

249290

250−Test flags, e.g., `--features xxx/yyy`, can be passed to `cargo test` via the

291+Test flags, e.g., `--package foo`, can be passed to `cargo test` via the

251292`cargoTestFlags` attribute.

252293

253294Another attribute, called `checkFlags`, is used to pass arguments to the test

254295binary itself, as stated

255−(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html].

296+[here](https://doc.rust-lang.org/cargo/commands/cargo-test.html).

256297

257298#### Tests relying on the structure of the `target/` directory {#tests-relying-on-the-structure-of-the-target-directory}

258299

@@ -397,7 +438,7 @@ you of the correct hash.

397438

398439`rustPlatform` provides the following hooks to automate Cargo builds:

399440

400−* `cargoSetupHook`: configure Cargo to use depenencies vendored

441+* `cargoSetupHook`: configure Cargo to use dependencies vendored

401442 through `fetchCargoTarball`. This hook uses the `cargoDeps`

402443 environment variable to find the vendored dependencies. If a project

403444 already vendors its dependencies, the variable `cargoVendorDir` can

@@ -407,20 +448,24 @@ you of the correct hash.

407448* `cargoBuildHook`: use Cargo to build a crate. If the crate to be

408449 built is a crate in e.g. a Cargo workspace, the relative path to the

409450 crate to build can be set through the optional `buildAndTestSubdir`

410− environment variable. Additional Cargo build flags can be passed

411− through `cargoBuildFlags`.

451+ environment variable. Features can be specified with

452+ `cargoBuildNoDefaultFeatures` and `cargoBuildFeatures`. Additional

453+ Cargo build flags can be passed through `cargoBuildFlags`.

412454* `maturinBuildHook`: use [Maturin](https://github.com/PyO3/maturin)

413455 to build a Python wheel. Similar to `cargoBuildHook`, the optional

414456 variable `buildAndTestSubdir` can be used to build a crate in a

415− Cargo workspace. Additional maturin flags can be passed through

457+ Cargo workspace. Additional Maturin flags can be passed through

416458 `maturinBuildFlags`.

417459* `cargoCheckHook`: run tests using Cargo. The build type for checks

418− can be set using `cargoCheckType`. Additional flags can be passed to

419− the tests using `checkFlags` and `checkFlagsArray`. By default,

420− tests are run in parallel. This can be disabled by setting

421− `dontUseCargoParallelTests`.

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`.

422465* `cargoInstallHook`: install binaries and static/shared libraries

423466 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`.

424469

425470### Examples {#examples}

426471

@@ -433,7 +478,7 @@ dependencies. The build itself is then performed by

433478

434479The following example outlines how the `tokenizers` Python package is

435480built. Since the Python package is in the `source/bindings/python`

436−directory of the *tokenizers* project's source archive, we use

481+directory of the `tokenizers` project's source archive, we use

437482`sourceRoot` to point the tooling to this directory:

438483

439484```nix

@@ -658,7 +703,7 @@ Some crates require external libraries. For crates from

658703`defaultCrateOverrides` package in nixpkgs itself.

659704

660705Starting from that file, one can add more overrides, to add features

661−or build inputs by overriding the hello crate in a seperate file.

706+or build inputs by overriding the hello crate in a separate file.

662707

663708```nix

664709with import <nixpkgs> {};

@@ -715,7 +760,7 @@ with import <nixpkgs> {};

715760Actually, the overrides introduced in the previous section are more

716761general. A number of other parameters can be overridden:

717762

718−- The version of rustc used to compile the crate:

763+- The version of `rustc` used to compile the crate:

719764

720765 ```nix

721766 (hello {}).override { rust = pkgs.rust; };

@@ -728,7 +773,7 @@ general. A number of other parameters can be overridden:

728773 (hello {}).override { release = false; };

729774 ```

730775

731−- Whether to print the commands sent to rustc when building

776+- Whether to print the commands sent to `rustc` when building

732777 (equivalent to `--verbose` in cargo:

733778

734779 ```nix

@@ -857,76 +902,107 @@ rustc 1.26.0-nightly (188e693b3 2018-03-26)

857902

858903To see that you are using nightly.

859904

860−## Using the Rust nightlies overlay {#using-the-rust-nightlies-overlay}

905+## Using community Rust overlays {#using-community-rust-overlays}

861906

862−Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.

863−This overlay can _also_ be used to install recent unstable or stable versions

864−of Rust, if desired.

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)

865910

866−### Rust overlay installation {#rust-overlay-installation}

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.

867914

868−You can use this overlay by either changing your local nixpkgs configuration,

869−or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`.

870−For more information see [the manual on installing overlays](#sec-overlays-install).

871−

872−#### Imperative rust overlay installation {#imperative-rust-overlay-installation}

873−

874−Clone [nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla),

875−and create a symbolic link to the file

876−[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix)

877−in the `~/.config/nixpkgs/overlays` directory.

915+Fenix is an alternative to `rustup` and can also be used as an overlay.

878916

879−```ShellSession

880−$ git clone https://github.com/mozilla/nixpkgs-mozilla.git

881−$ mkdir -p ~/.config/nixpkgs/overlays

882−$ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix

883−```

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`).

884920

885−### Declarative rust overlay installation {#declarative-rust-overlay-installation}

886−

887−Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar:

921+### How to select a specific `rustc` and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version}

888922

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:

889925```nix

890926{ pkgs ? import <nixpkgs> {

891927 overlays = [

892− (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))

893− # Further overlays go here

928+ (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))

894929 ];

895− };

896−};

930+ }

931+}:

932+pkgs.mkShell {

933+ nativeBuildInputs = with pkgs; [

934+ pkg-config

935+ rust-bin.stable.latest.minimal

936+ ];

937+}

897938```

898939

899−Note that this will fetch the latest overlay version when rebuilding your system.

940+You can try this out by:

941+1. Saving that to `shell.nix`

942+2. Executing `nix-shell --pure --command 'rustc --version'`

900943

901−### Rust overlay usage {#rust-overlay-usage}

944+As of writing, this prints out `rustc 1.56.0 (09c42c458 2021-10-18)`.

902945

903−The overlay contains attribute sets corresponding to different versions of the rust toolchain, such as:

946+### How to use an overlay toolchain in a derivation {#how-to-use-an-overlay-toolchain-in-a-derivation}

947+

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:

950+```nix

951+with import <nixpkgs> {

952+ overlays = [

953+ (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))

954+ ];

955+};

904956

905−* `latest.rustChannels.stable`

906−* `latest.rustChannels.nightly`

907−* a function `rustChannelOf`, called as `(rustChannelOf { date = "2018-04-11"; channel = "nightly"; })`, or...

908−* `(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)

957+rustPlatform.buildRustPackage rec {

958+ pname = "ripgrep";

959+ version = "12.1.1";

960+ nativeBuildInputs = [

961+ rust-bin.stable.latest.minimal

962+ ];

909963

910−Each of these contain packages such as `rust`, which contains your usual rust development tools with the respective toolchain chosen.

911−For example, you might want to add `latest.rustChannels.stable.rust` to the list of packages in your configuration.

964+ src = fetchFromGitHub {

965+ owner = "BurntSushi";

966+ repo = "ripgrep";

967+ rev = version;

968+ sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps";

969+ };

912970

913−Imperatively, the latest stable version can be installed with the following command:

971+ cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp";

914972

915−```ShellSession

916−$ nix-env -Ai nixpkgs.latest.rustChannels.stable.rust

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+}

917980```

918981

919−Or using the attribute with nix-shell:

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`

920986

921−```ShellSession

922−$ nix-shell -p nixpkgs.latest.rustChannels.stable.rust

923−```

987+### Rust overlay installation {#rust-overlay-installation}

988+

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).

992+

993+### Declarative Rust overlay installation {#declarative-rust-overlay-installation}

924994

925−Substitute the `nixpkgs` prefix with `nixos` on NixOS.

926−To install the beta or nightly channel, "stable" should be substituted by

927−"nightly" or "beta", or

928−use the function provided by this overlay to pull a version based on a

929−build date.

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:

930997

931−The overlay automatically updates itself as it uses the same source as

932−[rustup](https://www.rustup.rs/).

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+```

1007+

1008+Note that this will fetch the latest overlay version when rebuilding your system.

doc/languages-frameworks/texlive.section.md+1−1

@@ -6,7 +6,7 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under

77- For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support.

9−- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this:

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:

1010

1111 ```nix

1212 texlive.combine {

doc/languages-frameworks/vim.section.md+37−7

@@ -18,7 +18,7 @@ Adding custom .vimrc lines can be done using the following code:

1818

1919```nix

2020vim_configurable.customize {

21− # `name` specifies the name of the executable and package

21+ # `name` optionally specifies the name of the executable and package

2222 name = "vim-with-plugins";

2323

2424 vimrcConfig.customRC = ''

@@ -28,6 +28,9 @@ 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.

3134

3235For Neovim the `configure` argument can be overridden to achieve the same:

3336

@@ -120,7 +123,7 @@ After that you can install your special grafted `myVim` or `myNeovim` packages.

120123

121124If one of your favourite plugins isn't packaged, you can package it yourself:

122125

123−```

126+```nix

124127{ config, pkgs, ... }:

125128

126129let

@@ -154,6 +157,33 @@ in

154157}

155158```

156159

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+

157187## Managing plugins with vim-plug {#managing-plugins-with-vim-plug}

158188

159189To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim

@@ -259,7 +289,7 @@ Sample output1:

259289"reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation

260290 name = "reload";

261291 src = fetchgit {

262− url = "git://github.com/xolox/vim-reload";

292+ url = "https://github.com/xolox/vim-reload";

263293 rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1";

264294 sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh";

265295 };

@@ -282,9 +312,9 @@ Sample output2:

282312

283313## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}

284314

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`.

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`.

286316

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:

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:

288318

289319```nix

290320deoplete-fish = super.deoplete-fish.overrideAttrs(old: {

@@ -303,13 +333,13 @@ Finally, there are some plugins that are also packaged in nodePackages because t

303333Run 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).

304334

305335```sh

306−GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py

336+GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py

307337```

308338

309339Alternatively, set the number of processes to a lower count to avoid rate-limiting.

310340

311341```sh

312−./pkgs/misc/vim-plugins/update.py --proc 1

342+./pkgs/applications/editors/vim/plugins/update.py --proc 1

313343```

314344

315345## Important repositories {#important-repositories}

doc/manual.xml+2

@@ -25,8 +25,10 @@

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" />

2829 <xi:include href="builders/special.xml" />

2930 <xi:include href="builders/images.xml" />

31+ <xi:include href="hooks/index.xml" />

3032 <xi:include href="languages-frameworks/index.xml" />

3133 <xi:include href="builders/packages/index.xml" />

3234 </part>

doc/stdenv/cross-compilation.chapter.md+37−12

@@ -78,21 +78,46 @@ If both the dependency and depending packages aren't compilers or other machine-

7878

7979Finally, 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.

8080

81−Putting this all together, that means we have dependencies in the form "host → target", in at most the following six combinations:

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:

8286

8387#### Possible dependency types {#possible-dependency-types}

8488

85−| Dependency’s host platform | Dependency’s target platform |

86−|----------------------------|------------------------------|

87−| build | build |

88−| build | host |

89−| build | target |

90−| host | host |

91−| host | target |

92−| target | target |

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.

106+

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".

108+

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.

110+

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.

113+

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)`.

93117

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.

94119

95−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)`.

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`.

96121

97122### Cross packaging cookbook {#ssec-cross-cookbook}

98123

@@ -158,9 +183,9 @@ One would think that `localSystem` and `crossSystem` overlap horribly with the t

158183

159184### Implementation of dependencies {#ssec-cross-dependency-implementation}

160185

161−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" 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.

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.

162187

163−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.

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.

164189

165190But 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.

166191

doc/stdenv/meta.chapter.md+62−5

@@ -114,6 +114,10 @@ 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+

117121### `priority` {#var-meta-priority}

118122

119123The *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,7 +138,28 @@ Attribute Set `lib.platforms` defines [various common lists](https://github.com/

134138This 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.

135139:::

136140

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.

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

138163

139164The NixOS tests are available as `nixosTests` in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to:

140165

@@ -148,6 +173,42 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For

148173}

149174```

150175

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+

151212### `timeout` {#var-meta-timeout}

152213

153214A 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`.

@@ -165,10 +226,6 @@ meta.hydraPlatforms = [];

165226

166227If 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.

167228

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−

172229## Licenses {#sec-meta-license}

173230

174231The `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.

doc/stdenv/multiple-output.chapter.md+1−1

@@ -79,7 +79,7 @@ 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/blob/master/README) 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) for more details).

8383

8484### File type groups {#multiple-output-file-type-groups}

8585

doc/stdenv/stdenv.chapter.md+137−31

@@ -116,15 +116,27 @@ 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, 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 [](#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 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.

120120

121121Dependencies 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.

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−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.

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]

126127

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.

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.

128140

129141We 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!

130142

@@ -179,37 +191,37 @@ Overall, the unifying theme here is that propagation shouldn’t be introducing

179191

180192#### `depsBuildBuild` {#var-stdenv-depsBuildBuild}

181193

182−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.

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.

183195

184196Since 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.

185197

186198#### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs}

187199

188−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.

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.

189201

190202Since 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.

191203

192204#### `depsBuildTarget` {#var-stdenv-depsBuildTarget}

193205

194−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.

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.

195207

196−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.

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.

197209

198210Since 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.

199211

200212#### `depsHostHost` {#var-stdenv-depsHostHost}

201213

202−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.

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.

203215

204216#### `buildInputs` {#var-stdenv-buildInputs}

205217

206−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`.

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`.

207219

208220These 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.

209221

210222#### `depsTargetTarget` {#var-stdenv-depsTargetTarget}

211223

212−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.

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.

213225

214226#### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated}

215227

@@ -305,12 +317,72 @@ The script will be usually run from the root of the Nixpkgs repository but you s

305317

306318For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`.

307319

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+

308374## Phases {#sec-stdenv-phases}

309375

310−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.

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).

311379

312380Each 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`.

313381

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+

314386### Controlling phases {#ssec-controlling-phases}

315387

316388There are a number of variables that control what phases are executed and in what order:

@@ -321,7 +393,8 @@ There are a number of variables that control what phases are executed and in wha

321393

322394Specifies 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`.

323395

324−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.

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`).

325398

326399##### `prePhases` {#var-stdenv-prePhases}

327400

@@ -373,11 +446,11 @@ Additional file types can be supported by setting the `unpackCmd` variable (see

373446

374447##### `srcs` / `src` {#var-stdenv-src}

375448

376−The list of source files or directories to be unpacked or copied. One of these must be set.

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`.

377450

378451##### `sourceRoot` {#var-stdenv-sourceRoot}

379452

380−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.

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.

381454

382455##### `setSourceRoot` {#var-stdenv-setSourceRoot}

383456

@@ -463,6 +536,12 @@ The prefix under which the package must be installed, passed via the `--prefix`

463536

464537The key to use when specifying the prefix. By default, this is set to `--prefix=` as that is used by the majority of packages.

465538

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+

466545##### `dontAddDisableDepTrack` {#var-stdenv-dontAddDisableDepTrack}

467546

468547By 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.

@@ -475,7 +554,7 @@ By default, the configure phase applies some special hackery to all files called

475554

476555By default, when the configure script has `--enable-static`, the option `--disable-static` is added to the configure flags.

477556

478−If this is undesirable, set this variable to true.

557+If this is undesirable, set this variable to true. It is automatically set to true when building statically, for example through `pkgsStatic`.

479558

480559##### `configurePlatforms` {#var-stdenv-configurePlatforms}

481560

@@ -708,6 +787,8 @@ to `~/.gdbinit`. GDB will then be able to find debug information installed via `

708787

709788The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`.

710789

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+

711792#### Variables controlling the installCheck phase {#variables-controlling-the-installcheck-phase}

712793

713794##### `doInstallCheck` {#var-stdenv-doInstallCheck}

@@ -770,13 +851,13 @@ Hook executed at the start of the distribution phase.

770851

771852Hook executed at the end of the distribution phase.

772853

773−## Shell functions {#ssec-stdenv-functions}

854+## Shell functions and utilities {#ssec-stdenv-functions}

774855

775856The standard environment provides a number of useful functions.

776857

777858### `makeWrapper` \<executable\> \<wrapperfile\> \<args\> {#fun-makeWrapper}

778859

779−Constructs a wrapper for a program with various possible arguments. For example:

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:

780861

781862```bash

782863# adds `FOOBAR=baz` to `$out/bin/foo`’s environment

@@ -788,9 +869,24 @@ makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz

788869makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]}

789870```

790871

791−There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh`.

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}

792879

793−`wrapProgram` is a convenience function you probably want to use most of the time.

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+```

794890

795891### `substitute` \<infile\> \<outfile\> \<subs\> {#fun-substitute}

796892

@@ -865,9 +961,9 @@ someVar=$(stripHash $name)

865961

866962### `wrapProgram` \<executable\> \<makeWrapperArgs\> {#fun-wrapProgram}

867963

868−Convenience function for `makeWrapper` that automatically creates a sane wrapper file. It takes all the same arguments as `makeWrapper`, except for `--argv0`.

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).

869965

870−It cannot be applied multiple times, since it will overwrite the wrapper file.

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.

871967

872968## Package setup hooks {#ssec-setup-hooks}

873969

@@ -1001,7 +1097,7 @@ You can also specify a `runtimeDependencies` variable which lists dependencies t

10011097

10021098In 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.

10031099

1004−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.

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.

10051101

10061102The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories.

10071103

@@ -1119,9 +1215,13 @@ There are flags available to harden packages at compile or link-time. These can

11191215

11201216Both 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.

11211217

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+

11221222The following flags are enabled by default and might require disabling with `hardeningDisable` if the program to package is incompatible.

11231223

1124−### `format` {#format}

1224+#### `format` {#format}

11251225

11261226Adds 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`.

11271227

@@ -1134,7 +1234,7 @@ This needs to be turned off or fixed for errors similar to:

11341234cc1plus: some warnings being treated as errors

11351235```

11361236

1137−### `stackprotector` {#stackprotector}

1237+#### `stackprotector` {#stackprotector}

11381238

11391239Adds 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).

11401240

@@ -1145,7 +1245,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':

11451245/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'

11461246```

11471247

1148−### `fortify` {#fortify}

1248+#### `fortify` {#fortify}

11491249

11501250Adds 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.

11511251

@@ -1166,7 +1266,7 @@ installwatch.c:3751:5: error: conflicting types for '__open_2'

11661266fcntl2.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

11671267```

11681268

1169−### `pic` {#pic}

1269+#### `pic` {#pic}

11701270

11711271Adds the `-fPIC` compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible.

11721272

@@ -1179,19 +1279,19 @@ ccbLfRgg.s: Assembler messages:

11791279ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF'

11801280```

11811281

1182−### `strictoverflow` {#strictoverflow}

1282+#### `strictoverflow` {#strictoverflow}

11831283

11841284Signed 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.

11851285

11861286This flag should not trigger any build or runtime errors.

11871287

1188−### `relro` {#relro}

1288+#### `relro` {#relro}

11891289

11901290Adds 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.

11911291

11921292This 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.

11931293

1194−### `bindnow` {#bindnow}

1294+#### `bindnow` {#bindnow}

11951295

11961296Adds 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.

11971297

@@ -1201,16 +1301,22 @@ This flag can break dynamic shared object loading. For instance, the module syst

12011301intel_drv.so: undefined symbol: vgaHWFreeHWRec

12021302```

12031303

1304+### Hardening flags disabled by default {#sec-hardening-flags-disabled-by-default}

1305+

12041306The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services.

12051307

1206−### `pie` {#pie}

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.

12071311

12081312Adds 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.

12091313

1210−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).

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`.

12111316

12121317[^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.

12131318[^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.

12141320[^footnote-stdenv-find-inputs-location]: The `findInputs` function, currently residing in `pkgs/stdenv/generic/setup.sh`, implements the propagation logic.

12151321[^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.

12161322[^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+21−3

@@ -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)

80+- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS and CBLAS)

8181

8282 The Nixpkgs attribute is `lapack-reference`.

8383

@@ -112,12 +112,28 @@ 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 nix-shell -p octave --run octave

115+$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib${LD_LIBRARY_PATH:+:}$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−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:

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:

121137

122138```nix

123139{ stdenv, blas, lapack, ... }:

@@ -138,6 +154,8 @@ All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Pas

138154

139155- [MPICH](https://www.mpich.org/), attribute name `mpich`

140156

157+- [MVAPICH](https://mvapich.cse.ohio-state.edu/), attribute name `mvapich`

158+

141159To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, simply use the following overlay:

142160

143161```nix

doc/using/overrides.chapter.md+6−2

@@ -39,14 +39,18 @@ The function `overrideAttrs` allows overriding the attribute set passed to a `st

3939Example usage:

4040

4141```nix

42−helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {

42+helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: {

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 `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.

49+The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.

50+

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`.

5054

5155::: {.note}

5256Note 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).

flake.nix+9−41

@@ -11,55 +11,23 @@

1111

1212 lib = import ./lib;

1313

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− ];

14+ systems = lib.systems.supported.hydra;

2315

2416 forAllSystems = f: lib.genAttrs systems (system: f system);

2517

2618 in

2719 {

2820 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;

3721

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;

22+ nixos = import ./nixos/lib { lib = final; };

5623

57− system.build = {

58− vm = vmConfig.system.build.vm;

59− vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;

60− };

61− }

62− ];

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+ } ];

6331 });

6432 });

6533

lib/asserts.nix+10−12

@@ -2,35 +2,33 @@

33rec {

5− /* Print a trace message if pred is false.

5+ /* Throw if pred is false, else return pred.

66 Intended to be used to augment asserts with helpful error messages.

88 Example:

99 assertMsg false "nope"

10− => false

11− stderr> trace: nope

10+ stderr> error: nope

1211

13− assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); ""

14− stderr> trace: foo is not bar, silly

15− stderr> assert failed at …

12+ assert assertMsg ("foo" == "bar") "foo is not bar, silly"; ""

13+ stderr> error: foo is not bar, silly

1614

1715 Type:

1816 assertMsg :: Bool -> String -> Bool

1917 */

2018 # TODO(Profpatsch): add tests that check stderr

2119 assertMsg = pred: msg:

22− if pred

23− then true

24− else builtins.trace msg false;

20+ pred || builtins.throw msg;

2521

2622 /* Specialized `assertMsg` for checking if val is one of the elements

2723 of a list. Useful for checking enums.

2824

2925 Example:

30− let sslLibrary = "libressl"

26+ let sslLibrary = "libressl";

3127 in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]

32− => false

33− stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl"

28+ stderr> error: sslLibrary must be one of [

29+ stderr> "openssl"

30+ stderr> "bearssl"

31+ stderr> ], but is: "libressl"

3432

3533 Type:

3634 assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool

lib/attrsets.nix+141−29

@@ -3,9 +3,9 @@

44let

55 inherit (builtins) head tail length;

6− inherit (lib.trivial) and;

7− inherit (lib.strings) concatStringsSep sanitizeDerivationName;

8− inherit (lib.lists) fold concatMap concatLists;

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;

99in

1010

1111rec {

@@ -55,10 +55,13 @@ rec {

5555 => { a = { b = 3; }; }

5656 */

5757 setAttrByPath = attrPath: value:

58− if attrPath == [] then value

59− else listToAttrs

60− [ { name = head attrPath; value = setAttrByPath (tail attrPath) value; } ];

61−

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;

6265

6366 /* Like `attrByPath' without a default value. If it doesn't find the

6467 path it will throw.

@@ -70,10 +73,107 @@ rec {

7073 getAttrFromPath ["z" "z"] x

7174 => error: cannot find attribute `z.z'

7275 */

73− getAttrFromPath = attrPath: set:

76+ getAttrFromPath = attrPath:

7477 let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'";

75− in attrByPath attrPath (abort errorMsg) set;

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

76101

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;

77177

78178 /* Return the specified attributes from a set.

79179

@@ -151,12 +251,12 @@ rec {

151251 foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }]

152252 => { a = [ 2 3 ]; }

153253 */

154− foldAttrs = op: nul: list_of_attrs:

155− fold (n: a:

156− fold (name: o:

254+ foldAttrs = op: nul:

255+ foldr (n: a:

256+ foldr (name: o:

157257 o // { ${name} = op n.${name} (a.${name} or nul); }

158258 ) a (attrNames n)

159− ) {} list_of_attrs;

259+ ) {};

160260

161261

162262 /* Recursively collect sets that verify a given predicate named `pred'

@@ -195,7 +295,7 @@ rec {

195295 ]

196296 */

197297 cartesianProductOfSets = attrsOfLists:

198− lib.foldl' (listOfAttrs: attrName:

298+ foldl' (listOfAttrs: attrName:

199299 concatMap (attrs:

200300 map (listValue: attrs // { ${attrName} = listValue; }) attrsOfLists.${attrName}

201301 ) listOfAttrs

@@ -273,7 +373,7 @@ rec {

273373

274374

275375 /* Like `mapAttrsRecursive', but it takes an additional predicate

276− function that tells it whether to recursive into an attribute

376+ function that tells it whether to recurse into an attribute

277377 set. If it returns false, `mapAttrsRecursiveCond' does not

278378 recurse, but does apply the map function. If it returns true, it

279379 does recurse, and does not apply the map function.

@@ -292,14 +392,14 @@ rec {

292392 */

293393 mapAttrsRecursiveCond = cond: f: set:

294394 let

295− recurse = path: set:

395+ recurse = path:

296396 let

297397 g =

298398 name: value:

299399 if isAttrs value && cond value

300400 then recurse (path ++ [name]) value

301401 else f (path ++ [name]) value;

302− in mapAttrs g set;

402+ in mapAttrs g;

303403 in recurse [] set;

304404

305405

@@ -324,7 +424,7 @@ rec {

324424 isDerivation "foobar"

325425 => false

326426 */

327− isDerivation = x: isAttrs x && x ? type && x.type == "derivation";

427+ isDerivation = x: x.type or null == "derivation";

328428

329429 /* Converts a store path to a fake derivation. */

330430 toDerivation = path:

@@ -366,7 +466,7 @@ rec {

366466 value = f name (catAttrs name sets);

367467 }) names);

368468

369− /* Implementation note: Common names appear multiple times in the list of

469+ /* Implementation note: Common names appear multiple times in the list of

370470 names, hopefully this does not affect the system because the maximal

371471 laziness avoid computing twice the same expression and listToAttrs does

372472 not care about duplicated attribute names.

@@ -375,7 +475,8 @@ rec {

375475 zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}]

376476 => { a = ["x" "y"]; b = ["z"] }

377477 */

378− zipAttrsWith = f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets;

478+ zipAttrsWith =

479+ builtins.zipAttrsWith or (f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets);

379480 /* Like `zipAttrsWith' with `(name: values: values)' as the function.

380481

381482 Example:

@@ -416,8 +517,8 @@ rec {

416517 let f = attrPath:

417518 zipAttrsWith (n: values:

418519 let here = attrPath ++ [n]; in

419− if tail values == []

420− || pred here (head (tail values)) (head values) then

520+ if length values == 1

521+ || pred here (elemAt values 1) (head values) then

421522 head values

422523 else

423524 f here values

@@ -443,10 +544,7 @@ rec {

443544 }

444545

445546 */

446− recursiveUpdate = lhs: rhs:

447− recursiveUpdateUntil (path: lhs: rhs:

448− !(isAttrs lhs && isAttrs rhs)

449− ) lhs rhs;

547+ recursiveUpdate = recursiveUpdateUntil (path: lhs: rhs: !(isAttrs lhs && isAttrs rhs));

450548

451549 /* Returns true if the pattern is contained in the set. False otherwise.

452550

@@ -455,8 +553,8 @@ rec {

455553 => true

456554 */

457555 matchAttrs = pattern: attrs: assert isAttrs pattern;

458− fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:

459− let pat = head values; val = head (tail values); in

556+ all id (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:

557+ let pat = head values; val = elemAt values 1; in

460558 if length values == 1 then false

461559 else if isAttrs pat then isAttrs val && matchAttrs pat val

462560 else pat == val

@@ -476,6 +574,20 @@ rec {

476574 overrideExisting = old: new:

477575 mapAttrs (name: value: new.${name} or value) old;

478576

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+

479591 /* Get a package output.

480592 If no output is found, fallback to `.out` and then to the default.

481593

@@ -484,7 +596,7 @@ rec {

484596 => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"

485597 */

486598 getOutput = output: pkg:

487− if pkg.outputUnspecified or false

599+ if ! pkg ? outputSpecified || ! pkg.outputSpecified

488600 then pkg.${output} or pkg.out or pkg

489601 else pkg;

490602

lib/customisation.nix+50−3

@@ -117,8 +117,55 @@ rec {

117117 callPackageWith = autoArgs: fn: args:

118118 let

119119 f = if lib.isFunction fn then fn else import fn;

120− auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;

121− in makeOverridable f (auto // args);

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;

122169

123170

124171 /* Like callPackage, but for a function that returns an attribute

@@ -152,6 +199,7 @@ rec {

152199 { name = outputName;

153200 value = commonAttrs // {

154201 inherit (drv.${outputName}) type outputName;

202+ outputSpecified = true;

155203 drvPath = assert condition; drv.${outputName}.drvPath;

156204 outPath = assert condition; drv.${outputName}.outPath;

157205 };

@@ -159,7 +207,6 @@ rec {

159207

160208 outputsList = map outputToAttrListElement outputs;

161209 in commonAttrs // {

162− outputUnspecified = true;

163210 drvPath = assert condition; drv.drvPath;

164211 outPath = assert condition; drv.outPath;

165212 };

lib/default.nix+25−15

@@ -11,6 +11,9 @@ let

1111 callLibs = file: import file { lib = self; };

1212 in {

1313

14+ # interacting with flakes

15+ flakes = callLibs ./flakes.nix;

16+

1417 # often used, or depending on very little

1518 trivial = callLibs ./trivial.nix;

1619 fixedPoints = callLibs ./fixed-points.nix;

@@ -59,6 +62,7 @@ let

5962 # linux kernel configuration

6063 kernel = callLibs ./kernel.nix;

6164

65+ inherit (self.flakes) callLocklessFlake;

6266 inherit (builtins) add addErrorContext attrNames concatLists

6367 deepSeq elem elemAt filter genericClosure genList getAttr

6468 hasAttr head isAttrs isBool isInt isList isString length

@@ -66,8 +70,10 @@ let

6670 stringLength sub substring tail trace;

6771 inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor

6872 bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max

69− importJSON importTOML warn warnIf info showWarnings nixpkgsVersion version

70− mod compare splitByAndCompare functionArgs setFunctionArgs isFunction

73+ importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum

74+ info showWarnings nixpkgsVersion version isInOldestRelease

75+ mod compare splitByAndCompare

76+ functionArgs setFunctionArgs isFunction toFunction

7177 toHexString toBaseDigits;

7278 inherit (self.fixedPoints) fix fix' converge extends composeExtensions

7379 composeManyExtensions makeExtensible makeExtensibleWithCustomName;

@@ -77,9 +83,10 @@ let

7783 mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond

7884 genAttrs isDerivation toDerivation optionalAttrs

7985 zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil

80− recursiveUpdate matchAttrs overrideExisting getOutput getBin

86+ recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin

8187 getLib getDev getMan chooseDevOutputs zipWithNames zip

82− recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets;

88+ recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets

89+ updateManyAttrsByPath;

8390 inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1

8491 concatMap flatten remove findSingle findFirst any all count

8592 optional optionals toList range partition zipListsWith zipLists

@@ -91,7 +98,8 @@ let

9198 concatImapStringsSep makeSearchPath makeSearchPathOutput

9299 makeLibraryPath makeBinPath optionalString

93100 hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape

94− escapeShellArg escapeShellArgs replaceChars lowerChars

101+ escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars

102+ escapeRegex escapeXML replaceChars lowerChars

95103 upperChars toLower toUpper addContextFrom splitString

96104 removePrefix removeSuffix versionOlder versionAtLeast

97105 getName getVersion

@@ -105,26 +113,28 @@ let

105113 makeScope makeScopeWithSplicing;

106114 inherit (self.meta) addMetaAttrs dontDistribute setName updateName

107115 appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio

108− hiPrioSet;

116+ hiPrioSet getLicenseFromSpdxId getExe;

109117 inherit (self.sources) pathType pathIsDirectory cleanSourceFilter

110118 cleanSource sourceByRegex sourceFilesBySuffices

111119 commitIdFromGitRepo cleanSourceWith pathHasContext

112120 canCleanSource pathIsRegularFile pathIsGitRepo;

113− inherit (self.modules) evalModules unifyModuleSyntax

114− applyIfFunction mergeModules

121+ inherit (self.modules) evalModules setDefaultModuleLocation

122+ unifyModuleSyntax applyModuleArgsIfFunction mergeModules

115123 mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions

116124 pushDownProperties dischargeProperties filterOverrides

117125 sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride

118− mkOptionDefault mkDefault mkForce mkVMOverride mkStrict

126+ mkOptionDefault mkDefault mkImageMediaOverride mkForce mkVMOverride

119127 mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions

120128 mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule

121− mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule

122− mkAliasOptionModule doRename;

129+ mkRenamedOptionModule mkRenamedOptionModuleWith

130+ mkMergedOptionModule mkChangedOptionModule

131+ mkAliasOptionModule mkDerivedConfig doRename;

123132 inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions

124− mergeDefaultOption mergeOneOption mergeEqualOption getValues

125− getFiles optionAttrSetToDocList optionAttrSetToDocList'

126− scrubOptionValue literalExample showOption showFiles

127− unknownModule mkOption;

133+ mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption

134+ getValues getFiles

135+ optionAttrSetToDocList optionAttrSetToDocList'

136+ scrubOptionValue literalExpression literalExample literalDocBook

137+ showOption showFiles unknownModule mkOption mkPackageOption;

128138 inherit (self.types) isType setType defaultTypeMerge defaultFunctor

129139 isOptionType mkOptionType;

130140 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− fold lib.and true

80+ foldr lib.and true

8181 (map (x: let name = (head x); in

8282

8383 ((checkFlag attrSet name) ->

84− (fold lib.and true

84+ (foldr 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− fold (n: set: if set ? ${n}

180+ foldr (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− fold (n: set:

199+ foldr (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− fold lib.mergeAttrs {} [

227+ foldr 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: self: super:

76− let fApplied = f self super;

77− super' = super // fApplied;

78− in fApplied // g self super';

75+ f: g: final: prev:

76+ let fApplied = f final prev;

77+ prev' = prev // fApplied;

78+ in fApplied // g final prev';

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) (self: super: {});

87+ lib.foldr (x: y: composeExtensions x y) (final: prev: {});

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.";

4− outputs = { self }: { lib = import ./lib; };

4+ outputs = { self }: { lib = import ./.; };

55}

lib/flakes.nixnew file+22

@@ -0,0 +1,22 @@

1+{ lib }:

3+rec {

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.

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+77−5

@@ -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.nix

13+ * Tests can be found in ./tests/misc.nix

1414 * Documentation in the manual, #sec-generators

1515 */

1616{ lib }:

@@ -35,6 +35,8 @@ 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

3840 # we default to not quoting strings

3941 else if isString v then v

4042 # isString returns "1", which is not a good default

@@ -106,7 +108,7 @@ rec {

106108 * The mk* configuration attributes can generically change

107109 * the way sections and key-value strings are generated.

108110 *

109− * For more examples see the test cases in ./tests.nix.

111+ * For more examples see the test cases in ./tests/misc.nix.

110112 */

111113 toINI = {

112114 # apply transformations (e.g. escapes) to section names

@@ -128,6 +130,51 @@ rec {

128130 # map input to ini sections

129131 mapAttrsToStringsSep "\n" mkSection attrsOfAttrs;

130132

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+

131178 /* Generate a git-config file from an attrset.

132179 *

133180 * It has two major differences from the regular INI format:

@@ -169,7 +216,7 @@ rec {

169216 # converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI

170217 gitFlattenAttrs = let

171218 recurse = path: value:

172− if isAttrs value then

219+ if isAttrs value && !lib.isDerivation value then

173220 lib.mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value

174221 else if length path > 1 then {

175222 ${concatStringsSep "." (lib.reverseList (tail path))}.${head path} = value;

@@ -195,6 +242,30 @@ rec {

195242 */

196243 toYAML = {}@args: toJSON args;

197244

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;

198269

199270 /* Pretty print a value, akin to `builtins.trace`.

200271 * Should probably be a builtin as well.

@@ -206,7 +277,8 @@ rec {

206277 allowPrettyValues ? false,

207278 /* If this option is true, the output is indented with newlines for attribute sets and lists */

208279 multiline ? true

209− }@args: let

280+ }@args:

281+ let

210282 go = indent: v: with builtins;

211283 let isPath = v: typeOf v == "path";

212284 introSpace = if multiline then "\n${indent} " else " ";

@@ -248,7 +320,7 @@ rec {

248320 then v.__pretty v.val

249321 else if v == {} then "{ }"

250322 else if v ? type && v.type == "derivation" then

251− "<derivation ${v.drvPath}>"

323+ "<derivation ${v.drvPath or "???"}>"

252324 else "{" + introSpace

253325 + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList

254326 (name: value:

lib/licenses.nix+201−143

@@ -1,44 +1,56 @@

11{ lib }:

2−let

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; }) ({

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+ };

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) ({

1123 /* License identifiers from spdx.org where possible.

1224 * If you cannot find your license here, then look for a similar license or

1325 * add it to this list. The URL mentioned above is a good source for inspiration.

1426 */

1527

16− abstyles = spdx {

28+ abstyles = {

1729 spdxId = "Abstyles";

1830 fullName = "Abstyles License";

1931 };

2032

21− afl20 = spdx {

33+ afl20 = {

2234 spdxId = "AFL-2.0";

2335 fullName = "Academic Free License v2.0";

2436 };

2537

26− afl21 = spdx {

38+ afl21 = {

2739 spdxId = "AFL-2.1";

2840 fullName = "Academic Free License v2.1";

2941 };

3042

31− afl3 = spdx {

43+ afl3 = {

3244 spdxId = "AFL-3.0";

3345 fullName = "Academic Free License v3.0";

3446 };

3547

36− agpl3Only = spdx {

48+ agpl3Only = {

3749 spdxId = "AGPL-3.0-only";

3850 fullName = "GNU Affero General Public License v3.0 only";

3951 };

4052

41− agpl3Plus = spdx {

53+ agpl3Plus = {

4254 spdxId = "AGPL-3.0-or-later";

4355 fullName = "GNU Affero General Public License v3.0 or later";

4456 };

@@ -55,7 +67,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

5567 free = false;

5668 };

5769

58− apsl20 = spdx {

70+ aom = {

71+ fullName = "Alliance for Open Media Patent License 1.0";

72+ url = "https://aomedia.org/license/patent-license/";

73+ };

74+

75+ apsl20 = {

5976 spdxId = "APSL-2.0";

6077 fullName = "Apple Public Source License 2.0";

6178 };

@@ -65,72 +82,72 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

6582 url = "https://www.freedesktop.org/wiki/Arphic_Public_License/";

6683 };

6784

68− artistic1 = spdx {

85+ artistic1 = {

6986 spdxId = "Artistic-1.0";

7087 fullName = "Artistic License 1.0";

7188 };

7289

73− artistic2 = spdx {

90+ artistic2 = {

7491 spdxId = "Artistic-2.0";

7592 fullName = "Artistic License 2.0";

7693 };

7794

78− asl20 = spdx {

95+ asl20 = {

7996 spdxId = "Apache-2.0";

8097 fullName = "Apache License 2.0";

8198 };

8299

83− boost = spdx {

100+ boost = {

84101 spdxId = "BSL-1.0";

85102 fullName = "Boost Software License 1.0";

86103 };

87104

88− beerware = spdx {

105+ beerware = {

89106 spdxId = "Beerware";

90107 fullName = "Beerware License";

91108 };

92109

93− blueOak100 = spdx {

110+ blueOak100 = {

94111 spdxId = "BlueOak-1.0.0";

95112 fullName = "Blue Oak Model License 1.0.0";

96113 };

97114

98− bsd0 = spdx {

115+ bsd0 = {

99116 spdxId = "0BSD";

100117 fullName = "BSD Zero Clause License";

101118 };

102119

103− bsd1 = spdx {

120+ bsd1 = {

104121 spdxId = "BSD-1-Clause";

105122 fullName = "BSD 1-Clause License";

106123 };

107124

108− bsd2 = spdx {

125+ bsd2 = {

109126 spdxId = "BSD-2-Clause";

110127 fullName = ''BSD 2-clause "Simplified" License'';

111128 };

112129

113− bsd2Patent = spdx {

130+ bsd2Patent = {

114131 spdxId = "BSD-2-Clause-Patent";

115132 fullName = "BSD-2-Clause Plus Patent License";

116133 };

117134

118− bsd3 = spdx {

135+ bsd3 = {

119136 spdxId = "BSD-3-Clause";

120137 fullName = ''BSD 3-clause "New" or "Revised" License'';

121138 };

122139

123− bsdOriginal = spdx {

140+ bsdOriginal = {

124141 spdxId = "BSD-4-Clause";

125142 fullName = ''BSD 4-clause "Original" or "Old" License'';

126143 };

127144

128− bsdOriginalUC = spdx {

145+ bsdOriginalUC = {

129146 spdxId = "BSD-4-Clause-UC";

130147 fullName = "BSD 4-Clause University of California-Specific";

131148 };

132149

133− bsdProtection = spdx {

150+ bsdProtection = {

134151 spdxId = "BSD-Protection";

135152 fullName = "BSD Protection License";

136153 };

@@ -141,119 +158,129 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

141158 free = false;

142159 };

143160

144− clArtistic = spdx {

161+ capec = {

162+ fullName = "Common Attack Pattern Enumeration and Classification";

163+ url = "https://capec.mitre.org/about/termsofuse.html";

164+ };

165+

166+ clArtistic = {

145167 spdxId = "ClArtistic";

146168 fullName = "Clarified Artistic License";

147169 };

148170

149− cc0 = spdx {

171+ cc0 = {

150172 spdxId = "CC0-1.0";

151173 fullName = "Creative Commons Zero v1.0 Universal";

152174 };

153175

154− cc-by-nc-sa-20 = spdx {

176+ cc-by-nc-sa-20 = {

155177 spdxId = "CC-BY-NC-SA-2.0";

156178 fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0";

157179 free = false;

158180 };

159181

160− cc-by-nc-sa-25 = spdx {

182+ cc-by-nc-sa-25 = {

161183 spdxId = "CC-BY-NC-SA-2.5";

162184 fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5";

163185 free = false;

164186 };

165187

166− cc-by-nc-sa-30 = spdx {

188+ cc-by-nc-sa-30 = {

167189 spdxId = "CC-BY-NC-SA-3.0";

168190 fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0";

169191 free = false;

170192 };

171193

172− cc-by-nc-sa-40 = spdx {

194+ cc-by-nc-sa-40 = {

173195 spdxId = "CC-BY-NC-SA-4.0";

174196 fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0";

175197 free = false;

176198 };

177199

178− cc-by-nc-30 = spdx {

200+ cc-by-nc-30 = {

179201 spdxId = "CC-BY-NC-3.0";

180202 fullName = "Creative Commons Attribution Non Commercial 3.0 Unported";

181203 free = false;

182204 };

183205

184− cc-by-nc-40 = spdx {

206+ cc-by-nc-40 = {

185207 spdxId = "CC-BY-NC-4.0";

186208 fullName = "Creative Commons Attribution Non Commercial 4.0 International";

187209 free = false;

188210 };

189211

190− cc-by-nd-30 = spdx {

212+ cc-by-nd-30 = {

191213 spdxId = "CC-BY-ND-3.0";

192214 fullName = "Creative Commons Attribution-No Derivative Works v3.00";

193215 free = false;

194216 };

195217

196− cc-by-sa-25 = spdx {

218+ cc-by-sa-25 = {

197219 spdxId = "CC-BY-SA-2.5";

198220 fullName = "Creative Commons Attribution Share Alike 2.5";

199221 };

200222

201− cc-by-30 = spdx {

223+ cc-by-30 = {

202224 spdxId = "CC-BY-3.0";

203225 fullName = "Creative Commons Attribution 3.0";

204226 };

205227

206− cc-by-sa-30 = spdx {

228+ cc-by-sa-30 = {

207229 spdxId = "CC-BY-SA-3.0";

208230 fullName = "Creative Commons Attribution Share Alike 3.0";

209231 };

210232

211− cc-by-40 = spdx {

233+ cc-by-40 = {

212234 spdxId = "CC-BY-4.0";

213235 fullName = "Creative Commons Attribution 4.0";

214236 };

215237

216− cc-by-sa-40 = spdx {

238+ cc-by-sa-40 = {

217239 spdxId = "CC-BY-SA-4.0";

218240 fullName = "Creative Commons Attribution Share Alike 4.0";

219241 };

220242

221− cddl = spdx {

243+ cddl = {

222244 spdxId = "CDDL-1.0";

223245 fullName = "Common Development and Distribution License 1.0";

224246 };

225247

226− cecill20 = spdx {

248+ cecill20 = {

227249 spdxId = "CECILL-2.0";

228250 fullName = "CeCILL Free Software License Agreement v2.0";

229251 };

230252

231− cecill-b = spdx {

253+ cecill21 = {

254+ spdxId = "CECILL-2.1";

255+ fullName = "CeCILL Free Software License Agreement v2.1";

256+ };

257+

258+ cecill-b = {

232259 spdxId = "CECILL-B";

233260 fullName = "CeCILL-B Free Software License Agreement";

234261 };

235262

236− cecill-c = spdx {

263+ cecill-c = {

237264 spdxId = "CECILL-C";

238265 fullName = "CeCILL-C Free Software License Agreement";

239266 };

240267

241− cpal10 = spdx {

268+ cpal10 = {

242269 spdxId = "CPAL-1.0";

243270 fullName = "Common Public Attribution License 1.0";

244271 };

245272

246− cpl10 = spdx {

273+ cpl10 = {

247274 spdxId = "CPL-1.0";

248275 fullName = "Common Public License 1.0";

249276 };

250277

251− curl = spdx {

278+ curl = {

252279 spdxId = "curl";

253280 fullName = "curl License";

254281 };

255282

256− doc = spdx {

283+ doc = {

257284 spdxId = "DOC";

258285 fullName = "DOC License";

259286 };

@@ -264,12 +291,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

264291 free = false;

265292 };

266293

267− efl10 = spdx {

294+ efl10 = {

268295 spdxId = "EFL-1.0";

269296 fullName = "Eiffel Forum License v1.0";

270297 };

271298

272− efl20 = spdx {

299+ efl20 = {

273300 spdxId = "EFL-2.0";

274301 fullName = "Eiffel Forum License v2.0";

275302 };

@@ -280,12 +307,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

280307 free = false;

281308 };

282309

283− epl10 = spdx {

310+ epl10 = {

284311 spdxId = "EPL-1.0";

285312 fullName = "Eclipse Public License 1.0";

286313 };

287314

288− epl20 = spdx {

315+ epl20 = {

289316 spdxId = "EPL-2.0";

290317 fullName = "Eclipse Public License 2.0";

291318 };

@@ -296,42 +323,42 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

296323 free = false;

297324 };

298325

299− eupl11 = spdx {

326+ eupl11 = {

300327 spdxId = "EUPL-1.1";

301328 fullName = "European Union Public License 1.1";

302329 };

303330

304− eupl12 = spdx {

331+ eupl12 = {

305332 spdxId = "EUPL-1.2";

306333 fullName = "European Union Public License 1.2";

307334 };

308335

309− fdl11Only = spdx {

336+ fdl11Only = {

310337 spdxId = "GFDL-1.1-only";

311338 fullName = "GNU Free Documentation License v1.1 only";

312339 };

313340

314− fdl11Plus = spdx {

341+ fdl11Plus = {

315342 spdxId = "GFDL-1.1-or-later";

316343 fullName = "GNU Free Documentation License v1.1 or later";

317344 };

318345

319− fdl12Only = spdx {

346+ fdl12Only = {

320347 spdxId = "GFDL-1.2-only";

321348 fullName = "GNU Free Documentation License v1.2 only";

322349 };

323350

324− fdl12Plus = spdx {

351+ fdl12Plus = {

325352 spdxId = "GFDL-1.2-or-later";

326353 fullName = "GNU Free Documentation License v1.2 or later";

327354 };

328355

329− fdl13Only = spdx {

356+ fdl13Only = {

330357 spdxId = "GFDL-1.3-only";

331358 fullName = "GNU Free Documentation License v1.3 only";

332359 };

333360

334− fdl13Plus = spdx {

361+ fdl13Plus = {

335362 spdxId = "GFDL-1.3-or-later";

336363 fullName = "GNU Free Documentation License v1.3 or later";

337364 };

@@ -346,7 +373,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

346373 fullName = "Unspecified free software license";

347374 };

348375

349− ftl = spdx {

376+ ftl = {

350377 spdxId = "FTL";

351378 fullName = "Freetype Project License";

352379 };

@@ -362,22 +389,27 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

362389 free = false;

363390 };

364391

365− gpl1Only = spdx {

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 = {

366398 spdxId = "GPL-1.0-only";

367399 fullName = "GNU General Public License v1.0 only";

368400 };

369401

370− gpl1Plus = spdx {

402+ gpl1Plus = {

371403 spdxId = "GPL-1.0-or-later";

372404 fullName = "GNU General Public License v1.0 or later";

373405 };

374406

375− gpl2Only = spdx {

407+ gpl2Only = {

376408 spdxId = "GPL-2.0-only";

377409 fullName = "GNU General Public License v2.0 only";

378410 };

379411

380− gpl2Classpath = spdx {

412+ gpl2Classpath = {

381413 spdxId = "GPL-2.0-with-classpath-exception";

382414 fullName = "GNU General Public License v2.0 only (with Classpath exception)";

383415 };

@@ -392,17 +424,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

392424 url = "https://www.mysql.com/about/legal/licensing/foss-exception";

393425 };

394426

395− gpl2Plus = spdx {

427+ gpl2Plus = {

396428 spdxId = "GPL-2.0-or-later";

397429 fullName = "GNU General Public License v2.0 or later";

398430 };

399431

400− gpl3Only = spdx {

432+ gpl3Only = {

401433 spdxId = "GPL-3.0-only";

402434 fullName = "GNU General Public License v3.0 only";

403435 };

404436

405− gpl3Plus = spdx {

437+ gpl3Plus = {

406438 spdxId = "GPL-3.0-or-later";

407439 fullName = "GNU General Public License v3.0 or later";

408440 };

@@ -412,12 +444,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

412444 url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception";

413445 };

414446

415− hpnd = spdx {

447+ hpnd = {

416448 spdxId = "HPND";

417449 fullName = "Historic Permission Notice and Disclaimer";

418450 };

419451

420− hpndSellVariant = spdx {

452+ hpndSellVariant = {

421453 fullName = "Historical Permission Notice and Disclaimer - sell variant";

422454 spdxId = "HPND-sell-variant";

423455 };

@@ -428,39 +460,44 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

428460 url = "https://old.calculate-linux.org/packages/licenses/iASL";

429461 };

430462

431− ijg = spdx {

463+ ijg = {

432464 spdxId = "IJG";

433465 fullName = "Independent JPEG Group License";

434466 };

435467

436− imagemagick = spdx {

468+ imagemagick = {

437469 fullName = "ImageMagick License";

438470 spdxId = "imagemagick";

439471 };

440472

473+ imlib2 = {

474+ spdxId = "Imlib2";

475+ fullName = "Imlib2 License";

476+ };

477+

441478 inria-compcert = {

442479 fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler";

443− url = "http://compcert.inria.fr/doc/LICENSE"; # https is broken

480+ url = "https://compcert.org/doc/LICENSE.txt";

444481 free = false;

445482 };

446483

447484 inria-icesl = {

448485 fullName = "INRIA Non-Commercial License Agreement for IceSL";

449− url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; # https is broken

486+ url = "https://icesl.loria.fr/assets/pdf/EULA_IceSL_binary.pdf";

450487 free = false;

451488 };

452489

453− ipa = spdx {

490+ ipa = {

454491 spdxId = "IPA";

455492 fullName = "IPA Font License";

456493 };

457494

458− ipl10 = spdx {

495+ ipl10 = {

459496 spdxId = "IPL-1.0";

460497 fullName = "IBM Public License v1.0";

461498 };

462499

463− isc = spdx {

500+ isc = {

464501 spdxId = "ISC";

465502 fullName = "ISC License";

466503 };

@@ -478,52 +515,52 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

478515 free = false;

479516 };

480517

481− lgpl2Only = spdx {

518+ lgpl2Only = {

482519 spdxId = "LGPL-2.0-only";

483520 fullName = "GNU Library General Public License v2 only";

484521 };

485522

486− lgpl2Plus = spdx {

523+ lgpl2Plus = {

487524 spdxId = "LGPL-2.0-or-later";

488525 fullName = "GNU Library General Public License v2 or later";

489526 };

490527

491− lgpl21Only = spdx {

528+ lgpl21Only = {

492529 spdxId = "LGPL-2.1-only";

493530 fullName = "GNU Lesser General Public License v2.1 only";

494531 };

495532

496− lgpl21Plus = spdx {

533+ lgpl21Plus = {

497534 spdxId = "LGPL-2.1-or-later";

498535 fullName = "GNU Lesser General Public License v2.1 or later";

499536 };

500537

501− lgpl3Only = spdx {

538+ lgpl3Only = {

502539 spdxId = "LGPL-3.0-only";

503540 fullName = "GNU Lesser General Public License v3.0 only";

504541 };

505542

506− lgpl3Plus = spdx {

543+ lgpl3Plus = {

507544 spdxId = "LGPL-3.0-or-later";

508545 fullName = "GNU Lesser General Public License v3.0 or later";

509546 };

510547

511− lgpllr = spdx {

548+ lgpllr = {

512549 spdxId = "LGPLLR";

513550 fullName = "Lesser General Public License For Linguistic Resources";

514551 };

515552

516− libpng = spdx {

553+ libpng = {

517554 spdxId = "Libpng";

518555 fullName = "libpng License";

519556 };

520557

521− libpng2 = spdx {

558+ libpng2 = {

522559 spdxId = "libpng-2.0"; # Used since libpng 1.6.36.

523560 fullName = "PNG Reference Library version 2";

524561 };

525562

526− libtiff = spdx {

563+ libtiff = {

527564 spdxId = "libtiff";

528565 fullName = "libtiff License";

529566 };

@@ -533,22 +570,22 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

533570 url = "https://opensource.franz.com/preamble.html";

534571 };

535572

536− llvm-exception = spdx {

573+ llvm-exception = {

537574 spdxId = "LLVM-exception";

538575 fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License

539576 };

540577

541− lppl12 = spdx {

578+ lppl12 = {

542579 spdxId = "LPPL-1.2";

543580 fullName = "LaTeX Project Public License v1.2";

544581 };

545582

546− lppl13c = spdx {

583+ lppl13c = {

547584 spdxId = "LPPL-1.3c";

548585 fullName = "LaTeX Project Public License v1.3c";

549586 };

550587

551− lpl-102 = spdx {

588+ lpl-102 = {

552589 spdxId = "LPL-1.02";

553590 fullName = "Lucent Public License v1.02";

554591 };

@@ -560,43 +597,58 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

560597

561598 # spdx.org does not (yet) differentiate between the X11 and Expat versions

562599 # for details see https://en.wikipedia.org/wiki/MIT_License#Various_versions

563− mit = spdx {

600+ mit = {

564601 spdxId = "MIT";

565602 fullName = "MIT License";

566603 };

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+ };

614+

615+ mit0 = {

616+ spdxId = "MIT-0";

617+ fullName = "MIT No Attribution";

618+ };

567619

568− mpl10 = spdx {

620+ mpl10 = {

569621 spdxId = "MPL-1.0";

570622 fullName = "Mozilla Public License 1.0";

571623 };

572624

573− mpl11 = spdx {

625+ mpl11 = {

574626 spdxId = "MPL-1.1";

575627 fullName = "Mozilla Public License 1.1";

576628 };

577629

578− mpl20 = spdx {

630+ mpl20 = {

579631 spdxId = "MPL-2.0";

580632 fullName = "Mozilla Public License 2.0";

581633 };

582634

583− mspl = spdx {

635+ mspl = {

584636 spdxId = "MS-PL";

585637 fullName = "Microsoft Public License";

586638 };

587639

588− nasa13 = spdx {

640+ nasa13 = {

589641 spdxId = "NASA-1.3";

590642 fullName = "NASA Open Source Agreement 1.3";

591643 free = false;

592644 };

593645

594− ncsa = spdx {

646+ ncsa = {

595647 spdxId = "NCSA";

596648 fullName = "University of Illinois/NCSA Open Source License";

597649 };

598650

599− nposl3 = spdx {

651+ nposl3 = {

600652 spdxId = "NPOSL-3.0";

601653 fullName = "Non-Profit Open Software License 3.0";

602654 };

@@ -613,53 +665,53 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

613665 free = false;

614666 };

615667

616− odbl = spdx {

668+ odbl = {

617669 spdxId = "ODbL-1.0";

618670 fullName = "Open Data Commons Open Database License v1.0";

619671 };

620672

621− ofl = spdx {

673+ ofl = {

622674 spdxId = "OFL-1.1";

623675 fullName = "SIL Open Font License 1.1";

624676 };

625677

626− openldap = spdx {

678+ openldap = {

627679 spdxId = "OLDAP-2.8";

628680 fullName = "Open LDAP Public License v2.8";

629681 };

630682

631− openssl = spdx {

683+ openssl = {

632684 spdxId = "OpenSSL";

633685 fullName = "OpenSSL License";

634686 };

635687

636− osl2 = spdx {

688+ osl2 = {

637689 spdxId = "OSL-2.0";

638690 fullName = "Open Software License 2.0";

639691 };

640692

641− osl21 = spdx {

693+ osl21 = {

642694 spdxId = "OSL-2.1";

643695 fullName = "Open Software License 2.1";

644696 };

645697

646− osl3 = spdx {

698+ osl3 = {

647699 spdxId = "OSL-3.0";

648700 fullName = "Open Software License 3.0";

649701 };

650702

651− parity70 = spdx {

703+ parity70 = {

652704 spdxId = "Parity-7.0.0";

653705 fullName = "Parity Public License 7.0.0";

654706 url = "https://paritylicense.com/versions/7.0.0.html";

655707 };

656708

657− php301 = spdx {

709+ php301 = {

658710 spdxId = "PHP-3.01";

659711 fullName = "PHP License v3.01";

660712 };

661713

662− postgresql = spdx {

714+ postgresql = {

663715 spdxId = "PostgreSQL";

664716 fullName = "PostgreSQL License";

665717 };

@@ -670,7 +722,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

670722 free = false;

671723 };

672724

673− psfl = spdx {

725+ psfl = {

674726 spdxId = "Python-2.0";

675727 fullName = "Python Software Foundation License version 2";

676728 url = "https://docs.python.org/license.html";

@@ -691,12 +743,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

691743 url = "https://prosperitylicense.com/versions/3.0.0.html";

692744 };

693745

694− qhull = spdx {

746+ qhull = {

695747 spdxId = "Qhull";

696748 fullName = "Qhull License";

697749 };

698750

699− qpl = spdx {

751+ qpl = {

700752 spdxId = "QPL-1.0";

701753 fullName = "Q Public License 1.0";

702754 };

@@ -706,22 +758,22 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

706758 url = "https://qwt.sourceforge.io/qwtlicense.html";

707759 };

708760

709− ruby = spdx {

761+ ruby = {

710762 spdxId = "Ruby";

711763 fullName = "Ruby License";

712764 };

713765

714− sendmail = spdx {

766+ sendmail = {

715767 spdxId = "Sendmail";

716768 fullName = "Sendmail License";

717769 };

718770

719− sgi-b-20 = spdx {

771+ sgi-b-20 = {

720772 spdxId = "SGI-B-2.0";

721773 fullName = "SGI Free Software License B v2.0";

722774 };

723775

724− sleepycat = spdx {

776+ sleepycat = {

725777 spdxId = "Sleepycat";

726778 fullName = "Sleepycat License";

727779 };

@@ -737,15 +789,19 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

737789 fullName = "Server Side Public License";

738790 url = "https://www.mongodb.com/licensing/server-side-public-license";

739791 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

740796 };

741797

742798 stk = {

743799 shortName = "stk";

744800 fullName = "Synthesis Tool Kit 4.3";

745− url = https://github.com/thestk/stk/blob/master/LICENSE;

801+ url = "https://github.com/thestk/stk/blob/master/LICENSE";

746802 };

747803

748− tcltk = spdx {

804+ tcltk = {

749805 spdxId = "TCL";

750806 fullName = "TCL/TK License";

751807 };

@@ -763,25 +819,27 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

763819 unfreeRedistributable = {

764820 fullName = "Unfree redistributable";

765821 free = false;

822+ redistributable = true;

766823 };

767824

768825 unfreeRedistributableFirmware = {

769826 fullName = "Unfree redistributable firmware";

827+ redistributable = true;

770828 # Note: we currently consider these "free" for inclusion in the

771829 # channel and NixOS images.

772830 };

773831

774− unicode-dfs-2015 = spdx {

832+ unicode-dfs-2015 = {

775833 spdxId = "Unicode-DFS-2015";

776834 fullName = "Unicode License Agreement - Data Files and Software (2015)";

777835 };

778836

779− unicode-dfs-2016 = spdx {

837+ unicode-dfs-2016 = {

780838 spdxId = "Unicode-DFS-2016";

781839 fullName = "Unicode License Agreement - Data Files and Software (2016)";

782840 };

783841

784− unlicense = spdx {

842+ unlicense = {

785843 spdxId = "Unlicense";

786844 fullName = "The Unlicense";

787845 };

@@ -791,7 +849,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

791849 url = "https://oss.oracle.com/licenses/upl/";

792850 };

793851

794− vim = spdx {

852+ vim = {

795853 spdxId = "Vim";

796854 fullName = "Vim License";

797855 };

@@ -802,17 +860,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

802860 free = false;

803861 };

804862

805− vsl10 = spdx {

863+ vsl10 = {

806864 spdxId = "VSL-1.0";

807865 fullName = "Vovida Software License v1.0";

808866 };

809867

810− watcom = spdx {

868+ watcom = {

811869 spdxId = "Watcom-1.0";

812870 fullName = "Sybase Open Watcom Public License 1.0";

813871 };

814872

815− w3c = spdx {

873+ w3c = {

816874 spdxId = "W3C";

817875 fullName = "W3C Software Notice and License";

818876 };

@@ -822,12 +880,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

822880 url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab";

823881 };

824882

825− wtfpl = spdx {

883+ wtfpl = {

826884 spdxId = "WTFPL";

827885 fullName = "Do What The F*ck You Want To Public License";

828886 };

829887

830− wxWindows = spdx {

888+ wxWindows = {

831889 spdxId = "wxWindows";

832890 fullName = "wxWindows Library Licence, Version 3.1";

833891 };

@@ -837,68 +895,68 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({

837895 url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken

838896 };

839897

840− zlib = spdx {

898+ zlib = {

841899 spdxId = "Zlib";

842900 fullName = "zlib License";

843901 };

844902

845− zpl20 = spdx {

903+ zpl20 = {

846904 spdxId = "ZPL-2.0";

847905 fullName = "Zope Public License 2.0";

848906 };

849907

850− zpl21 = spdx {

908+ zpl21 = {

851909 spdxId = "ZPL-2.1";

852910 fullName = "Zope Public License 2.1";

853911 };

854912} // {

855913 # TODO: remove legacy aliases

856− agpl3 = spdx {

914+ agpl3 = {

857915 spdxId = "AGPL-3.0";

858916 fullName = "GNU Affero General Public License v3.0";

859917 deprecated = true;

860918 };

861− fdl11 = spdx {

919+ fdl11 = {

862920 spdxId = "GFDL-1.1";

863921 fullName = "GNU Free Documentation License v1.1";

864922 deprecated = true;

865923 };

866− fdl12 = spdx {

924+ fdl12 = {

867925 spdxId = "GFDL-1.2";

868926 fullName = "GNU Free Documentation License v1.2";

869927 deprecated = true;

870928 };

871− fdl13 = spdx {

929+ fdl13 = {

872930 spdxId = "GFDL-1.3";

873931 fullName = "GNU Free Documentation License v1.3";

874932 deprecated = true;

875933 };

876− gpl1 = spdx {

934+ gpl1 = {

877935 spdxId = "GPL-1.0";

878936 fullName = "GNU General Public License v1.0";

879937 deprecated = true;

880938 };

881− gpl2 = spdx {

939+ gpl2 = {

882940 spdxId = "GPL-2.0";

883941 fullName = "GNU General Public License v2.0";

884942 deprecated = true;

885943 };

886− gpl3 = spdx {

944+ gpl3 = {

887945 spdxId = "GPL-3.0";

888946 fullName = "GNU General Public License v3.0";

889947 deprecated = true;

890948 };

891− lgpl2 = spdx {

949+ lgpl2 = {

892950 spdxId = "LGPL-2.0";

893951 fullName = "GNU Library General Public License v2";

894952 deprecated = true;

895953 };

896− lgpl21 = spdx {

954+ lgpl21 = {

897955 spdxId = "LGPL-2.1";

898956 fullName = "GNU Lesser General Public License v2.1";

899957 deprecated = true;

900958 };

901− lgpl3 = spdx {

959+ lgpl3 = {

902960 spdxId = "LGPL-3.0";

903961 fullName = "GNU Lesser General Public License v3.0";

904962 deprecated = true;

lib/lists.nix+11−13

@@ -4,6 +4,7 @@

44let

55 inherit (lib.strings) toInt;

66 inherit (lib.trivial) compare min;

7+ inherit (lib.attrsets) mapAttrs;

78in

89rec {

910

@@ -340,15 +341,15 @@ rec {

340341 groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]

341342 => { true = 12; false = 3; }

342343 */

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;

344+ groupBy' = op: nul: pred: lst: mapAttrs (name: foldl op nul) (groupBy pred lst);

350345

351− groupBy = groupBy' (sum: e: sum ++ [e]) [];

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+ ) {});

352353

353354 /* Merges two lists of the same size together. If the sizes aren't the same

354355 the merging stops at the shortest. How both lists are merged is defined

@@ -642,7 +643,7 @@ rec {

642643 unique [ 3 2 3 4 ]

643644 => [ 3 2 4 ]

644645 */

645− unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [];

646+ unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [];

646647

647648 /* Intersects list 'e' and another list. O(nm) complexity.

648649

@@ -663,9 +664,6 @@ rec {

663664 /* Test if two lists have no common element.

664665 It should be slightly more efficient than (intersectLists a b == [])

665666 */

666− mutuallyExclusive = a: b:

667− (builtins.length a) == 0 ||

668− (!(builtins.elem (builtins.head a) b) &&

669− mutuallyExclusive (builtins.tail a) b);

667+ mutuallyExclusive = a: b: length a == 0 || !(any (x: elem x a) b);

670668

671669}

lib/meta.nix+42−1

@@ -78,7 +78,7 @@ rec {

7878

7979 2. (modern) a pattern for the platform `parsed` field.

8080

81− We can inject these into a patten for the whole of a structured platform,

81+ We can inject these into a pattern for the whole of a structured platform,

8282 and then match that.

8383 */

8484 platformMatch = platform: elem: let

@@ -99,4 +99,45 @@ 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)}";

102143}

lib/modules.nix+341−92

@@ -9,12 +9,10 @@ let

99 catAttrs

1010 concatLists

1111 concatMap

12− count

12+ concatStringsSep

1313 elem

1414 filter

1515 findFirst

16− flip

17− foldl

1816 foldl'

1917 getAttrFromPath

2018 head

@@ -39,6 +37,7 @@ let

3937 toList

4038 types

4139 warnIf

40+ zipAttrsWith

4241 ;

4342 inherit (lib.options)

4443 isOption

@@ -47,20 +46,63 @@ let

4746 showFiles

4847 showOption

4948 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+

5165in

5266

5367rec {

5468

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.

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+

5899 !!! Please think twice before adding to this argument list! The more

59100 that is specified here instead of in the modules themselves the harder

60101 it is to transparently move a set of modules to be a submodule of another

61102 config (as the proper arguments need to be replicated at each call to

62103 evalModules) and the less declarative the module set is. */

63− evalModules = { modules

104+ evalModules = evalModulesArgs@

105+ { modules

64106 , prefix ? []

65107 , # This should only be used for special arguments that need to be evaluated

66108 # when resolving module structure (like in imports). For everything else,

@@ -71,13 +113,39 @@ rec {

71113 args ? {}

72114 , # This would be remove in the future, Prefer _module.check option instead.

73115 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

74120 }:

75121 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+

76140 # This internal module declare internal options under the `_module'

77141 # attribute. These options are fragile, as they are used by the

78142 # 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.

79147 internalModule = rec {

80− _file = ./modules.nix;

148+ _file = "lib/modules.nix";

81149

82150 key = _file;

83151

@@ -89,21 +157,106 @@ rec {

89157 # support for that, in turn it's lazy in its values. This means e.g.

90158 # a `_module.args.pkgs = import (fetchTarball { ... }) {}` won't

91159 # start a download when `pkgs` wasn't evaluated.

92− type = types.lazyAttrsOf types.unspecified;

93− internal = true;

94− description = "Arguments passed to each module.";

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+ '';

95249 };

96250

97251 _module.check = mkOption {

98252 type = types.bool;

99253 internal = true;

100− default = check;

254+ default = true;

101255 description = "Whether to check whether all option definitions have matching declarations.";

102256 };

103257

104258 _module.freeformType = mkOption {

105− # Disallow merging for now, but could be implemented nicely with a `types.optionType`

106− type = types.nullOr (types.uniq types.attrs);

259+ type = types.nullOr types.optionType;

107260 internal = true;

108261 default = null;

109262 description = ''

@@ -120,14 +273,17 @@ rec {

120273 };

121274

122275 config = {

123− _module.args = args;

276+ _module.args = {

277+ inherit extendModules;

278+ moduleType = type;

279+ };

124280 };

125281 };

126282

127283 merged =

128284 let collected = collectModules

129285 (specialArgs.modulesPath or "")

130− (modules ++ [ internalModule ])

286+ (regularModules ++ [ internalModule ])

131287 ({ inherit lib options config specialArgs; } // specialArgs);

132288 in mergeModules prefix (reverseList collected);

133289

@@ -162,20 +318,51 @@ rec {

162318 baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}";

163319 in

164320 if attrNames options == [ "_module" ]

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− ''

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+ ''

172339 else throw baseMsg

173340 else null;

174341

175− result = builtins.seq checkUnmatched {

176− inherit options;

177− config = removeAttrs config [ "_module" ];

178− inherit (config) _module;

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;

179366 };

180367 in result;

181368

@@ -188,11 +375,11 @@ rec {

188375 # Like unifyModuleSyntax, but also imports paths and calls functions if necessary

189376 loadModule = args: fallbackFile: fallbackKey: m:

190377 if isFunction m || isAttrs m then

191− unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args)

378+ unifyModuleSyntax fallbackFile fallbackKey (applyModuleArgsIfFunction fallbackKey m args)

192379 else if isList m then

193380 let defs = [{ file = fallbackFile; value = m; }]; in

194381 throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}"

195− else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args);

382+ else unifyModuleSyntax (toString m) (toString m) (applyModuleArgsIfFunction (toString m) (import m) args);

196383

197384 /*

198385 Collects all modules recursively into the form

@@ -253,6 +440,10 @@ rec {

253440 in modulesPath: initialModules: args:

254441 filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args);

255442

443+ /* Wrap a module with a default location for reporting errors. */

444+ setDefaultModuleLocation = file: m:

445+ { _file = file; imports = [ m ]; };

446+

256447 /* Massage a module into canonical form, that is, a set consisting

257448 of ‘options’, ‘config’ and ‘imports’ attributes. */

258449 unifyModuleSyntax = file: key: m:

@@ -285,7 +476,7 @@ rec {

285476 config = addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"]));

286477 };

287478

288− applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then

479+ applyModuleArgsIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then

289480 let

290481 # Module arguments are resolved in a strict manner when attribute set

291482 # deconstruction is used. As the arguments are now defined with the

@@ -362,10 +553,11 @@ rec {

362553 }

363554 */

364555 byName = attr: f: modules:

365− foldl' (acc: module:

366− if !(builtins.isAttrs module.${attr}) then

556+ zipAttrsWith (n: concatLists)

557+ (map (module: let subtree = module.${attr}; in

558+ if !(builtins.isAttrs subtree) then

367559 throw ''

368− You're trying to declare a value of type `${builtins.typeOf module.${attr}}'

560+ You're trying to declare a value of type `${builtins.typeOf subtree}'

369561 rather than an attribute-set for the option

370562 `${builtins.concatStringsSep "." prefix}'!

371563

@@ -374,11 +566,8 @@ rec {

374566 this option by e.g. referring to `man 5 configuration.nix'!

375567 ''

376568 else

377− acc // (mapAttrs (n: v:

378− (acc.${n} or []) ++ f module v

379− ) module.${attr}

380− )

381− ) {} modules;

569+ mapAttrs (n: f module) subtree

570+ ) modules);

382571 # an attrset 'name' => list of submodules that declare ‘name’.

383572 declsByName = byName "options" (module: option:

384573 [{ inherit (module) _file; options = option; }]

@@ -392,28 +581,63 @@ rec {

392581 [{ inherit (module) file; inherit value; }]

393582 ) configs;

394583

395− resultsByName = flip mapAttrs declsByName (name: decls:

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:

396601 # We're descending into attribute ‘name’.

397602 let

398603 loc = prefix ++ [name];

399604 defns = defnsByName.${name} or [];

400605 defns' = defnsByName'.${name} or [];

401− nrOptions = count (m: isOption m.options) decls;

606+ optionDecls = filter (m: isOption m.options) decls;

402607 in

403− if nrOptions == length decls then

608+ if length optionDecls == length decls then

404609 let opt = fixupOptionType loc (mergeOptionDecls loc decls);

405610 in {

406611 matchedOptions = evalOptionValue loc opt defns';

407612 unmatchedDefns = [];

408613 }

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}'."

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+ }"

415639 else

416− mergeModules' loc decls defns);

640+ mergeModules' loc decls defns) declsByName;

417641

418642 matchedOptions = mapAttrs (n: v: v.matchedOptions) resultsByName;

419643

@@ -427,12 +651,19 @@ rec {

427651 inherit matchedOptions;

428652

429653 # Transforms unmatchedDefnsByName into a list of definitions

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);

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);

436667 };

437668

438669 /* Merge multiple option declarations into a single declaration. In

@@ -448,11 +679,9 @@ rec {

448679 correspond to the definition of 'loc' in 'opt.file'. */

449680 mergeOptionDecls =

450681 let

451− packSubmodule = file: m:

452− { _file = file; imports = [ m ]; };

453682 coerceOption = file: opt:

454− if isFunction opt then packSubmodule file opt

455− else packSubmodule file { options = opt; };

683+ if isFunction opt then setDefaultModuleLocation file opt

684+ else setDefaultModuleLocation file { options = opt; };

456685 in loc: opts:

457686 foldl' (res: opt:

458687 let t = res.type;

@@ -473,17 +702,9 @@ rec {

473702 throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}."

474703 else

475704 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−

483705 getSubModules = opt.options.type.getSubModules or null;

484706 submodules =

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

707+ if getSubModules != null then map (setDefaultModuleLocation opt._file) getSubModules ++ res.options

487708 else res.options;

488709 in opt.options // res //

489710 { declarations = res.declarations ++ [opt._file];

@@ -527,6 +748,8 @@ rec {

527748 definitions = map (def: def.value) res.defsFinal;

528749 files = map (def: def.file) res.defsFinal;

529750 inherit (res) isDefined;

751+ # This allows options to be correctly displayed using `${options.path.to.it}`

752+ __toString = _: showOption loc;

530753 };

531754

532755 # Merge definitions of a value of a given type.

@@ -664,26 +887,13 @@ rec {

664887 compare = a: b: (a.priority or 1000) < (b.priority or 1000);

665888 in sort compare defs';

666889

667− /* Hack for backward compatibility: convert options of type

668− optionSet to options of type submodule. FIXME: remove

669− eventually. */

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

670893 fixupOptionType = loc: opt:

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 = []; };

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 = []; };

687897

688898

689899 /* Properties. */

@@ -710,12 +920,11 @@ rec {

710920

711921 mkOptionDefault = mkOverride 1500; # priority of option defaults

712922 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

713924 mkForce = mkOverride 50;

714925 mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’

715926

716− mkStrict = builtins.trace "`mkStrict' is obsolete; use `mkOverride 0' instead." (mkOverride 0);

717−

718− mkFixStrictness = id; # obsolete, no-op

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;

719928

720929 mkOrder = priority: content:

721930 { _type = "order";

@@ -816,6 +1025,26 @@ rec {

8161025 use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'.";

8171026 };

8181027

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+

8191048 /* Return a module that causes a warning to be shown if any of the "from"

8201049 option is defined; the defined values can be used in the "mergeFn" to set

8211050 the "to" value.

@@ -847,7 +1076,7 @@ rec {

8471076 mkMergedOptionModule = from: to: mergeFn:

8481077 { config, options, ... }:

8491078 {

850− options = foldl recursiveUpdate {} (map (path: setAttrByPath path (mkOption {

1079+ options = foldl' recursiveUpdate {} (map (path: setAttrByPath path (mkOption {

8511080 visible = false;

8521081 # To use the value in mergeFn without triggering errors

8531082 default = "_mkMergedOptionModule";

@@ -902,6 +1131,26 @@ rec {

9021131 use = id;

9031132 };

9041133

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+

9051154 doRename = { from, to, visible, warn, use, withPriority ? true }:

9061155 { config, options, ... }:

9071156 let

@@ -931,7 +1180,7 @@ rec {

9311180

9321181 /* Use this function to import a JSON file as NixOS configuration.

9331182

934− importJSON -> path -> attrs

1183+ modules.importJSON :: path -> attrs

9351184 */

9361185 importJSON = file: {

9371186 _file = file;

@@ -940,7 +1189,7 @@ rec {

9401189

9411190 /* Use this function to import a TOML file as NixOS configuration.

9421191

943− importTOML -> path -> attrs

1192+ modules.importTOML :: path -> attrs

9441193 */

9451194 importTOML = file: {

9461195 _file = file;

lib/options.nix+84−19

@@ -11,6 +11,7 @@ let

1111 filter

1212 foldl'

1313 head

14+ tail

1415 isAttrs

1516 isBool

1617 isDerivation

@@ -25,6 +26,7 @@ let

2526 take

2627 ;

2728 inherit (lib.attrsets)

29+ attrByPath

2830 optionalAttrs

2931 ;

3032 inherit (lib.strings)

@@ -53,7 +55,7 @@ rec {

5355

5456 Example:

5557 mkOption { } // => { _type = "option"; }

56− mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }

58+ mkOption { default = "foo"; } // => { _type = "option"; default = "foo"; }

5759 */

5860 mkOption =

5961 {

@@ -73,12 +75,10 @@ rec {

7375 apply ? null,

7476 # Whether the option is for NixOS developers only.

7577 internal ? null,

76− # Whether the option shows up in the manual.

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.

7779 visible ? null,

7880 # Whether the option can be set only once

7981 readOnly ? null,

80− # Deprecated, used by types.optionSet.

81− options ? null

8282 } @ attrs:

8383 attrs // { _type = "option"; };

8484

@@ -98,6 +98,49 @@ 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+

101144 /* This option accepts anything, but it does not produce any result.

102145

103146 This is useful for sharing a module across different module sets

@@ -127,11 +170,13 @@ rec {

127170 else if all isInt list && all (x: x == head list) list then head list

128171 else throw "Cannot merge definitions of `${showOption loc}'. Definition values:${showDefs defs}";

129172

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;

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}";

135180

136181 /* "Merge" option definitions by checking that they all have the same value. */

137182 mergeEqualOption = loc: defs:

@@ -144,7 +189,7 @@ rec {

144189 if def.value != first.value then

145190 throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}"

146191 else

147− first) (head defs) defs).value;

192+ first) (head defs) (tail defs)).value;

148193

149194 /* Extracts values of all "value" keys of the given list.

150195

@@ -176,12 +221,15 @@ rec {

176221 docOption = rec {

177222 loc = opt.loc;

178223 name = showOption opt.loc;

179− description = opt.description or (lib.warn "Option `${name}' has no description." "This option has no description.");

224+ description = opt.description or null;

180225 declarations = filter (x: x != unknownModule) opt.declarations;

181226 internal = opt.internal or false;

182− visible = opt.visible or true;

227+ visible =

228+ if (opt?visible && opt.visible == "shallow")

229+ then true

230+ else opt.visible or true;

183231 readOnly = opt.readOnly or false;

184− type = opt.type.description or null;

232+ type = opt.type.description or "unspecified";

185233 }

186234 // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; }

187235 // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }

@@ -191,8 +239,9 @@ rec {

191239 subOptions =

192240 let ss = opt.type.getSubOptions opt.loc;

193241 in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];

242+ subOptionsVisible = docOption.visible && opt.visible or null != "shallow";

194243 in

195− [ docOption ] ++ optionals docOption.visible subOptions) (collect isOption options);

244+ [ docOption ] ++ optionals subOptionsVisible subOptions) (collect isOption options);

196245

197246

198247 /* This function recursively removes all derivation attributes from

@@ -211,11 +260,25 @@ rec {

211260 else x;

212261

213262

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.

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.

217278 */

218− literalExample = text: { _type = "literalExample"; inherit text; };

279+ literalDocBook = text:

280+ if ! isString text then throw "literalDocBook expects a string."

281+ else { _type = "literalDocBook"; inherit text; };

219282

220283 # Helper functions.

221284

@@ -246,7 +309,9 @@ rec {

246309 showDefs = defs: concatMapStrings (def:

247310 let

248311 # Pretty print the value for display, if successful

249− prettyEval = builtins.tryEval (lib.generators.toPretty {} def.value);

312+ prettyEval = builtins.tryEval

313+ (lib.generators.toPretty { }

314+ (lib.generators.withRecursion { depthLimit = 10; throwOnDepthLimit = false; } def.value));

250315 # Split it into its lines

251316 lines = filter (v: ! isList v) (builtins.split "\n" prettyEval.value);

252317 # Only display the first 5 lines, and indent them for better visibility

lib/sources.nix+170−66

@@ -1,6 +1,7 @@

11# Functions for copying sources to the Nix store.

22{ lib }:

4+# Tested in lib/tests/sources.sh

45let

56 inherit (builtins)

67 hasContext

@@ -11,26 +12,34 @@ let

1112 tryEval

1213 ;

1314 inherit (lib)

15+ boolToString

1416 filter

1517 getAttr

1618 isString

1719 pathExists

1820 readFile

1921 ;

20−in

21−rec {

2222

23− # Returns the type of a path: regular (for file), symlink, or directory

24− pathType = p: getAttr (baseNameOf p) (readDir (dirOf p));

23+ /*

24+ Returns the type of a path: regular (for file), symlink, or directory.

25+ */

26+ pathType = path: getAttr (baseNameOf path) (readDir (dirOf path));

2527

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;

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;

2832

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;

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;

3137

32− # Bring in a path as a source, filtering out all Subversion and CVS

33− # directories, as well as backup files (*~).

38+ /*

39+ A basic filter for `cleanSourceWith` that removes

40+ directories of version control system, backup files (*~)

41+ and some generated files.

42+ */

3443 cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! (

3544 # Filter out version control software files/directories

3645 (baseName == ".git" || type == "directory" && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||

@@ -43,62 +52,89 @@ rec {

4352 lib.hasSuffix ".o" baseName ||

4453 lib.hasSuffix ".so" baseName ||

4554 # Filter out nix-build result symlinks

46− (type == "symlink" && lib.hasPrefix "result" baseName)

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")

4758 );

4859

49− # Filters a source tree removing version control files and directories using cleanSourceWith

50− #

51− # Example:

52− # cleanSource ./.

60+ /*

61+ Filters a source tree removing version control files and directories using cleanSourceFilter.

62+

63+ Example:

64+ cleanSource ./.

65+ */

5366 cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; };

5467

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 }:

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+ }:

86102 let

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';

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;

97108 };

98109

99− # Filter sources by a list of regular expressions.

100− #

101− # E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]`

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+ */

102138 sourceByRegex = src: regexes:

103139 let

104140 isFiltered = src ? _isLibCleanSourceWith;

@@ -110,19 +146,34 @@ rec {

110146 inherit src;

111147 };

112148

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:

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:

117165 let filter = name: type:

118166 let base = baseNameOf (toString name);

119167 in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;

120− in cleanSourceWith { inherit filter; src = path; };

168+ in cleanSourceWith { inherit filter src; };

121169

122170 pathIsGitRepo = path: (tryEval (commitIdFromGitRepo path)).success;

123171

124− # Get the commit id of a git repo

125− # Example: commitIdFromGitRepo <nixpkgs/.git>

172+ /*

173+ Get the commit id of a git repo.

174+

175+ Example: commitIdFromGitRepo <nixpkgs/.git>

176+ */

126177 commitIdFromGitRepo =

127178 let readCommitFromFile = file: path:

128179 let fileName = toString path + "/" + file;

@@ -177,4 +228,57 @@ rec {

177228 pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir);

178229

179230 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+ ;

180284}

lib/strings.nix+212−8

@@ -17,6 +17,7 @@ rec {

1717 head

1818 isInt

1919 isList

20+ isAttrs

2021 isString

2122 match

2223 parseDrvName

@@ -89,13 +90,13 @@ rec {

8990 => "usr/local/bin"

9091 */

9192 concatStringsSep = builtins.concatStringsSep or (separator: list:

92− concatStrings (intersperse separator list));

93+ lib.foldl' (x: y: x + y) "" (intersperse separator list));

9394

9495 /* Maps a function over a list of strings and then concatenates the

9596 result with the specified separator interspersed between

9697 elements.

9798

98− Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string

99+ Type: concatMapStringsSep :: string -> (a -> string) -> [a] -> string

99100

100101 Example:

101102 concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"]

@@ -112,7 +113,7 @@ rec {

112113 /* Same as `concatMapStringsSep`, but the mapping function

113114 additionally receives the position of its argument.

114115

115− Type: concatIMapStringsSep :: string -> (int -> string -> string) -> [string] -> string

116+ Type: concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string

116117

117118 Example:

118119 concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]

@@ -253,10 +254,7 @@ rec {

253254 => false

254255 */

255256 hasInfix = infix: content:

256− let

257− drop = x: substring 1 (stringLength x) x;

258− in hasPrefix infix content

259− || content != "" && hasInfix infix (drop content);

257+ builtins.match ".*${escapeRegex infix}.*" "${content}" != null;

260258

261259 /* Convert a string to a list of characters (i.e. singleton strings).

262260 This allows you to, e.g., map a function over each character. However,

@@ -327,6 +325,65 @@ rec {

327325 */

328326 escapeShellArgs = concatMapStringsSep " " escapeShellArg;

329327

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+

330387 /* Turn a string into a Nix expression representing that string

331388

332389 Type: string -> string

@@ -362,6 +419,19 @@ rec {

362419 if match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null

363420 then s else escapeNixString s;

364421

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+

365435 # Obsolete - use replaceStrings instead.

366436 replaceChars = builtins.replaceStrings or (

367437 del: new: s:

@@ -743,7 +813,14 @@ rec {

743813 sanitizeDerivationName pkgs.hello

744814 => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10"

745815 */

746− sanitizeDerivationName = string: lib.pipe string [

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 [

747824 # Get rid of string context. This is safe under the assumption that the

748825 # resulting string is only used as a derivation name

749826 unsafeDiscardStringContext

@@ -761,4 +838,131 @@ rec {

761838 (x: if stringLength x == 0 then "unknown" else x)

762839 ];

763840

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;

764968}

lib/systems/default.nix+4−1

@@ -8,6 +8,7 @@ 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; };

1112

1213 # Elaborate a `localSystem` or `crossSystem` so that it contains everything

1314 # necessary.

@@ -104,9 +105,11 @@ rec {

104105 else if final.isAarch64 then "arm64"

105106 else if final.isx86_32 then "i386"

106107 else if final.isx86_64 then "x86_64"

107− else if final.isMips then "mips"

108+ else if final.isMips32 then "mips"

109+ else if final.isMips64 then "mips" # linux kernel does not distinguish mips32/mips64

108110 else if final.isPower then "powerpc"

109111 else if final.isRiscV then "riscv"

112+ else if final.isS390 then "s390"

110113 else final.parsed.cpu.name;

111114

112115 qemuArch =

lib/systems/doubles.nix+18−8

@@ -26,20 +26,22 @@ let

2626

2727 # Linux

2828 "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"

29− "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux"

30− "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-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"

3132

3233 # MMIXware

3334 "mmix-mmixware"

3435

3536 # NetBSD

3637 "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd"

37− "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd"

38− "riscv64-netbsd" "x86_64-netbsd"

38+ "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd"

39+ "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd"

3940

4041 # 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"

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"

4345 "x86_64-none"

4446

4547 # OpenBSD

@@ -72,8 +74,12 @@ in {

7274 mips = filterDoubles predicates.isMips;

7375 mmix = filterDoubles predicates.isMmix;

7476 riscv = filterDoubles predicates.isRiscV;

77+ riscv32 = filterDoubles predicates.isRiscV32;

78+ riscv64 = filterDoubles predicates.isRiscV64;

7579 vc4 = filterDoubles predicates.isVc4;

7680 or1k = filterDoubles predicates.isOr1k;

81+ m68k = filterDoubles predicates.isM68k;

82+ s390 = filterDoubles predicates.isS390;

7783 js = filterDoubles predicates.isJavaScript;

7884

7985 bigEndian = filterDoubles predicates.isBigEndian;

@@ -83,7 +89,11 @@ in {

8389 darwin = filterDoubles predicates.isDarwin;

8490 freebsd = filterDoubles predicates.isFreeBSD;

8591 # Should be better, but MinGW is unclear.

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; });

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; });

8797 illumos = filterDoubles predicates.isSunOS;

8898 linux = filterDoubles predicates.isLinux;

8999 netbsd = filterDoubles predicates.isNetBSD;

@@ -96,5 +106,5 @@ in {

96106

97107 embedded = filterDoubles predicates.isNone;

98108

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"];

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"];

100110}

lib/systems/examples.nix+39

@@ -93,6 +93,26 @@ 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+

96116 muslpi = raspberryPi // {

97117 config = "armv6l-unknown-linux-musleabihf";

98118 };

@@ -144,6 +164,18 @@ rec {

144164 libc = "newlib";

145165 };

146166

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+

147179 arm-embedded = {

148180 config = "arm-none-eabi";

149181 libc = "newlib";

@@ -246,6 +278,12 @@ rec {

246278 platform = {};

247279 };

248280

281+ x86_64-darwin = {

282+ config = "x86_64-apple-darwin";

283+ xcodePlatform = "MacOSX";

284+ platform = {};

285+ };

286+

249287 #

250288 # Windows

251289 #

@@ -272,6 +310,7 @@ rec {

272310 libc = "nblibc";

273311 };

274312

313+ # this is broken and never worked fully

275314 x86_64-netbsd-llvm = {

276315 config = "x86_64-unknown-netbsd";

277316 libc = "nblibc";

lib/systems/inspect.nix+11−1

@@ -13,12 +13,19 @@ 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; }; };

1617 isx86 = { cpu = { family = "x86"; }; };

1718 isAarch32 = { cpu = { family = "arm"; bits = 32; }; };

1819 isAarch64 = { cpu = { family = "arm"; bits = 64; }; };

1920 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"; }; };

2025 isMmix = { cpu = { family = "mmix"; }; };

2126 isRiscV = { cpu = { family = "riscv"; }; };

27+ isRiscV32 = { cpu = { family = "riscv"; bits = 32; }; };

28+ isRiscV64 = { cpu = { family = "riscv"; bits = 64; }; };

2229 isSparc = { cpu = { family = "sparc"; }; };

2330 isWasm = { cpu = { family = "wasm"; }; };

2431 isMsp430 = { cpu = { family = "msp430"; }; };

@@ -26,6 +33,8 @@ rec {

2633 isAvr = { cpu = { family = "avr"; }; };

2734 isAlpha = { cpu = { family = "alpha"; }; };

2835 isOr1k = { cpu = { family = "or1k"; }; };

36+ isM68k = { cpu = { family = "m68k"; }; };

37+ isS390 = { cpu = { family = "s390"; }; };

2938 isJavaScript = { cpu = cpuTypes.js; };

3039

3140 is32bit = { cpu = { bits = 32; }; };

@@ -54,7 +63,8 @@ rec {

5463 isNone = { kernel = kernels.none; };

5564

5665 isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];

57− isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];

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 ];

5868 isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];

5969

6070 isEfi = map (family: { cpu.family = family; })

lib/systems/parse.nix+18−5

@@ -95,6 +95,8 @@ rec {

9595

9696 mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; };

9797

98+ m68k = { bits = 32; significantByte = bigEndian; family = "m68k"; };

99+

98100 powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };

99101 powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };

100102 powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };

@@ -103,6 +105,9 @@ rec {

103105 riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };

104106 riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };

105107

108+ s390 = { bits = 32; significantByte = bigEndian; family = "s390"; };

109+ s390x = { bits = 64; significantByte = bigEndian; family = "s390"; };

110+

106111 sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; };

107112 sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; };

108113

@@ -123,9 +128,10 @@ rec {

123128

124129 # GNU build systems assume that older NetBSD architectures are using a.out.

125130 gnuNetBSDDefaultExecFormat = cpu:

126− if (cpu.family == "x86" && cpu.bits == 32) ||

127− (cpu.family == "arm" && cpu.bits == 32) ||

128− (cpu.family == "sparc" && cpu.bits == 32)

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)

129135 then execFormats.aout

130136 else execFormats.elf;

131137

@@ -353,13 +359,20 @@ rec {

353359 ];

354360 };

355361 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"; };

356369

357370 musleabi = { float = "soft"; };

358371 musleabihf = { float = "hard"; };

359372 musl = {};

360373

361− uclibceabihf = { float = "soft"; };

362− uclibceabi = { float = "hard"; };

374+ uclibceabi = { float = "soft"; };

375+ uclibceabihf = { float = "hard"; };

363376 uclibc = {};

364377

365378 unknown = {};

lib/systems/platforms.nix+60−5

@@ -1,3 +1,10 @@

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.

18{ lib }:

29rec {

310 pc = {

@@ -20,15 +27,17 @@ rec {

2027 name = "PowerNV";

2128

2229 baseConfig = "powernv_defconfig";

23− target = "zImage";

24− installTarget = "install";

25− file = "vmlinux";

30+ target = "vmlinux";

2631 autoModules = true;

2732 # avoid driver/FS trouble arising from unusual page size

2833 extraConfig = ''

2934 PPC_64K_PAGES n

3035 PPC_4K_PAGES y

3136 IPV6 y

37+

38+ ATA_BMDMA y

39+ ATA_SFF y

40+ VIRTIO_MENU y

3241 '';

3342 };

3443 };

@@ -233,7 +242,7 @@ rec {

233242 };

234243 };

235244

236− scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform {

245+ scaleway-c1 = armv7l-hf-multiplatform // {

237246 gcc = {

238247 cpu = "cortex-a9";

239248 fpu = "vfpv3";

@@ -315,6 +324,12 @@ rec {

315324 # Disable OABI to have seccomp_filter (required for systemd)

316325 # https://github.com/raspberrypi/firmware/issues/651

317326 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

318333 '';

319334 };

320335 gcc = {

@@ -474,6 +489,43 @@ rec {

474489 };

475490 };

476491

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+

477529 ##

478530 ## Other

479531 ##

@@ -491,6 +543,9 @@ rec {

491543 };

492544 };

493545

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.

494549 select = platform:

495550 # x86

496551 /**/ if platform.isx86 then pc

@@ -513,5 +568,5 @@ rec {

513568

514569 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv

515570

516− else pc;

571+ else { };

517572}

lib/systems/supported.nixnew file+26

@@ -0,0 +1,26 @@

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.nixnew file+8

@@ -0,0 +1,8 @@

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.nixnew file+5

@@ -0,0 +1,5 @@

1+{

2+ outputs = { self }: {

3+ subflakeOutput = 1;

4+ };

5+}

lib/tests/maintainers.nix+6−2

@@ -16,6 +16,10 @@ let

1616 email = lib.mkOption {

1717 type = types.str;

1818 };

19+ matrix = lib.mkOption {

20+ type = types.nullOr types.str;

21+ default = null;

22+ };

1923 github = lib.mkOption {

2024 type = types.nullOr types.str;

2125 default = null;

@@ -61,9 +65,9 @@ let

6165

6266 missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers);

6367

64− success = pkgs.runCommandNoCC "checked-maintainers-success" {} ">$out";

68+ success = pkgs.runCommand "checked-maintainers-success" {} ">$out";

6569

66− failure = pkgs.runCommandNoCC "checked-maintainers-failure" {

70+ failure = pkgs.runCommand "checked-maintainers-failure" {

6771 nativeBuildInputs = [ pkgs.curl pkgs.jq ];

6872 outputHash = "sha256:${lib.fakeSha256}";

6973 outputHAlgo = "sha256";

lib/tests/misc.nix+464−2

@@ -22,6 +22,15 @@ 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+ };

2534

2635# TRIVIAL

2736

@@ -132,6 +141,16 @@ runTests {

132141 expected = [ 1 1 0 ];

133142 };

134143

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+

135154# STRINGS

136155

137156 testConcatMapStrings = {

@@ -236,6 +255,61 @@ runTests {

236255 };

237256 };

238257

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+

239313# LISTS

240314

241315 testFilter = {

@@ -456,6 +530,66 @@ runTests {

456530 '';

457531 };

458532

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+

459593 /* right now only invocation check */

460594 testToJSONSimple =

461595 let val = {

@@ -481,7 +615,7 @@ runTests {

481615

482616 testToPretty =

483617 let

484− deriv = derivation { name = "test"; builder = "/bin/sh"; system = builtins.currentSystem; };

618+ deriv = derivation { name = "test"; builder = "/bin/sh"; system = "aarch64-linux"; };

485619 in {

486620 expr = mapAttrs (const (generators.toPretty { multiline = false; })) rec {

487621 int = 42;

@@ -519,6 +653,25 @@ runTests {

519653 };

520654 };

521655

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+

522675 testToPrettyMultiline = {

523676 expr = mapAttrs (const (generators.toPretty { })) rec {

524677 list = [ 3 4 [ false ] ];

@@ -615,6 +768,11 @@ runTests {

615768 expected = "foo";

616769 };

617770

771+ testSanitizeDerivationNameUnicode = testSanitizeDerivationName {

772+ name = "fö";

773+ expected = "f-";

774+ };

775+

618776 testSanitizeDerivationNameAscii = testSanitizeDerivationName {

619777 name = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";

620778 expected = "-+--.-0123456789-=-?-ABCDEFGHIJKLMNOPQRSTUVWXYZ-_-abcdefghijklmnopqrstuvwxyz-";

@@ -657,7 +815,7 @@ runTests {

657815

658816 locs = filter (o: ! o.internal) (optionAttrSetToDocList options);

659817 in map (o: o.loc) locs;

660− expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];

818+ expected = [ [ "_module" "args" ] [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];

661819 };

662820

663821 testCartesianProductOfEmptySet = {

@@ -727,4 +885,308 @@ runTests {

727885 { a = 3; b = 30; c = 300; }

728886 ];

729887 };

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+ };

7301192}

lib/tests/modules.sh+180−121

@@ -1,8 +1,11 @@

1−#!/bin/sh

1+#!/usr/bin/env bash

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.

6+set -o errexit -o noclobber -o nounset -o pipefail

7+shopt -s failglob inherit_errexit

69# https://stackoverflow.com/a/246128/6605742

710DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

811

@@ -13,101 +16,103 @@ fail=0

1316

1417evalConfig() {

1518 local attr=$1

16− shift;

17− local script="import ./default.nix { modules = [ $@ ];}"

19+ shift

20+ local script="import ./default.nix { modules = [ $* ];}"

1821 nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace --read-write-mode

1922}

2023

2124reportFailure() {

2225 local attr=$1

23− shift;

24− local script="import ./default.nix { modules = [ $@ ];}"

26+ shift

27+ local script="import ./default.nix { modules = [ $* ];}"

2528 echo 2>&1 "$ nix-instantiate -E '$script' -A '$attr' --eval-only"

26− evalConfig "$attr" "$@"

27− fail=$((fail + 1))

29+ evalConfig "$attr" "$@" || true

30+ ((++fail))

2831}

2932

3033checkConfigOutput() {

3134 local outputContains=$1

32− shift;

35+ shift

3336 if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then

34− pass=$((pass + 1))

35− return 0;

37+ ((++pass))

3638 else

3739 echo 2>&1 "error: Expected result matching '$outputContains', while evaluating"

3840 reportFailure "$@"

39− return 1

4041 fi

4142}

4243

4344checkConfigError() {

4445 local errorContains=$1

4546 local err=""

46− shift;

47− if err==$(evalConfig "$@" 2>&1 >/dev/null); then

47+ shift

48+ if err="$(evalConfig "$@" 2>&1 >/dev/null)"; then

4849 echo 2>&1 "error: Expected error code, got exit code 0, while evaluating"

4950 reportFailure "$@"

50− return 1

5151 else

5252 if echo "$err" | grep -zP --silent "$errorContains" ; then

53− pass=$((pass + 1))

54− return 0;

53+ ((++pass))

5554 else

5655 echo 2>&1 "error: Expected error matching '$errorContains', while evaluating"

5756 reportFailure "$@"

58− return 1

5957 fi

6058 fi

6159}

6260

6361# Check boolean option.

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

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

6671

6772# Check integer types.

6873# unsigned

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

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

7176# positive

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

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

7378# between

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

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

7681

7782# Check either types

7883# types.either

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

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

8186# types.oneOf

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

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

8590

8691# Check mkForce without submodules.

8792set -- config.enable ./declare-enable.nix ./define-enable.nix

88−checkConfigOutput "true" "$@"

89−checkConfigOutput "false" "$@" ./define-force-enable.nix

90−checkConfigOutput "false" "$@" ./define-enable-force.nix

93+checkConfigOutput '^true$' "$@"

94+checkConfigOutput '^false$' "$@" ./define-force-enable.nix

95+checkConfigOutput '^false$' "$@" ./define-enable-force.nix

9196

9297# Check mkForce with option and submodules.

9398checkConfigError 'attribute .*foo.* .* not found' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix

94−checkConfigOutput 'false' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix

99+checkConfigOutput '^false$' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix

95100set -- config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo-enable.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

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

101106

102107# Check overriding effect of mkForce on submodule definitions.

103108checkConfigError 'attribute .*bar.* .* not found' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix

104−checkConfigOutput 'false' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar.nix

109+checkConfigOutput '^false$' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar.nix

105110set -- config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar-enable.nix

106−checkConfigOutput 'true' "$@"

111+checkConfigOutput '^true$' "$@"

107112checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-force-attrsOfSub-foo-enable.nix

108113checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-attrsOfSub-force-foo-enable.nix

109−checkConfigOutput 'true' "$@" ./define-attrsOfSub-foo-force-enable.nix

110−checkConfigOutput 'true' "$@" ./define-attrsOfSub-foo-enable-force.nix

114+checkConfigOutput '^true$' "$@" ./define-attrsOfSub-foo-force-enable.nix

115+checkConfigOutput '^true$' "$@" ./define-attrsOfSub-foo-enable-force.nix

111116

112117# Check mkIf with submodules.

113118checkConfigError 'attribute .*foo.* .* not found' config.attrsOfSub.foo.enable ./declare-enable.nix ./declare-attrsOfSub-any-enable.nix

@@ -115,24 +120,24 @@ set -- config.attrsOfSub.foo.enable ./declare-enable.nix ./declare-attrsOfSub-an

115120checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-if-attrsOfSub-foo-enable.nix

116121checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-attrsOfSub-if-foo-enable.nix

117122checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-attrsOfSub-foo-if-enable.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

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

123128

124129# Check disabledModules with config definitions and option declarations.

125130set -- config.enable ./define-enable.nix ./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

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

129134checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix

130135checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix

131136

132137# Check _module.args.

133138set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix

134139checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@"

135−checkConfigOutput "true" "$@" ./define-_module-args-custom.nix

140+checkConfigOutput '^true$' "$@" ./define-_module-args-custom.nix

136141

137142# Check that using _module.args on imports cause infinite recursions, with

138143# the proper error context.

@@ -142,71 +147,78 @@ checkConfigError 'infinite recursion encountered' "$@"

142147

143148# Check _module.check.

144149set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix

145−checkConfigError 'The option .* does not exist. Definition values:\n- In .*' "$@"

146−checkConfigOutput "true" "$@" ./define-module-check.nix

150+checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*' "$@"

151+checkConfigOutput '^true$' "$@" ./define-module-check.nix

147152

148153# Check coerced value.

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

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

152157

153158# Check coerced value with unsound coercion

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

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

157162

158163# Check mkAliasOptionModule.

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

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

163168

164169# submoduleWith

165170

166171## specialArgs should work

167−checkConfigOutput "foo" config.submodule.foo ./declare-submoduleWith-special.nix

172+checkConfigOutput '^"foo"$' config.submodule.foo ./declare-submoduleWith-special.nix

168173

169174## shorthandOnlyDefines config behaves as expected

170−checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix

175+checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix

171176checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.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

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

174179

175180## submoduleWith should merge all modules in one swoop

176−checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules.nix

177−checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix

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

178190# Should also be able to evaluate the type name (which evaluates freeformType,

179191# which evaluates all the modules defined by the type)

180−checkConfigOutput "submodule" options.submodule.type.description ./declare-submoduleWith-modules.nix

192+checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-submodule-via-evalModules.nix

181193

182194## Paths should be allowed as values and work as expected

183−checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix

195+checkConfigOutput '^true$' config.submodule.enable ./declare-submoduleWith-path.nix

184196

185197# Check that disabledModules works recursively and correctly

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}

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}

190202

191203# Check that imports can depend on derivations

192−checkConfigOutput "true" config.enable ./import-from-store.nix

204+checkConfigOutput '^true$' config.enable ./import-from-store.nix

193205

194206# Check that configs can be conditional on option existence

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

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

201213

202214# Check attrsOf and lazyAttrsOf. Only lazyAttrsOf should be lazy, and only

203215# attrsOf should work with conditional definitions

204216# In addition, lazyAttrsOf should honor an options emptyValue

205217checkConfigError "is not lazy" config.isLazy ./declare-attrsOf.nix ./attrsOf-lazy-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

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

210222

211223

212224# Even with multiple assignments, a type error should be thrown if any of them aren't valid

@@ -215,62 +227,109 @@ checkConfigError 'A definition for option .* is not of type .*' \

215227

216228## Freeform modules

217229# Assigning without a declared option should work

218−checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.nix

230+checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix

219231# No freeform assigments shouldn't make it error

220−checkConfigOutput '{ }' config ./freeform-attrsOf.nix

232+checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix

221233# but only if the type matches

222234checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix

223235# and properties should be applied

224−checkConfigOutput yes config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix

236+checkConfigOutput '^"yes"$' config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix

225237# Options should still be declarable, and be able to have a type that doesn't match the freeform type

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

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

228240# and this should work too with nested values

229−checkConfigOutput false config.nest.foo ./freeform-attrsOf.nix ./freeform-nested.nix

230−checkConfigOutput bar config.nest.bar ./freeform-attrsOf.nix ./freeform-nested.nix

241+checkConfigOutput '^false$' config.nest.foo ./freeform-attrsOf.nix ./freeform-nested.nix

242+checkConfigOutput '^"bar"$' config.nest.bar ./freeform-attrsOf.nix ./freeform-nested.nix

231243# Check whether a declared option can depend on an freeform-typed one

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

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

234246# Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf

235247checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix

236248checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix

237−checkConfigOutput 24 config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.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

238255

239256## types.anything

240257# Check that attribute sets are merged recursively

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

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

245262# Attribute sets that are coercible to strings shouldn't be recursed into

246−checkConfigOutput foo config.value.outPath ./types-anything/attrs-coercible.nix

263+checkConfigOutput '^"foo"$' config.value.outPath ./types-anything/attrs-coercible.nix

247264# Multiple lists aren't concatenated together

248265checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix

249266# Check that all equalizable atoms can be used as long as all definitions are equal

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

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

256273# Functions can't be merged together

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

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

259278# Check that all mk* modifiers are applied

260279checkConfigError 'attribute .* not found' config.value.mkiffalse ./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

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

267286

268287## types.functionTo

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

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

274333

275334cat <<EOF

276335====== module tests ======

@@ -278,7 +337,7 @@ $pass Pass

278337$fail Fail

279338EOF

280339

281−if test $fail -ne 0; then

340+if [ "$fail" -ne 0 ]; then

282341 exit 1

283342fi

284343exit 0

lib/tests/modules/adhoc-freeformType-survives-type-merge.nixnew file+14

@@ -0,0 +1,14 @@

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+8−1

@@ -1,6 +1,13 @@

1−{ lib, ... }: {

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+{

28 options.value = lib.mkOption {

39 type = lib.types.attrsOf lib.types.str;

410 default = {};

511 };

12+ options.testing-laziness-so-don't-read-me = lib.mkOption deathtrapArgs;

613}

lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nixnew file+10

@@ -0,0 +1,10 @@

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.nixnew file+10

@@ -0,0 +1,10 @@

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.nixnew file+19

@@ -0,0 +1,19 @@

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.nixnew file+18

@@ -0,0 +1,18 @@

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.nixnew file+12

@@ -0,0 +1,12 @@

1+{ lib, ... }:

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.nixnew file+28

@@ -0,0 +1,28 @@

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.nixnew file+9

@@ -0,0 +1,9 @@

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.nixnew file+4

@@ -0,0 +1,4 @@

1+{

2+ bare-submodule.nested = 42;

3+ bare-submodule.deep = 420;

4+}

lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nixnew file+1

@@ -0,0 +1 @@

1+{ shorthandOnlyDefinesConfig = true; }

lib/tests/modules/define-variant.nixnew file+22

@@ -0,0 +1,22 @@

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.nixnew file+36

@@ -0,0 +1,36 @@

1+{ lib, ... }:

2+let

3+ inherit (lib) types;

4+in {

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.nixnew file+41

@@ -0,0 +1,41 @@

1+{ lib

2+, extendModules

3+, ...

4+}:

5+with lib;

6+{

7+ imports = [

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+8−1

@@ -1,7 +1,14 @@

1−{ lib, ... }: {

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+{

28 options.nest.foo = lib.mkOption {

39 type = lib.types.bool;

410 default = false;

511 };

12+ options.nest.unused = lib.mkOption deathtrapArgs;

613 config.nest.bar = "bar";

714}

lib/tests/modules/freeform-submodules.nixnew file+22

@@ -0,0 +1,22 @@

1+{ lib, options, ... }: with lib.types; {

3+ options.fooDeclarations = lib.mkOption {

4+ default = (options.free.type.getSubOptions [])._freeformOptions.foo.declarations;

5+ };

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.nixnew file+28

@@ -0,0 +1,28 @@

1+{ config, lib, ... }: {

3+ _file = "optionTypeFile.nix";

5+ options.theType = lib.mkOption {

6+ type = lib.types.optionType;

7+ };

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.nixnew file+27

@@ -0,0 +1,27 @@

1+{ config, lib, ... }: {

3+ options.theType = lib.mkOption {

4+ type = lib.types.optionType;

5+ };

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.nixnew file+30

@@ -0,0 +1,30 @@

1+{ lib, ... }: {

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+9−3

@@ -1,16 +1,22 @@

1−{ lib, ... }: {

1+{ lib, config, ... }: {

33 options.value = lib.mkOption {

44 type = lib.types.anything;

55 };

7+ options.applied = lib.mkOption {

8+ default = lib.mapAttrs (name: fun: fun null) config.value;

9+ };

10+

711 config = lib.mkMerge [

812 {

913 value.single-lambda = x: x;

10− value.multiple-lambdas = x: x;

14+ value.multiple-lambdas = x: { inherit x; };

15+ value.merging-lambdas = x: { inherit x; };

1116 }

1217 {

13− value.multiple-lambdas = x: x;

18+ value.multiple-lambdas = x: [ x ];

19+ value.merging-lambdas = y: { inherit y; };

1420 }

1521 ];

1622

lib/tests/release.nix+9−1

@@ -3,7 +3,7 @@

33 pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }

44}:

6−pkgs.runCommandNoCC "nixpkgs-lib-tests" {

6+pkgs.runCommand "nixpkgs-lib-tests" {

77 buildInputs = [

88 pkgs.nix

99 (import ./check-eval.nix)

@@ -23,10 +23,18 @@ pkgs.runCommandNoCC "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+

2630 nix-store --init

2731

2832 cp -r ${../.} lib

33+ echo "Running lib/tests/modules.sh"

2934 bash lib/tests/modules.sh

3035

36+ echo "Running lib/tests/sources.sh"

37+ TEST_LIB=$PWD/lib bash lib/tests/sources.sh

38+

3139 touch $out

3240''

lib/tests/sources.shnew file+61

@@ -0,0 +1,61 @@

1+#!/usr/bin/env bash

2+set -euo pipefail

3+shopt -s inherit_errexit

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+6−3

@@ -17,8 +17,11 @@ 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 [ "mipsel-linux" "mipsel-netbsd" ];

20+ testmips = mseteq mips [ "mips64el-linux" "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" ];

2225 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" ];

2326

2427 testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];

@@ -28,8 +31,8 @@ with lib.systems.doubles; lib.runTests {

2831 testredox = mseteq redox [ "x86_64-redox" ];

2932 testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);

3033 testillumos = mseteq illumos [ "x86_64-solaris" ];

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" ];

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" ];

3336 testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];

3437 testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];

3538 testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);

lib/trivial.nix+128−10

@@ -61,11 +61,11 @@ rec {

6161 pipe = val: functions:

6262 let reverseApply = x: f: f x;

6363 in builtins.foldl' reverseApply val functions;

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− */

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.

6969

7070 ## Named versions corresponding to some builtin operators.

7171

@@ -166,12 +166,36 @@ 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+

169193 /* Returns the current nixpkgs release code name.

170194

171195 On each release the first letter is bumped and a new animal is chosen

172196 starting with that new letter.

173197 */

174− codeName = "Porcupine";

198+ codeName = "Quokka";

175199

176200 /* Returns the current nixpkgs version suffix as string. */

177201 versionSuffix =

@@ -303,12 +327,84 @@ rec {

303327 # TODO: figure out a clever way to integrate location information from

304328 # something like __unsafeGetAttrPos.

305329

306− warn = msg: builtins.trace "[1;31mwarning: ${msg}[0m";

307− warnIf = cond: msg: if cond then warn msg else id;

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)}";

308404

309405 info = msg: builtins.trace "INFO: ${msg}";

310406

311− showWarnings = warnings: res: lib.fold (w: x: warn w x) res warnings;

407+ showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings;

312408

313409 ## Function annotations

314410

@@ -334,7 +430,10 @@ rec {

334430 has the same return type and semantics as builtins.functionArgs.

335431 setFunctionArgs : (a → b) → Map String Bool.

336432 */

337− functionArgs = f: f.__functionArgs or (builtins.functionArgs f);

433+ functionArgs = f:

434+ if f ? __functor

435+ then f.__functionArgs or (lib.functionArgs (f.__functor f))

436+ else builtins.functionArgs f;

338437

339438 /* Check whether something is a function or something

340439 annotated with function args.

@@ -342,6 +441,25 @@ rec {

342441 isFunction = f: builtins.isFunction f ||

343442 (f ? __functor && isFunction (f.__functor f));

344443

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+

345463 /* Convert the given positive integer to a string of its hexadecimal

346464 representation. For example:

347465

lib/types.nix+153−52

@@ -32,7 +32,6 @@ let

3232 last

3333 length

3434 tail

35− unique

3635 ;

3736 inherit (lib.attrsets)

3837 attrNames

@@ -48,6 +47,7 @@ let

4847 mergeDefaultOption

4948 mergeEqualOption

5049 mergeOneOption

50+ mergeUniqueOption

5151 showFiles

5252 showOption

5353 ;

@@ -61,7 +61,11 @@ let

6161 boolToString

6262 ;

6363

64− inherit (lib.modules) mergeDefinitions;

64+ inherit (lib.modules)

65+ mergeDefinitions

66+ fixupOptionType

67+ mergeOptionDecls

68+ ;

6569 outer_types =

6670rec {

6771 isType = type: x: (x._type or "") == type;

@@ -162,6 +166,13 @@ rec {

162166 # nixos/doc/manual/development/option-types.xml!

163167 types = rec {

164168

169+ raw = mkOptionType rec {

170+ name = "raw";

171+ description = "raw value";

172+ check = value: true;

173+ merge = mergeOneOption;

174+ };

175+

165176 anything = mkOptionType {

166177 name = "anything";

167178 description = "anything";

@@ -192,6 +203,12 @@ rec {

192203 else (listOf anything).merge;

193204 # This is the type of packages, only accept a single definition

194205 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);

195212 # Otherwise fall back to only allowing all equal definitions

196213 }.${commonType} or mergeEqualOption;

197214 in mergeFunction loc defs;

@@ -287,6 +304,26 @@ rec {

287304 merge = mergeEqualOption;

288305 };

289306

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+

290327 strMatching = pattern: mkOptionType {

291328 name = "strMatching ${escapeNixString pattern}";

292329 description = "string matching the pattern ${pattern}";

@@ -331,13 +368,21 @@ rec {

331368 emptyValue = { value = {}; };

332369 };

333370

334− # derivation is a reserved keyword.

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.

335378 package = mkOptionType {

336379 name = "package";

337380 check = x: isDerivation x || isStorePath x;

338381 merge = loc: defs:

339382 let res = mergeOneOption loc defs;

340− in if isDerivation res then res else toDerivation res;

383+ in if builtins.isPath res || (builtins.isString res && ! builtins.hasContext res)

384+ then toDerivation res

385+ else res;

341386 };

342387

343388 shellPackage = package // {

@@ -364,7 +409,7 @@ rec {

364409 ).optionalValue

365410 ) def.value

366411 ) defs)));

367− emptyValue = { value = {}; };

412+ emptyValue = { value = []; };

368413 getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);

369414 getSubModules = elemType.getSubModules;

370415 substSubModules = m: listOf (elemType.substSubModules m);

@@ -376,7 +421,7 @@ rec {

376421 let list = addCheck (types.listOf elemType) (l: l != []);

377422 in list // {

378423 description = "non-empty " + list.description;

379− # Note: emptyValue is left as is, because another module may define an element.

424+ emptyValue = { }; # no .value attr, meaning unset

380425 };

381426

382427 attrsOf = elemType: mkOptionType rec {

@@ -444,6 +489,18 @@ rec {

444489 nestedTypes.elemType = elemType;

445490 };

446491

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+

447504 # Null or value of ...

448505 nullOr = elemType: mkOptionType rec {

449506 name = "nullOr";

@@ -465,7 +522,7 @@ rec {

465522

466523 functionTo = elemType: mkOptionType {

467524 name = "functionTo";

468− description = "function that evaluates to a(n) ${elemType.name}";

525+ description = "function that evaluates to a(n) ${elemType.description}";

469526 check = isFunction;

470527 merge = loc: defs:

471528 fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue;

@@ -480,29 +537,84 @@ rec {

480537 modules = toList modules;

481538 };

482539

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+

483567 submoduleWith =

484568 { modules

485569 , specialArgs ? {}

486570 , 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

487576 }@attrs:

488577 let

489578 inherit (lib.modules) evalModules;

490579

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

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)

499592 else value

500593 ) defs;

501594

502− freeformType = (evalModules {

503− inherit modules specialArgs;

504− args.name = "‹name›";

505− })._module.freeformType;

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;

506618

507619 in

508620 mkOptionType rec {

@@ -510,32 +622,14 @@ rec {

510622 description = freeformType.description or name;

511623 check = x: isAttrs x || isFunction x || path.check x;

512624 merge = loc: defs:

513− (evalModules {

514− modules = allModules defs;

515− inherit specialArgs;

516− args.name = last loc;

625+ (base.extendModules {

626+ modules = [ { _module.args.name = last loc; } ] ++ allModules defs;

517627 prefix = loc;

628+ extensionOffset = extensionOffset + length defs;

518629 }).config;

519630 emptyValue = { value = {}; };

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) {

631+ getSubOptions = prefix: (base.extendModules

632+ { inherit prefix; }).options // optionalAttrs (freeformType != null) {

539633 # Expose the sub options of the freeform type. Note that the option

540634 # discovery doesn't care about the attribute name used here, so this

541635 # is just to avoid conflicts with potential options from the submodule

@@ -563,7 +657,11 @@ rec {

563657 then lhs.specialArgs // rhs.specialArgs

564658 else throw "A submoduleWith option is declared multiple times with the same specialArgs \"${toString (attrNames intersecting)}\"";

565659 shorthandOnlyDefinesConfig =

566− if lhs.shorthandOnlyDefinesConfig == rhs.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

567665 then lhs.shorthandOnlyDefinesConfig

568666 else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values";

569667 };

@@ -573,6 +671,7 @@ rec {

573671 # A value from a set of allowed ones.

574672 enum = values:

575673 let

674+ inherit (lib.lists) unique;

576675 show = v:

577676 if builtins.isString v then ''"${v}"''

578677 else if builtins.isInt v then builtins.toString v

@@ -581,7 +680,17 @@ rec {

581680 in

582681 mkOptionType rec {

583682 name = "enum";

584− description = "one of ${concatMapStringsSep ", " show values}";

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}";

585694 check = flip elem values;

586695 merge = mergeEqualOption;

587696 functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); };

@@ -646,14 +755,6 @@ rec {

646755 nestedTypes.finalType = finalType;

647756 };

648757

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− };

657758 # Augment the given type with an additional type check function.

658759 addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };

659760

maintainers/maintainer-list.nix+2833−191

@@ -6,6 +6,7 @@

66 email = "address@example.org";

88 # Optional

9+ matrix = "@user:example.org";

910 github = "GithubUsername";

1011 githubId = your-github-id;

1112 keys = [{

@@ -19,7 +20,8 @@

1920

2021 - `handle` is the handle you are going to use in nixpkgs expressions,

2122 - `name` is your, preferably real, name,

22− - `email` is your maintainer email address, and

23+ - `email` is your maintainer email address,

24+ - `matrix` is your Matrix user ID,

2325 - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),

2426 - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,

2527 - `keys` is a list of your PGP/GPG key IDs and fingerprints.

@@ -56,6 +58,7 @@

5658 };

5759 _0x4A6F = {

5860 email = "mail-maintainer@0x4A6F.dev";

61+ matrix = "@0x4a6f:matrix.org";

5962 name = "Joachim Ernst";

6063 github = "0x4A6F";

6164 githubId = 9675338;

@@ -80,12 +83,24 @@

8083 githubId = 791309;

8184 name = "Jan Hrnko";

8285 };

86+ _1000teslas = {

87+ name = "Kevin Tran";

88+ email = "47207223+1000teslas@users.noreply.github.com";

89+ github = "1000teslas";

90+ githubId = 47207223;

91+ };

8392 _3699n = {

8493 email = "nicholas@nvk.pm";

8594 github = "3699n";

8695 githubId = 7414843;

8796 name = "Nicholas von Klitzing";

8897 };

98+ _13r0ck = {

99+ name = "Brock Szuszczewicz";

100+ email = "bnr@tuta.io";

101+ github = "13r0ck";

102+ githubId = 58987761;

103+ };

89104 _3noch = {

90105 email = "eacameron@gmail.com";

91106 github = "3noch";

@@ -110,18 +125,32 @@

110125 githubId = 241628;

111126 name = "Adam Russell";

112127 };

128+ aadibajpai = {

129+ email = "hello@aadibajpai.com";

130+ github = "aadibajpai";

131+ githubId = 27063113;

132+ name = "Aadi Bajpai";

133+ };

113134 aanderse = {

114135 email = "aaron@fosslib.net";

136+ matrix = "@aanderse:nixos.dev";

115137 github = "aanderse";

116138 githubId = 7755101;

117139 name = "Aaron Andersen";

118140 };

119141 aaronjanse = {

120142 email = "aaron@ajanse.me";

143+ matrix = "@aaronjanse:matrix.org";

121144 github = "aaronjanse";

122145 githubId = 16829510;

123146 name = "Aaron Janse";

124147 };

148+ aaronjheng = {

149+ email = "wentworth@outlook.com";

150+ github = "aaronjheng";

151+ githubId = 806876;

152+ name = "Aaron Jheng";

153+ };

125154 aaronschif = {

126155 email = "aaronschif@gmail.com";

127156 github = "aaronschif";

@@ -148,6 +177,7 @@

148177 };

149178 abbe = {

150179 email = "ashish.is@lostca.se";

180+ matrix = "@abbe:badti.me";

151181 github = "wahjava";

152182 githubId = 2255192;

153183 name = "Ashish SHUKLA";

@@ -236,12 +266,14 @@

236266 };

237267 addict3d = {

238268 email = "nickbathum@gmail.com";

269+ matrix = "@nbathum:matrix.org";

239270 github = "addict3d";

240271 githubId = 49227;

241272 name = "Nick Bathum";

242273 };

243274 adisbladis = {

244275 email = "adisbladis@gmail.com";

276+ matrix = "@adis:blad.is";

245277 github = "adisbladis";

246278 githubId = 63286;

247279 name = "Adam Hose";

@@ -264,6 +296,12 @@

264296 githubId = 1250775;

265297 name = "Adolfo E. García Castro";

266298 };

299+ AdsonCicilioti = {

300+ name = "Adson Cicilioti";

301+ email = "adson.cicilioti@live.com";

302+ github = "AdsonCicilioti";

303+ githubId = 6278398;

304+ };

267305 adsr = {

268306 email = "as@php.net";

269307 github = "adsr";

@@ -337,10 +375,16 @@

337375 name = "AmirHossein Roozbahani";

338376 };

339377 ahuzik = {

340− email = "ales.guzik@gmail.com";

341− github = "alesguzik";

378+ email = "ah1990au@gmail.com";

379+ github = "alesya-h";

342380 githubId = 209175;

343− name = "Ales Huzik";

381+ name = "Alesya Huzik";

382+ };

383+ aidalgol = {

384+ email = "aidalgol+nixpkgs@fastmail.net";

385+ github = "aidalgol";

386+ githubId = 2313201;

387+ name = "Aidan Gauland";

344388 };

345389 aij = {

346390 email = "aij+git@mrph.org";

@@ -348,8 +392,15 @@

348392 githubId = 4732885;

349393 name = "Ivan Jager";

350394 };

395+ airwoodix = {

396+ email = "airwoodix@posteo.me";

397+ github = "airwoodix";

398+ githubId = 44871469;

399+ name = "Etienne Wodey";

400+ };

351401 ajs124 = {

352402 email = "nix@ajs124.de";

403+ matrix = "@andreas.schraegle:helsinki-systems.de";

353404 github = "ajs124";

354405 githubId = 1229027;

355406 name = "Andreas Schrägle";

@@ -390,6 +441,12 @@

390441 githubId = 1318982;

391442 name = "Anders Claesson";

392443 };

444+ akho = {

445+ name = "Alexander Khodyrev";

446+ email = "a@akho.name";

447+ github = "akho";

448+ githubId = 104951;

449+ };

393450 akru = {

394451 email = "mail@akru.me";

395452 github = "akru";

@@ -414,6 +471,12 @@

414471 githubId = 173595;

415472 name = "Caleb Maclennan";

416473 };

474+ ALEX11BR = {

475+ email = "alexioanpopa11@gmail.com";

476+ github = "ALEX11BR";

477+ githubId = 49609151;

478+ name = "Popa Ioan Alexandru";

479+ };

417480 alexarice = {

418481 email = "alexrice999@hotmail.co.uk";

419482 github = "alexarice";

@@ -444,6 +507,12 @@

444507 githubId = 2335822;

445508 name = "Alexandre Esteves";

446509 };

510+ alexnortung = {

511+ name = "alexnortung";

512+ email = "alex_nortung@live.dk";

513+ github = "alexnortung";

514+ githubId = 1552267;

515+ };

447516 alexvorobiev = {

448517 email = "alexander.vorobiev@gmail.com";

449518 github = "alexvorobiev";

@@ -456,9 +525,11 @@

456525 githubId = 38869148;

457526 name = "Alex Eyre";

458527 };

459− algorith = {

460− email = "dries_van_daele@telenet.be";

461− name = "Dries Van Daele";

528+ algram = {

529+ email = "aliasgram@gmail.com";

530+ github = "Algram";

531+ githubId = 5053729;

532+ name = "Alias Gram";

462533 };

463534 alibabzo = {

464535 email = "alistair.bill@gmail.com";

@@ -520,6 +591,16 @@

520591 fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A";

521592 }];

522593 };

594+ alyaeanyx = {

595+ email = "alexandra.hollmeier@mailbox.org";

596+ github = "alyaeanyx";

597+ githubId = 74795488;

598+ name = "Alexandra Hollmeier";

599+ keys = [{

600+ longkeyid = "rsa3072/0x87D1AADCD25B8DEE";

601+ fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE";

602+ }];

603+ };

523604 amanjeev = {

524605 email = "aj@amanjeev.com";

525606 github = "amanjeev";

@@ -532,6 +613,12 @@

532613 githubId = 15623522;

533614 name = "Amar Paul";

534615 };

616+ amarshall = {

617+ email = "andrew@johnandrewmarshall.com";

618+ github = "amarshall";

619+ githubId = 153175;

620+ name = "Andrew Marshall";

621+ };

535622 ambroisie = {

536623 email = "bruno.nixpkgs@belanyi.fr";

537624 github = "ambroisie";

@@ -544,6 +631,22 @@

544631 githubId = 2626481;

545632 name = "Ambroz Bizjak";

546633 };

634+ ametrine = {

635+ name = "Matilde Ametrine";

636+ email = "matilde@diffyq.xyz";

637+ github = "matilde-ametrine";

638+ githubId = 90799677;

639+ keys = [{

640+ longkeyid = "rsa3072/0x07EE1FFCA58A11C5";

641+ fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5";

642+ }];

643+ };

644+ amfl = {

645+ email = "amfl@none.none";

646+ github = "amfl";

647+ githubId = 382798;

648+ name = "amfl";

649+ };

547650 amiddelk = {

548651 email = "amiddelk@gmail.com";

549652 github = "amiddelk";

@@ -578,6 +681,18 @@

578681 githubId = 858965;

579682 name = "Andrew Morsillo";

580683 };

684+ an-empty-string = {

685+ name = "Tris Emmy Wilson";

686+ email = "tris@tris.fyi";

687+ github = "an-empty-string";

688+ githubId = 681716;

689+ };

690+ AnatolyPopov = {

691+ email = "aipopov@live.ru";

692+ github = "AnatolyPopov";

693+ githubId = 2312534;

694+ name = "Anatolii Popov";

695+ };

581696 andehen = {

582697 email = "git@andehen.net";

583698 github = "andehen";

@@ -690,6 +805,18 @@

690805 fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169";

691806 }];

692807 };

808+ anhduy = {

809+ email = "vo@anhduy.io";

810+ github = "voanhduy1512";

811+ githubId = 1771266;

812+ name = "Vo Anh Duy";

813+ };

814+ anirrudh = {

815+ email = "anik597@gmail.com";

816+ github = "anirrudh";

817+ githubId = 6091755;

818+ name = "Anirrudh Krishnan";

819+ };

693820 ankhers = {

694821 email = "me@ankhers.dev";

695822 github = "ankhers";

@@ -714,6 +841,13 @@

714841 githubId = 5327697;

715842 name = "Anatolii Prylutskyi";

716843 };

844+ anselmschueler = {

845+ email = "mail@anselmschueler.com";

846+ github = "schuelermine";

847+ githubId = 48802534;

848+ name = "Anselm Schüler";

849+ matrix = "@schuelermine:matrix.org";

850+ };

717851 antoinerg = {

718852 email = "roygobeil.antoine@gmail.com";

719853 github = "antoinerg";

@@ -790,6 +924,12 @@

790924 githubId = 13426784;

791925 name = "arcnmx";

792926 };

927+ arcticlimer = {

928+ email = "vinigm.nho@gmail.com";

929+ github = "arcticlimer";

930+ githubId = 59743220;

931+ name = "Vinícius Müller";

932+ };

793933 ardumont = {

794934 email = "eniotna.t@gmail.com";

795935 github = "ardumont";

@@ -820,6 +960,18 @@

820960 githubId = 1296771;

821961 name = "Anders Riutta";

822962 };

963+ arjan-s = {

964+ email = "github@anymore.nl";

965+ github = "arjan-s";

966+ githubId = 10400299;

967+ name = "Arjan Schrijver";

968+ };

969+ arkivm = {

970+ email = "vikram186@gmail.com";

971+ github = "arkivm";

972+ githubId = 1118815;

973+ name = "Vikram Narayanan";

974+ };

823975 armijnhemel = {

824976 email = "armijn@tjaldur.nl";

825977 github = "armijnhemel";

@@ -838,6 +990,12 @@

838990 githubId = 59696216;

839991 name = "Arnold Farkas";

840992 };

993+ arnoutkroeze = {

994+ email = "nixpkgs@arnoutkroeze.nl";

995+ github = "arnoutkroeze";

996+ githubId = 37151054;

997+ name = "Arnout Kroeze";

998+ };

841999 arobyn = {

8421000 email = "shados@shados.net";

8431001 github = "shados";

@@ -880,6 +1038,7 @@

8801038 };

8811039 asbachb = {

8821040 email = "asbachb-nixpkgs-5c2a@impl.it";

1041+ matrix = "@asbachb:matrix.org";

8831042 github = "asbachb";

8841043 githubId = 1482768;

8851044 name = "Benjamin Asbach";

@@ -909,8 +1068,8 @@

9091068 name = "Kirill Boltaev";

9101069 };

9111070 ashley = {

912− email = "personavinny@protonmail.com";

913− github = "paranoidcat";

1071+ email = "ashley@kira64.xyz";

1072+ github = "kira64xyz";

9141073 githubId = 84152630;

9151074 name = "Ashley Chiara";

9161075 };

@@ -960,6 +1119,12 @@

9601119 githubId = 55833;

9611120 name = "Troels Henriksen";

9621121 };

1122+ atila = {

1123+ name = "Átila Saraiva";

1124+ email = "atilasaraiva@gmail.com";

1125+ github = "AtilaSaraiva";

1126+ githubId = 29521461;

1127+ };

9631128 atkinschang = {

9641129 email = "atkinschang+nixpkgs@gmail.com";

9651130 github = "AtkinsChang";

@@ -990,6 +1155,12 @@

9901155 githubId = 354741;

9911156 name = "Austin Butler";

9921157 };

1158+ autophagy = {

1159+ email = "mail@autophagy.io";

1160+ github = "autophagy";

1161+ githubId = 12958979;

1162+ name = "Mika Naylor";

1163+ };

9931164 avaq = {

9941165 email = "nixpkgs@account.avaq.it";

9951166 github = "avaq";

@@ -1042,12 +1213,42 @@

10421213 githubId = 135230;

10431214 name = "Aycan iRiCAN";

10441215 };

1216+ arjix = {

1217+ email = "arjix@protonmail.com";

1218+ github = "arjix";

1219+ githubId = 62168569;

1220+ name = "arjix";

1221+ };

10451222 artturin = {

10461223 email = "artturin@artturin.com";

1224+ matrix = "@artturin:matrix.org";

10471225 github = "artturin";

10481226 githubId = 56650223;

10491227 name = "Artturi N";

10501228 };

1229+ azahi = {

1230+ name = "Azat Bahawi";

1231+ email = "azat@bahawi.net";

1232+ matrix = "@azahi:azahi.cc";

1233+ github = "azahi";

1234+ githubId = 22211000;

1235+ keys = [{

1236+ longkeyid = "rsa4096/0xC8C6BDDB3847F72B";

1237+ fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B";

1238+ }];

1239+ };

1240+ ayazhafiz = {

1241+ email = "ayaz.hafiz.1@gmail.com";

1242+ github = "ayazhafiz";

1243+ githubId = 262763;

1244+ name = "Ayaz Hafiz";

1245+ };

1246+ azuwis = {

1247+ email = "azuwis@gmail.com";

1248+ github = "azuwis";

1249+ githubId = 9315;

1250+ name = "Zhong Jianxin";

1251+ };

10511252 b4dm4n = {

10521253 email = "fabianm88@gmail.com";

10531254 github = "B4dM4n";

@@ -1062,7 +1263,11 @@

10621263 email = "babathriviere@gmail.com";

10631264 github = "babariviere";

10641265 githubId = 12128029;

1065− name = "babariviere";

1266+ name = "Bastien Rivière";

1267+ keys = [{

1268+ longkeyid = "rsa4096/0xF202AD3B6EDF4BD1";

1269+ fingerprint = "2F85 B362 B274 0012 37E2 81EE F202 AD3B 6EDF 4BD1";

1270+ }];

10661271 };

10671272 babbaj = {

10681273 name = "babbaj";

@@ -1076,6 +1281,7 @@

10761281 };

10771282 bachp = {

10781283 email = "pascal.bach@nextrem.ch";

1284+ matrix = "@bachp:matrix.org";

10791285 github = "bachp";

10801286 githubId = 333807;

10811287 name = "Pascal Bach";

@@ -1096,6 +1302,12 @@

10961302 email = "sivaraman.balaji@gmail.com";

10971303 name = "Balaji Sivaraman";

10981304 };

1305+ balodja = {

1306+ email = "balodja@gmail.com";

1307+ github = "balodja";

1308+ githubId = 294444;

1309+ name = "Vladimir Korolev";

1310+ };

10991311 baloo = {

11001312 email = "nixpkgs@superbaloo.net";

11011313 github = "baloo";

@@ -1120,12 +1332,24 @@

11201332 githubId = 127523;

11211333 name = "Herman Fries";

11221334 };

1335+ BarinovMaxim = {

1336+ name = "Barinov Maxim";

1337+ email = "barinov274@gmail.com";

1338+ github = "barinov274";

1339+ githubId = 54442153;

1340+ };

11231341 barrucadu = {

11241342 email = "mike@barrucadu.co.uk";

11251343 github = "barrucadu";

11261344 githubId = 75235;

11271345 name = "Michael Walker";

11281346 };

1347+ bartsch = {

1348+ email = "consume.noise@gmail.com";

1349+ github = "bartsch";

1350+ githubId = 3390885;

1351+ name = "Daniel Martin";

1352+ };

11291353 bartuka = {

11301354 email = "wand@hey.com";

11311355 github = "wandersoncferreira";

@@ -1150,6 +1374,7 @@

11501374 };

11511375 bb010g = {

11521376 email = "me@bb010g.com";

1377+ matrix = "@bb010g:matrix.org";

11531378 github = "bb010g";

11541379 githubId = 340132;

11551380 name = "Brayden Banks";

@@ -1184,6 +1409,12 @@

11841409 githubId = 164148;

11851410 name = "Ben Darwin";

11861411 };

1412+ bdd = {

1413+ email = "bdd@mindcast.org";

1414+ github = "bdd";

1415+ githubId = 11135;

1416+ name = "Berk D. Demir";

1417+ };

11871418 bdesham = {

11881419 email = "benjamin@esham.io";

11891420 github = "bdesham";

@@ -1202,8 +1433,15 @@

12021433 github = "beardhatcode";

12031434 githubId = 662538;

12041435 };

1436+ beezow = {

1437+ name = "beezow";

1438+ email = "zbeezow@gmail.com";

1439+ github = "beezow";

1440+ githubId = 42082156;

1441+ };

12051442 bendlas = {

12061443 email = "herwig@bendlas.net";

1444+ matrix = "@bendlas:matrix.org";

12071445 github = "bendlas";

12081446 githubId = 214787;

12091447 name = "Herwig Hochleitner";

@@ -1220,6 +1458,16 @@

12201458 github = "benneti";

12211459 githubId = 11725645;

12221460 };

1461+ bertof = {

1462+ name = "Filippo Berto";

1463+ email = "berto.f@protonmail.com";

1464+ github = "bertof";

1465+ githubId = 9915675;

1466+ keys = [{

1467+ longkeyid = "rsa4096/0xFE98AE5EC52B1056";

1468+ fingerprint = "17C5 1EF9 C0FE 2EB2 FE56 BB53 FE98 AE5E C52B 1056";

1469+ }];

1470+ };

12231471 bennofs = {

12241472 email = "benno.fuenfstueck@gmail.com";

12251473 github = "bennofs";

@@ -1240,6 +1488,7 @@

12401488 };

12411489 berberman = {

12421490 email = "berberman@yandex.com";

1491+ matrix = "@berberman:mozilla.org";

12431492 github = "berberman";

12441493 githubId = 26041945;

12451494 name = "Potato Hatsue";

@@ -1262,12 +1511,24 @@

12621511 githubId = 251106;

12631512 name = "Daniel Bergey";

12641513 };

1514+ bergkvist = {

1515+ email = "tobias@bergkv.ist";

1516+ github = "bergkvist";

1517+ githubId = 410028;

1518+ name = "Tobias Bergkvist";

1519+ };

12651520 betaboon = {

12661521 email = "betaboon@0x80.ninja";

12671522 github = "betaboon";

12681523 githubId = 7346933;

12691524 name = "betaboon";

12701525 };

1526+ bew = {

1527+ email = "benoit.dechezelles@gmail.com";

1528+ github = "bew";

1529+ githubId = 9730330;

1530+ name = "Benoit de Chezelles";

1531+ };

12711532 bfortz = {

12721533 email = "bernard.fortz@gmail.com";

12731534 github = "bfortz";

@@ -1298,6 +1559,12 @@

12981559 githubId = 28444296;

12991560 name = "Benjamin Hougland";

13001561 };

1562+ billewanick = {

1563+ email = "bill@ewanick.com";

1564+ github = "billewanick";

1565+ githubId = 13324165;

1566+ name = "Bill Ewanick";

1567+ };

13011568 binarin = {

13021569 email = "binarin@binarin.ru";

13031570 github = "binarin";

@@ -1334,6 +1601,7 @@

13341601 };

13351602 blitz = {

13361603 email = "js@alien8.de";

1604+ matrix = "@js:ukvly.org";

13371605 github = "blitz";

13381606 githubId = 37907;

13391607 name = "Julian Stecklina";

@@ -1368,6 +1636,13 @@

13681636 githubId = 10221570;

13691637 name = "Bo Bakker";

13701638 };

1639+ bobby285271 = {

1640+ name = "Bobby Rong";

1641+ email = "rjl931189261@126.com";

1642+ matrix = "@bobby285271:matrix.org";

1643+ github = "bobby285271";

1644+ githubId = 20080233;

1645+ };

13711646 bobvanderlinden = {

13721647 email = "bobvanderlinden@gmail.com";

13731648 github = "bobvanderlinden";

@@ -1398,6 +1673,16 @@

13981673 githubId = 87764;

13991674 name = "Ben Ford";

14001675 };

1676+ boppyt = {

1677+ email = "boppy@nwcpz.com";

1678+ github = "boppyt";

1679+ githubId = 71049646;

1680+ name = "Zack A";

1681+ keys = [{

1682+ longkeyid = "rsa4096/0x6310C97DE31D1545";

1683+ fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545";

1684+ }];

1685+ };

14011686 borisbabic = {

14021687 email = "boris.ivan.babic@gmail.com";

14031688 github = "borisbabic";

@@ -1452,11 +1737,11 @@

14521737 githubId = 355401;

14531738 name = "Brian Hicks";

14541739 };

1455− bricewge = {

1456− email = "bricewge@gmail.com";

1457− github = "bricewge";

1458− githubId = 5525646;

1459− name = "Brice Waegeneire";

1740+ brianmcgee = {

1741+ name = "Brian McGee";

1742+ email = "brian@41north.dev";

1743+ github = "brianmcgee";

1744+ githubId = 1173648;

14601745 };

14611746 Br1ght0ne = {

14621747 email = "brightone@protonmail.com";

@@ -1486,6 +1771,12 @@

14861771 githubId = 1111035;

14871772 name = "Break Yang";

14881773 };

1774+ brecht = {

1775+ email = "brecht.savelkoul@alumni.lse.ac.uk";

1776+ github = "brechtcs";

1777+ githubId = 6107054;

1778+ name = "Brecht Savelkoul";

1779+ };

14891780 brettlyons = {

14901781 email = "blyons@fastmail.com";

14911782 github = "brettlyons";

@@ -1502,8 +1793,15 @@

15021793 fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E";

15031794 }];

15041795 };

1796+ broke = {

1797+ email = "broke@in-fucking.space";

1798+ github = "broke";

1799+ githubId = 1071610;

1800+ name = "Gunnar Nitsche";

1801+ };

15051802 bryanasdev000 = {

15061803 email = "bryanasdev000@gmail.com";

1804+ matrix = "@bryanasdev000:matrix.org";

15071805 github = "bryanasdev000";

15081806 githubId = 53131727;

15091807 name = "Bryan Albuquerque";

@@ -1516,6 +1814,7 @@

15161814 };

15171815 buckley310 = {

15181816 email = "sean.bck@gmail.com";

1817+ matrix = "@buckley310:matrix.org";

15191818 github = "buckley310";

15201819 githubId = 2379774;

15211820 name = "Sean Buckley";

@@ -1532,6 +1831,12 @@

15321831 githubId = 7214361;

15331832 name = "Roman Gerasimenko";

15341833 };

1834+ builditluc = {

1835+ email = "builditluc@icloud.com";

1836+ github = "builditluc";

1837+ githubId = 37375448;

1838+ name = "Buildit";

1839+ };

15351840 bburdette = {

15361841 email = "bburdette@protonmail.com";

15371842 github = "bburdette";

@@ -1609,6 +1914,12 @@

16091914 githubId = 7435854;

16101915 name = "Victor Calvert";

16111916 };

1917+ cameronnemo = {

1918+ email = "cnemo@tutanota.com";

1919+ github = "cameronnemo";

1920+ githubId = 3212452;

1921+ name = "Cameron Nemo";

1922+ };

16121923 campadrenalin = {

16131924 email = "campadrenalin@gmail.com";

16141925 github = "campadrenalin";

@@ -1645,6 +1956,12 @@

16451956 githubId = 82591;

16461957 name = "Carl Sverre";

16471958 };

1959+ carpinchomug = {

1960+ email = "aki.suda@protonmail.com";

1961+ github = "carpinchomug";

1962+ githubId = 101536256;

1963+ name = "Akiyoshi Suda";

1964+ };

16481965 cartr = {

16491966 email = "carter.sande@duodecima.technology";

16501967 github = "cartr";

@@ -1669,14 +1986,32 @@

16691986 githubId = 495429;

16701987 name = "Claas Augner";

16711988 };

1989+ cawilliamson = {

1990+ email = "home@chrisaw.com";

1991+ github = "cawilliamson";

1992+ githubId = 1141769;

1993+ matrix = "@cawilliamson:nixos.dev";

1994+ name = "Christopher A. Williamson";

1995+ };

16721996 cbley = {

16731997 email = "claudio.bley@gmail.com";

16741998 github = "avdv";

16751999 githubId = 3471749;

16762000 name = "Claudio Bley";

16772001 };

2002+ cburstedde = {

2003+ email = "burstedde@ins.uni-bonn.de";

2004+ github = "cburstedde";

2005+ githubId = 109908;

2006+ name = "Carsten Burstedde";

2007+ keys = [{

2008+ longkeyid = "rsa2048/0x0704CD9E550A6BCD";

2009+ fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD";

2010+ }];

2011+ };

16782012 cdepillabout = {

16792013 email = "cdep.illabout@gmail.com";

2014+ matrix = "@cdepillabout:matrix.org";

16802015 github = "cdepillabout";

16812016 githubId = 64804;

16822017 name = "Dennis Gosnell";

@@ -1693,6 +2028,18 @@

16932028 githubId = 977929;

16942029 name = "Cody Allen";

16952030 };

2031+ centromere = {

2032+ email = "nix@centromere.net";

2033+ github = "centromere";

2034+ githubId = 543423;

2035+ name = "Alex Wied";

2036+ };

2037+ cfhammill = {

2038+ email = "cfhammill@gmail.com";

2039+ github = "cfhammill";

2040+ githubId = 7467038;

2041+ name = "Chris Hammill";

2042+ };

16962043 cfouche = {

16972044 email = "chaddai.fouche@gmail.com";

16982045 github = "Chaddai";

@@ -1733,6 +2080,18 @@

17332080 githubId = 1762540;

17342081 name = "Changlin Li";

17352082 };

2083+ chanley = {

2084+ email = "charlieshanley@gmail.com";

2085+ github = "charlieshanley";

2086+ githubId = 8228888;

2087+ name = "Charlie Hanley";

2088+ };

2089+ charlesbaynham = {

2090+ email = "charlesbaynham@gmail.com";

2091+ github = "charlesbaynham";

2092+ githubId = 4397637;

2093+ name = "Charles Baynham";

2094+ };

17362095 CharlesHD = {

17372096 email = "charleshdespointes@gmail.com";

17382097 github = "CharlesHD";

@@ -1749,6 +2108,12 @@

17492108 email = "me@philscotted.com";

17502109 name = "Phil Scott";

17512110 };

2111+ chekoopa = {

2112+ email = "chekoopa@mail.ru";

2113+ github = "chekoopa";

2114+ githubId = 1689801;

2115+ name = "Mikhail Chekan";

2116+ };

17522117 ChengCat = {

17532118 email = "yu@cheng.cat";

17542119 github = "ChengCat";

@@ -1767,12 +2132,6 @@

17672132 githubId = 18648043;

17682133 name = "Daniel Cartwright";

17692134 };

1770− chiiruno = {

1771− email = "okinan@protonmail.com";

1772− github = "chiiruno";

1773− githubId = 30435868;

1774− name = "Okina Matara";

1775− };

17762135 Chili-Man = {

17772136 email = "dr.elhombrechile@gmail.com";

17782137 name = "Diego Rodriguez";

@@ -1789,6 +2148,12 @@

17892148 githubId = 3086255;

17902149 name = "Barry Moore II";

17912150 };

2151+ chisui = {

2152+ email = "chisui.pd@gmail.com";

2153+ github = "chisui";

2154+ githubId = 4526429;

2155+ name = "Philipp Dargel";

2156+ };

17922157 chivay = {

17932158 email = "hubert.jasudowicz@gmail.com";

17942159 github = "chivay";

@@ -1825,18 +2190,18 @@

18252190 githubId = 399718;

18262191 name = "Chris Martin";

18272192 };

1828− chrisaw = {

1829− email = "home@chrisaw.com";

1830− github = "cawilliamson";

1831− githubId = 1141769;

1832− name = "Christopher A. Williamson";

1833− };

18342193 chrisjefferson = {

18352194 email = "chris@bubblescope.net";

18362195 github = "chrisjefferson";

18372196 githubId = 811527;

18382197 name = "Christopher Jefferson";

18392198 };

2199+ chrispickard = {

2200+ email = "chrispickard9@gmail.com";

2201+ github = "chrispickard";

2202+ githubId = 1438690;

2203+ name = "Chris Pickard";

2204+ };

18402205 chrisrosset = {

18412206 email = "chris@rosset.org.uk";

18422207 github = "chrisrosset";

@@ -1865,30 +2230,81 @@

18652230 githubId = 12386805;

18662231 name = "Chua Hou";

18672232 };

2233+ chuangzhu = {

2234+ name = "Chuang Zhu";

2235+ email = "chuang@melty.land";

2236+ matrix = "@chuangzhu:matrix.org";

2237+ github = "chuangzhu";

2238+ githubId = 31200881;

2239+ keys = [{

2240+ longkeyid = "rsa4096/E838CED81CFFD3F9";

2241+ fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9";

2242+ }];

2243+ };

18682244 chvp = {

18692245 email = "nixpkgs@cvpetegem.be";

2246+ matrix = "@charlotte:vanpetegem.me";

18702247 github = "chvp";

18712248 githubId = 42220376;

18722249 name = "Charlotte Van Petegem";

18732250 };

2251+ cigrainger = {

2252+ name = "Christopher Grainger";

2253+ email = "chris@amplified.ai";

2254+ github = "cigrainger";

2255+ githubId = 3984794;

2256+ };

18742257 ciil = {

18752258 email = "simon@lackerbauer.com";

18762259 github = "ciil";

18772260 githubId = 3956062;

18782261 name = "Simon Lackerbauer";

18792262 };

2263+ cirno-999 = {

2264+ email = "reverene@protonmail.com";

2265+ github = "cirno-999";

2266+ githubId = 73712874;

2267+ name = "cirno-999";

2268+ };

2269+ citadelcore = {

2270+ email = "alex@arctarus.co.uk";

2271+ github = "citadelcore";

2272+ githubId = 5567402;

2273+ name = "Alex Zero";

2274+ keys = [{

2275+ longkeyid = "rsa4096/0xA51550EDB450302C";

2276+ fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C";

2277+ }];

2278+ };

18802279 cizra = {

18812280 email = "todurov+nix@gmail.com";

18822281 github = "cizra";

18832282 githubId = 2131991;

18842283 name = "Elmo Todurov";

18852284 };

2285+ cjab = {

2286+ email = "chad+nixpkgs@jablonski.xyz";

2287+ github = "cjab";

2288+ githubId = 136485;

2289+ name = "Chad Jablonski";

2290+ };

18862291 ck3d = {

18872292 email = "ck3d@gmx.de";

18882293 github = "ck3d";

18892294 githubId = 25088352;

18902295 name = "Christian Kögler";

18912296 };

2297+ ckie = {

2298+ email = "nixpkgs-0efe364@ckie.dev";

2299+ github = "ckiee";

2300+ githubId = 25263210;

2301+ keys = [{

2302+ longkeyid = "rsa4096/0x13E79449C0525215";

2303+ fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215";

2304+ }];

2305+ name = "ckie";

2306+ matrix = "@ckie:ckie.dev";

2307+ };

18922308 clkamp = {

18932309 email = "c@lkamp.de";

18942310 github = "clkamp";

@@ -1913,8 +2329,15 @@

19132329 githubId = 199180;

19142330 name = "Claes Wallin";

19152331 };

2332+ cleeyv = {

2333+ email = "cleeyv@riseup.net";

2334+ github = "cleeyv";

2335+ githubId = 71959829;

2336+ name = "Cleeyv";

2337+ };

19162338 cleverca22 = {

19172339 email = "cleverca22@gmail.com";

2340+ matrix = "@cleverca22:matrix.org";

19182341 github = "cleverca22";

19192342 githubId = 848609;

19202343 name = "Michael Bishop";

@@ -1959,6 +2382,12 @@

19592382 githubId = 34317;

19602383 name = "Corey O'Connor";

19612384 };

2385+ CodeLongAndProsper90 = {

2386+ github = "CodeLongAndProsper90";

2387+ githubId = 50145141;

2388+ email = "jupiter@m.rdis.dev";

2389+ name = "Scott Little";

2390+ };

19622391 codsl = {

19632392 email = "codsl@riseup.net";

19642393 github = "codsl";

@@ -1971,6 +2400,13 @@

19712400 githubId = 5561189;

19722401 name = "Cody Opel";

19732402 };

2403+ Cogitri = {

2404+ email = "oss@cogitri.dev";

2405+ github = "Cogitri";

2406+ githubId = 8766773;

2407+ matrix = "@cogitri:cogitri.dev";

2408+ name = "Rasmus Thomsen";

2409+ };

19742410 cohei = {

19752411 email = "a.d.xvii.kal.mai@gmail.com";

19762412 github = "cohei";

@@ -1985,6 +2421,7 @@

19852421 };

19862422 colemickens = {

19872423 email = "cole.mickens@gmail.com";

2424+ matrix = "@colemickens:matrix.org";

19882425 github = "colemickens";

19892426 githubId = 327028;

19902427 name = "Cole Mickens";

@@ -1998,6 +2435,7 @@

19982435 cole-h = {

19992436 name = "Cole Helbling";

20002437 email = "cole.e.helbling@outlook.com";

2438+ matrix = "@cole-h:matrix.org";

20012439 github = "cole-h";

20022440 githubId = 28582702;

20032441 keys = [{

@@ -2041,6 +2479,13 @@

20412479 githubId = 11145016;

20422480 name = "J.C.";

20432481 };

2482+ congee = {

2483+ email = "changshengwu@pm.me";

2484+ matrix = "@congeec:matrix.org";

2485+ github = "congee";

2486+ name = "Changsheng Wu";

2487+ githubId = 2083950;

2488+ };

20442489 contrun = {

20452490 email = "uuuuuu@protonmail.com";

20462491 github = "contrun";

@@ -2053,6 +2498,23 @@

20532498 githubId = 5510514;

20542499 name = "Conrad Mearns";

20552500 };

2501+ corbanr = {

2502+ email = "corban@raunco.co";

2503+ github = "CorbanR";

2504+ githubId = 1918683;

2505+ matrix = "@corbansolo:matrix.org";

2506+ name = "Corban Raun";

2507+ keys = [

2508+ {

2509+ longkeyid = "rsa4096/0xA697A56F1F151189";

2510+ fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189";

2511+ }

2512+ {

2513+ longkeyid = "ed25519/0x230F4AC153F90F29";

2514+ fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29";

2515+ }

2516+ ];

2517+ };

20562518 couchemar = {

20572519 email = "couchemar@yandex.ru";

20582520 github = "couchemar";

@@ -2093,6 +2555,12 @@

20932555 githubId = 12202789;

20942556 name = "CrazedProgrammer";

20952557 };

2558+ creator54 = {

2559+ email = "hi.creator54@gmail.com";

2560+ github = "creator54";

2561+ githubId = 34543609;

2562+ name = "creator54";

2563+ };

20962564 cript0nauta = {

20972565 email = "shareman1204@gmail.com";

20982566 github = "cript0nauta";

@@ -2101,6 +2569,7 @@

21012569 };

21022570 CRTified = {

21032571 email = "carl.schneider+nixos@rub.de";

2572+ matrix = "@schnecfk:ruhr-uni-bochum.de";

21042573 github = "CRTified";

21052574 githubId = 2440581;

21062575 name = "Carl Richard Theodor Schneider";

@@ -2155,6 +2624,12 @@

21552624 githubId = 1382175;

21562625 name = "Oliver Matthews";

21572626 };

2627+ cyounkins = {

2628+ name = "Craig Younkins";

2629+ email = "cyounkins@gmail.com";

2630+ github = "cyounkins";

2631+ githubId = 346185;

2632+ };

21582633 cypherpunk2140 = {

21592634 email = "stefan.mihaila@pm.me";

21602635 github = "stefan-mihaila";

@@ -2173,6 +2648,7 @@

21732648 };

21742649 cyplo = {

21752650 email = "nixos@cyplo.dev";

2651+ matrix = "@cyplo:cyplo.dev";

21762652 github = "cyplo";

21772653 githubId = 217899;

21782654 name = "Cyryl Płotnicki";

@@ -2187,6 +2663,12 @@

21872663 fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";

21882664 }];

21892665 };

2666+ d-xo = {

2667+ email = "hi@d-xo.org";

2668+ github = "d-xo";

2669+ githubId = 6689924;

2670+ name = "David Terry";

2671+ };

21902672 dadada = {

21912673 name = "dadada";

21922674 email = "dadada@dadada.li";

@@ -2203,6 +2685,12 @@

22032685 githubId = 4331004;

22042686 name = "Naoya Hatta";

22052687 };

2688+ dalpd = {

2689+ email = "denizalpd@ogr.iu.edu.tr";

2690+ github = "dalpd";

2691+ githubId = 16895361;

2692+ name = "Deniz Alp Durmaz";

2693+ };

22062694 DamienCassou = {

22072695 email = "damien@cassou.me";

22082696 github = "DamienCassou";

@@ -2229,6 +2717,7 @@

22292717 };

22302718 dandellion = {

22312719 email = "daniel@dodsorf.as";

2720+ matrix = "@dandellion:dodsorf.as";

22322721 github = "dali99";

22332722 githubId = 990767;

22342723 name = "Daniel Olsen";

@@ -2263,6 +2752,30 @@

22632752 githubId = 1298344;

22642753 name = "Daniel Fullmer";

22652754 };

2755+ danth = {

2756+ name = "Daniel Thwaites";

2757+ email = "danthwaites30@btinternet.com";

2758+ matrix = "@danth:matrix.org";

2759+ github = "danth";

2760+ githubId = 28959268;

2761+ keys = [{

2762+ longkeyid = "rsa3072/0xD8AFC4BF05670F9D";

2763+ fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D";

2764+ }];

2765+ };

2766+ dan4ik605743 = {

2767+ email = "6057430gu@gmail.com";

2768+ github = "dan4ik605743";

2769+ githubId = 86075850;

2770+ name = "Danil Danevich";

2771+ };

2772+ darkonion0 = {

2773+ name = "Alexandre Peruggia";

2774+ email = "darkgenius1@protonmail.com";

2775+ matrix = "@alexoo:matrix.org";

2776+ github = "DarkOnion0";

2777+ githubId = 68606322;

2778+ };

22662779 das-g = {

22672780 email = "nixpkgs@raphael.dasgupta.ch";

22682781 github = "das-g";

@@ -2271,6 +2784,7 @@

22712784 };

22722785 das_j = {

22732786 email = "janne@hess.ooo";

2787+ matrix = "@janne.hess:helsinki-systems.de";

22742788 github = "dasJ";

22752789 githubId = 4971975;

22762790 name = "Janne Heß";

@@ -2295,6 +2809,12 @@

22952809 email = "christoph.senjak@googlemail.com";

22962810 name = "Christoph-Simon Senjak";

22972811 };

2812+ datafoo = {

2813+ email = "34766150+datafoo@users.noreply.github.com";

2814+ github = "datafoo";

2815+ githubId = 34766150;

2816+ name = "datafoo";

2817+ };

22982818 davhau = {

22992819 email = "d.hauer.it@gmail.com";

23002820 name = "David Hauer";

@@ -2315,10 +2835,17 @@

23152835 };

23162836 davidak = {

23172837 email = "post@davidak.de";

2838+ matrix = "@davidak:matrix.org";

23182839 github = "davidak";

23192840 githubId = 91113;

23202841 name = "David Kleuker";

23212842 };

2843+ davidarmstronglewis = {

2844+ email = "davidlewis@mac.com";

2845+ github = "davidarmstronglewis";

2846+ githubId = 6754950;

2847+ name = "David Armstrong Lewis";

2848+ };

23222849 davidrusu = {

23232850 email = "davidrusu.me@gmail.com";

23242851 github = "davidrusu";

@@ -2347,6 +2874,12 @@

23472874 githubId = 49904992;

23482875 name = "Dawid Sowa";

23492876 };

2877+ dbeckwith = {

2878+ email = "djbsnx@gmail.com";

2879+ github = "dbeckwith";

2880+ githubId = 1279939;

2881+ name = "Daniel Beckwith";

2882+ };

23502883 dbirks = {

23512884 email = "david@birks.dev";

23522885 github = "dbirks";

@@ -2381,12 +2914,28 @@

23812914 githubId = 75067;

23822915 name = "Daniel Duan";

23832916 };

2917+ dearrude = {

2918+ name = "Ebrahim Nejati";

2919+ email = "dearrude@tfwno.gf";

2920+ github = "dearrude";

2921+ githubId = 30749142;

2922+ keys = [{

2923+ longkeyid = "rsa4096/19151E03BF2CF012";

2924+ fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000";

2925+ }];

2926+ };

23842927 deepfire = {

23852928 email = "_deepfire@feelingofgreen.ru";

23862929 github = "deepfire";

23872930 githubId = 452652;

23882931 name = "Kosyrev Serge";

23892932 };

2933+ DeeUnderscore = {

2934+ email = "d.anzorge@gmail.com";

2935+ github = "DeeUnderscore";

2936+ githubId = 156239;

2937+ name = "D Anzorge";

2938+ };

23902939 delan = {

23912940 name = "Delan Azabani";

23922941 email = "delan@azabani.com";

@@ -2405,6 +2954,16 @@

24052954 githubId = 202798;

24062955 name = "Pierre Bourdon";

24072956 };

2957+ delta = {

2958+ email = "d4delta@outlook.fr";

2959+ name = "Delta";

2960+ };

2961+ deltadelta = {

2962+ email = "contact@libellules.eu";

2963+ name = "Dara Ly";

2964+ github = "tournemire";

2965+ githubId = 20159432;

2966+ };

24082967 deltaevo = {

24092968 email = "deltaduartedavid@gmail.com";

24102969 github = "DeltaEvo";

@@ -2435,12 +2994,24 @@

24352994 githubId = 706758;

24362995 name = "Christian Gerbrandt";

24372996 };

2997+ derekcollison = {

2998+ email = "derek@nats.io";

2999+ github = "derekcollison";

3000+ githubId = 90097;

3001+ name = "Derek Collison";

3002+ };

24383003 DerGuteMoritz = {

24393004 email = "moritz@twoticketsplease.de";

24403005 github = "DerGuteMoritz";

24413006 githubId = 19733;

24423007 name = "Moritz Heidkamp";

24433008 };

3009+ DerickEddington = {

3010+ email = "derick.eddington@pm.me";

3011+ github = "DerickEddington";

3012+ githubId = 4731128;

3013+ name = "Derick Eddington";

3014+ };

24443015 dermetfan = {

24453016 email = "serverkorken@gmail.com";

24463017 github = "dermetfan";

@@ -2489,12 +3060,24 @@

24893060 githubId = 4708206;

24903061 name = "Daniel Fox Franke";

24913062 };

3063+ dgliwka = {

3064+ email = "dawid.gliwka@gmail.com";

3065+ github = "dgliwka";

3066+ githubId = 33262214;

3067+ name = "Dawid Gliwka";

3068+ };

24923069 dgonyeo = {

24933070 email = "derek@gonyeo.com";

24943071 github = "dgonyeo";

24953072 githubId = 2439413;

24963073 name = "Derek Gonyeo";

24973074 };

3075+ dguenther = {

3076+ email = "dguenther9@gmail.com";

3077+ github = "dguenther";

3078+ githubId = 767083;

3079+ name = "Derek Guenther";

3080+ };

24983081 dhkl = {

24993082 email = "david@davidslab.com";

25003083 github = "dhl";

@@ -2513,6 +3096,18 @@

25133096 githubId = 8404455;

25143097 name = "Diego Lelis";

25153098 };

3099+ DieracDelta = {

3100+ email = "justin@restivo.me";

3101+ github = "DieracDelta";

3102+ githubId = 13730968;

3103+ name = "Justin Restivo";

3104+ };

3105+ diffumist = {

3106+ email = "git@diffumist.me";

3107+ github = "diffumist";

3108+ githubId = 32810399;

3109+ name = "Diffumist";

3110+ };

25163111 diogox = {

25173112 name = "Diogo Xavier";

25183113 email = "13244408+diogox@users.noreply.github.com";

@@ -2543,6 +3138,12 @@

25433138 githubId = 40633781;

25443139 name = "Sergei S.";

25453140 };

3141+ dit7ya = {

3142+ email = "7rat13@gmail.com";

3143+ github = "dit7ya";

3144+ githubId = 14034137;

3145+ name = "Mostly Void";

3146+ };

25463147 dizfer = {

25473148 email = "david@izquierdofernandez.com";

25483149 github = "dizfer";

@@ -2579,6 +3180,12 @@

25793180 githubId = 28980797;

25803181 name = "David Leslie";

25813182 };

3183+ dlip = {

3184+ email = "dane@lipscombe.com.au";

3185+ github = "dlip";

3186+ githubId = 283316;

3187+ name = "Dane Lipscombe";

3188+ };

25823189 dmalikov = {

25833190 email = "malikov.d.y@gmail.com";

25843191 github = "dmalikov";

@@ -2641,6 +3248,7 @@

26413248 };

26423249 dotlambda = {

26433250 email = "rschuetz17@gmail.com";

3251+ matrix = "@robert:funklause.de";

26443252 github = "dotlambda";

26453253 githubId = 6806011;

26463254 name = "Robert Schütz";

@@ -2711,9 +3319,20 @@

27113319 githubId = 10198051;

27123320 name = "Drew Risinger";

27133321 };

3322+ drperceptron = {

3323+ email = "92106371+drperceptron@users.noreply.github.com";

3324+ github = "drperceptron";

3325+ githubId = 92106371;

3326+ name = "Dr Perceptron";

3327+ keys = [{

3328+ longkeyid = "rsa4096/0x95EB6DFF26D1CEB0";

3329+ fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0";

3330+ }];

3331+ };

27143332 drupol = {

27153333 name = "Pol Dellaiera";

27163334 email = "pol.dellaiera@protonmail.com";

3335+ matrix = "@drupol:matrix.org";

27173336 github = "drupol";

27183337 githubId = 252042;

27193338 keys = [{

@@ -2721,6 +3340,18 @@

27213340 fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715";

27223341 }];

27233342 };

3343+ drzoidberg = {

3344+ email = "jakob@mast3rsoft.com";

3345+ github = "jakobneufeld";

3346+ githubId = 24791219;

3347+ name = "Jakob Neufeld";

3348+ };

3349+ dsalaza4 = {

3350+ email = "podany270895@gmail.com";

3351+ github = "dsalaza4";

3352+ githubId = 11205987;

3353+ name = "Daniel Salazar";

3354+ };

27243355 dschrempf = {

27253356 name = "Dominik Schrempf";

27263357 email = "dominik.schrempf@gmail.com";

@@ -2777,6 +3408,7 @@

27773408 };

27783409 dywedir = {

27793410 email = "dywedir@gra.red";

3411+ matrix = "@dywedir:matrix.org";

27803412 github = "dywedir";

27813413 githubId = 399312;

27823414 name = "Vladyslav M.";

@@ -2819,10 +3451,21 @@

28193451 };

28203452 earvstedt = {

28213453 email = "erik.arvstedt@gmail.com";

3454+ matrix = "@erikarvstedt:matrix.org";

28223455 github = "erikarvstedt";

28233456 githubId = 36110478;

28243457 name = "Erik Arvstedt";

28253458 };

3459+ ebbertd = {

3460+ email = "daniel@ebbert.nrw";

3461+ github = "ebbertd";

3462+ githubId = 20522234;

3463+ name = "Daniel Ebbert";

3464+ keys = [{

3465+ longkeyid = "rsa2048/0x47BC155927CBB9C7";

3466+ fingerprint = "E765 FCA3 D9BF 7FDB 856E AD73 47BC 1559 27CB B9C7";

3467+ }];

3468+ };

28263469 ebzzry = {

28273470 email = "ebzzry@ebzzry.io";

28283471 github = "ebzzry";

@@ -2853,11 +3496,11 @@

28533496 githubId = 50854;

28543497 name = "edef";

28553498 };

2856− edibopp = {

2857− email = "eduard.bopp@aepsil0n.de";

2858− github = "edibopp";

2859− githubId = 3098430;

2860− name = "Eduard Bopp";

3499+ edlimerkaj = {

3500+ name = "Edli Merkaj";

3501+ email = "edli.merkaj@identinet.io";

3502+ github = "edlimerkaj";

3503+ githubId = 71988351;

28613504 };

28623505 emantor = {

28633506 email = "rouven+nixos@czerwinskis.de";

@@ -2877,6 +3520,12 @@

28773520 githubId = 18535642;

28783521 name = "Emily";

28793522 };

3523+ emilytrau = {

3524+ name = "Emily Trau";

3525+ email = "nix@angus.ws";

3526+ github = "emilytrau";

3527+ githubId = 13267947;

3528+ };

28803529 enderger = {

28813530 email = "endergeryt@gmail.com";

28823531 github = "enderger";

@@ -2895,12 +3544,6 @@

28953544 githubId = 119483;

28963545 name = "Matthew Brown";

28973546 };

2898− eduardosm = {

2899− email = "esm@eduardosm.net";

2900− github = "eduardosm";

2901− githubId = 761151;

2902− name = "Eduardo Sánchez Muñoz";

2903− };

29043547 eduarrrd = {

29053548 email = "e.bachmakov@gmail.com";

29063549 github = "eduarrrd";

@@ -2945,6 +3588,7 @@

29453588 };

29463589 ekleog = {

29473590 email = "leo@gaspard.io";

3591+ matrix = "@leo:gaspard.ninja";

29483592 github = "ekleog";

29493593 githubId = 411447;

29503594 name = "Leo Gaspard";

@@ -2955,6 +3599,12 @@

29553599 githubId = 4742;

29563600 name = "Aaron Bull Schaefer";

29573601 };

3602+ elatov = {

3603+ email = "elatov@gmail.com";

3604+ github = "elatov";

3605+ githubId = 7494394;

3606+ name = "Karim Elatov";

3607+ };

29583608 eleanor = {

29593609 email = "dejan@proteansec.com";

29603610 github = "proteansec";

@@ -2967,6 +3617,12 @@

29673617 githubId = 103082;

29683618 name = "Ed Brindley";

29693619 };

3620+ elliot = {

3621+ email = "hack00mind@gmail.com";

3622+ github = "Eliot00";

3623+ githubId = 18375468;

3624+ name = "Elliot Xu";

3625+ };

29703626 elliottvillars = {

29713627 email = "elliottvillars@gmail.com";

29723628 github = "elliottvillars";

@@ -2975,6 +3631,7 @@

29753631 };

29763632 eliasp = {

29773633 email = "mail@eliasprobst.eu";

3634+ matrix = "@eliasp:kde.org";

29783635 github = "eliasp";

29793636 githubId = 48491;

29803637 name = "Elias Probst";

@@ -3027,12 +3684,25 @@

30273684 githubId = 57923898;

30283685 name = "Elyhaka";

30293686 };

3687+ em0lar = {

3688+ email = "nix@em0lar.dev";

3689+ github = "em0lar";

3690+ githubId = 11006031;

3691+ name = "Leo Maroni";

3692+ };

30303693 emmanuelrosa = {

3031− email = "emmanuel_rosa@aol.com";

3694+ email = "emmanuelrosa@protonmail.com";

3695+ matrix = "@emmanuelrosa:matrix.org";

30323696 github = "emmanuelrosa";

30333697 githubId = 13485450;

30343698 name = "Emmanuel Rosa";

30353699 };

3700+ emptyflask = {

3701+ email = "jon@emptyflask.dev";

3702+ github = "emptyflask";

3703+ githubId = 28287;

3704+ name = "Jon Roberts";

3705+ };

30363706 endgame = {

30373707 email = "jack@jackkelly.name";

30383708 github = "endgame";

@@ -3051,9 +3721,9 @@

30513721 githubId = 5493775;

30523722 name = "Ente";

30533723 };

3054− enzime = {

3724+ Enzime = {

30553725 email = "enzime@users.noreply.github.com";

3056− github = "enzime";

3726+ github = "Enzime";

30573727 githubId = 10492681;

30583728 name = "Michael Hoang";

30593729 };

@@ -3101,6 +3771,13 @@

31013771 fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02";

31023772 }];

31033773 };

3774+ ereslibre = {

3775+ email = "ereslibre@ereslibre.es";

3776+ matrix = "@ereslibre:matrix.org";

3777+ github = "ereslibre";

3778+ githubId = 8706;

3779+ name = "Rafael Fernández López";

3780+ };

31043781 ericbmerritt = {

31053782 email = "eric@afiniate.com";

31063783 github = "ericbmerritt";

@@ -3121,6 +3798,7 @@

31213798 };

31223799 ericson2314 = {

31233800 email = "John.Ericson@Obsidian.Systems";

3801+ matrix = "@ericson2314:matrix.org";

31243802 github = "ericson2314";

31253803 githubId = 1055245;

31263804 name = "John Ericson";

@@ -3203,8 +3881,22 @@

32033881 githubId = 222467;

32043882 name = "Dmitry Ivanov";

32053883 };

3884+ ethindp = {

3885+ name = "Ethin Probst";

3886+ email = "harlydavidsen@gmail.com";

3887+ matrix = "@ethindp:the-gdn.net";

3888+ github = "ethindp";

3889+ githubId = 8030501;

3890+ };

3891+ Etjean = {

3892+ email = "et.jean@outlook.fr";

3893+ github = "Etjean";

3894+ githubId = 32169529;

3895+ name = "Etienne Jean";

3896+ };

32063897 etu = {

32073898 email = "elis@hirwing.se";

3899+ matrix = "@etu:semi.social";

32083900 github = "etu";

32093901 githubId = 461970;

32103902 name = "Elis Hirwing";

@@ -3222,6 +3914,7 @@

32223914 evalexpr = {

32233915 name = "Jonathan Wilkins";

32243916 email = "nixos@wilkins.tech";

3917+ matrix = "@evalexpr:matrix.org";

32253918 github = "evalexpr";

32263919 githubId = 23485511;

32273920 keys = [{

@@ -3255,6 +3948,7 @@

32553948 };

32563949 evils = {

32573950 email = "evils.devils@protonmail.com";

3951+ matrix = "@evils:nixos.dev";

32583952 github = "evils";

32593953 githubId = 30512529;

32603954 name = "Evils";

@@ -3265,6 +3959,12 @@

32653959 githubId = 454695;

32663960 name = "Artur Taranchiev";

32673961 };

3962+ exarkun = {

3963+ email = "exarkun@twistedmatrix.com";

3964+ github = "exarkun";

3965+ githubId = 254565;

3966+ name = "Jean-Paul Calderone";

3967+ };

32683968 exfalso = {

32693969 email = "0slemi0@gmail.com";

32703970 github = "exfalso";

@@ -3285,9 +3985,14 @@

32853985 };

32863986 expipiplus1 = {

32873987 email = "nix@monoid.al";

3988+ matrix = "@ellie:monoid.al";

32883989 github = "expipiplus1";

32893990 githubId = 857308;

3290− name = "Joe Hermaszewski";

3991+ name = "Ellie Hermaszewska";

3992+ keys = [{

3993+ longkeyid = "rsa4096/0xC8116E3A0C1CA76A";

3994+ fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A";

3995+ }];

32913996 };

32923997 extends = {

32933998 email = "sharosari@gmail.com";

@@ -3297,6 +4002,7 @@

32974002 };

32984003 eyjhb = {

32994004 email = "eyjhbb@gmail.com";

4005+ matrix = "@eyjhb:eyjhb.dk";

33004006 github = "eyJhb";

33014007 githubId = 25955146;

33024008 name = "eyJhb";

@@ -3315,6 +4021,7 @@

33154021 };

33164022 fab = {

33174023 email = "mail@fabian-affolter.ch";

4024+ matrix = "@fabaff:matrix.org";

33184025 name = "Fabian Affolter";

33194026 github = "fabaff";

33204027 githubId = 116184;

@@ -3323,6 +4030,12 @@

33234030 fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F";

33244031 }];

33254032 };

4033+ fabiangd = {

4034+ email = "fabian.g.droege@gmail.com";

4035+ name = "Fabian G. Dröge";

4036+ github = "FabianGD";

4037+ githubId = 40316600;

4038+ };

33264039 fabianhauser = {

33274040 email = "fabian.nixos@fh2.ch";

33284041 github = "fabianhauser";

@@ -3363,6 +4076,12 @@

33634076 githubId = 1276854;

33644077 name = "Florian Peter";

33654078 };

4079+ fbeffa = {

4080+ email = "beffa@fbengineering.ch";

4081+ github = "fedeinthemix";

4082+ githubId = 7670450;

4083+ name = "Federico Beffa";

4084+ };

33664085 fbrs = {

33674086 email = "yuuki@protonmail.com";

33684087 github = "cideM";

@@ -3375,6 +4094,13 @@

33754094 githubId = 541748;

33764095 name = "Felipe Espinoza";

33774096 };

4097+ fedx-sudo = {

4098+ email = "fedx-sudo@pm.me";

4099+ github = "Fedx-sudo";

4100+ githubId = 66258975;

4101+ name = "Fedx sudo";

4102+ matrix = "fedx:matrix.org";

4103+ };

33784104 fehnomenal = {

33794105 email = "fehnomenal@fehn.systems";

33804106 github = "fehnomenal";

@@ -3395,13 +4121,21 @@

33954121 };

33964122 felschr = {

33974123 email = "dev@felschr.com";

4124+ matrix = "@felschr:matrix.org";

33984125 github = "felschr";

33994126 githubId = 3314323;

3400− name = "Felix Tenley";

3401− keys = [{

3402− longkeyid = "ed25519/0x910ACB9F6BD26F58";

3403− fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";

3404− }];

4127+ name = "Felix Schröter";

4128+ keys = [

4129+ {

4130+ # historical

4131+ longkeyid = "ed25519/0x910ACB9F6BD26F58";

4132+ fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";

4133+ }

4134+ {

4135+ longkeyid = "ed25519/0x671E39E6744C807D";

4136+ fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D";

4137+ }

4138+ ];

34054139 };

34064140 ffinkdevs = {

34074141 email = "fink@h0st.space";

@@ -3411,12 +4145,14 @@

34114145 };

34124146 fgaz = {

34134147 email = "fgaz@fgaz.me";

4148+ matrix = "@fgaz:matrix.org";

34144149 github = "fgaz";

34154150 githubId = 8182846;

34164151 name = "Francesco Gazzetta";

34174152 };

34184153 figsoda = {

34194154 email = "figsoda@pm.me";

4155+ matrix = "@figsoda:matrix.org";

34204156 github = "figsoda";

34214157 githubId = 40620903;

34224158 name = "figsoda";

@@ -3445,6 +4181,12 @@

34454181 github = "fitzgibbon";

34464182 githubId = 617048;

34474183 };

4184+ fkautz = {

4185+ name = "Frederick F. Kautz IV";

4186+ email = "fkautz@alumni.cmu.edu";

4187+ github = "fkautz";

4188+ githubId = 135706;

4189+ };

34484190 Flakebi = {

34494191 email = "flakebi@t-online.de";

34504192 github = "Flakebi";

@@ -3455,6 +4197,12 @@

34554197 fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672";

34564198 }];

34574199 };

4200+ flexagoon = {

4201+ email = "flexagoon@pm.me";

4202+ github = "flexagoon";

4203+ githubId = 66178592;

4204+ name = "Pavel Zolotarevskiy";

4205+ };

34584206 flexw = {

34594207 email = "felix.weilbach@t-online.de";

34604208 github = "FlexW";

@@ -3473,6 +4221,12 @@

34734221 githubId = 183879;

34744222 name = "Florian Klink";

34754223 };

4224+ florentc = {

4225+ email = "florentc@users.noreply.github.com";

4226+ github = "florentc";

4227+ githubId = 1149048;

4228+ name = "Florent Ch.";

4229+ };

34764230 FlorianFranzen = {

34774231 email = "Florian.Franzen@gmail.com";

34784232 github = "FlorianFranzen";

@@ -3529,6 +4283,7 @@

35294283 };

35304284 fortuneteller2k = {

35314285 email = "lythe1107@gmail.com";

4286+ matrix = "@fortuneteller2k:matrix.org";

35324287 github = "fortuneteller2k";

35334288 githubId = 20619776;

35344289 name = "fortuneteller2k";

@@ -3556,19 +4311,18 @@

35564311 githubId = 119691;

35574312 name = "Michael Gough";

35584313 };

3559−

4314+ freax13 = {

4315+ email = "erbse.13@gmx.de";

4316+ github = "freax13";

4317+ githubId = 14952658;

4318+ name = "Tom Dohrmann";

4319+ };

35604320 fredeb = {

35614321 email = "im@fredeb.dev";

35624322 github = "fredeeb";

35634323 githubId = 7551358;

35644324 name = "Frede Emil";

35654325 };

3566− freepotion = {

3567− email = "42352817+freepotion@users.noreply.github.com";

3568− github = "freepotion";

3569− githubId = 42352817;

3570− name = "Free Potion";

3571− };

35724326 freezeboy = {

35734327 email = "freezeboy@users.noreply.github.com";

35744328 github = "freezeboy";

@@ -3691,6 +4445,16 @@

36914445 githubId = 1313787;

36924446 name = "Gabriel Gonzalez";

36934447 };

4448+ gador = {

4449+ email = "florian.brandes@posteo.de";

4450+ github = "gador";

4451+ githubId = 1883533;

4452+ name = "Florian Brandes";

4453+ keys = [{

4454+ longkeyid = "rsa4096/0xBBB3E40E53797FD9";

4455+ fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9";

4456+ }];

4457+ };

36944458 gal_bolle = {

36954459 email = "florent.becker@ens-lyon.org";

36964460 github = "FlorentBecker";

@@ -3715,6 +4479,12 @@

37154479 githubId = 20208;

37164480 name = "Rok Garbas";

37174481 };

4482+ gardspirito = {

4483+ name = "gardspirito";

4484+ email = "nyxoroso@gmail.com";

4485+ github = "gardspirito";

4486+ githubId = 29687558;

4487+ };

37184488 garrison = {

37194489 email = "jim@garrison.cc";

37204490 github = "garrison";

@@ -3733,12 +4503,28 @@

37334503 githubId = 16470252;

37344504 name = "Gemini Lasswell";

37354505 };

4506+ gbtb = {

4507+ email = "goodbetterthebeast3@gmail.com";

4508+ github = "gbtb";

4509+ githubId = 37017396;

4510+ name = "gbtb";

4511+ };

37364512 gebner = {

37374513 email = "gebner@gebner.org";

37384514 github = "gebner";

37394515 githubId = 313929;

37404516 name = "Gabriel Ebner";

37414517 };

4518+ genofire = {

4519+ name = "genofire";

4520+ email = "geno+dev@fireorbit.de";

4521+ github = "genofire";

4522+ githubId = 6905586;

4523+ keys = [{

4524+ longkeyid = "rsa4096/0xFC83907C125BC2BC";

4525+ fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC";

4526+ }];

4527+ };

37424528 georgewhewell = {

37434529 email = "georgerw@gmail.com";

37444530 github = "georgewhewell";

@@ -3769,10 +4555,17 @@

37694555 };

37704556 ggpeti = {

37714557 email = "ggpeti@gmail.com";

4558+ matrix = "@ggpeti:ggpeti.com";

37724559 github = "ggpeti";

37734560 githubId = 3217744;

37744561 name = "Peter Ferenczy";

37754562 };

4563+ ghostbuster91 = {

4564+ name = "Kasper Kondzielski";

4565+ email = "kghost0@gmail.com";

4566+ github = "ghostbuster91";

4567+ githubId = 5662622;

4568+ };

37764569 ghuntley = {

37774570 email = "ghuntley@ghuntley.com";

37784571 github = "ghuntley";

@@ -3791,12 +4584,24 @@

37914584 githubId = 27668;

37924585 name = "Tobias Pflug";

37934586 };

4587+ gin66 = {

4588+ email = "jochen@kiemes.de";

4589+ github = "gin66";

4590+ githubId = 5549373;

4591+ name = "Jochen Kiemes";

4592+ };

37944593 giogadi = {

37954594 email = "lgtorres42@gmail.com";

37964595 github = "giogadi";

37974596 githubId = 1713676;

37984597 name = "Luis G. Torres";

37994598 };

4599+ GKasparov = {

4600+ email = "mizozahr@gmail.com";

4601+ github = "GKasparov";

4602+ githubId = 60962839;

4603+ name = "Mazen Zahr";

4604+ };

38004605 gleber = {

38014606 email = "gleber.p@gmail.com";

38024607 github = "gleber";

@@ -3861,6 +4666,16 @@

38614666 githubId = 1621335;

38624667 name = "Andrew Trachenko";

38634668 };

4669+ gordias = {

4670+ name = "Gordias";

4671+ email = "gordias@disroot.org";

4672+ github = "gordiasdot";

4673+ githubId = 94724133;

4674+ keys = [{

4675+ longkeyid = "ed25519/0x5D47284830FAA4FA";

4676+ fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA";

4677+ }];

4678+ };

38644679 govanify = {

38654680 name = "Gauvain 'GovanifY' Roussel-Tarbouriech";

38664681 email = "gauvain@govanify.com";

@@ -3871,6 +4686,16 @@

38714686 fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556";

38724687 }];

38734688 };

4689+ gpanders = {

4690+ name = "Gregory Anders";

4691+ email = "greg@gpanders.com";

4692+ github = "gpanders";

4693+ githubId = 8965202;

4694+ keys = [{

4695+ longkeyid = "rsa2048/0x56E93C2FB6B08BDB";

4696+ fingerprint = "B9D5 0EDF E95E ECD0 C135 00A9 56E9 3C2F B6B0 8BDB";

4697+ }];

4698+ };

38744699 gpyh = {

38754700 email = "yacine.hmito@gmail.com";

38764701 github = "yacinehmito";

@@ -3895,6 +4720,12 @@

38954720 githubId = 4656860;

38964721 name = "Gaute Ravndal";

38974722 };

4723+ graysonhead = {

4724+ email = "grayson@graysonhead.net";

4725+ github = "graysonhead";

4726+ githubId = 6179496;

4727+ name = "Grayson Head";

4728+ };

38984729 grburst = {

38994730 email = "GRBurst@protonmail.com";

39004731 github = "GRBurst";

@@ -3923,6 +4754,12 @@

39234754 githubId = 201997;

39244755 name = "Eric Seidel";

39254756 };

4757+ grindhold = {

4758+ name = "grindhold";

4759+ email = "grindhold+nix@skarphed.org";

4760+ github = "grindhold";

4761+ githubId = 2592640;

4762+ };

39264763 gspia = {

39274764 email = "iahogsp@gmail.com";

39284765 github = "gspia";

@@ -3941,6 +4778,18 @@

39414778 githubId = 343415;

39424779 name = "Greg Roodt";

39434780 };

4781+ grnnja = {

4782+ email = "grnnja@gmail.com";

4783+ github = "grnnja";

4784+ githubId = 31556469;

4785+ name = "Prem Netsuwan";

4786+ };

4787+ gruve-p = {

4788+ email = "groestlcoin@gmail.com";

4789+ github = "gruve-p";

4790+ githubId = 11212268;

4791+ name = "gruve-p";

4792+ };

39444793 gschwartz = {

39454794 email = "gsch@pennmedicine.upenn.edu";

39464795 github = "GregorySchwartz";

@@ -3992,9 +4841,16 @@

39924841 gytis-ivaskevicius = {

39934842 name = "Gytis Ivaskevicius";

39944843 email = "me@gytis.io";

4844+ matrix = "@gytis-ivaskevicius:matrix.org";

39954845 github = "gytis-ivaskevicius";

39964846 githubId = 23264966;

39974847 };

4848+ hagl = {

4849+ email = "harald@glie.be";

4850+ github = "hagl";

4851+ githubId = 1162118;

4852+ name = "Harald Gliebe";

4853+ };

39984854 hakuch = {

39994855 email = "hakuch@gmail.com";

40004856 github = "hakuch";

@@ -4007,6 +4863,12 @@

40074863 githubId = 1742172;

40084864 name = "Hamish Hutchings";

40094865 };

4866+ hanemile = {

4867+ email = "mail@emile.space";

4868+ github = "hanemile";

4869+ githubId = 22756350;

4870+ name = "Emile Hansmaennel";

4871+ };

40104872 hansjoergschurr = {

40114873 email = "commits@schurr.at";

40124874 github = "hansjoergschurr";

@@ -4025,6 +4887,7 @@

40254887 };

40264888 happysalada = {

40274889 email = "raphael@megzari.com";

4890+ matrix = "@happysalada:matrix.org";

40284891 github = "happysalada";

40294892 githubId = 5317234;

40304893 name = "Raphael Megzari";

@@ -4035,6 +4898,16 @@

40354898 githubId = 54728477;

40364899 name = "Happy River";

40374900 };

4901+ hardselius = {

4902+ email = "martin@hardselius.dev";

4903+ github = "hardselius";

4904+ githubId = 1422583;

4905+ name = "Martin Hardselius";

4906+ keys = [{

4907+ longkeyid = "rsa4096/0x03A6E6F786936619";

4908+ fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619";

4909+ }];

4910+ };

40384911 haslersn = {

40394912 email = "haslersn@fius.informatik.uni-stuttgart.de";

40404913 github = "haslersn";

@@ -4047,8 +4920,15 @@

40474920 githubId = 731722;

40484921 name = "Ryan Scheel";

40494922 };

4923+ hawkw = {

4924+ email = "eliza@elizas.website";

4925+ github = "hawkw";

4926+ githubId = 2796466;

4927+ name = "Eliza Weisman";

4928+ };

40504929 hax404 = {

40514930 email = "hax404foogit@hax404.de";

4931+ matrix = "@hax404:hax404.de";

40524932 github = "hax404";

40534933 githubId = 1379411;

40544934 name = "Georg Haas";

@@ -4065,6 +4945,16 @@

40654945 githubId = 147689;

40664946 name = "Hans-Christian Esperer";

40674947 };

4948+ hdhog = {

4949+ name = "Serg Larchenko";

4950+ email = "hdhog@hdhog.ru";

4951+ github = "hdhog";

4952+ githubId = 386666;

4953+ keys = [{

4954+ longkeyid = "rsa496/952EACB76703BA63";

4955+ fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63";

4956+ }];

4957+ };

40684958 hectorj = {

40694959 email = "hector.jusforgues+nixos@gmail.com";

40704960 github = "hectorj";

@@ -4089,6 +4979,13 @@

40894979 githubId = 2405974;

40904980 name = "Sébastian Méric de Bellefon";

40914981 };

4982+ henkkalkwater = {

4983+ email = "chris+nixpkgs@netsoj.nl";

4984+ github = "HenkKalkwater";

4985+ githubId = 4262067;

4986+ matrix = "@chris:netsoj.nl";

4987+ name = "Chris Josten";

4988+ };

40924989 henrikolsson = {

40934990 email = "henrik@fixme.se";

40944991 github = "henrikolsson";

@@ -4101,6 +4998,12 @@

41014998 githubId = 6430643;

41024999 name = "Henry Till";

41035000 };

5001+ heph2 = {

5002+ email = "srht@mrkeebs.eu";

5003+ github = "heph2";

5004+ githubId = 87579883;

5005+ name = "Marco";

5006+ };

41045007 herberteuler = {

41055008 email = "herberteuler@gmail.com";

41065009 github = "herberteuler";

@@ -4109,10 +5012,17 @@

41095012 };

41105013 hexa = {

41115014 email = "hexa@darmstadt.ccc.de";

5015+ matrix = "@hexa:lossy.network";

41125016 github = "mweinelt";

41135017 githubId = 131599;

41145018 name = "Martin Weinelt";

41155019 };

5020+ hexagonal-sun = {

5021+ email = "dev@mattleach.net";

5022+ github = "hexagonal-sun";

5023+ githubId = 222664;

5024+ name = "Matthew Leach";

5025+ };

41165026 hh = {

41175027 email = "hh@m-labs.hk";

41185028 github = "HarryMakes";

@@ -4131,6 +5041,12 @@

41315041 github = "higebu";

41325042 githubId = 733288;

41335043 };

5044+ hiljusti = {

5045+ name = "J.R. Hill";

5046+ email = "hiljusti@so.dang.cool";

5047+ github = "hiljusti";

5048+ githubId = 17605298;

5049+ };

41345050 hinton = {

41355051 email = "t@larkery.com";

41365052 name = "Tom Hinton";

@@ -4167,6 +5083,12 @@

41675083 fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15";

41685084 }];

41695085 };

5086+ hleboulanger = {

5087+ email = "hleboulanger@protonmail.com";

5088+ name = "Harold Leboulanger";

5089+ github = "thbkrhsw";

5090+ githubId = 33122;

5091+ };

41705092 hlolli = {

41715093 email = "hlolli@gmail.com";

41725094 github = "hlolli";

@@ -4195,6 +5117,12 @@

41955117 githubId = 896431;

41965118 name = "Chris Hodapp";

41975119 };

5120+ hollowman6 = {

5121+ email = "hollowman@hollowman.ml";

5122+ github = "HollowMan6";

5123+ githubId = 43995067;

5124+ name = "Songlin Jiang";

5125+ };

41985126 holymonson = {

41995127 email = "holymonson@gmail.com";

42005128 github = "holymonson";

@@ -4215,6 +5143,7 @@

42155143 };

42165144 hoverbear = {

42175145 email = "operator+nix@hoverbear.org";

5146+ matrix = "@hoverbear:matrix.org";

42185147 github = "hoverbear";

42195148 githubId = 130903;

42205149 name = "Ana Hobden";

@@ -4225,12 +5154,24 @@

42255154 github = "HolgerPeters";

42265155 githubId = 4097049;

42275156 };

5157+ hqurve = {

5158+ email = "hqurve@outlook.com";

5159+ github = "hqurve";

5160+ githubId = 53281855;

5161+ name = "hqurve";

5162+ };

42285163 hrdinka = {

42295164 email = "c.nix@hrdinka.at";

42305165 github = "hrdinka";

42315166 githubId = 1436960;

42325167 name = "Christoph Hrdinka";

42335168 };

5169+ hrhino = {

5170+ email = "hora.rhino@gmail.com";

5171+ github = "hrhino";

5172+ githubId = 28076058;

5173+ name = "Harrison Houghton";

5174+ };

42345175 hschaeidt = {

42355176 email = "he.schaeidt@gmail.com";

42365177 github = "hschaeidt";

@@ -4261,6 +5202,16 @@

42615202 githubId = 12491746;

42625203 name = "Masato Yonekawa";

42635204 };

5205+ hyshka = {

5206+ name = "Bryan Hyshka";

5207+ email = "bryan@hyshka.com";

5208+ github = "hyshka";

5209+ githubId = 2090758;

5210+ keys = [{

5211+ longkeyid = "rsa2048/0xDB2D93D1BFAAA6EA";

5212+ fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA";

5213+ }];

5214+ };

42645215 hyzual = {

42655216 email = "hyzual@gmail.com";

42665217 github = "Hyzual";

@@ -4279,8 +5230,19 @@

42795230 githubId = 2789926;

42805231 name = "Imran Hossain";

42815232 };

5233+ iagoq = {

5234+ email = "18238046+iagocq@users.noreply.github.com";

5235+ github = "iagocq";

5236+ githubId = 18238046;

5237+ name = "Iago Manoel Brito";

5238+ keys = [{

5239+ longkeyid = "rsa4096/0x35D39F9A9A1BC8DA";

5240+ fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA";

5241+ }];

5242+ };

42825243 iammrinal0 = {

42835244 email = "nixpkgs@mrinalpurohit.in";

5245+ matrix = "@iammrinal0:nixos.dev";

42845246 github = "iammrinal0";

42855247 githubId = 890062;

42865248 name = "Mrinal";

@@ -4312,6 +5274,7 @@

43125274 icy-thought = {

43135275 name = "Icy-Thought";

43145276 email = "gilganyx@pm.me";

5277+ matrix = "@gilganix:matrix.org";

43155278 github = "Icy-Thought";

43165279 githubId = 53710398;

43175280 };

@@ -4351,6 +5314,13 @@

43515314 githubId = 36193715;

43525315 name = "Lassi Haasio";

43535316 };

5317+ ilkecan = {

5318+ email = "ilkecan@protonmail.com";

5319+ matrix = "@ilkecan:matrix.org";

5320+ github = "ilkecan";

5321+ githubId = 40234257;

5322+ name = "ilkecan bozdogan";

5323+ };

43545324 illegalprime = {

43555325 email = "themichaeleden@gmail.com";

43565326 github = "illegalprime";

@@ -4381,6 +5351,12 @@

43815351 githubId = 592849;

43825352 name = "Ilya Kolpakov";

43835353 };

5354+ ilyakooo0 = {

5355+ name = "Ilya Kostyuchenko";

5356+ email = "ilyakooo0@gmail.com";

5357+ github = "ilyakooo0";

5358+ githubId = 6209627;

5359+ };

43845360 imalison = {

43855361 email = "IvanMalison@gmail.com";

43865362 github = "IvanMalison";

@@ -4393,6 +5369,12 @@

43935369 githubId = 993484;

43945370 name = "Greg Hale";

43955371 };

5372+ imgabe = {

5373+ email = "gabrielpmonte@hotmail.com";

5374+ github = "imgabe";

5375+ githubId = 24387926;

5376+ name = "Gabriel Pereira";

5377+ };

43965378 imlonghao = {

43975379 email = "nixos@esd.cc";

43985380 github = "imlonghao";

@@ -4401,6 +5383,7 @@

44015383 };

44025384 immae = {

44035385 email = "ismael@bouya.org";

5386+ matrix = "@immae:immae.eu";

44045387 github = "immae";

44055388 githubId = 510202;

44065389 name = "Ismaël Bouya";

@@ -4411,8 +5394,15 @@

44115394 githubId = 4085046;

44125395 name = "Imuli";

44135396 };

5397+ ineol = {

5398+ email = "leo.stefanesco@gmail.com";

5399+ github = "ineol";

5400+ githubId = 37965;

5401+ name = "Léo Stefanesco";

5402+ };

44145403 infinisil = {

44155404 email = "contact@infinisil.com";

5405+ matrix = "@infinisil:matrix.org";

44165406 github = "infinisil";

44175407 githubId = 20525370;

44185408 name = "Silvan Mosberger";

@@ -4430,6 +5420,7 @@

44305420 irenes = {

44315421 name = "Irene Knapp";

44325422 email = "ireneista@gmail.com";

5423+ matrix = "@irenes:matrix.org";

44335424 github = "IreneKnapp";

44345425 githubId = 157678;

44355426 keys = [{

@@ -4453,6 +5444,13 @@

44535444 fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293";

44545445 }];

44555446 };

5447+ ius = {

5448+ email = "j.de.gram@gmail.com";

5449+ name = "Joerie de Gram";

5450+ matrix = "@ius:nltrix.net";

5451+ github = "ius";

5452+ githubId = 529626;

5453+ };

44565454 ivan = {

44575455 email = "ivan@ludios.org";

44585456 github = "ivan";

@@ -4486,7 +5484,7 @@

44865484 }];

44875485 };

44885486 ivankovnatsky = {

4489− email = "ikovnatsky@protonmail.ch";

5487+ email = "75213+ivankovnatsky@users.noreply.github.com";

44905488 github = "ivankovnatsky";

44915489 githubId = 75213;

44925490 name = "Ivan Kovnatsky";

@@ -4501,6 +5499,12 @@

45015499 githubId = 41924494;

45025500 name = "Ivar";

45035501 };

5502+ iwanb = {

5503+ email = "tracnar@gmail.com";

5504+ github = "iwanb";

5505+ githubId = 4035835;

5506+ name = "Iwan";

5507+ };

45045508 ixmatus = {

45055509 email = "parnell@digitalmentat.com";

45065510 github = "ixmatus";

@@ -4519,6 +5523,12 @@

45195523 githubId = 26877687;

45205524 name = "Yurii Izorkin";

45215525 };

5526+ j0xaf = {

5527+ email = "j0xaf@j0xaf.de";

5528+ name = "Jörn Gersdorf";

5529+ github = "j0xaf";

5530+ githubId = 932697;

5531+ };

45225532 j0hax = {

45235533 name = "Johannes Arnold";

45245534 email = "johannes.arnold@stud.uni-hannover.de";

@@ -4543,6 +5553,18 @@

45435553 githubId = 6874204;

45445554 name = "Jason Carr";

45455555 };

5556+ j-brn = {

5557+ email = "me@bricker.io";

5558+ github = "j-brn";

5559+ githubId = 40566146;

5560+ name = "Jonas Braun";

5561+ };

5562+ j-hui = {

5563+ email = "j-hui@cs.columbia.edu";

5564+ github = "j-hui";

5565+ githubId = 11800204;

5566+ name = "John Hui";

5567+ };

45465568 j-keck = {

45475569 email = "jhyphenkeck@gmail.com";

45485570 github = "j-keck";

@@ -4627,6 +5649,12 @@

46275649 githubId = 488556;

46285650 name = "Javier Aguirre";

46295651 };

5652+ jayesh-bhoot = {

5653+ name = "Jayesh Bhoot";

5654+ email = "jayesh@bhoot.sh";

5655+ github = "jayesh-bhoot";

5656+ githubId = 1915507;

5657+ };

46305658 jb55 = {

46315659 email = "jb55@jb55.com";

46325660 github = "jb55";

@@ -4641,6 +5669,7 @@

46415669 };

46425670 jbedo = {

46435671 email = "cu@cua0.org";

5672+ matrix = "@jb:vk3.wtf";

46445673 github = "jbedo";

46455674 githubId = 372912;

46465675 name = "Justin Bedő";

@@ -4651,12 +5680,34 @@

46515680 githubId = 221929;

46525681 name = "Jean-Baptiste Giraudeau";

46535682 };

5683+ jc = {

5684+ name = "Josh Cooper";

5685+ email = "josh@cooper.is";

5686+ github = "joshua-cooper";

5687+ githubId = 35612334;

5688+ };

5689+ jceb = {

5690+ name = "jceb";

5691+ email = "jceb@e-jc.de";

5692+ github = "jceb";

5693+ githubId = 101593;

5694+ };

46545695 jchw = {

46555696 email = "johnwchadwick@gmail.com";

46565697 github = "jchv";

46575698 githubId = 938744;

46585699 name = "John Chadwick";

46595700 };

5701+ jcouyang = {

5702+ email = "oyanglulu@gmail.com";

5703+ github = "jcouyang";

5704+ githubId = 1235045;

5705+ name = "Jichao Ouyang";

5706+ keys = [{

5707+ longkeyid = "rsa2048/0xDA8B833B52604E63";

5708+ fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63";

5709+ }];

5710+ };

46605711 jcumming = {

46615712 email = "jack@mudshark.org";

46625713 github = "jcumming";

@@ -4669,6 +5720,12 @@

46695720 githubId = 1383440;

46705721 name = "Jason Gilliland";

46715722 };

5723+ jdahm = {

5724+ email = "johann.dahm@gmail.com";

5725+ github = "jdahm";

5726+ githubId = 68032;

5727+ name = "Johann Dahm";

5728+ };

46725729 jdanek = {

46735730 email = "jdanek@redhat.com";

46745731 github = "jdanekrh";

@@ -4691,12 +5748,30 @@

46915748 githubId = 117874;

46925749 name = "Jeroen de Haas";

46935750 };

5751+ jdreaver = {

5752+ email = "johndreaver@gmail.com";

5753+ github = "jdreaver";

5754+ githubId = 1253071;

5755+ name = "David Reaver";

5756+ };

46945757 jduan = {

46955758 name = "Jingjing Duan";

46965759 email = "duanjingjing@gmail.com";

46975760 github = "jduan";

46985761 githubId = 452450;

46995762 };

5763+ jdupak = {

5764+ name = "Jakub Dupak";

5765+ email = "dev@jakubdupak.com";

5766+ github = "jdupak";

5767+ githubId = 22683640;

5768+ };

5769+ jecaro = {

5770+ email = "jeancharles.quillet@gmail.com";

5771+ github = "jecaro";

5772+ githubId = 17029738;

5773+ name = "Jean-Charles Quillet";

5774+ };

47005775 jefdaj = {

47015776 email = "jefdaj@gmail.com";

47025777 github = "jefdaj";

@@ -4745,6 +5820,16 @@

47455820 githubId = 143075;

47465821 name = "James Felix Black";

47475822 };

5823+ jfchevrette = {

5824+ email = "jfchevrette@gmail.com";

5825+ github = "jfchevrette";

5826+ githubId = 3001;

5827+ name = "Jean-Francois Chevrette";

5828+ keys = [{

5829+ longkeyid = "rsa4096/0x67A0585801290DC6";

5830+ fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6";

5831+ }];

5832+ };

47485833 jflanglois = {

47495834 email = "yourstruly@julienlanglois.me";

47505835 github = "jflanglois";

@@ -4760,6 +5845,7 @@

47605845 jfroche = {

47615846 name = "Jean-François Roche";

47625847 email = "jfroche@pyxel.be";

5848+ matrix = "@jfroche:matrix.pyxel.cloud";

47635849 github = "jfroche";

47645850 githubId = 207369;

47655851 keys = [{

@@ -4767,6 +5853,12 @@

47675853 fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0";

47685854 }];

47695855 };

5856+ jgart = {

5857+ email = "jgart@dismail.de";

5858+ github = "jgarte";

5859+ githubId = 47760695;

5860+ name = "Jorge Gomez";

5861+ };

47705862 jgeerds = {

47715863 email = "jascha@geerds.org";

47725864 github = "jgeerds";

@@ -4829,10 +5921,17 @@

48295921 };

48305922 jk = {

48315923 email = "hello+nixpkgs@j-k.io";

5924+ matrix = "@j-k:matrix.org";

48325925 github = "06kellyjac";

48335926 githubId = 9866621;

48345927 name = "Jack";

48355928 };

5929+ jkarlson = {

5930+ email = "jekarlson@gmail.com";

5931+ github = "jkarlson";

5932+ githubId = 1204734;

5933+ name = "Emil Karlson";

5934+ };

48365935 jlesquembre = {

48375936 email = "jl@lafuente.me";

48385937 github = "jlesquembre";

@@ -4863,12 +5962,36 @@

48635962 githubId = 8900;

48645963 name = "Johan Magnus Jonsson";

48655964 };

5965+ jmc-figueira = {

5966+ email = "business+nixos@jmc-figueira.dev";

5967+ github = "jmc-figueira";

5968+ githubId = 6634716;

5969+ name = "João Figueira";

5970+ keys = [

5971+ # GitHub signing key

5972+ {

5973+ longkeyid = "rsa4096/0xDC7AE56AE98E02D7";

5974+ fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7";

5975+ }

5976+ # Email encryption

5977+ {

5978+ longkeyid = "ed25519/0x197F9A632D139E30";

5979+ fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30";

5980+ }

5981+ ];

5982+ };

48665983 jmettes = {

48675984 email = "jonathan@jmettes.com";

48685985 github = "jmettes";

48695986 githubId = 587870;

48705987 name = "Jonathan Mettes";

48715988 };

5989+ jmgilman = {

5990+ email = "joshuagilman@gmail.com";

5991+ github = "jmgilman";

5992+ githubId = 2308444;

5993+ name = "Joshua Gilman";

5994+ };

48725995 jo1gi = {

48735996 email = "joakimholm@protonmail.com";

48745997 github = "jo1gi";

@@ -4923,6 +6046,7 @@

49236046 };

49246047 joepie91 = {

49256048 email = "admin@cryto.net";

6049+ matrix = "@joepie91:pixie.town";

49266050 name = "Sven Slootweg";

49276051 github = "joepie91";

49286052 githubId = 1663259;

@@ -4969,6 +6093,12 @@

49696093 githubId = 8735102;

49706094 name = "John Ramsden";

49716095 };

6096+ johnrichardrinehart = {

6097+ email = "johnrichardrinehart@gmail.com";

6098+ github = "johnrichardrinehart";

6099+ githubId = 6321578;

6100+ name = "John Rinehart";

6101+ };

49726102 johntitor = {

49736103 email = "huyuumi.dev@gmail.com";

49746104 github = "JohnTitor";

@@ -4978,6 +6108,7 @@

49786108 jojosch = {

49796109 name = "Johannes Schleifenbaum";

49806110 email = "johannes@js-webcoding.de";

6111+ matrix = "@jojosch:jswc.de";

49816112 github = "jojosch";

49826113 githubId = 327488;

49836114 keys = [{

@@ -5016,6 +6147,7 @@

50166147 };

50176148 jonringer = {

50186149 email = "jonringer117@gmail.com";

6150+ matrix = "@jonringer:matrix.org";

50196151 github = "jonringer";

50206152 githubId = 7673602;

50216153 name = "Jonathan Ringer";

@@ -5056,6 +6188,12 @@

50566188 githubId = 20675;

50576189 name = "Joël Perras";

50586190 };

6191+ jpetrucciani = {

6192+ email = "j@cobi.dev";

6193+ github = "jpetrucciani";

6194+ githubId = 8117202;

6195+ name = "Jacobi Petrucciani";

6196+ };

50596197 jpierre03 = {

50606198 email = "nix@prunetwork.fr";

50616199 github = "jpierre03";

@@ -5080,8 +6218,15 @@

50806218 githubId = 4611077;

50816219 name = "Raymond Gauthier";

50826220 };

6221+ jrpotter = {

6222+ email = "jrpotter2112@gmail.com";

6223+ github = "jrpotter";

6224+ githubId = 3267697;

6225+ name = "Joshua Potter";

6226+ };

50836227 jschievink = {

50846228 email = "jonasschievink@gmail.com";

6229+ matrix = "@jschievink:matrix.org";

50856230 github = "jonas-schievink";

50866231 githubId = 1786438;

50876232 name = "Jonas Schievink";

@@ -5098,6 +6243,13 @@

50986243 githubId = 107689;

50996244 name = "Josh Holland";

51006245 };

6246+ jsierles = {

6247+ email = "joshua@hey.com";

6248+ matrix = "@jsierles:matrix.org";

6249+ name = "Joshua Sierles";

6250+ github = "jsierles";

6251+ githubId = 82;

6252+ };

51016253 jtcoolen = {

51026254 email = "jtcoolen@pm.me";

51036255 name = "Julien Coolen";

@@ -5116,22 +6268,35 @@

51166268 };

51176269 jtojnar = {

51186270 email = "jtojnar@gmail.com";

6271+ matrix = "@jtojnar:matrix.org";

51196272 github = "jtojnar";

51206273 githubId = 705123;

51216274 name = "Jan Tojnar";

51226275 };

51236276 juaningan = {

51246277 email = "juaningan@gmail.com";

5125− github = "juaningan";

6278+ github = "uningan";

51266279 githubId = 810075;

51276280 name = "Juan Rodal";

51286281 };

6282+ juboba = {

6283+ email = "juboba@gmail.com";

6284+ github = "juboba";

6285+ githubId = 1189739;

6286+ name = "Julio Borja Barra";

6287+ };

51296288 juliendehos = {

51306289 email = "dehos@lisic.univ-littoral.fr";

51316290 github = "juliendehos";

51326291 githubId = 11947756;

51336292 name = "Julien Dehos";

51346293 };

6294+ julienmalka = {

6295+ email = "julien.malka@me.com";

6296+ github = "JulienMalka";

6297+ githubId = 1792886;

6298+ name = "Julien Malka";

6299+ };

51356300 julm = {

51366301 email = "julm+nixpkgs@sourcephile.fr";

51376302 github = "ju1m";

@@ -5144,6 +6309,12 @@

51446309 githubId = 39434424;

51456310 name = "Felix Springer";

51466311 };

6312+ junjihashimoto = {

6313+ email = "junji.hashimoto@gmail.com";

6314+ github = "junjihashimoto";

6315+ githubId = 2469618;

6316+ name = "Junji Hashimoto";

6317+ };

51476318 justinas = {

51486319 email = "justinas@justinas.org";

51496320 github = "justinas";

@@ -5162,6 +6333,16 @@

51626333 githubId = 2396926;

51636334 name = "Justin Woo";

51646335 };

6336+ jvanbruegge = {

6337+ email = "supermanitu@gmail.com";

6338+ github = "jvanbruegge";

6339+ githubId = 1529052;

6340+ name = "Jan van Brügge";

6341+ keys = [{

6342+ longkeyid = "rsa4096/0x366572BE7D6C78A2";

6343+ fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2";

6344+ }];

6345+ };

51656346 jwatt = {

51666347 email = "jwatt@broken.watch";

51676348 github = "jjwatt";

@@ -5184,12 +6365,28 @@

51846365 email = "jwilberding@afiniate.com";

51856366 name = "Jordan Wilberding";

51866367 };

6368+ jwoudenberg = {

6369+ email = "nixpkgs@jasperwoudenberg.com";

6370+ github = "jwoudenberg";

6371+ githubId = 1525551;

6372+ name = "Jasper Woudenberg";

6373+ };

51876374 jwygoda = {

51886375 email = "jaroslaw@wygoda.me";

51896376 github = "jwygoda";

51906377 githubId = 20658981;

51916378 name = "Jarosław Wygoda";

51926379 };

6380+ jyooru = {

6381+ email = "joel@joel.tokyo";

6382+ github = "jyooru";

6383+ githubId = 63786778;

6384+ name = "Joel";

6385+ keys = [{

6386+ longkeyid = "rsa4096/18550BD205E9EF64";

6387+ fingerprint = "9148 DC9E F4D5 3EB6 A30E 8EF0 1855 0BD2 05E9 EF64";

6388+ }];

6389+ };

51936390 jyp = {

51946391 email = "jeanphilippe.bernardy@gmail.com";

51956392 github = "jyp";

@@ -5202,6 +6399,19 @@

52026399 githubId = 66669;

52036400 name = "Jeff Zellner";

52046401 };

6402+ k4leg = {

6403+ name = "k4leg";

6404+ email = "python.bogdan@gmail.com";

6405+ github = "k4leg";

6406+ githubId = 39882583;

6407+ };

6408+ k900 = {

6409+ name = "Ilya K.";

6410+ email = "me@0upti.me";

6411+ github = "K900";

6412+ githubId = 386765;

6413+ matrix = "@k900:0upti.me";

6414+ };

52056415 kaction = {

52066416 name = "Dmitry Bogatov";

52076417 email = "KAction@disroot.org";

@@ -5220,6 +6430,7 @@

52206430 };

52216431 kalbasit = {

52226432 email = "wael.nasreddine@gmail.com";

6433+ matrix = "@kalbasit:matrix.org";

52236434 github = "kalbasit";

52246435 githubId = 87115;

52256436 name = "Wael Nasreddine";

@@ -5252,6 +6463,12 @@

52526463 githubId = 3831860;

52536464 name = "Arnold Krille";

52546465 };

6466+ kanashimia = {

6467+ email = "chad@redpilled.dev";

6468+ github = "kanashimia";

6469+ githubId = 56224949;

6470+ name = "Mia Kanashi";

6471+ };

52556472 karantan = {

52566473 name = "Gasper Vozel";

52576474 email = "karantan@gmail.com";

@@ -5286,6 +6503,12 @@

52866503 githubId = 37185887;

52876504 name = "Calvin Kim";

52886505 };

6506+ keldu = {

6507+ email = "mail@keldu.de";

6508+ github = "keldu";

6509+ githubId = 15373888;

6510+ name = "Claudius Holeksa";

6511+ };

52896512 kennyballou = {

52906513 email = "kb@devnulllabs.io";

52916514 github = "kennyballou";

@@ -5310,6 +6533,7 @@

53106533 };

53116534 kevincox = {

53126535 email = "kevincox@kevincox.ca";

6536+ matrix = "@kevincox:matrix.org";

53136537 github = "kevincox";

53146538 githubId = 494012;

53156539 name = "Kevin Cox";

@@ -5320,6 +6544,12 @@

53206544 githubId = 209729;

53216545 name = "Kevin Griffin";

53226546 };

6547+ kevink = {

6548+ email = "kevin@kevink.dev";

6549+ github = "Unkn0wnCat";

6550+ githubId = 8211181;

6551+ name = "Kevin Kandlbinder";

6552+ };

53236553 kfollesdal = {

53246554 email = "kfollesdal@gmail.com";

53256555 github = "kfollesdal";

@@ -5338,6 +6568,16 @@

53386568 githubId = 788813;

53396569 name = "Bryan Gardiner";

53406570 };

6571+ khushraj = {

6572+ email = "khushraj.rathod@gmail.com";

6573+ github = "KhushrajRathod";

6574+ githubId = 44947946;

6575+ name = "Khushraj Rathod";

6576+ keys = [{

6577+ longkeyid = "rsa2048/0xB77B2A40E7702F19";

6578+ fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19";

6579+ }];

6580+ };

53416581 KibaFox = {

53426582 email = "kiba.fox@foxypossibilities.com";

53436583 github = "KibaFox";

@@ -5350,6 +6590,12 @@

53506590 githubId = 25607;

53516591 name = "Raimon Grau";

53526592 };

6593+ kidonng = {

6594+ email = "hi@xuann.wang";

6595+ github = "kidonng";

6596+ githubId = 44045911;

6597+ name = "Kid";

6598+ };

53536599 kierdavis = {

53546600 email = "kierdavis@gmail.com";

53556601 github = "kierdavis";

@@ -5394,6 +6640,7 @@

53946640 };

53956641 kirelagin = {

53966642 email = "kirelagin@gmail.com";

6643+ matrix = "@kirelagin:matrix.org";

53976644 github = "kirelagin";

53986645 githubId = 451835;

53996646 name = "Kirill Elagin";

@@ -5410,6 +6657,16 @@

54106657 githubId = 148352;

54116658 name = "Jim Fowler";

54126659 };

6660+ kittywitch = {

6661+ email = "kat@kittywit.ch";

6662+ github = "kittywitch";

6663+ githubId = 67870215;

6664+ name = "kat witch";

6665+ keys = [{

6666+ longkeyid = "rsa4096/0x7248991EFA8EFBEE";

6667+ fingerprint = "01F5 0A29 D4AA 9117 5A11 BDB1 7248 991E FA8E FBEE";

6668+ }];

6669+ };

54136670 kiwi = {

54146671 email = "envy1988@gmail.com";

54156672 github = "Kiwi";

@@ -5426,10 +6683,22 @@

54266683 githubId = 8260207;

54276684 name = "Karthik Iyengar";

54286685 };

6686+ kjeremy = {

6687+ email = "kjeremy@gmail.com";

6688+ name = "Jeremy Kolb";

6689+ github = "kjeremy";

6690+ githubId = 4325700;

6691+ };

54296692 kkallio = {

54306693 email = "tierpluspluslists@gmail.com";

54316694 name = "Karn Kallio";

54326695 };

6696+ klden = {

6697+ name = "Kenzyme Le";

6698+ email = "kl@kenzymele.com";

6699+ github = "klDen";

6700+ githubId = 5478260;

6701+ };

54336702 klntsky = {

54346703 email = "klntsky@gmail.com";

54356704 name = "Vladimir Kalnitsky";

@@ -5437,7 +6706,8 @@

54376706 githubId = 18447310;

54386707 };

54396708 kloenk = {

5440− email = "me@kloenk.de";

6709+ email = "me@kloenk.dev";

6710+ matrix = "@kloenk:petabyte.dev";

54416711 name = "Finn Behrens";

54426712 github = "kloenk";

54436713 githubId = 12898828;

@@ -5460,7 +6730,7 @@

54606730 };

54616731

54626732 kmein = {

5463− email = "kieran.meinhardt@gmail.com";

6733+ email = "kmein@posteo.de";

54646734 name = "Kierán Meinhardt";

54656735 github = "kmein";

54666736 githubId = 10352507;

@@ -5513,6 +6783,12 @@

55136783 githubId = 15692230;

55146784 name = "Muhammad Herdiansyah";

55156785 };

6786+ koozz = {

6787+ email = "koozz@linux.com";

6788+ github = "koozz";

6789+ githubId = 264372;

6790+ name = "Jan van den Berg";

6791+ };

55166792 koral = {

55176793 email = "koral@mailoo.org";

55186794 github = "k0ral";

@@ -5537,6 +6813,12 @@

55376813 githubId = 787421;

55386814 name = "Kevin Quick";

55396815 };

6816+ kradalby = {

6817+ name = "Kristoffer Dalby";

6818+ email = "kristoffer@dalby.cc";

6819+ github = "kradalby";

6820+ githubId = 98431;

6821+ };

55406822 kraem = {

55416823 email = "me@kraem.xyz";

55426824 github = "kraem";

@@ -5549,6 +6831,12 @@

55496831 githubId = 735008;

55506832 name = "Louis Taylor";

55516833 };

6834+ kranzes = {

6835+ email = "personal@ilanjoselevich.com";

6836+ github = "Kranzes";

6837+ githubId = 56614642;

6838+ name = "Ilan Joselevich";

6839+ };

55526840 krav = {

55536841 email = "kristoffer@microdisko.no";

55546842 github = "krav";

@@ -5597,11 +6885,17 @@

55976885 githubId = 99639;

55986886 name = "Pawel Kruszewski";

55996887 };

5600− ktosiek = {

5601− email = "tomasz.kontusz@gmail.com";

5602− github = "ktosiek";

5603− githubId = 278013;

5604− name = "Tomasz Kontusz";

6888+ kubukoz = {

6889+ email = "kubukoz@gmail.com";

6890+ github = "kubukoz";

6891+ githubId = 894884;

6892+ name = "Jakub Kozłowski";

6893+ };

6894+ kurnevsky = {

6895+ email = "kurnevsky@gmail.com";

6896+ github = "kurnevsky";

6897+ githubId = 2943605;

6898+ name = "Evgeny Kurnevsky";

56056899 };

56066900 kuznero = {

56076901 email = "roman@kuznero.com";

@@ -5609,6 +6903,13 @@

56096903 githubId = 449813;

56106904 name = "Roman Kuznetsov";

56116905 };

6906+ kvark = {

6907+ name = "Dzmitry Malyshau";

6908+ email = "kvark@fastmail.com";

6909+ matrix = "@kvark:matrix.org";

6910+ github = "kvark";

6911+ githubId = 107301;

6912+ };

56126913 kwohlfahrt = {

56136914 email = "kai.wohlfahrt@gmail.com";

56146915 github = "kwohlfahrt";

@@ -5627,7 +6928,7 @@

56276928 };

56286929 kylesferrazza = {

56296930 name = "Kyle Sferrazza";

5630− email = "kyle.sferrazza@gmail.com";

6931+ email = "nixpkgs@kylesferrazza.com";

56316932

56326933 github = "kylesferrazza";

56336934 githubId = 6677292;

@@ -5639,6 +6940,7 @@

56396940 };

56406941 l-as = {

56416942 email = "las@protonmail.ch";

6943+ matrix = "@Las:matrix.org";

56426944 github = "L-as";

56436945 githubId = 22075344;

56446946 keys = [{

@@ -5649,16 +6951,33 @@

56496951 };

56506952 l3af = {

56516953 email = "L3afMeAlon3@gmail.com";

6954+ matrix = "@L3afMe:matrix.org";

56526955 github = "L3afMe";

56536956 githubId = 72546287;

56546957 name = "L3af";

56556958 };

6959+ lach = {

6960+ email = "iam@lach.pw";

6961+ github = "CertainLach";

6962+ githubId = 6235312;

6963+ keys = [{

6964+ longkeyid = "rsa3072/40B5D6948143175F";

6965+ fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F";

6966+ }];

6967+ name = "Yaroslav Bolyukin";

6968+ };

56566969 laikq = {

56576970 email = "gwen@quasebarth.de";

56586971 github = "laikq";

56596972 githubId = 55911173;

56606973 name = "Gwendolyn Quasebarth";

56616974 };

6975+ lammermann = {

6976+ email = "k.o.b.e.r@web.de";

6977+ github = "lammermann";

6978+ githubId = 695526;

6979+ name = "Benjamin Kober";

6980+ };

56626981 larsr = {

56636982 email = "Lars.Rasmusson@gmail.com";

56646983 github = "larsr";

@@ -5679,6 +6998,7 @@

56796998 };

56806999 lassulus = {

56817000 email = "lassulus@gmail.com";

7001+ matrix = "@lassulus:nixos.dev";

56827002 github = "Lassulus";

56837003 githubId = 621759;

56847004 name = "Lassulus";

@@ -5720,6 +7040,18 @@

57207040 githubId = 1104419;

57217041 name = "Lucas Hoffmann";

57227042 };

7043+ lucasew = {

7044+ email = "lucas59356@gmail.com";

7045+ github = "lucasew";

7046+ githubId = 15693688;

7047+ name = "Lucas Eduardo Wendt";

7048+ };

7049+ lde = {

7050+ email = "lilian.deloche@puck.fr";

7051+ github = "lde";

7052+ githubId = 1447020;

7053+ name = "Lilian Deloche";

7054+ };

57237055 ldelelis = {

57247056 email = "ldelelis@est.frba.utn.edu.ar";

57257057 github = "ldelelis";

@@ -5734,6 +7066,7 @@

57347066 };

57357067 ldesgoui = {

57367068 email = "ldesgoui@gmail.com";

7069+ matrix = "@ldesgoui:matrix.org";

57377070 github = "ldesgoui";

57387071 githubId = 2472678;

57397072 name = "Lucas Desgouilles";

@@ -5774,11 +7107,27 @@

57747107 githubId = 4158274;

57757108 name = "Michiel Leenaars";

57767109 };

5777− legendofmiracles = {

7110+ lom = {

57787111 email = "legendofmiracles@protonmail.com";

7112+ matrix = "@legendofmiracles:matrix.org";

57797113 github = "legendofmiracles";

57807114 githubId = 30902201;

57817115 name = "legendofmiracles";

7116+ keys = [{

7117+ longkeyid = "rsa4096/0x19B082B3DEFE5451";

7118+ fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451";

7119+ }];

7120+ };

7121+ leixb = {

7122+ email = "abone9999+nixpkgs@gmail.com";

7123+ matrix = "@leix_b:matrix.org";

7124+ github = "LeixB";

7125+ githubId = 17183803;

7126+ name = "Aleix Boné";

7127+ keys = [{

7128+ longkeyid = "rsa4096/0xFC035BB2BB28E15D";

7129+ fingerprint = "63D3 F436 EDE8 7E1F 1292 24AF FC03 5BB2 BB28 E15D";

7130+ }];

57827131 };

57837132 lejonet = {

57847133 email = "daniel@kuehn.se";

@@ -5824,6 +7173,7 @@

58247173 };

58257174 lewo = {

58267175 email = "lewo@abesis.fr";

7176+ matrix = "@lewo:matrix.org";

58277177 github = "nlewo";

58287178 githubId = 3425311;

58297179 name = "Antoine Eiche";

@@ -5868,6 +7218,13 @@

58687218 githubId = 1769386;

58697219 name = "Liam Diprose";

58707220 };

7221+ libjared = {

7222+ email = "jared@perrycode.com";

7223+ github = "libjared";

7224+ githubId = 3746656;

7225+ matrix = "@libjared:matrix.org";

7226+ name = "Jared Perry";

7227+ };

58717228 liff = {

58727229 email = "liff@iki.fi";

58737230 github = "liff";

@@ -5898,18 +7255,19 @@

58987255 githubId = 714;

58997256 name = "Lily Ballard";

59007257 };

7258+ lilyinstarlight = {

7259+ email = "lily@lily.flowers";

7260+ matrix = "@lily:lily.flowers";

7261+ github = "lilyinstarlight";

7262+ githubId = 298109;

7263+ name = "Lily Foster";

7264+ };

59017265 limeytexan = {

59027266 email = "limeytexan@gmail.com";

59037267 github = "limeytexan";

59047268 githubId = 36448130;

59057269 name = "Michael Brantley";

59067270 };

5907− linarcx = {

5908− email = "linarcx@gmail.com";

5909− github = "linarcx";

5910− githubId = 10884422;

5911− name = "Kaveh Ahangar";

5912− };

59137271 linc01n = {

59147272 email = "git@lincoln.hk";

59157273 github = "linc01n";

@@ -5922,6 +7280,12 @@

59227280 githubId = 791115;

59237281 name = "Linquize";

59247282 };

7283+ linsui = {

7284+ email = "linsui555@gmail.com";

7285+ github = "linsui";

7286+ githubId = 36977733;

7287+ name = "linsui";

7288+ };

59257289 linus = {

59267290 email = "linusarver@gmail.com";

59277291 github = "listx";

@@ -5948,12 +7312,30 @@

59487312 fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A";

59497313 }];

59507314 };

7315+ lorenzleutgeb = {

7316+ email = "lorenz@leutgeb.xyz";

7317+ github = "lorenzleutgeb";

7318+ githubId = 542154;

7319+ name = "Lorenz Leutgeb";

7320+ };

59517321 luis = {

59527322 email = "luis.nixos@gmail.com";

59537323 github = "Luis-Hebendanz";

59547324 githubId = 22085373;

59557325 name = "Luis Hebendanz";

59567326 };

7327+ lunarequest = {

7328+ email = "nullarequest@vivlaid.net";

7329+ github = "Lunarequest";

7330+ githubId = 30698906;

7331+ name = "Luna D Dragon";

7332+ };

7333+ LunNova = {

7334+ email = "nixpkgs-maintainer@lunnova.dev";

7335+ github = "LunNova";

7336+ githubId = 782440;

7337+ name = "Luna Nova";

7338+ };

59577339 lionello = {

59587340 email = "lio@lunesu.com";

59597341 github = "lionello";

@@ -5990,6 +7372,29 @@

59907372 githubId = 1267527;

59917373 name = "Daniel Firth";

59927374 };

7375+ lockejan = {

7376+ email = "git@smittie.de";

7377+ matrix = "@jan:smittie.de";

7378+ github = "lockejan";

7379+ githubId = 25434434;

7380+ name = "Jan Schmitt";

7381+ keys = [{

7382+ longkeyid = "dsa2048/0xA2BC3C6F14351991";

7383+ fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991";

7384+ }];

7385+ };

7386+ lodi = {

7387+ email = "anthony.lodi@gmail.com";

7388+ github = "lodi";

7389+ githubId = 918448;

7390+ name = "Anthony Lodi";

7391+ };

7392+ loicreynier = {

7393+ email = "loic@loicreynier.fr";

7394+ github = "loicreynier";

7395+ githubId = 88983487;

7396+ name = "Loïc Reynier";

7397+ };

59937398 lopsided98 = {

59947399 email = "benwolsieffer@gmail.com";

59957400 github = "lopsided98";

@@ -6022,6 +7427,7 @@

60227427 };

60237428 lovesegfault = {

60247429 email = "meurerbernardo@gmail.com";

7430+ matrix = "@lovesegfault:matrix.org";

60257431 github = "lovesegfault";

60267432 githubId = 7243783;

60277433 name = "Bernardo Meurer";

@@ -6036,6 +7442,12 @@

60367442 githubId = 10626;

60377443 name = "Andreas Wagner";

60387444 };

7445+ lrewega = {

7446+ email = "lrewega@c32.ca";

7447+ github = "lrewega";

7448+ githubId = 639066;

7449+ name = "Luke Rewega";

7450+ };

60397451 lromor = {

60407452 email = "leonardo.romor@gmail.com";

60417453 github = "lromor";

@@ -6048,6 +7460,7 @@

60487460 };

60497461 lschuermann = {

60507462 email = "leon.git@is.currently.online";

7463+ matrix = "@leons:is.currently.online";

60517464 github = "lschuermann";

60527465 githubId = 5341193;

60537466 name = "Leon Schuermann";

@@ -6124,6 +7537,7 @@

61247537 };

61257538 lukegb = {

61267539 email = "nix@lukegb.com";

7540+ matrix = "@lukegb:zxcvbnm.ninja";

61277541 github = "lukegb";

61287542 githubId = 246745;

61297543 name = "Luke Granger-Brown";

@@ -6134,6 +7548,12 @@

61347548 githubId = 13791;

61357549 name = "Luke Gorrie";

61367550 };

7551+ luker = {

7552+ email = "luker@fenrirproject.org";

7553+ github = "LucaFulchir";

7554+ githubId = 2486026;

7555+ name = "Luca Fulchir";

7556+ };

61377557 lumi = {

61387558 email = "lumi@pew.im";

61397559 github = "lumi-me-not";

@@ -6142,6 +7562,7 @@

61427562 };

61437563 lunik1 = {

61447564 email = "ch.nixpkgs@themaw.xyz";

7565+ matrix = "@lunik1:lunik.one";

61457566 github = "lunik1";

61467567 githubId = 13547699;

61477568 name = "Corin Hoad";

@@ -6150,6 +7571,12 @@

61507571 fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492";

61517572 }];

61527573 };

7574+ lux = {

7575+ email = "lux@lux.name";

7576+ githubId = 1208273;

7577+ matrix = "@lux:ontheblueplanet.com";

7578+ name = "Lux";

7579+ };

61537580 luz = {

61547581 email = "luz666@daum.net";

61557582 github = "Luz";

@@ -6178,6 +7605,12 @@

61787605 email = "wheatdoge@gmail.com";

61797606 name = "Tim Liou";

61807607 };

7608+ m00wl = {

7609+ name = "Moritz Lumme";

7610+ email = "moritz.lumme@gmail.com";

7611+ github = "m00wl";

7612+ githubId = 46034439;

7613+ };

61817614 m1cr0man = {

61827615 email = "lucas+nix@m1cr0man.com";

61837616 github = "m1cr0man";

@@ -6190,6 +7623,7 @@

61907623 };

61917624 ma27 = {

61927625 email = "maximilian@mbosch.me";

7626+ matrix = "@ma27:nicht-so.sexy";

61937627 github = "ma27";

61947628 githubId = 6025220;

61957629 name = "Maximilian Bosch";

@@ -6200,12 +7634,24 @@

62007634 githubId = 36235154;

62017635 name = "Sean Haugh";

62027636 };

7637+ maaslalani = {

7638+ email = "maaslalani0@gmail.com";

7639+ github = "maaslalani";

7640+ githubId = 42545625;

7641+ name = "Maas Lalani";

7642+ };

62037643 madjar = {

62047644 email = "georges.dubus@compiletoi.net";

62057645 github = "madjar";

62067646 githubId = 109141;

62077647 name = "Georges Dubus";

62087648 };

7649+ Madouura = {

7650+ email = "madouura@gmail.com";

7651+ github = "Madouura";

7652+ githubId = 93990818;

7653+ name = "Madoura";

7654+ };

62097655 mafo = {

62107656 email = "Marc.Fontaine@gmx.de";

62117657 github = "MarcFontaine";

@@ -6274,12 +7720,14 @@

62747720 };

62757721 manveru = {

62767722 email = "m.fellinger@gmail.com";

7723+ matrix = "@manveru:matrix.org";

62777724 github = "manveru";

62787725 githubId = 3507;

62797726 name = "Michael Fellinger";

62807727 };

62817728 maralorn = {

62827729 email = "malte.brandy@maralorn.de";

7730+ matrix = "@maralorn:maralorn.de";

62837731 github = "maralorn";

62847732 githubId = 1651325;

62857733 name = "Malte Brandy";

@@ -6342,12 +7790,24 @@

63427790 githubId = 623509;

63437791 name = "Martijn Vermaat";

63447792 };

7793+ martinetd = {

7794+ email = "f.ktfhrvnznqxacf@noclue.notk.org";

7795+ github = "martinetd";

7796+ githubId = 1729331;

7797+ name = "Dominique Martinet";

7798+ };

63457799 martingms = {

63467800 email = "martin@mg.am";

63477801 github = "martingms";

63487802 githubId = 458783;

63497803 name = "Martin Gammelsæter";

63507804 };

7805+ martfont = {

7806+ name = "Martino Fontana";

7807+ email = "tinozzo123@tutanota.com";

7808+ github = "SuperSamus";

7809+ githubId = 40663462;

7810+ };

63517811 marzipankaiser = {

63527812 email = "nixos@gaisseml.de";

63537813 github = "marzipankaiser";

@@ -6364,6 +7824,12 @@

63647824 githubId = 775189;

63657825 name = "Jordi Masip";

63667826 };

7827+ MaskedBelgian = {

7828+ email = "michael.colicchia@imio.be";

7829+ github = "MaskedBelgian";

7830+ githubId = 29855073;

7831+ name = "Michael Colicchia";

7832+ };

63677833 matejc = {

63687834 email = "cotman.matej@gmail.com";

63697835 github = "matejc";

@@ -6402,6 +7868,7 @@

64027868 };

64037869 matthiasbeyer = {

64047870 email = "mail@beyermatthias.de";

7871+ matrix = "@musicmatze:beyermatthi.as";

64057872 github = "matthiasbeyer";

64067873 githubId = 427866;

64077874 name = "Matthias Beyer";

@@ -6418,6 +7885,16 @@

64187885 githubId = 279868;

64197886 name = "Matti Kariluoma";

64207887 };

7888+ matthewpi = {

7889+ email = "me+nix@matthewp.io";

7890+ github = "matthewpi";

7891+ githubId = 26559841;

7892+ name = "Matthew Penner";

7893+ keys = [{

7894+ longkeyid = "ed25519/0x31311906AD4CF6D6";

7895+ fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6";

7896+ }];

7897+ };

64217898 maurer = {

64227899 email = "matthew.r.maurer+nix@gmail.com";

64237900 github = "maurer";

@@ -6430,6 +7907,16 @@

64307907 githubId = 95194;

64317908 name = "Mauricio Scheffer";

64327909 };

7910+ max-niederman = {

7911+ email = "max@maxniederman.com";

7912+ github = "max-niederman";

7913+ githubId = 19580458;

7914+ name = "Max Niederman";

7915+ keys = [{

7916+ longkeyid = "rsa3072/0x9AED881481D8444E";

7917+ fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E";

7918+ }];

7919+ };

64337920 maxdamantus = {

64347921 email = "maxdamantus@gmail.com";

64357922 github = "Maxdamantus";

@@ -6442,18 +7929,36 @@

64427929 githubId = 35892750;

64437930 name = "Maxine Aubrey";

64447931 };

7932+ maxhille = {

7933+ email = "mh@lambdasoup.com";

7934+ github = "maxhille";

7935+ githubId = 693447;

7936+ name = "Max Hille";

7937+ };

64457938 maxhbr = {

64467939 email = "nixos@maxhbr.dev";

64477940 github = "maxhbr";

64487941 githubId = 1187050;

64497942 name = "Maximilian Huber";

64507943 };

7944+ maximsmol = {

7945+ email = "maximsmol@gmail.com";

7946+ github = "maximsmol";

7947+ githubId = 1472826;

7948+ name = "Max Smolin";

7949+ };

64517950 maxxk = {

64527951 email = "maxim.krivchikov@gmail.com";

64537952 github = "maxxk";

64547953 githubId = 1191859;

64557954 name = "Maxim Krivchikov";

64567955 };

7956+ MayNiklas = {

7957+ email = "info@niklas-steffen.de";

7958+ github = "MayNiklas";

7959+ githubId = 44636701;

7960+ name = "Niklas Steffen";

7961+ };

64577962 mazurel = {

64587963 email = "mateusz.mazur@yahoo.com";

64597964 github = "Mazurel";

@@ -6496,6 +8001,12 @@

64968001 githubId = 51356;

64978002 name = "Mathieu Boespflug";

64988003 };

8004+ mbprtpmnr = {

8005+ name = "mbprtpmnr";

8006+ email = "mbprtpmnr@pm.me";

8007+ github = "mbprtpmnr";

8008+ githubId = 88109321;

8009+ };

64998010 mbrgm = {

65008011 email = "marius@yeai.de";

65018012 github = "mbrgm";

@@ -6558,16 +8069,6 @@

65588069 fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94";

65598070 }];

65608071 };

6561− mdsp = {

6562− github = "Mdsp9070";

6563− githubId = 44469426;

6564− name = "Matheus de Souza Pessanha";

6565− email = "matheus_pessanha2001@outlook.com";

6566− keys = [{

6567− longkeyid = "rsa4096/6DFD656220A3B849";

6568− fingerprint = "2D4D 488F 17FB FF75 664E C016 6DFD 6562 20A3 B849";

6569− }];

6570− };

65718072 meatcar = {

65728073 email = "nixpkgs@denys.me";

65738074 github = "meatcar";

@@ -6626,12 +8127,6 @@

66268127 github = "kira-bruneau";

66278128 githubId = 382041;

66288129 };

6629− meutraa = {

6630− email = "paul+nixpkgs@lost.host";

6631− name = "Paul Meredith";

6632− github = "meutraa";

6633− githubId = 68550871;

6634− };

66358130 mephistophiles = {

66368131 email = "mussitantesmortem@gmail.com";

66378132 name = "Maxim Zhukov";

@@ -6674,14 +8169,27 @@

66748169 githubId = 668926;

66758170 name = "Maximilian Güntner";

66768171 };

8172+ mh = {

8173+ email = "68288772+markus-heinrich@users.noreply.github.com";

8174+ github = "markus-heinrich";

8175+ githubId = 68288772;

8176+ name = "Markus Heinrich";

8177+ };

66778178 mhaselsteiner = {

66788179 email = "magdalena.haselsteiner@gmx.at";

66798180 github = "mhaselsteiner";

66808181 githubId = 20536514;

66818182 name = "Magdalena Haselsteiner";

66828183 };

8184+ mh182 = {

8185+ email = "mh182@chello.at";

8186+ github = "mh182";

8187+ githubId = 9980864;

8188+ name = "Max Hofer";

8189+ };

66838190 mic92 = {

66848191 email = "joerg@thalheim.io";

8192+ matrix = "@mic92:nixos.dev";

66858193 github = "mic92";

66868194 githubId = 96200;

66878195 name = "Jörg Thalheim";

@@ -6691,6 +8199,12 @@

66918199 fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92";

66928200 }];

66938201 };

8202+ michaeladler = {

8203+ email = "therisen06@gmail.com";

8204+ github = "michaeladler";

8205+ githubId = 1575834;

8206+ name = "Michael Adler";

8207+ };

66948208 michaelpj = {

66958209 email = "michaelpj@gmail.com";

66968210 github = "michaelpj";

@@ -6715,6 +8229,12 @@

67158229 githubId = 21156022;

67168230 name = "Michal Minář";

67178231 };

8232+ michzappa = {

8233+ email = "me@michzappa.com";

8234+ github = "michzappa";

8235+ githubId = 59343378;

8236+ name = "Michael Zappa";

8237+ };

67188238 mickours = {

67198239 email = "mickours@gmail.com<";

67208240 github = "mickours";

@@ -6723,6 +8243,7 @@

67238243 };

67248244 midchildan = {

67258245 email = "git@midchildan.org";

8246+ matrix = "@midchildan:matrix.org";

67268247 github = "midchildan";

67278248 githubId = 7343721;

67288249 name = "midchildan";

@@ -6731,6 +8252,12 @@

67318252 fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83";

67328253 }];

67338254 };

8255+ mihnea-s = {

8256+ email = "mihn.stn@gmail.com";

8257+ github = "mihnea-s";

8258+ githubId = 43088426;

8259+ name = "Mihnea Stoian";

8260+ };

67348261 mikefaille = {

67358262 email = "michael@faille.io";

67368263 github = "mikefaille";

@@ -6759,18 +8286,36 @@

67598286 fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22";

67608287 }];

67618288 };

8289+ milahu = {

8290+ email = "milahu@gmail.com";

8291+ github = "milahu";

8292+ githubId = 12958815;

8293+ name = "Milan Hauth";

8294+ };

67628295 milesbreslin = {

67638296 email = "milesbreslin@gmail.com";

67648297 github = "milesbreslin";

67658298 githubId = 38543128;

67668299 name = "Miles Breslin";

67678300 };

8301+ milibopp = {

8302+ email = "contact@ebopp.de";

8303+ github = "milibopp";

8304+ githubId = 3098430;

8305+ name = "Emilia Bopp";

8306+ };

67688307 millerjason = {

67698308 email = "mailings-github@millerjason.com";

67708309 github = "millerjason";

67718310 githubId = 7610974;

67728311 name = "Jason Miller";

67738312 };

8313+ milogert = {

8314+ email = "milo@milogert.com";

8315+ github = "milogert";

8316+ githubId = 5378535;

8317+ name = "Milo Gertjejansen";

8318+ };

67748319 miltador = {

67758320 email = "miltador@yandex.ua";

67768321 name = "Vasiliy Solovey";

@@ -6815,6 +8360,17 @@

68158360 githubId = 1776903;

68168361 name = "Andrew Abbott";

68178362 };

8363+ misterio77 = {

8364+ email = "eu@misterio.me";

8365+ github = "misterio77";

8366+ githubId = 5727578;

8367+ matrix = "@misterio:matrix.org";

8368+ name = "Gabriel Fontes";

8369+ keys = [{

8370+ longkeyid = "rsa3072/0x245CAB70B4C225E9";

8371+ fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9";

8372+ }];

8373+ };

68188374 mitchmindtree = {

68198375 email = "mail@mitchellnordine.com";

68208376 github = "mitchmindtree";

@@ -6827,12 +8383,6 @@

68278383 githubId = 1001112;

68288384 name = "Marcin Janczyk";

68298385 };

6830− mjlbach = {

6831− email = "m.j.lbach@gmail.com";

6832− github = "mjlbach";

6833− githubId = 13316262;

6834− name = "Michael Lingelbach";

6835− };

68368386 mjp = {

68378387 email = "mike@mythik.co.uk";

68388388 github = "MikePlayle";

@@ -6869,6 +8419,7 @@

68698419 };

68708420 mkg20001 = {

68718421 email = "mkg20001+nix@gmail.com";

8422+ matrix = "@mkg20001:matrix.org";

68728423 github = "mkg20001";

68738424 githubId = 7735145;

68748425 name = "Maciej Krüger";

@@ -6952,6 +8503,7 @@

69528503 mohe2015 = {

69538504 name = "Moritz Hedtke";

69548505 email = "Moritz.Hedtke@t-online.de";

8506+ matrix = "@moritz.hedtke:matrix.org";

69558507 github = "mohe2015";

69568508 githubId = 13287984;

69578509 keys = [{

@@ -6993,6 +8545,12 @@

69938545 githubId = 99988;

69948546 name = "Maarten Hoogendoorn";

69958547 };

8548+ MoritzBoehme = {

8549+ email = "mail@moritzboeh.me";

8550+ github = "MoritzBoehme";

8551+ githubId = 42215704;

8552+ name = "Moritz Böhme";

8553+ };

69968554 MostAwesomeDude = {

69978555 email = "cds@corbinsimpson.com";

69988556 github = "MostAwesomeDude";

@@ -7059,6 +8617,17 @@

70598617 githubId = 3073833;

70608618 name = "Massimo Redaelli";

70618619 };

8620+ mrhedgehog = {

8621+ name = "Mr Hedgehog";

8622+ email = "hedgehog@mrhedgehog.xyz";

8623+ matrix = "@mrhedgehog:jupiterbroadcasting.com";

8624+ github = "ModdedGamers";

8625+ githubId = 35778371;

8626+ keys = [{

8627+ longkeyid = "rsa4096/0x7D5107866B1C6752";

8628+ fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752";

8629+ }];

8630+ };

70628631 mrkkrp = {

70638632 email = "markkarpov92@gmail.com";

70648633 github = "mrkkrp";

@@ -7097,6 +8666,16 @@

70978666 name = "Maxim Schuwalow";

70988667 email = "maxim.schuwalow@gmail.com";

70998668 };

8669+ msfjarvis = {

8670+ github = "msfjarvis";

8671+ githubId = 13348378;

8672+ name = "Harsh Shandilya";

8673+ email = "nixos@msfjarvis.dev";

8674+ keys = [{

8675+ longkeyid = "rsa4096/0xB7843F823355E9B9";

8676+ fingerprint = "8F87 050B 0F9C B841 1515 7399 B784 3F82 3355 E9B9";

8677+ }];

8678+ };

71008679 msiedlarek = {

71018680 email = "mikolaj@siedlarek.pl";

71028681 github = "msiedlarek";

@@ -7133,6 +8712,12 @@

71338712 githubId = 4996739;

71348713 name = "Masayuki Takeda";

71358714 };

8715+ mtesseract = {

8716+ email = "moritz@stackrox.com";

8717+ github = "mtesseract";

8718+ githubId = 11706080;

8719+ name = "Moritz Clasmeier";

8720+ };

71368721 MtP = {

71378722 email = "marko.nixos@poikonen.de";

71388723 github = "MtP76";

@@ -7140,10 +8725,10 @@

71408725 name = "Marko Poikonen";

71418726 };

71428727 mtreca = {

7143− email = "maxime@treca.dev";

7144− name = "Maxime Tréca";

8728+ email = "maxime.treca@gmail.com";

71458729 github = "mtreca";

71468730 githubId = 16440823;

8731+ name = "Maxime Tréca";

71478732 };

71488733 mtreskin = {

71498734 email = "zerthurd@gmail.com";

@@ -7187,12 +8772,30 @@

71878772 githubId = 25388474;

71888773 name = "Matej Urbas";

71898774 };

8775+ mvisonneau = {

8776+ name = "Maxime VISONNEAU";

8777+ email = "maxime@visonneau.fr";

8778+ matrix = "@maxime:visonneau.fr";

8779+ github = "mvisonneau";

8780+ githubId = 1761583;

8781+ keys = [{

8782+ longkeyid = "rsa4096/0x150D6F0AE9198D24";

8783+ fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24";

8784+ }];

8785+ };

71908786 mvnetbiz = {

71918787 email = "mvnetbiz@gmail.com";

8788+ matrix = "@mvtva:matrix.org";

71928789 github = "mvnetbiz";

71938790 githubId = 6455574;

71948791 name = "Matt Votava";

71958792 };

8793+ mvs = {

8794+ email = "mvs@nya.yt";

8795+ github = "illdefined";

8796+ githubId = 772914;

8797+ name = "Mikael Voss";

8798+ };

71968799 maxwilson = {

71978800 email = "nixpkgs@maxwilson.dev";

71988801 github = "mwilsoncoding";

@@ -7205,6 +8808,12 @@

72058808 githubId = 9636071;

72068809 name = "Myrl Hex";

72078810 };

8811+ n0emis = {

8812+ email = "nixpkgs@n0emis.network";

8813+ github = "n0emis";

8814+ githubId = 22817873;

8815+ name = "Ember Keske";

8816+ };

72088817 nadrieril = {

72098818 email = "nadrieril@gmail.com";

72108819 github = "nadrieril";

@@ -7237,6 +8846,12 @@

72378846 email = "natedevv@gmail.com";

72388847 name = "Nathan Moore";

72398848 };

8849+ nathanruiz = {

8850+ email = "nathanruiz@protonmail.com";

8851+ github = "nathanruiz";

8852+ githubId = 18604892;

8853+ name = "Nathan Ruiz";

8854+ };

72408855 nathan-gs = {

72418856 email = "nathan@nathan.gs";

72428857 github = "nathan-gs";

@@ -7255,6 +8870,23 @@

72558870 githubId = 56316606;

72568871 name = "Amneesh Singh";

72578872 };

8873+ nazarewk = {

8874+ name = "Krzysztof Nazarewski";

8875+ email = "3494992+nazarewk@users.noreply.github.com";

8876+ matrix = "@nazarewk:matrix.org";

8877+ github = "nazarewk";

8878+ githubId = 3494992;

8879+ keys = [{

8880+ longkeyid = "rsa4096/0x916D8B67241892AE";

8881+ fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE";

8882+ }];

8883+ };

8884+ nbr = {

8885+ email = "nbr@users.noreply.github.com";

8886+ github = "nbr";

8887+ githubId = 3819225;

8888+ name = "Nick Braga";

8889+ };

72588890 nbren12 = {

72598891 email = "nbren12@gmail.com";

72608892 github = "nbren12";

@@ -7263,6 +8895,7 @@

72638895 };

72648896 ncfavier = {

72658897 email = "n@monade.li";

8898+ matrix = "@ncfavier:matrix.org";

72668899 github = "ncfavier";

72678900 githubId = 4323933;

72688901 name = "Naïm Favier";

@@ -7289,18 +8922,42 @@

72898922 githubId = 3747396;

72908923 name = "Nathan Isom";

72918924 };

8925+ neilmayhew = {

8926+ email = "nix@neil.mayhew.name";

8927+ github = "neilmayhew";

8928+ githubId = 166791;

8929+ name = "Neil Mayhew";

8930+ };

8931+ nelsonjeppesen = {

8932+ email = "nix@jeppesen.io";

8933+ github = "NelsonJeppesen";

8934+ githubId = 50854675;

8935+ name = "Nelson Jeppesen";

8936+ };

72928937 neonfuz = {

72938938 email = "neonfuz@gmail.com";

72948939 github = "neonfuz";

72958940 githubId = 2590830;

72968941 name = "Sage Raflik";

72978942 };

8943+ neosimsim = {

8944+ email = "me@abn.sh";

8945+ github = "neosimsim";

8946+ githubId = 1771772;

8947+ name = "Alexander Ben Nasrallah";

8948+ };

72988949 nequissimus = {

72998950 email = "tim@nequissimus.com";

73008951 github = "nequissimus";

73018952 githubId = 628342;

73028953 name = "Tim Steinbach";

73038954 };

8955+ nerdypepper = {

8956+ email = "nerdy@peppe.rs";

8957+ github = "nerdypepper";

8958+ githubId = 23743547;

8959+ name = "Akshay Oppiliappan";

8960+ };

73048961 nessdoor = {

73058962 name = "Tomas Antonio Lopez";

73068963 email = "entropy.overseer@protonmail.com";

@@ -7324,6 +8981,18 @@

73248981 githubId = 17120571;

73258982 name = "Xinhao Luo";

73268983 };

8984+ newam = {

8985+ email = "alex@thinglab.org";

8986+ github = "newAM";

8987+ githubId = 7845120;

8988+ name = "Alex Martens";

8989+ };

8990+ nialov = {

8991+ email = "nikolasovaskainen@gmail.com";

8992+ github = "nialov";

8993+ githubId = 47318483;

8994+ name = "Nikolas Ovaskainen";

8995+ };

73278996 nikitavoloboev = {

73288997 email = "nikita.voloboev@gmail.com";

73298998 github = "nikitavoloboev";

@@ -7336,6 +9005,7 @@

73369005 };

73379006 nh2 = {

73389007 email = "mail@nh2.me";

9008+ matrix = "@nh2:matrix.org";

73399009 github = "nh2";

73409010 githubId = 399535;

73419011 name = "Niklas Hambüchen";

@@ -7362,6 +9032,12 @@

73629032 githubId = 1665818;

73639033 name = "Philipp Eder";

73649034 };

9035+ nickcao = {

9036+ name = "Nick Cao";

9037+ email = "nickcao@nichi.co";

9038+ github = "NickCao";

9039+ githubId = 15247171;

9040+ };

73659041 nickhu = {

73669042 email = "me@nickhu.co.uk";

73679043 github = "nickhu";

@@ -7380,6 +9056,12 @@

73809056 githubId = 8214542;

73819057 name = "Nicolò Balzarotti";

73829058 };

9059+ nidabdella = {

9060+ name = "Mohamed Nidabdella";

9061+ email = "nidabdella.mohamed@gmail.com";

9062+ github = "nidabdella";

9063+ githubId = 8083813;

9064+ };

73839065 NieDzejkob = {

73849066 email = "kuba@kadziolka.net";

73859067 github = "NieDzejkob";

@@ -7408,8 +9090,15 @@

74089090 githubId = 26231126;

74099091 name = "Nils ANDRÉ-CHANG";

74109092 };

9093+ nils-degroot = {

9094+ email = "nils@peeko.nl";

9095+ github = "nils-degroot";

9096+ githubId = 53556985;

9097+ name = "Nils de Groot";

9098+ };

74119099 ninjatrappeur = {

74129100 email = "felix@alternativebit.fr";

9101+ matrix = "@ninjatrappeur:matrix.org";

74139102 github = "ninjatrappeur";

74149103 githubId = 1219785;

74159104 name = "Félix Baylac-Jacqué";

@@ -7430,6 +9119,22 @@

74309119 githubId = 3159451;

74319120 name = "Nicolas Schneider";

74329121 };

9122+ nkje = {

9123+ name = "Niels Kristian Lyshøj Jensen";

9124+ email = "n@nk.je";

9125+ github = "NKJe";

9126+ githubId = 1102306;

9127+ keys = [{

9128+ longkeyid = "nistp256/0xDE3BADFECD31A89D";

9129+ fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D";

9130+ }];

9131+ };

9132+ nitsky = {

9133+ name = "nitsky";

9134+ email = "492793+nitsky@users.noreply.github.com";

9135+ github = "nitsky";

9136+ githubId = 492793;

9137+ };

74339138 nkpvk = {

74349139 email = "niko.pavlinek@gmail.com";

74359140 github = "nkpvk";

@@ -7448,6 +9153,7 @@

74489153 };

74499154 nixinator = {

74509155 email = "33lockdown33@protonmail.com";

9156+ matrix = "@nixinator:nixos.dev";

74519157 github = "nixinator";

74529158 githubId = 66913205;

74539159 name = "Rick Sanchez";

@@ -7458,6 +9164,12 @@

74589164 githubId = 7588406;

74599165 name = "Andrew R. M.";

74609166 };

9167+ nkalupahana = {

9168+ email = "hello@nisa.la";

9169+ github = "nkalupahana";

9170+ githubId = 7347290;

9171+ name = "Nisala Kalupahana";

9172+ };

74619173 nloomans = {

74629174 email = "noah@nixos.noahloomans.com";

74639175 github = "nloomans";

@@ -7482,6 +9194,12 @@

74829194 githubId = 810877;

74839195 name = "Tom Doggett";

74849196 };

9197+ noisersup = {

9198+ email = "patryk@kwiatek.xyz";

9199+ github = "noisersup";

9200+ githubId = 42322511;

9201+ name = "Patryk Kwiatek";

9202+ };

74859203 nomeata = {

74869204 email = "mail@joachim-breitner.de";

74879205 github = "nomeata";

@@ -7496,13 +9214,14 @@

74969214 };

74979215 noneucat = {

74989216 email = "andy@lolc.at";

9217+ matrix = "@noneucat:lolc.at";

74999218 github = "noneucat";

75009219 githubId = 40049608;

75019220 name = "Andy Chun";

75029221 };

75039222 noreferences = {

75049223 email = "norkus@norkus.net";

7505− github = "noreferences";

9224+ github = "jozuas";

75069225 githubId = 13085275;

75079226 name = "Juozas Norkus";

75089227 };

@@ -7518,9 +9237,9 @@

75189237 githubId = 2946283;

75199238 name = "Brian Cohen";

75209239 };

7521− novoxudonoser = {

9240+ novoxd = {

75229241 email = "radnovox@gmail.com";

7523− github = "novoxudonoser";

9242+ github = "novoxd";

75249243 githubId = 6052922;

75259244 name = "Kirill Struokov";

75269245 };

@@ -7538,6 +9257,7 @@

75389257 };

75399258 nrdxp = {

75409259 email = "tim.deh@pm.me";

9260+ matrix = "@timdeh:matrix.org";

75419261 github = "nrdxp";

75429262 githubId = 34083928;

75439263 name = "Tim DeHerrera";

@@ -7558,6 +9278,12 @@

75589278 githubId = 1839979;

75599279 name = "Niklas Thörne";

75609280 };

9281+ nukaduka = {

9282+ email = "ksgokte@gmail.com";

9283+ github = "NukaDuka";

9284+ githubId = 22592293;

9285+ name = "Kartik Gokte";

9286+ };

75619287 nullx76 = {

75629288 email = "nix@xirion.net";

75639289 github = "NULLx76";

@@ -7573,6 +9299,7 @@

75739299 numkem = {

75749300 name = "Sebastien Bariteau";

75759301 email = "numkem@numkem.org";

9302+ matrix = "@numkem:matrix.org";

75769303 github = "numkem";

75779304 githubId = 332423;

75789305 };

@@ -7594,6 +9321,17 @@

75949321 githubId = 127548;

75959322 name = "Judson Lester";

75969323 };

9324+ nzbr = {

9325+ email = "nixos@nzbr.de";

9326+ github = "nzbr";

9327+ githubId = 7851175;

9328+ name = "nzbr";

9329+ matrix = "@nzbr:nzbr.de";

9330+ keys = [{

9331+ longkeyid = "rsa2048/0x6C78B50B97A42F8A";

9332+ fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A";

9333+ }];

9334+ };

75979335 nzhang-zh = {

75989336 email = "n.zhang.hp.au@gmail.com";

75999337 github = "nzhang-zh";

@@ -7614,6 +9352,7 @@

76149352 };

76159353 obfusk = {

76169354 email = "flx@obfusk.net";

9355+ matrix = "@obfusk:matrix.org";

76179356 github = "obfusk";

76189357 githubId = 1260687;

76199358 name = "Felix C. Stegerman";

@@ -7628,6 +9367,12 @@

76289367 githubId = 158758;

76299368 name = "Oliver Dunkl";

76309369 };

9370+ ofek = {

9371+ email = "oss@ofek.dev";

9372+ github = "ofek";

9373+ githubId = 9677399;

9374+ name = "Ofek Lev";

9375+ };

76319376 offline = {

76329377 email = "jaka@x-truder.net";

76339378 github = "offlinehacker";

@@ -7662,6 +9407,12 @@

76629407 githubId = 72201;

76639408 name = "Ole Jørgen Brønner";

76649409 };

9410+ ollieB = {

9411+ email = "1237862+oliverbunting@users.noreply.github.com";

9412+ github = "oliverbunting";

9413+ githubId = 1237862;

9414+ name = "Ollie Bunting";

9415+ };

76659416 olynch = {

76669417 email = "owen@olynch.me";

76679418 github = "olynch";

@@ -7704,12 +9455,24 @@

77049455 githubId = 757752;

77059456 name = "Jonas Heinrich";

77069457 };

9458+ ony = {

9459+ name = "Mykola Orliuk";

9460+ email = "virkony@gmail.com";

9461+ github = "ony";

9462+ githubId = 11265;

9463+ };

77079464 OPNA2608 = {

77089465 email = "christoph.neidahl@gmail.com";

77099466 github = "OPNA2608";

77109467 githubId = 23431373;

77119468 name = "Christoph Neidahl";

77129469 };

9470+ opeik = {

9471+ email = "sandro@stikic.com";

9472+ github = "opeik";

9473+ githubId = 11566773;

9474+ name = "Sandro Stikić";

9475+ };

77139476 orbekk = {

77149477 email = "kjetil.orbekk@gmail.com";

77159478 github = "orbekk";

@@ -7728,6 +9491,12 @@

77289491 githubId = 101514;

77299492 name = "Orivej Desh";

77309493 };

9494+ ornxka = {

9495+ email = "ornxka@littledevil.sh";

9496+ github = "ornxka";

9497+ githubId = 52086525;

9498+ name = "ornxka";

9499+ };

77319500 oro = {

77329501 email = "marco@orovecchia.at";

77339502 github = "oro";

@@ -7788,6 +9557,12 @@

77889557 githubId = 15930073;

77899558 name = "Moritz Scheuren";

77909559 };

9560+ ozkutuk = {

9561+ email = "ozkutuk@protonmail.com";

9562+ github = "ozkutuk";

9563+ githubId = 5948762;

9564+ name = "Berk Özkütük";

9565+ };

77919566 pablovsky = {

77929567 email = "dealberapablo07@gmail.com";

77939568 github = "pablo1107";

@@ -7802,6 +9577,7 @@

78029577 };

78039578 pacman99 = {

78049579 email = "pachum99@gmail.com";

9580+ matrix = "@pachumicchu:myrdd.info";

78059581 github = "Pacman99";

78069582 githubId = 16345849;

78079583 name = "Parthiv Seetharaman";

@@ -7832,6 +9608,7 @@

78329608 };

78339609 pamplemousse = {

78349610 email = "xav.maso@gmail.com";

9611+ matrix = "@pamplemouss_:matrix.org";

78359612 github = "Pamplemousse";

78369613 githubId = 2647236;

78379614 name = "Xavier Maso";

@@ -7854,6 +9631,13 @@

78549631 githubId = 71795;

78559632 name = "Mica Semrick";

78569633 };

9634+ papojari = {

9635+ email = "papojari-git.ovoid@aleeas.com";

9636+ matrix = "@papojari:artemislena.eu";

9637+ github = "papojari";

9638+ githubId = 81317317;

9639+ name = "papojari";

9640+ };

78579641 paraseba = {

78589642 email = "paraseba@gmail.com";

78599643 github = "paraseba";

@@ -7885,7 +9669,7 @@

78859669 name = "pasqui23";

78869670 };

78879671 patryk27 = {

7888− email = "wychowaniec.patryk@gmail.com";

9672+ email = "pwychowaniec@pm.me";

78899673 github = "Patryk27";

78909674 githubId = 3395477;

78919675 name = "Patryk Wychowaniec";

@@ -7912,6 +9696,12 @@

79129696 githubId = 116740;

79139697 name = "Paweł Pacana";

79149698 };

9699+ pb- = {

9700+ email = "pbaecher@gmail.com";

9701+ github = "pb-";

9702+ githubId = 84886;

9703+ name = "Paul Baecher";

9704+ };

79159705 pbogdan = {

79169706 email = "ppbogdan@gmail.com";

79179707 github = "pbogdan";

@@ -7936,18 +9726,18 @@

79369726 githubId = 8641;

79379727 name = "Pierre Carrier";

79389728 };

7939− pengmeiyu = {

7940− email = "pengmyu@gmail.com";

7941− github = "pmeiyu";

7942− githubId = 8529551;

7943− name = "Peng Mei Yu";

7944− };

79459729 penguwin = {

79469730 email = "penguwin@penguwin.eu";

79479731 github = "penguwin";

79489732 githubId = 13225611;

79499733 name = "Nicolas Martin";

79509734 };

9735+ pennae = {

9736+ name = "pennae";

9737+ email = "github@quasiparticle.net";

9738+ github = "pennae";

9739+ githubId = 82953136;

9740+ };

79519741 p3psi = {

79529742 name = "Elliot Boo";

79539743 email = "p3psi.boo@gmail.com";

@@ -7962,6 +9752,7 @@

79629752 };

79639753 petabyteboy = {

79649754 email = "milan@petabyte.dev";

9755+ matrix = "@milan:petabyte.dev";

79659756 github = "petabyteboy";

79669757 githubId = 3250809;

79679758 name = "Milan Pässler";

@@ -7974,6 +9765,7 @@

79749765 };

79759766 peterhoeg = {

79769767 email = "peter@hoeg.com";

9768+ matrix = "@peter:hoeg.com";

79779769 github = "peterhoeg";

79789770 githubId = 722550;

79799771 name = "Peter Hoeg";

@@ -8026,17 +9818,23 @@

80269818 githubId = 1640697;

80279819 name = "Philipp Hausmann";

80289820 };

9821+ Philipp-M = {

9822+ email = "philipp@mildenberger.me";

9823+ github = "Philipp-M";

9824+ githubId = 9267430;

9825+ name = "Philipp Mildenberger";

9826+ };

80299827 Phlogistique = {

80309828 email = "noe.rubinstein@gmail.com";

80319829 github = "Phlogistique";

80329830 githubId = 421510;

80339831 name = "Noé Rubinstein";

80349832 };

8035− phreedom = {

8036− email = "phreedom@yandex.ru";

8037− github = "phreedom";

8038− githubId = 62577;

8039− name = "Evgeny Egorochkin";

9833+ photex = {

9834+ email = "photex@gmail.com";

9835+ github = "photex";

9836+ githubId = 301903;

9837+ name = "Chip Collier";

80409838 };

80419839 phryneas = {

80429840 email = "mail@lenzw.de";

@@ -8053,6 +9851,7 @@

80539851 piegames = {

80549852 name = "piegames";

80559853 email = "nix@piegames.de";

9854+ matrix = "@piegames:matrix.org";

80569855 github = "piegamesde";

80579856 githubId = 14054505;

80589857 };

@@ -8080,6 +9879,12 @@

80809879 githubId = 1179566;

80819880 name = "Nicolas B. Pierron";

80829881 };

9882+ pimeys = {

9883+ email = "julius@nauk.io";

9884+ github = "pimeys";

9885+ githubId = 34967;

9886+ name = "Julius de Bruijn";

9887+ };

80839888 pingiun = {

80849889 email = "nixos@pingiun.com";

80859890 github = "pingiun";

@@ -8096,7 +9901,7 @@

80969901 githubId = 1719781;

80979902 name = "Pablo Ovelleiro Corral";

80989903 keys = [{

8099− longkeyid = "sa4096/0x823A6154426408D3";

9904+ longkeyid = "rsa4096/0x823A6154426408D3";

81009905 fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3";

81019906 }];

81029907 };

@@ -8190,6 +9995,12 @@

81909995 githubId = 178496;

81919996 name = "Philipp Middendorf";

81929997 };

9998+ pmy = {

9999+ email = "pmy@xqzp.net";

10000+ github = "pmeiyu";

10001+ githubId = 8529551;

10002+ name = "Peng Mei Yu";

10003+ };

819310004 pmyjavec = {

819410005 email = "pauly@myjavec.com";

819510006 github = "pmyjavec";

@@ -8208,6 +10019,12 @@

820810019 githubId = 11365056;

820910020 name = "Kevin Liu";

821010021 };

10022+ pnmadelaine = {

10023+ name = "Paul-Nicolas Madelaine";

10024+ email = "pnm@pnm.tf";

10025+ github = "pnmadelaine";

10026+ githubId = 21977014;

10027+ };

821110028 pnotequalnp = {

821210029 email = "kevin@pnotequalnp.com";

821310030 github = "pnotequalnp";

@@ -8218,6 +10035,12 @@

821810035 fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A";

821910036 }];

822010037 };

10038+ podocarp = {

10039+ email = "xdjiaxd@gmail.com";

10040+ github = "podocarp";

10041+ githubId = 10473184;

10042+ name = "Jia Xiaodong";

10043+ };

822110044 polendri = {

822210045 email = "paul@ijj.li";

822310046 github = "polendri";

@@ -8230,6 +10053,12 @@

823010053 github = "polygon";

823110054 githubId = 51489;

823210055 };

10056+ polykernel = {

10057+ email = "81340136+polykernel@users.noreply.github.com";

10058+ github = "polykernel";

10059+ githubId = 81340136;

10060+ name = "polykernel";

10061+ };

823310062 polyrod = {

823410063 email = "dc1mdp@gmail.com";

823510064 github = "polyrod";

@@ -8252,6 +10081,18 @@

825210081 fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0";

825310082 }];

825410083 };

10084+ ppenguin = {

10085+ name = "Jeroen Versteeg";

10086+ email = "hieronymusv@gmail.com";

10087+ github = "ppenguin";

10088+ githubId = 17690377;

10089+ };

10090+ ppom = {

10091+ name = "Paco Pompeani";

10092+ email = "paco@ecomail.io";

10093+ github = "aopom";

10094+ githubId = 38916722;

10095+ };

825510096 pradeepchhetri = {

825610097 email = "pradeep.chhetri89@gmail.com";

825710098 github = "pradeepchhetri";

@@ -8288,6 +10129,7 @@

828810129 };

828910130 primeos = {

829010131 email = "dev.primeos@gmail.com";

10132+ matrix = "@primeos:matrix.org";

829110133 github = "primeos";

829210134 githubId = 7537109;

829310135 name = "Michael Weiss";

@@ -8348,14 +10190,23 @@

834810190 githubId = 33375;

834910191 name = "Peter Sanford";

835010192 };

10193+ pshirshov = {

10194+ email = "pshirshov@eml.cc";

10195+ github = "pshirshov";

10196+ githubId = 295225;

10197+ name = "Pavel Shirshov";

10198+ };

835110199 psibi = {

835210200 email = "sibi@psibi.in";

10201+ matrix = "@psibi:matrix.org";

835310202 github = "psibi";

835410203 githubId = 737477;

8355− name = "Sibi";

10204+ name = "Sibi Prabakaran";

835610205 };

835710206 pstn = {

835810207 email = "philipp@xndr.de";

10208+ github = "pstn";

10209+ githubId = 1329940;

835910210 name = "Philipp Steinpaß";

836010211 };

836110212 pSub = {

@@ -8370,6 +10221,12 @@

837010221 githubId = 20524473;

837110222 name = "Psyanticy";

837210223 };

10224+ psydvl = {

10225+ email = "psydvl@fea.st";

10226+ github = "psydvl";

10227+ githubId = 43755002;

10228+ name = "Dmitriy P";

10229+ };

837310230 ptival = {

837410231 email = "valentin.robert.42@gmail.com";

837510232 github = "Ptival";

@@ -8400,6 +10257,13 @@

840010257 githubId = 5636;

840110258 name = "Steve Purcell";

840210259 };

10260+ putchar = {

10261+ email = "slim.cadoux@gmail.com";

10262+ matrix = "@putch4r:matrix.org";

10263+ github = "putchar";

10264+ githubId = 8208767;

10265+ name = "Slim Cadoux";

10266+ };

840310267 puzzlewolf = {

840410268 email = "nixos@nora.pink";

840510269 github = "puzzlewolf";

@@ -8436,6 +10300,12 @@

843610300 githubId = 115877;

843710301 name = "Kenny Shen";

843810302 };

10303+ quag = {

10304+ email = "quaggy@gmail.com";

10305+ github = "quag";

10306+ githubId = 35086;

10307+ name = "Jonathan Wright";

10308+ };

843910309 queezle = {

844010310 email = "git@queezle.net";

844110311 github = "qzle";

@@ -8464,8 +10334,15 @@

846410334 githubId = 52847440;

846510335 name = "Ryan Burns";

846610336 };

10337+ r3dl3g = {

10338+ email = "redleg@rothfuss-web.de";

10339+ github = "r3dl3g";

10340+ githubId = 35229674;

10341+ name = "Armin Rothfuss";

10342+ };

846710343 raboof = {

846810344 email = "arnout@bzzt.net";

10345+ matrix = "@raboof:matrix.org";

846910346 github = "raboof";

847010347 githubId = 131856;

847110348 name = "Arnout Engelen";

@@ -8482,6 +10359,13 @@

848210359 githubId = 1016742;

848310360 name = "Rafael García";

848410361 };

10362+ raitobezarius = {

10363+ email = "ryan@lahfa.xyz";

10364+ matrix = "@raitobezarius:matrix.org";

10365+ github = "RaitoBezarius";

10366+ githubId = 314564;

10367+ name = "Ryan Lahfa";

10368+ };

848510369 raquelgb = {

848610370 email = "raquel.garcia.bautista@gmail.com";

848710371 github = "raquelgb";

@@ -8496,6 +10380,7 @@

849610380 };

849710381 ralith = {

849810382 email = "ben.e.saunders@gmail.com";

10383+ matrix = "@ralith:ralith.com";

849910384 github = "ralith";

850010385 githubId = 104558;

850110386 name = "Benjamin Saunders";

@@ -8564,6 +10449,16 @@

856410449 githubId = 16487165;

856510450 name = "Rafael Basso";

856610451 };

10452+ rbreslow = {

10453+ name = "Rocky Breslow";

10454+ email = "1774125+rbreslow@users.noreply.github.com";

10455+ github = "rbreslow";

10456+ githubId = 1774125;

10457+ keys = [{

10458+ longkeyid = "ed25519/0xA0D32ACCA38B88ED";

10459+ fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED";

10460+ }];

10461+ };

856710462 rbrewer = {

856810463 email = "rwb123@gmail.com";

856910464 github = "rbrewer123";

@@ -8582,6 +10477,20 @@

858210477 githubId = 16624;

858310478 name = "Maxim Ivanov";

858410479 };

10480+ reckenrode = {

10481+ name = "Randy Eckenrode";

10482+ email = "randy@largeandhighquality.com";

10483+ matrix = "@reckenrode:matrix.org";

10484+ github = "reckenrode";

10485+ githubId = 7413633;

10486+ keys = [

10487+ # compare with https://keybase.io/reckenrode

10488+ {

10489+ longkeyid = "ed25519/0xFBF19A982CCE0048";

10490+ fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048";

10491+ }

10492+ ];

10493+ };

858510494 redfish64 = {

858610495 email = "engler@gmail.com";

858710496 github = "redfish64";

@@ -8636,6 +10545,12 @@

863610545 githubId = 546296;

863710546 name = "Eric Ren";

863810547 };

10548+ renesat = {

10549+ name = "Ivan Smolyakov";

10550+ email = "smol.ivan97@gmail.com";

10551+ github = "renesat";

10552+ githubId = 11363539;

10553+ };

863910554 renzo = {

864010555 email = "renzocarbonara@gmail.com";

864110556 github = "k0001";

@@ -8648,12 +10563,40 @@

864810563 githubId = 500703;

864910564 name = "Tadas Barzdžius";

865010565 };

10566+ revol-xut = {

10567+ email = "revol-xut@protonmail.com";

10568+ name = "Tassilo Tanneberger";

10569+ github = "revol-xut";

10570+ githubId = 32239737;

10571+ keys = [{

10572+ longkeyid = "rsa4096/B966009D57E69CC6";

10573+ fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6";

10574+ }];

10575+ };

865110576 rexim = {

865210577 email = "reximkut@gmail.com";

865310578 github = "rexim";

865410579 githubId = 165283;

865510580 name = "Alexey Kutepov";

865610581 };

10582+ rewine = {

10583+ email = "lhongxu@outlook.com";

10584+ github = "wineee";

10585+ githubId = 22803888;

10586+ name = "Lu Hongxu";

10587+ };

10588+ rgnns = {

10589+ email = "jglievano@gmail.com";

10590+ github = "rgnns";

10591+ githubId = 811827;

10592+ name = "Gabriel Lievano";

10593+ };

10594+ rgrinberg = {

10595+ name = "Rudi Grinberg";

10596+ email = "me@rgrinberg.com";

10597+ github = "rgrinberg";

10598+ githubId = 139003;

10599+ };

865710600 rgrunbla = {

865810601 email = "remy@grunblatt.org";

865910602 github = "rgrunbla";

@@ -8678,6 +10621,13 @@

867810621 githubId = 6047658;

867910622 name = "Ryan Horiguchi";

868010623 };

10624+ rhysmdnz = {

10625+ email = "rhys@memes.nz";

10626+ matrix = "@rhys:memes.nz";

10627+ github = "rhysmdnz";

10628+ githubId = 2162021;

10629+ name = "Rhys Davies";

10630+ };

868110631 ribose-jeffreylau = {

868210632 name = "Jeffrey Lau";

868310633 email = "jeffrey.lau@ribose.com";

@@ -8702,6 +10652,13 @@

870210652 githubId = 16779;

870310653 name = "Rickard Nilsson";

870410654 };

10655+ ricochet = {

10656+ email = "behayes2@gmail.com";

10657+ github = "ricochet";

10658+ githubId = 974323;

10659+ matrix = "@ricochetcode:matrix.org";

10660+ name = "Bailey Hayes";

10661+ };

870510662 riey = {

870610663 email = "creeper844@gmail.com";

870710664 github = "Riey";

@@ -8720,6 +10677,12 @@

872010677 githubId = 37246692;

872110678 name = "Riley Inman";

872210679 };

10680+ riotbib = {

10681+ email = "github-nix@lnrt.de";

10682+ github = "riotbib";

10683+ githubId = 43172581;

10684+ name = "Lennart Mühlenmeier";

10685+ };

872310686 ris = {

872410687 email = "code@humanleg.org.uk";

872510688 github = "risicle";

@@ -8729,6 +10692,7 @@

872910692 risson = {

873010693 name = "Marc Schmitt";

873110694 email = "marc.schmitt@risson.space";

10695+ matrix = "@risson:lama-corp.space";

873210696 github = "rissson";

873310697 githubId = 18313093;

873410698 keys = [

@@ -8742,12 +10706,6 @@

874210706 }

874310707 ];

874410708 };

8745− rittelle = {

8746− email = "rittelle@posteo.de";

8747− github = "rittelle";

8748− githubId = 33598633;

8749− name = "Lennart Rittel";

8750− };

875110709 rixed = {

875210710 email = "rixed-github@happyleptic.org";

875310711 github = "rixed";

@@ -8786,12 +10744,14 @@

878610744 };

878710745 rmcgibbo = {

878810746 email = "rmcgibbo@gmail.com";

10747+ matrix = "@rmcgibbo:matrix.org";

878910748 github = "rmcgibbo";

879010749 githubId = 641278;

879110750 name = "Robert T. McGibbon";

879210751 };

879310752 rnhmjoj = {

879410753 email = "rnhmjoj@inventati.org";

10754+ matrix = "@rnhmjoj:maxwell.ydns.eu";

879510755 github = "rnhmjoj";

879610756 githubId = 2817565;

879710757 name = "Michele Guerini Rocco";

@@ -8832,6 +10792,7 @@

883210792 };

883310793 roberth = {

883410794 email = "nixpkgs@roberthensing.nl";

10795+ matrix = "@roberthensing:matrix.org";

883510796 github = "roberth";

883610797 githubId = 496447;

883710798 name = "Robert Hensing";

@@ -8890,18 +10851,9 @@

889010851 githubId = 1312525;

889110852 name = "Rongcui Dong";

889210853 };

8893− ronthecookie = {

8894− name = "Ron B";

8895− email = "me@ronthecookie.me";

8896− github = "ronthecookie";

8897− githubId = 2526321;

8898− keys = [{

8899− longkeyid = "rsa2048/0x6F5B32DE5E5FA80C";

8900− fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C";

8901− }];

8902− };

890310854 roosemberth = {

890410855 email = "roosembert.palacios+nixpkgs@posteo.ch";

10856+ matrix = "@roosemberth:orbstheorem.ch";

890510857 github = "roosemberth";

890610858 githubId = 3621083;

890710859 name = "Roosembert (Roosemberth) Palacios";

@@ -8938,6 +10890,12 @@

893810890 githubId = 592876;

893910891 name = "Robert W. Pearce";

894010892 };

10893+ rprecenth = {

10894+ email = "rasmus@precenth.eu";

10895+ github = "Prillan";

10896+ githubId = 1675190;

10897+ name = "Rasmus Précenth";

10898+ };

894110899 rprospero = {

894210900 email = "rprospero+nix@gmail.com";

894310901 github = "rprospero";

@@ -8956,12 +10914,24 @@

895610914 githubId = 373566;

895710915 name = "Ronuk Raval";

895810916 };

10917+ rski = {

10918+ name = "rski";

10919+ email = "rom.skiad+nix@gmail.com";

10920+ github = "rski";

10921+ githubId = 2960312;

10922+ };

895910923 rszibele = {

896010924 email = "richard@szibele.com";

896110925 github = "rszibele";

896210926 githubId = 1387224;

896310927 name = "Richard Szibele";

896410928 };

10929+ rsynnest = {

10930+ email = "contact@rsynnest.com";

10931+ github = "rsynnest";

10932+ githubId = 4392850;

10933+ name = "Roland Synnestvedt";

10934+ };

896510935 rtburns-jpl = {

896610936 email = "rtburns@jpl.nasa.gov";

896710937 github = "rtburns-jpl";

@@ -9036,6 +11006,7 @@

903611006 };

903711007 ryantm = {

903811008 email = "ryan@ryantm.com";

11009+ matrix = "@ryantm:matrix.org";

903911010 github = "ryantm";

904011011 githubId = 4804;

904111012 name = "Ryan Mulligan";

@@ -9068,6 +11039,16 @@

906811039 githubId = 3280280;

906911040 name = "Ryne Everett";

907011041 };

11042+ rytone = {

11043+ email = "max@ryt.one";

11044+ github = "rytone";

11045+ githubId = 8082305;

11046+ name = "Maxwell Beck";

11047+ keys = [{

11048+ longkeyid = "rsa2048/0xBB3EFA303760A0DB";

11049+ fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB";

11050+ }];

11051+ };

907111052 rzetterberg = {

907211053 email = "richard.zetterberg@gmail.com";

907311054 github = "rzetterberg";

@@ -9076,10 +11057,28 @@

907611057 };

907711058 s1341 = {

907811059 email = "s1341@shmarya.net";

11060+ matrix = "@s1341:matrix.org";

907911061 name = "Shmarya Rubenstein";

908011062 github = "s1341";

908111063 githubId = 5682183;

908211064 };

11065+ sagikazarmark = {

11066+ name = "Mark Sagi-Kazar";

11067+ email = "mark.sagikazar@gmail.com";

11068+ matrix = "@mark.sagikazar:matrix.org";

11069+ github = "sagikazarmark";

11070+ githubId = 1226384;

11071+ keys = [{

11072+ longkeyid = "rsa4096/0xF251ADDC9D041C7E";

11073+ fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E";

11074+ }];

11075+ };

11076+ samalws = {

11077+ email = "sam@samalws.com";

11078+ name = "Sam Alws";

11079+ github = "samalws";

11080+ githubId = 20981725;

11081+ };

908311082 samb96 = {

908411083 email = "samb96@gmail.com";

908511084 github = "samb96";

@@ -9114,28 +11113,35 @@

911411113 githubId = 115821;

911511114 name = "Sam Rose";

911611115 };

11116+ samuela = {

11117+ email = "skainsworth@gmail.com";

11118+ github = "samuela";

11119+ githubId = 226872;

11120+ name = "Samuel Ainsworth";

11121+ };

911711122 samueldr = {

911811123 email = "samuel@dionne-riel.com";

11124+ matrix = "@samueldr:matrix.org";

911911125 github = "samueldr";

912011126 githubId = 132835;

912111127 name = "Samuel Dionne-Riel";

912211128 };

9123− samuelgrf = {

9124− email = "git@samuelgrf.com";

9125− github = "samuelgrf";

9126− githubId = 67663538;

9127− name = "Samuel Gräfenstein";

9128− keys = [{

9129− longkeyid = "rsa4096/0xEF76A063F15C63C8";

9130− fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8";

9131− }];

9132− };

913311129 samuelrivas = {

913411130 email = "samuelrivas@gmail.com";

913511131 github = "samuelrivas";

913611132 githubId = 107703;

913711133 name = "Samuel Rivas";

913811134 };

11135+ samyak = {

11136+ name = "Samyak Sarnayak";

11137+ email = "samyak201@gmail.com";

11138+ github = "Samyak2";

11139+ githubId = 34161949;

11140+ keys = [{

11141+ longkeyid = "rsa4096/0x365873F2F0C6153B";

11142+ fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B";

11143+ }];

11144+ };

913911145 sander = {

914011146 email = "s.vanderburg@tudelft.nl";

914111147 github = "svanderburg";

@@ -9184,6 +11190,12 @@

918411190 githubId = 720864;

918511191 name = "Sébastien Bourdeauducq";

918611192 };

11193+ sbellem = {

11194+ email = "sbellem@gmail.com";

11195+ github = "sbellem";

11196+ githubId = 125458;

11197+ name = "Sylvain Bellemare";

11198+ };

918711199 sbond75 = {

918811200 name = "sbond75";

918911201 email = "43617712+sbond75@users.noreply.github.com";

@@ -9236,6 +11248,16 @@

923611248 email = "schristopher@konputa.com";

923711249 name = "Scott Christopher";

923811250 };

11251+ sciencentistguy = {

11252+ email = "jamie@quigley.xyz";

11253+ name = "Jamie Quigley";

11254+ github = "Sciencentistguy";

11255+ githubId = 4983935;

11256+ keys = [{

11257+ longkeyid = "rsa2048/0x8E8FF66E2AE8D970";

11258+ fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970";

11259+ }];

11260+};

923911261 scode = {

924011262 email = "peter.schuller@infidyne.com";

924111263 github = "scode";

@@ -9256,6 +11278,7 @@

925611278 };

925711279 Scriptkiddi = {

925811280 email = "nixos@scriptkiddi.de";

11281+ matrix = "@fritz.otlinghaus:helsinki-systems.de";

925911282 github = "scriptkiddi";

926011283 githubId = 3598650;

926111284 name = "Fritz Otlinghaus";

@@ -9268,16 +11291,11 @@

926811291 };

926911292 sdier = {

927011293 email = "scott@dier.name";

11294+ matrix = "@sdier:matrix.org";

927111295 github = "sdier";

927211296 githubId = 11613056;

927311297 name = "Scott Dier";

927411298 };

9275− sdll = {

9276− email = "sasha.delly@gmail.com";

9277− github = "sdll";

9278− githubId = 17913919;

9279− name = "Sasha Illarionov";

9280− };

928111299 SeanZicari = {

928211300 email = "sean.zicari@gmail.com";

928311301 github = "SeanZicari";

@@ -9290,12 +11308,30 @@

929011308 githubId = 19472270;

929111309 name = "Sebastian";

929211310 };

11311+ sebastianblunt = {

11312+ name = "Sebastian Blunt";

11313+ email = "nix@sebastianblunt.com";

11314+ github = "sebastianblunt";

11315+ githubId = 47431204;

11316+ };

929311317 sebbadk = {

929411318 email = "sebastian@sebba.dk";

929511319 github = "SEbbaDK";

929611320 githubId = 1567527;

929711321 name = "Sebastian Hyberts";

929811322 };

11323+ sebbel = {

11324+ email = "hej@sebastian-ball.de";

11325+ github = "sebbel";

11326+ githubId = 1940568;

11327+ name = "Sebastian Ball";

11328+ };

11329+ sebtm = {

11330+ email = "mail@sebastian-sellmeier.de";

11331+ github = "sebtm";

11332+ githubId = 17243347;

11333+ name = "Sebastian Sellmeier";

11334+ };

929911335 sellout = {

930011336 email = "greg@technomadic.org";

930111337 github = "sellout";

@@ -9332,6 +11368,18 @@

933211368 githubId = 307899;

933311369 name = "Gurkan Gur";

933411370 };

11371+ serge = {

11372+ email = "sb@canva.com";

11373+ github = "serge-belov";

11374+ githubId = 38824235;

11375+ name = "Serge Belov";

11376+ };

11377+ sersorrel = {

11378+ email = "ash@sorrel.sh";

11379+ github = "sersorrel";

11380+ githubId = 9433472;

11381+ name = "ash";

11382+ };

933511383 servalcatty = {

933611384 email = "servalcat@pm.me";

933711385 github = "servalcatty";

@@ -9370,6 +11418,12 @@

937011418 githubId = 1151264;

937111419 name = "Sebastian Graf";

937211420 };

11421+ shadaj = {

11422+ email = "shadaj@users.noreply.github.com";

11423+ github = "shadaj";

11424+ githubId = 543055;

11425+ name = "Shadaj Laddad";

11426+ };

937311427 shahrukh330 = {

937411428 email = "shahrukh330@gmail.com";

937511429 github = "shahrukh330";

@@ -9394,12 +11448,28 @@

939411448 githubId = 6720672;

939511449 name = "Shane Pearlman";

939611450 };

11451+ shanesveller = {

11452+ email = "shane@sveller.dev";

11453+ github = "shanesveller";

11454+ githubId = 831;

11455+ keys = [{

11456+ longkeyid = "rsa4096/0x9210C218023C15CD";

11457+ fingerprint = "F83C 407C ADC4 5A0F 1F2F 44E8 9210 C218 023C 15CD";

11458+ }];

11459+ name = "Shane Sveller";

11460+ };

939711461 shawndellysse = {

939811462 email = "sdellysse@gmail.com";

939911463 github = "shawndellysse";

940011464 githubId = 293035;

940111465 name = "Shawn Dellysse";

940211466 };

11467+ shawn8901 = {

11468+ email = "shawn8901@googlemail.com";

11469+ github = "shawn8901";

11470+ githubId = 12239057;

11471+ name = "Shawn8901";

11472+ };

940311473 shazow = {

940411474 email = "andrey.petrov@shazow.net";

940511475 github = "shazow";

@@ -9430,6 +11500,22 @@

943011500 githubId = 251028;

943111501 name = "Shell Turner";

943211502 };

11503+ shikanime = {

11504+ name = "William Phetsinorath";

11505+ email = "deva.shikanime@protonmail.com";

11506+ github = "shikanime";

11507+ githubId = 22115108;

11508+ };

11509+ shiryel = {

11510+ email = "contact@shiryel.com";

11511+ name = "Shiryel";

11512+ github = "shiryel";

11513+ githubId = 35617139;

11514+ keys = [{

11515+ longkeyid = "ed25519/0xC4041EA6B32633DE";

11516+ fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE";

11517+ }];

11518+ };

943311519 shlevy = {

943411520 email = "shea@shealevy.com";

943511521 github = "shlevy";

@@ -9460,6 +11546,16 @@

946011546 githubId = 819413;

946111547 name = "Benedict Aas";

946211548 };

11549+ shreerammodi = {

11550+ name = "Shreeram Modi";

11551+ email = "shreerammodi10@gmail.com";

11552+ github = "Shrimpram";

11553+ githubId = 67710369;

11554+ keys = [{

11555+ longkeyid = "rsa4096/0x163B16EE76ED24CE";

11556+ fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE";

11557+ }];

11558+ };

946311559 shyim = {

946411560 email = "s.sayakci@gmail.com";

946511561 github = "shyim";

@@ -9491,7 +11587,7 @@

949111587 name = "Yann Hodique";

949211588 };

949311589 sikmir = {

9494− email = "sikmir@gmail.com";

11590+ email = "sikmir@disroot.org";

949511591 github = "sikmir";

949611592 githubId = 688044;

949711593 name = "Nikolay Korotkiy";

@@ -9500,20 +11596,39 @@

950011596 fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5";

950111597 }];

950211598 };

11599+ simarra = {

11600+ name = "simarra";

11601+ email = "loic.martel@protonmail.com";

11602+ github = "simarra";

11603+ githubId = 14372987;

11604+ };

950311605 simonchatts = {

950411606 email = "code@chatts.net";

950511607 github = "simonchatts";

950611608 githubId = 11135311;

950711609 name = "Simon Chatterjee";

950811610 };

11611+ simonkampe = {

11612+ email = "simon.kampe+nix@gmail.com";

11613+ github = "simonkampe";

11614+ githubId = 254799;

11615+ name = "Simon Kämpe";

11616+ };

950911617 simonvandel = {

951011618 email = "simon.vandel@gmail.com";

951111619 github = "simonvandel";

951211620 githubId = 2770647;

951311621 name = "Simon Vandel Sillesen";

951411622 };

11623+ sir4ur0n = {

11624+ email = "sir4ur0n@users.noreply.github.com";

11625+ github = "sir4ur0n";

11626+ githubId = 1204125;

11627+ name = "sir4ur0n";

11628+ };

951511629 siraben = {

951611630 email = "bensiraphob@gmail.com";

11631+ matrix = "@siraben:matrix.org";

951711632 github = "siraben";

951811633 githubId = 8219659;

951911634 name = "Siraphob Phipathananunth";

@@ -9528,6 +11643,12 @@

952811643 fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA";

952911644 }];

953011645 };

11646+ sirseruju = {

11647+ email = "sir.seruju@yandex.ru";

11648+ github = "sirseruju";

11649+ githubId = 74881555;

11650+ name = "Fofanov Sergey";

11651+ };

953111652 sivteck = {

953211653 email = "sivaram1992@gmail.com";

953311654 github = "sivteck";

@@ -9586,6 +11707,7 @@

958611707 };

958711708 SlothOfAnarchy = {

958811709 email = "slothofanarchy1@gmail.com";

11710+ matrix = "@michel.weitbrecht:helsinki-systems.de";

958911711 github = "SlothOfAnarchy";

959011712 githubId = 12828415;

959111713 name = "Michel Weitbrecht";

@@ -9600,6 +11722,12 @@

960011722 fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B";

960111723 }];

960211724 };

11725+ smancill = {

11726+ email = "smancill@smancill.dev";

11727+ github = "smancill";

11728+ githubId = 238528;

11729+ name = "Sebastián Mancilla";

11730+ };

960311731 smaret = {

960411732 email = "sebastien.maret@icloud.com";

960511733 github = "smaret";

@@ -9610,12 +11738,25 @@

961011738 fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C";

961111739 }];

961211740 };

11741+ smasher164 = {

11742+ email = "aindurti@gmail.com";

11743+ github = "smasher164";

11744+ githubId = 12636891;

11745+ name = "Akhil Indurti";

11746+ };

961311747 smironov = {

961411748 email = "grrwlf@gmail.com";

961511749 github = "grwlf";

961611750 githubId = 4477729;

961711751 name = "Sergey Mironov";

961811752 };

11753+ smitop = {

11754+ name = "Smitty van Bodegom";

11755+ email = "me@smitop.com";

11756+ matrix = "@smitop:kde.org";

11757+ github = "Smittyvb";

11758+ githubId = 10530973;

11759+ };

961911760 sna = {

962011761 email = "abouzahra.9@wright.edu";

962111762 github = "s-na";

@@ -9654,10 +11795,18 @@

965411795 };

965511796 solson = {

965611797 email = "scott@solson.me";

11798+ matrix = "@solson:matrix.org";

965711799 github = "solson";

965811800 githubId = 26806;

965911801 name = "Scott Olson";

966011802 };

11803+ SomeoneSerge = {

11804+ email = "sergei.kozlukov@aalto.fi";

11805+ matrix = "@ss:someonex.net";

11806+ github = "SomeoneSerge";

11807+ githubId = 9720532;

11808+ name = "Sergei K";

11809+ };

966111810 sondr3 = {

966211811 email = "nilsen.sondre@gmail.com";

966311812 github = "sondr3";

@@ -9706,6 +11855,7 @@

970611855 };

970711856 spencerjanssen = {

970811857 email = "spencerjanssen@gmail.com";

11858+ matrix = "@sjanssen:matrix.org";

970911859 github = "spencerjanssen";

971011860 githubId = 2600039;

971111861 name = "Spencer Janssen";

@@ -9754,6 +11904,7 @@

975411904 };

975511905 srhb = {

975611906 email = "sbrofeldt@gmail.com";

11907+ matrix = "@srhb:matrix.org";

975711908 github = "srhb";

975811909 githubId = 219362;

975911910 name = "Sarah Brofeldt";

@@ -9770,12 +11921,47 @@

977011921 githubId = 8668915;

977111922 name = "Stephane Schitter";

977211923 };

11924+ staccato = {

11925+ name = "staccato";

11926+ email = "moveq@riseup.net";

11927+ github = "staccato";

11928+ githubId = 86573128;

11929+ };

11930+ stackshadow = {

11931+ email = "stackshadow@evilbrain.de";

11932+ github = "stackshadow";

11933+ githubId = 7512804;

11934+ name = "Martin Langlotz";

11935+ };

11936+ steamwalker = {

11937+ email = "steamwalker@xs4all.nl";

11938+ github = "steamwalker";

11939+ githubId = 94006354;

11940+ name = "steamwalker";

11941+ };

977311942 steell = {

977411943 email = "steve@steellworks.com";

977511944 github = "Steell";

977611945 githubId = 1699155;

977711946 name = "Steve Elliott";

977811947 };

11948+ stehessel = {

11949+ email = "stephan@stehessel.de";

11950+ github = "stehessel";

11951+ githubId = 55607356;

11952+ name = "Stephan Heßelmann";

11953+ };

11954+ steinybot = {

11955+ name = "Jason Pickens";

11956+ email = "jasonpickensnz@gmail.com";

11957+ matrix = "@steinybot:matrix.org";

11958+ github = "steinybot";

11959+ githubId = 4659562;

11960+ keys = [{

11961+ longkeyid = "ed25519/0x21DE1CAE59762A0F";

11962+ fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F";

11963+ }];

11964+ };

977911965 stelcodes = {

978011966 email = "stel@stel.codes";

978111967 github = "stelcodes";

@@ -9784,6 +11970,7 @@

978411970 };

978511971 stephank = {

978611972 email = "nix@stephank.nl";

11973+ matrix = "@skochen:matrix.org";

978711974 github = "stephank";

978811975 githubId = 89950;

978911976 name = "Stéphan Kochen";

@@ -9834,12 +12021,24 @@

983412021 githubId = 1829294;

983512022 name = "Steve Chávez";

983612023 };

12024+ stevebob = {

12025+ email = "stephen@sherra.tt";

12026+ github = "stevebob";

12027+ githubId = 417118;

12028+ name = "Stephen Sherratt";

12029+ };

983712030 steveej = {

983812031 email = "mail@stefanjunker.de";

983912032 github = "steveej";

984012033 githubId = 1181362;

984112034 name = "Stefan Junker";

984212035 };

12036+ stevenroose = {

12037+ email = "github@stevenroose.org";

12038+ github = "stevenroose";

12039+ githubId = 853468;

12040+ name = "Steven Roose";

12041+ };

984312042 stianlagstad = {

984412043 email = "stianlagstad@gmail.com";

984512044 github = "stianlagstad";

@@ -9864,6 +12063,12 @@

986412063 githubId = 1694705;

986512064 name = "Sam Stites";

986612065 };

12066+ strager = {

12067+ email = "strager.nds@gmail.com";

12068+ github = "strager";

12069+ githubId = 48666;

12070+ name = "Matthew \"strager\" Glazar";

12071+ };

986712072 stumoss = {

986812073 email = "samoss@gmail.com";

986912074 github = "stumoss";

@@ -9883,10 +12088,10 @@

988312088 name = "Justus K";

988412089 };

988512090 SubhrajyotiSen = {

9886− email = "subhrajyoti12@gmail.com";

9887− github = "SubhrajyotiSen";

9888− githubId = 12984845;

9889− name = "Subhrajyoti Sen";

12091+ email = "subhrajyoti12@gmail.com";

12092+ github = "SubhrajyotiSen";

12093+ githubId = 12984845;

12094+ name = "Subhrajyoti Sen";

989012095 };

989112096 suhr = {

989212097 email = "suhr@i2pmail.org";

@@ -9909,11 +12114,13 @@

990912114 superherointj = {

991012115 name = "Sérgio G.";

991112116 email = "5861043+superherointj@users.noreply.github.com";

12117+ matrix = "@superherointj:matrix.org";

991212118 github = "superherointj";

991312119 githubId = 5861043;

991412120 };

991512121 SuperSandro2000 = {

991612122 email = "sandro.jaeckel@gmail.com";

12123+ matrix = "@sandro:supersandro.de";

991712124 github = "SuperSandro2000";

991812125 githubId = 7258858;

991912126 name = "Sandro Jäckel";

@@ -9998,6 +12205,7 @@

999812205 };

999912206 symphorien = {

1000012207 email = "symphorien_nixpkgs@xlumurb.eu";

12208+ matrix = "@symphorien:xlumurb.eu";

1000112209 github = "symphorien";

1000212210 githubId = 12595971;

1000312211 name = "Guillaume Girol";

@@ -10066,6 +12274,16 @@

1006612274 githubId = 321799;

1006712275 name = "Paul Colomiets";

1006812276 };

12277+ taikx4 = {

12278+ email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion";

12279+ github = "taikx4";

12280+ githubId = 94917129;

12281+ name = "taikx4";

12282+ keys = [{

12283+ longkeyid = "ed25519/0xCCD52C7B37BB837E";

12284+ fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E";

12285+ }];

12286+ };

1006912287 takagiy = {

1007012288 email = "takagiy.4dev@gmail.com";

1007112289 github = "takagiy";

@@ -10086,6 +12304,7 @@

1008612304 };

1008712305 taktoa = {

1008812306 email = "taktoa@gmail.com";

12307+ matrix = "@taktoa:matrix.org";

1008912308 github = "taktoa";

1009012309 githubId = 553443;

1009112310 name = "Remy Goldschmidt";

@@ -10104,6 +12323,7 @@

1010412323 };

1010512324 talyz = {

1010612325 email = "kim.lindberger@gmail.com";

12326+ matrix = "@talyz:matrix.org";

1010712327 github = "talyz";

1010812328 githubId = 63433;

1010912329 name = "Kim Lindberger";

@@ -10138,6 +12358,13 @@

1013812358 githubId = 863327;

1013912359 name = "Tyler Benster";

1014012360 };

12361+ tboerger = {

12362+ email = "thomas@webhippie.de";

12363+ matrix = "@tboerger:matrix.org";

12364+ github = "tboerger";

12365+ githubId = 156964;

12366+ name = "Thomas Boerger";

12367+ };

1014112368 tcbravo = {

1014212369 email = "tomas.bravo@protonmail.ch";

1014312370 github = "tcbravo";

@@ -10150,6 +12377,12 @@

1015012377 githubId = 2389333;

1015112378 name = "Andy Tockman";

1015212379 };

12380+ techknowlogick = {

12381+ email = "techknowlogick@gitea.io";

12382+ github = "techknowlogick";

12383+ githubId = 164197;

12384+ name = "techknowlogick";

12385+ };

1015312386 Technical27 = {

1015412387 email = "38222826+Technical27@users.noreply.github.com";

1015512388 github = "Technical27";

@@ -10186,6 +12419,12 @@

1018612419 githubId = 280235;

1018712420 name = "Terje Larsen";

1018812421 };

12422+ terrorjack = {

12423+ email = "astrohavoc@gmail.com";

12424+ github = "TerrorJack";

12425+ githubId = 3889585;

12426+ name = "Cheng Shao";

12427+ };

1018912428 tesq0 = {

1019012429 email = "mikolaj.galkowski@gmail.com";

1019112430 github = "tesq0";

@@ -10212,6 +12451,7 @@

1021212451 };

1021312452 tfc = {

1021412453 email = "jacek@galowicz.de";

12454+ matrix = "@jonge:ukvly.org";

1021512455 github = "tfc";

1021612456 githubId = 29044;

1021712457 name = "Jacek Galowicz";

@@ -10222,6 +12462,12 @@

1022212462 githubId = 378734;

1022312463 name = "TG ⊗ Θ";

1022412464 };

12465+ tgunnoe = {

12466+ email = "t@gvno.net";

12467+ github = "tgunnoe";

12468+ githubId = 7254833;

12469+ name = "Taylor Gunnoe";

12470+ };

1022512471 th0rgal = {

1022612472 email = "thomas.marchand@tuta.io";

1022712473 github = "Th0rgal";

@@ -10246,6 +12492,17 @@

1024612492 githubId = 1141680;

1024712493 name = "Thane Gill";

1024812494 };

12495+ thblt = {

12496+ name = "Thibault Polge";

12497+ email = "thibault@thb.lt";

12498+ matrix = "@thbltp:matrix.org";

12499+ github = "thblt";

12500+ githubId = 2453136;

12501+ keys = [{

12502+ longkeyid = "rsa4096/0x63A44817A52EAB7B";

12503+ fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B";

12504+ }];

12505+ };

1024912506 TheBrainScrambler = {

1025012507 email = "esthromeris@riseup.net";

1025112508 github = "TheBrainScrambler";

@@ -10304,8 +12561,15 @@

1030412561 githubId = 844343;

1030512562 name = "Thiago K. Okada";

1030612563 };

12564+ thibaultlemaire = {

12565+ email = "thibault.lemaire@protonmail.com";

12566+ github = "ThibaultLemaire";

12567+ githubId = 21345269;

12568+ name = "Thibault Lemaire";

12569+ };

1030712570 thibautmarty = {

1030812571 email = "github@thibautmarty.fr";

12572+ matrix = "@thibaut:thibautmarty.fr";

1030912573 github = "ThibautMarty";

1031012574 githubId = 3268082;

1031112575 name = "Thibaut Marty";

@@ -10368,6 +12632,13 @@

1036812632 githubId = 1618946;

1036912633 name = "Tiago Castro";

1037012634 };

12635+ tilcreator = {

12636+ name = "TilCreator";

12637+ email = "contact.nixos@tc-j.de";

12638+ matrix = "@tilcreator:matrix.org";

12639+ github = "TilCreator";

12640+ githubId = 18621411;

12641+ };

1037112642 tilpner = {

1037212643 email = "till@hoeppner.ws";

1037312644 github = "tilpner";

@@ -10432,6 +12703,12 @@

1043212703 fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B";

1043312704 }];

1043412705 };

12706+ tmarkovski = {

12707+ email = "tmarkovski@gmail.com";

12708+ github = "tmarkovski";

12709+ githubId = 1280118;

12710+ name = "Tomislav Markovski";

12711+ };

1043512712 tmountain = {

1043612713 email = "tinymountain@gmail.com";

1043712714 github = "tmountain";

@@ -10446,10 +12723,22 @@

1044612723 };

1044712724 tnias = {

1044812725 email = "phil@grmr.de";

12726+ matrix = "@tnias:stratum0.org";

1044912727 github = "tnias";

1045012728 githubId = 9853194;

1045112729 name = "Philipp Bartsch";

1045212730 };

12731+ toastal = {

12732+ email = "toastal+nix@posteo.net";

12733+ matrix = "@toastal:matrix.org";

12734+ github = "toastal";

12735+ githubId = 561087;

12736+ name = "toastal";

12737+ keys = [{

12738+ longkeyid = "ed25519/5CCE6F1466D47C9E";

12739+ fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E";

12740+ }];

12741+ };

1045312742 tobim = {

1045412743 email = "nix@tobim.fastmail.fm";

1045512744 github = "tobim";

@@ -10482,6 +12771,7 @@

1048212771 };

1048312772 tomberek = {

1048412773 email = "tomberek@gmail.com";

12774+ matrix = "@tomberek:matrix.org";

1048512775 github = "tomberek";

1048612776 githubId = 178444;

1048712777 name = "Thomas Bereknyei";

@@ -10500,6 +12790,7 @@

1050012790 };

1050112791 toonn = {

1050212792 email = "nixpkgs@toonn.io";

12793+ matrix = "@toonn:matrix.org";

1050312794 github = "toonn";

1050412795 githubId = 1486805;

1050512796 name = "Toon Nolten";

@@ -10516,12 +12807,31 @@

1051612807 github = "totoroot";

1051712808 githubId = 39650930;

1051812809 };

12810+ ToxicFrog = {

12811+ email = "toxicfrog@ancilla.ca";

12812+ github = "ToxicFrog";

12813+ githubId = 90456;

12814+ name = "Rebecca (Bex) Kelly";

12815+ };

12816+ tpw_rules = {

12817+ name = "Thomas Watson";

12818+ email = "twatson52@icloud.com";

12819+ matrix = "@tpw_rules:matrix.org";

12820+ github = "tpwrules";

12821+ githubId = 208010;

12822+ };

1051912823 travisbhartwell = {

1052012824 email = "nafai@travishartwell.net";

1052112825 github = "travisbhartwell";

1052212826 githubId = 10110;

1052312827 name = "Travis B. Hartwell";

1052412828 };

12829+ travisdavis-ops = {

12830+ email = "travisdavismedia@gmail.com";

12831+ github = "travisdavis-ops";

12832+ githubId = 52011418;

12833+ name = "Travis Davis";

12834+ };

1052512835 TredwellGit = {

1052612836 email = "tredwell@tutanota.com";

1052712837 github = "TredwellGit";

@@ -10570,12 +12880,24 @@

1057012880 githubId = 1183303;

1057112881 name = "Jakob Klepp";

1057212882 };

12883+ trundle = {

12884+ name = "Andreas Stührk";

12885+ email = "andy@hammerhartes.de";

12886+ github = "Trundle";

12887+ githubId = 332418;

12888+ };

1057312889 tscholak = {

1057412890 email = "torsten.scholak@googlemail.com";

1057512891 github = "tscholak";

1057612892 githubId = 1568873;

1057712893 name = "Torsten Scholak";

1057812894 };

12895+ tshaynik = {

12896+ email = "tshaynik@protonmail.com";

12897+ github = "tshaynik";

12898+ githubId = 15064765;

12899+ name = "tshaynik";

12900+ };

1057912901 tstrobel = {

1058012902 email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains";

1058112903 name = "Thomas Strobel";

@@ -10654,24 +12976,66 @@

1065412976 fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802";

1065512977 }];

1065612978 };

12979+ twitchyliquid64 = {

12980+ name = "Tom";

12981+ email = "twitchyliquid64@ciphersink.net";

12982+ github = "twitchyliquid64";

12983+ githubId = 6328589;

12984+ };

1065712985 typetetris = {

1065812986 email = "ericwolf42@mail.com";

1065912987 github = "typetetris";

1066012988 githubId = 1983821;

1066112989 name = "Eric Wolf";

1066212990 };

12991+ uakci = {

12992+ name = "uakci";

12993+ email = "uakci@uakci.pl";

12994+ github = "uakci";

12995+ githubId = 6961268;

12996+ };

1066312997 udono = {

1066412998 email = "udono@virtual-things.biz";

1066512999 github = "udono";

1066613000 githubId = 347983;

1066713001 name = "Udo Spallek";

1066813002 };

13003+ ulrikstrid = {

13004+ email = "ulrik.strid@outlook.com";

13005+ github = "ulrikstrid";

13006+ githubId = 1607770;

13007+ name = "Ulrik Strid";

13008+ };

13009+ unclechu = {

13010+ name = "Viacheslav Lotsmanov";

13011+ email = "lotsmanov89@gmail.com";

13012+ github = "unclechu";

13013+ githubId = 799353;

13014+ keys = [{

13015+ longkeyid = "rsa4096/0xD276FF7467007335";

13016+ fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335";

13017+ }];

13018+ };

13019+ uniquepointer = {

13020+ email = "uniquepointer@mailbox.org";

13021+ matrix = "@uniquepointer:matrix.org";

13022+ github = "uniquepointer";

13023+ githubId = 71751817;

13024+ name = "uniquepointer";

13025+ };

1066913026 unode = {

1067013027 email = "alves.rjc@gmail.com";

13028+ matrix = "@renato_alves:matrix.org";

1067113029 github = "unode";

1067213030 githubId = 122319;

1067313031 name = "Renato Alves";

1067413032 };

13033+ unrooted = {

13034+ name = "Konrad Klawikowski";

13035+ email = "konrad.root.klawikowski@gmail.com";

13036+ github = "unrooted";

13037+ githubId = 30440603;

13038+ };

1067513039 uralbash = {

1067613040 email = "root@uralbash.ru";

1067713041 github = "uralbash";

@@ -10726,14 +13090,9 @@

1072613090 github = "deviant";

1072713091 githubId = 68829907;

1072813092 };

10729− va1entin = {

10730− email = "github@valentinsblog.com";

10731− github = "va1entin";

10732− githubId = 31535155;

10733− name = "Valentin Heidelberger";

10734− };

1073513093 vaibhavsagar = {

1073613094 email = "vaibhavsagar@gmail.com";

13095+ matrix = "@vaibhavsagar:matrix.org";

1073713096 github = "vaibhavsagar";

1073813097 githubId = 1525767;

1073913098 name = "Vaibhav Sagar";

@@ -10752,6 +13111,7 @@

1075213111 };

1075313112 valodim = {

1075413113 email = "look@my.amazin.horse";

13114+ matrix = "@Valodim:stratum0.org";

1075513115 github = "valodim";

1075613116 githubId = 27813;

1075713117 name = "Vincent Breitmoser";

@@ -10762,6 +13122,16 @@

1076213122 githubId = 608417;

1076313123 name = "Jos van den Oever";

1076413124 };

13125+ vanilla = {

13126+ email = "osu_vanilla@126.com";

13127+ github = "VergeDX";

13128+ githubId = 25173827;

13129+ name = "Vanilla";

13130+ keys = [{

13131+ longkeyid = "rsa4096/0x3750028ED04FA42E";

13132+ fingerprint = "2649 340C C909 F821 D251 6714 3750 028E D04F A42E";

13133+ }];

13134+ };

1076513135 vanschelven = {

1076613136 email = "klaas@vanschelven.com";

1076713137 github = "vanschelven";

@@ -10802,6 +13172,7 @@

1080213172 name = "Vladimír Čunát";

1080313173 # vcunat@gmail.com predominated in commits before 2019/03

1080413174 email = "v@cunat.cz";

13175+ matrix = "@vcunat:matrix.org";

1080513176 github = "vcunat";

1080613177 githubId = 1785925;

1080713178 keys = [{

@@ -10827,7 +13198,7 @@

1082713198 };

1082813199 vel = {

1082913200 email = "llathasa@outlook.com";

10830− github = "llathasa-veleth";

13201+ github = "q60";

1083113202 githubId = 61933599;

1083213203 name = "vel";

1083313204 };

@@ -10849,15 +13220,21 @@

1084913220 githubId = 335406;

1085013221 name = "David Asabina";

1085113222 };

13223+ vidister = {

13224+ email = "v@vidister.de";

13225+ github = "vidister";

13226+ githubId = 11413574;

13227+ name = "Fiona Weber";

13228+ };

1085213229 vifino = {

1085313230 email = "vifino@tty.sh";

1085413231 github = "vifino";

1085513232 githubId = 5837359;

1085613233 name = "Adrian Pistol";

1085713234 };

10858− vika_nezrimaya = {

13235+ vikanezrimaya = {

1085913236 email = "vika@fireburn.ru";

10860− github = "kisik21";

13237+ github = "vikanezrimaya";

1086113238 githubId = 7953163;

1086213239 name = "Vika Shleina";

1086313240 keys = [{

@@ -10881,6 +13258,12 @@

1088113258 githubId = 118959;

1088213259 name = "VinyMeuh";

1088313260 };

13261+ viraptor = {

13262+ email = "nix@viraptor.info";

13263+ github = "viraptor";

13264+ githubId = 188063;

13265+ name = "Stanisław Pitucha";

13266+ };

1088413267 viric = {

1088513268 email = "viric@viric.name";

1088613269 github = "viric";

@@ -10911,6 +13294,12 @@

1091113294 githubId = 1771332;

1091213295 name = "László Vaskó";

1091313296 };

13297+ vlinkz = {

13298+ email = "vmfuentes64@gmail.com";

13299+ github = "vlinkz";

13300+ githubId = 20145996;

13301+ name = "Victor Fuentes";

13302+ };

1091413303 vlstill = {

1091513304 email = "xstill@fi.muni.cz";

1091613305 github = "vlstill";

@@ -10960,10 +13349,6 @@

1096013349 githubId = 3413119;

1096113350 name = "Vonfry";

1096213351 };

10963− vozz = {

10964− email = "oliver.huntuk@gmail.com";

10965− name = "Oliver Hunt";

10966− };

1096713352 vq = {

1096813353 email = "vq@erq.se";

1096913354 name = "Daniel Nilsson";

@@ -11004,6 +13389,26 @@

1100413389 githubId = 3889405;

1100513390 name = "vyp";

1100613391 };

13392+ wackbyte = {

13393+ name = "wackbyte";

13394+ email = "wackbyte@pm.me";

13395+ github = "wackbyte";

13396+ githubId = 29505620;

13397+ keys = [{

13398+ longkeyid = "rsa4096/0x937F2AE5CCEFBF59";

13399+ fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59";

13400+ }];

13401+ };

13402+ wakira = {

13403+ name = "Sheng Wang";

13404+ email = "sheng@a64.work";

13405+ github = "wakira";

13406+ githubId = 2338339;

13407+ keys = [{

13408+ longkeyid = "rsa4096/0x8C9B0A8FC0C0D862";

13409+ fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862";

13410+ }];

13411+ };

1100713412 wamserma = {

1100813413 name = "Markus S. Wamser";

1100913414 email = "github-dev@mail2013.wamser.eu";

@@ -11022,16 +13427,44 @@

1102213427 githubId = 34962284;

1102313428 name = "wchresta";

1102413429 };

13430+ wdavidw = {

13431+ name = "David Worms";

13432+ email = "david@adaltas.com";

13433+ github = "wdavidw";

13434+ githubId = 46896;

13435+ };

1102513436 wedens = {

1102613437 email = "kirill.wedens@gmail.com";

1102713438 name = "wedens";

1102813439 };

13440+ wegank = {

13441+ name = "Weijia Wang";

13442+ email = "contact@weijia.wang";

13443+ github = "wegank";

13444+ githubId = 9713184;

13445+ };

1102913446 weihua = {

1103013447 email = "luwh364@gmail.com";

1103113448 github = "weihua-lu";

1103213449 githubId = 9002575;

1103313450 name = "Weihua Lu";

1103413451 };

13452+ welteki = {

13453+ email = "welteki@pm.me";

13454+ github = "welteki";

13455+ githubId = 16267532;

13456+ name = "Han Verstraete";

13457+ keys = [{

13458+ longkeyid = "rsa4096/0x11F7BAEA856743FF";

13459+ fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF";

13460+ }];

13461+ };

13462+ wentasah = {

13463+ name = "Michal Sojka";

13464+ email = "wsh@2x.cz";

13465+ github = "wentasah";

13466+ githubId = 140542;

13467+ };

1103513468 wheelsandmetal = {

1103613469 email = "jakob@schmutz.co.uk";

1103713470 github = "wheelsandmetal";

@@ -11044,6 +13477,12 @@

1104413477 githubId = 19174984;

1104513478 name = "Alex Whitt";

1104613479 };

13480+ whonore = {

13481+ email = "wolfhonore@gmail.com";

13482+ github = "whonore";

13483+ githubId = 7121530;

13484+ name = "Wolf Honoré";

13485+ };

1104713486 wildsebastian = {

1104813487 name = "Sebastian Wild";

1104913488 email = "sebastian@wild-siena.com";

@@ -11064,6 +13503,12 @@

1106413503 email = "tim.williams.public@gmail.com";

1106513504 name = "Tim Philip Williams";

1106613505 };

13506+ willcohen = {

13507+ email = "willcohen@users.noreply.github.com";

13508+ github = "willcohen";

13509+ githubId = 5185341;

13510+ name = "Will Cohen";

13511+ };

1106713512 winden = {

1106813513 email = "windenntw@gmail.com";

1106913514 name = "Antonio Vargas Gonzalez";

@@ -11074,12 +13519,18 @@

1107413519 githubId = 6016963;

1107513520 name = "Patrick Winter";

1107613521 };

11077− winterqt = {

13522+ winter = {

1107813523 email = "nixos@winter.cafe";

1107913524 github = "winterqt";

1108013525 githubId = 78392041;

1108113526 name = "Winter";

1108213527 };

13528+ wintrmvte = {

13529+ name = "Jakub Lutczyn";

13530+ email = "kubalutczyn@gmail.com";

13531+ github = "wintrmvte";

13532+ githubId = 41823252;

13533+ };

1108313534 wirew0rm = {

1108413535 email = "alex@wirew0rm.de";

1108513536 github = "wirew0rm";

@@ -11141,7 +13592,7 @@

1114113592 name = "Andrei Pampu";

1114213593 };

1114313594 wolfangaukang = {

11144− email = "liquid.query960@4wrd.cc";

13595+ email = "clone.gleeful135+nixpkgs@anonaddy.me";

1114513596 github = "wolfangaukang";

1114613597 githubId = 8378365;

1114713598 name = "P. R. d. O.";

@@ -11158,6 +13609,12 @@

1115813609 githubId = 28888242;

1115913610 name = "WORLDofPEACE";

1116013611 };

13612+ wr0belj = {

13613+ name = "Jakub Wróbel";

13614+ email = "wrobel.jakub@protonmail.com";

13615+ github = "wr0belj";

13616+ githubId = 40501814;

13617+ };

1116113618 wscott = {

1116213619 email = "wsc9tt@gmail.com";

1116313620 github = "wscott";

@@ -11165,7 +13622,7 @@

1116513622 name = "Wayne Scott";

1116613623 };

1116713624 wucke13 = {

11168− email = "info@wucke13.de";

13625+ email = "wucke13@gmail.com";

1116913626 github = "wucke13";

1117013627 githubId = 20400405;

1117113628 name = "Wucke";

@@ -11188,12 +13645,25 @@

1118813645 github = "wunderbrick";

1118913646 githubId = 52174714;

1119013647 };

13648+ wyndon = {

13649+ email = "72203260+wyndon@users.noreply.github.com";

13650+ matrix = "@wyndon:envs.net";

13651+ github = "wyndon";

13652+ githubId = 72203260;

13653+ name = "wyndon";

13654+ };

1119113655 wyvie = {

1119213656 email = "elijahrum@gmail.com";

1119313657 github = "wyvie";

1119413658 githubId = 3992240;

1119513659 name = "Elijah Rum";

1119613660 };

13661+ x3ro = {

13662+ name = "^x3ro";

13663+ email = "nix@x3ro.dev";

13664+ github = "x3rAx";

13665+ githubId = 2268851;

13666+ };

1119713667 xaverdh = {

1119813668 email = "hoe.dom@gmx.de";

1119913669 github = "xaverdh";

@@ -11214,6 +13684,7 @@

1121413684 };

1121513685 xe = {

1121613686 email = "me@christine.website";

13687+ matrix = "@withoutwithin:matrix.org";

1121713688 github = "Xe";

1121813689 githubId = 529003;

1121913690 name = "Christine Dodrill";

@@ -11232,10 +13703,17 @@

1123213703 };

1123313704 xfix = {

1123413705 email = "konrad@borowski.pw";

13706+ matrix = "@xfix:matrix.org";

1123513707 github = "xfix";

1123613708 githubId = 1297598;

1123713709 name = "Konrad Borowski";

1123813710 };

13711+ xgroleau = {

13712+ email = "xgroleau@gmail.com";

13713+ github = "xgroleau";

13714+ githubId = 31734358;

13715+ name = "Xavier Groleau";

13716+ };

1123913717 xiorcale = {

1124013718 email = "quentin.vaucher@pm.me";

1124113719 github = "xiorcale";

@@ -11278,12 +13756,6 @@

1127813756 githubId = 1962985;

1127913757 name = "Vincenzo Mantova";

1128013758 };

11281− xwvvvvwx = {

11282− email = "davidterry@posteo.de";

11283− github = "xwvvvvwx";

11284− githubId = 6689924;

11285− name = "David Terry";

11286− };

1128713759 xzfc = {

1128813760 email = "xzfcpw@gmail.com";

1128913761 github = "xzfc";

@@ -11296,6 +13768,12 @@

1129613768 githubId = 2242427;

1129713769 name = "Yoann Ono";

1129813770 };

13771+ yana = {

13772+ email = "yana@riseup.net";

13773+ github = "sowelisuwi";

13774+ githubId = 1643293;

13775+ name = "Yana Timoshenko";

13776+ };

1129913777 yarny = {

1130013778 email = "41838844+Yarny0@users.noreply.github.com";

1130113779 github = "Yarny0";

@@ -11308,11 +13786,12 @@

1130813786 githubId = 3705333;

1130913787 name = "Dmitry V.";

1131013788 };

11311− yegortimoshenko = {

11312− email = "yegortimoshenko@riseup.net";

11313− github = "yegortimoshenko";

11314− githubId = 1643293;

11315− name = "Yegor Timoshenko";

13789+ yayayayaka = {

13790+ email = "nixpkgs@uwu.is";

13791+ matrix = "@lara:uwu.is";

13792+ github = "yayayayaka";

13793+ githubId = 73759599;

13794+ name = "Lara A.";

1131613795 };

1131713796 yesbox = {

1131813797 email = "jesper.geertsen.jonsson@gmail.com";

@@ -11320,12 +13799,30 @@

1132013799 githubId = 4113027;

1132113800 name = "Jesper Geertsen Jonsson";

1132213801 };

13802+ yinfeng = {

13803+ email = "lin.yinfeng@outlook.com";

13804+ github = "linyinfeng";

13805+ githubId = 11229748;

13806+ name = "Lin Yinfeng";

13807+ };

13808+ ylecornec = {

13809+ email = "yves.stan.lecornec@tweag.io";

13810+ github = "ylecornec";

13811+ githubId = 5978566;

13812+ name = "Yves-Stan Le Cornec";

13813+ };

1132313814 ylwghst = {

1132413815 email = "ylwghst@onionmail.info";

1132513816 github = "ylwghst";

1132613817 githubId = 26011724;

1132713818 name = "Burim Augustin Berisa";

1132813819 };

13820+ yl3dy = {

13821+ email = "aleksandr.kiselyov@gmail.com";

13822+ github = "yl3dy";

13823+ githubId = 1311192;

13824+ name = "Alexander Kiselyov";

13825+ };

1132913826 yochai = {

1133013827 email = "yochai@titat.info";

1133113828 github = "yochai";

@@ -11340,6 +13837,7 @@

1134013837 };

1134113838 yorickvp = {

1134213839 email = "yorickvanpelt@gmail.com";

13840+ matrix = "@yorickvp:matrix.org";

1134313841 github = "yorickvp";

1134413842 githubId = 647076;

1134513843 name = "Yorick van Pelt";

@@ -11350,6 +13848,12 @@

1135013848 githubId = 452;

1135113849 name = "Yurii Rashkovskii";

1135213850 };

13851+ yrd = {

13852+ name = "Yannik Rödel";

13853+ email = "nix@yannik.info";

13854+ github = "yrd";

13855+ githubId = 1820447;

13856+ };

1135313857 ysndr = {

1135413858 email = "me@ysndr.de";

1135513859 github = "ysndr";

@@ -11378,8 +13882,16 @@

1137813882 fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C";

1137913883 }];

1138013884 };

13885+ yuka = {

13886+ email = "yuka@yuka.dev";

13887+ matrix = "@yuka:yuka.dev";

13888+ github = "yu-re-ka";

13889+ githubId = 86169957;

13890+ name = "Yureka";

13891+ };

1138113892 yusdacra = {

1138213893 email = "y.bera003.06@protonmail.com";

13894+ matrix = "@yusdacra:nixos.dev";

1138313895 github = "yusdacra";

1138413896 githubId = 19897088;

1138513897 name = "Yusuf Bera Ertan";

@@ -11388,6 +13900,16 @@

1138813900 fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2";

1138913901 }];

1139013902 };

13903+ yuu = {

13904+ email = "yuuyin@protonmail.com";

13905+ github = "yuuyins";

13906+ githubId = 86538850;

13907+ name = "Yuu Yin";

13908+ keys = [{

13909+ longkeyid = "rsa4096/0x416F303B43C20AC3";

13910+ fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3";

13911+ }];

13912+ };

1139113913 yvesf = {

1139213914 email = "yvesf+nix@xapek.org";

1139313915 github = "yvesf";

@@ -11482,6 +14004,7 @@

1148214004 };

1148314005 zhaofengli = {

1148414006 email = "hello@zhaofeng.li";

14007+ matrix = "@zhaofeng:zhaofeng.li";

1148514008 github = "zhaofengli";

1148614009 githubId = 2189609;

1148714010 name = "Zhaofeng Li";

@@ -11510,12 +14033,6 @@

1151014033 githubId = 1772064;

1151114034 name = "Tim Zook";

1151214035 };

11513− zoomulator = {

11514− email = "zoomulator@gmail.com";

11515− github = "zoomulator";

11516− githubId = 1069303;

11517− name = "Kim Simmons";

11518− };

1151914036 zopieux = {

1152014037 email = "zopieux@gmail.com";

1152114038 github = "zopieux";

@@ -11612,12 +14129,6 @@

1161214129 githubId = 8686360;

1161314130 name = "Illia Shestakov";

1161414131 };

11615− foxit64 = {

11616− email = "o4nsxy05@gmail.com";

11617− github = "foxit64";

11618− githubId = 56247270;

11619− name = "Foxit";

11620− };

1162114132 masaeedu = {

1162214133 email = "masaeedu@gmail.com";

1162314134 github = "masaeedu";

@@ -11700,9 +14211,16 @@

1170014211 github = "deifactor";

1170114212 githubId = 30192992;

1170214213 };

14214+ deinferno = {

14215+ name = "deinferno";

14216+ email = "14363193+deinferno@users.noreply.github.com";

14217+ github = "deinferno";

14218+ githubId = 14363193;

14219+ };

1170314220 fzakaria = {

1170414221 name = "Farid Zakaria";

1170514222 email = "farid.m.zakaria@gmail.com";

14223+ matrix = "@fzakaria:matrix.org";

1170614224 github = "fzakaria";

1170714225 githubId = 605070;

1170814226 };

@@ -11712,15 +14230,16 @@

1171214230 github = "nagisa";

1171314231 githubId = 679122;

1171414232 };

11715− yevhenshymotiuk = {

14233+ yshym = {

1171614234 name = "Yevhen Shymotiuk";

11717− email = "yevhenshymotiuk@gmail.com";

11718− github = "yevhenshymotiuk";

14235+ email = "yshym@pm.me";

14236+ github = "yshym";

1171914237 githubId = 44244245;

1172014238 };

1172114239 hmenke = {

1172214240 name = "Henri Menke";

1172314241 email = "henri@henrimenke.de";

14242+ matrix = "@hmenke:matrix.org";

1172414243 github = "hmenke";

1172514244 githubId = 1903556;

1172614245 keys = [{

@@ -11787,6 +14306,7 @@

1178714306 princemachiavelli = {

1178814307 name = "Josh Hoffer";

1178914308 email = "jhoffer@sansorgan.es";

14309+ matrix = "@princemachiavelli:matrix.org";

1179014310 github = "princemachiavelli";

1179114311 githubId = 2730968;

1179214312 keys = [{

@@ -11814,12 +14334,51 @@

1181414334 fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5";

1181514335 }];

1181614336 };

14337+ zbioe = {

14338+ name = "Iury Fukuda";

14339+ email = "zbioe@protonmail.com";

14340+ github = "zbioe";

14341+ githubId = 7332055;

14342+ };

14343+ zendo = {

14344+ name = "zendo";

14345+ email = "linzway@qq.com";

14346+ github = "zendo";

14347+ githubId = 348013;

14348+ };

14349+ zenithal = {

14350+ name = "zenithal";

14351+ email = "i@zenithal.me";

14352+ github = "ZenithalHourlyRate";

14353+ githubId = 19512674;

14354+ keys = [{

14355+ longkeyid = "rsa4096/0x87E17EEF9B18B6C9";

14356+ fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9";

14357+ }];

14358+ };

1181714359 zeri = {

1181814360 name = "zeri";

1181914361 email = "68825133+zeri42@users.noreply.github.com";

14362+ matrix = "@zeri:matrix.org";

1182014363 github = "zeri42";

1182114364 githubId = 68825133;

1182214365 };

14366+ zoedsoupe = {

14367+ github = "zoedsoupe";

14368+ githubId = 44469426;

14369+ name = "Zoey de Souza Pessanha";

14370+ email = "zoey.spessanha@outlook.com";

14371+ keys = [{

14372+ longkeyid = "rsa4096/0x1E1E889CDBD6A315";

14373+ fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315";

14374+ }];

14375+ };

14376+ zombiezen = {

14377+ name = "Ross Light";

14378+ email = "ross@zombiezen.com";

14379+ github = "zombiezen";

14380+ githubId = 181535;

14381+ };

1182314382 zseri = {

1182414383 name = "zseri";

1182514384 email = "zseri.devel@ytrizja.de";

@@ -11836,4 +14395,87 @@

1183614395 github = "zupo";

1183714396 githubId = 311580;

1183814397 };

14398+ sei40kr = {

14399+ name = "Seong Yong-ju";

14400+ email = "sei40kr@gmail.com";

14401+ github = "sei40kr";

14402+ githubId = 11665236;

14403+ };

14404+ vdot0x23 = {

14405+ name = "Victor Büttner";

14406+ email = "nix.victor@0x23.dk";

14407+ github = "vdot0x23";

14408+ githubId = 40716069;

14409+ };

14410+ jpagex = {

14411+ name = "Jérémy Pagé";

14412+ email = "contact@jeremypage.me";

14413+ github = "jpagex";

14414+ githubId = 635768;

14415+ };

14416+ vbrandl = {

14417+ name = "Valentin Brandl";

14418+ email = "mail+nixpkgs@vbrandl.net";

14419+ github = "vbrandl";

14420+ githubId = 20639051;

14421+ };

14422+ portothree = {

14423+ name = "Gustavo Porto";

14424+ email = "gustavoporto@ya.ru";

14425+ github = "portothree";

14426+ githubId = 3718120;

14427+ };

14428+ pwoelfel = {

14429+ name = "Philipp Woelfel";

14430+ email = "philipp.woelfel@gmail.com";

14431+ github = "PhilippWoelfel";

14432+ githubId = 19400064;

14433+ };

14434+ qbit = {

14435+ name = "Aaron Bieber";

14436+ email = "aaron@bolddaemon.com";

14437+ github = "qbit";

14438+ githubId = 68368;

14439+ matrix = "@qbit:tapenet.org";

14440+ keys = [{

14441+ longkeyid = "rsa4096/0x1F81112D62A9ADCE";

14442+ fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE";

14443+ }];

14444+ };

14445+ ameer = {

14446+ name = "Ameer Taweel";

14447+ email = "ameertaweel2002@gmail.com";

14448+ github = "AmeerTaweel";

14449+ githubId = 20538273;

14450+ };

14451+ nigelgbanks = {

14452+ name = "Nigel Banks";

14453+ email = "nigel.g.banks@gmail.com";

14454+ github = "nigelgbanks";

14455+ githubId = 487373;

14456+ };

14457+ zanculmarktum = {

14458+ name = "Azure Zanculmarktum";

14459+ email = "zanculmarktum@gmail.com";

14460+ github = "zanculmarktum";

14461+ githubId = 16958511;

14462+ };

14463+ kuwii = {

14464+ name = "kuwii";

14465+ email = "kuwii.someone@gmail.com";

14466+ github = "kuwii";

14467+ githubId = 10705175;

14468+ };

14469+ melias122 = {

14470+ name = "Martin Elias";

14471+ email = "martin+nixpkgs@elias.sx";

14472+ github = "melias122";

14473+ githubId = 1027766;

14474+ };

14475+ bryanhonof = {

14476+ name = "Bryan Honof";

14477+ email = "bryanhonof@gmail.com";

14478+ github = "bryanhonof";

14479+ githubId = 5932804;

14480+ };

1183914481}

maintainers/scripts/check-maintainer-github-handles.sh+9−9

@@ -4,20 +4,19 @@

44# Example how to work with the `lib.maintainers` attrset.

55# Can be used to check whether all user handles are still valid.

7−set -e

8−

9−# nixpkgs='<nixpkgs>'

10−# if [ -n "$1" ]; then

7+set -o errexit -o noclobber -o nounset -o pipefail

8+shopt -s failglob inherit_errexit

119

1210function checkCommits {

13− local user="$1"

14− local tmp=$(mktemp)

11+ local ret status tmp user

12+ user="$1"

13+ tmp=$(mktemp)

1514 curl --silent -w "%{http_code}" \

1615 "https://github.com/NixOS/nixpkgs/commits?author=$user" \

1716 > "$tmp"

1817 # the last line of tmp contains the http status

19− local status=$(tail -n1 "$tmp")

20− local ret=

18+ status=$(tail -n1 "$tmp")

19+ ret=

2120 case $status in

2221 200) if <"$tmp" grep -i "no commits found" > /dev/null; then

2322 ret=1

@@ -31,7 +30,7 @@ function checkCommits {

3130 checkCommits "$user"

3231 ret=$?

3332 ;;

34− *) printf "BAD STATUS: $(tail -n1 $tmp) for %s\n" "$user"; ret=1

33+ *) printf "BAD STATUS: $(tail -n1 "$tmp") for %s\n" "$user"; ret=1

3534 ret=1

3635 ;;

3736 esac

@@ -63,4 +62,5 @@ nix-instantiate -A lib.maintainers --eval --strict --json \

6362 | jq -r '.[]|.github|select(.)' \

6463 | parallel -j5 checkUser

6564

65+# To check some arbitrary users:

6666# parallel -j100 checkUser ::: "eelco" "profpatsch" "Profpatsch" "a"

maintainers/scripts/copy-tarballs.pl+15−1

@@ -165,6 +165,20 @@ elsif (defined $expr) {

165165 my $hash = $fetch->{hash};

166166 my $name = $fetch->{name};

167167

168+ if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) {

169+ $algo = $1;

170+ $hash = `nix hash to-base16 $hash` or die;

171+ chomp $hash;

172+ }

173+

174+ next unless $algo =~ /^[a-z0-9]+$/;

175+

176+ # Convert non-SRI base-64 to base-16.

177+ if ($hash =~ /^[A-Za-z0-9+\/=]+$/) {

178+ $hash = `nix hash to-base16 --type '$algo' $hash` or die;

179+ chomp $hash;

180+ }

181+

168182 if (defined $ENV{DEBUG}) {

169183 print "$url $algo $hash\n";

170184 next;

@@ -184,7 +198,7 @@ elsif (defined $expr) {

184198

185199 my $storePath = makeFixedOutputPath(0, $algo, $hash, $name);

186200

187− print STDERR "mirroring $url ($storePath)...\n";

201+ print STDERR "mirroring $url ($storePath, $algo, $hash)...\n";

188202

189203 if ($dryRun) {

190204 $mirrored++;

maintainers/scripts/db-to-md.shnew file+88

@@ -0,0 +1,88 @@

1+#! /usr/bin/env nix-shell

2+#! nix-shell -I nixpkgs=. -i bash -p pandoc

4+# This script is temporarily needed while we transition the manual to

5+# CommonMark. It converts DocBook files into our CommonMark flavour.

7+debug=

8+files=()

10+while [ "$#" -gt 0 ]; do

11+ i="$1"; shift 1

12+ case "$i" in

13+ --debug)

14+ debug=1

15+ ;;

16+ *)

17+ files+=("$i")

18+ ;;

19+ esac

20+done

21+

22+echo "WARNING: This is an experimental script and might not preserve all formatting." > /dev/stderr

23+echo "Please report any issues you discover." > /dev/stderr

24+

25+outExtension="md"

26+if [[ $debug ]]; then

27+ outExtension="json"

28+fi

29+

30+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

31+

32+# NOTE: Keep in sync with Nixpkgs manual (/doc/Makefile).

33+# TODO: Remove raw-attribute when we can get rid of DocBook altogether.

34+pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute

35+targetLang="commonmark${pandoc_commonmark_enabled_extensions}+smart"

36+if [[ $debug ]]; then

37+ targetLang=json

38+fi

39+pandoc_flags=(

40+ # Not needed:

41+ # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies)

42+ # - media extraction (was only required for diagram generator)

43+ # - myst-reader/roles.lua (only relevant for MyST → DocBook)

44+ # - link-unix-man-references.lua (links should only be added to display output)

45+ # - docbook-writer/rst-roles.lua (only relevant for → DocBook)

46+ # - docbook-writer/labelless-link-is-xref.lua (only relevant for → DocBook)

47+ "--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua"

48+ "--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/myst-writer/roles.lua"

49+ "--lua-filter=$DIR/doc/unknown-code-language.lua"

50+ -f docbook

51+ -t "$targetLang"

52+ --tab-stop=2

53+ --wrap=none

54+)

55+

56+for file in "${files[@]}"; do

57+ if [[ ! -f "$file" ]]; then

58+ echo "db-to-md.sh: $file does not exist" > /dev/stderr

59+ exit 1

60+ else

61+ rootElement=$(xmllint --xpath 'name(//*)' "$file")

62+

63+ if [[ $rootElement = chapter ]]; then

64+ extension=".chapter.$outExtension"

65+ elif [[ $rootElement = section ]]; then

66+ extension=".section.$outExtension"

67+ else

68+ echo "db-to-md.sh: $file contains an unsupported root element $rootElement" > /dev/stderr

69+ exit 1

70+ fi

71+

72+ outFile="${file%".section.xml"}"

73+ outFile="${outFile%".chapter.xml"}"

74+ outFile="${outFile%".xml"}$extension"

75+ temp1=$(mktemp)

76+ $DIR/doc/escape-code-markup.py "$file" "$temp1"

77+ if [[ $debug ]]; then

78+ echo "Converted $file to $temp1" > /dev/stderr

79+ fi

80+ temp2=$(mktemp)

81+ $DIR/doc/replace-xrefs-by-empty-links.py "$temp1" "$temp2"

82+ if [[ $debug ]]; then

83+ echo "Converted $temp1 to $temp2" > /dev/stderr

84+ fi

85+ pandoc "$temp2" -o "$outFile" "${pandoc_flags[@]}"

86+ echo "Converted $file to $outFile" > /dev/stderr

87+ fi

88+done

maintainers/scripts/dep-licenses.sh+1−1

@@ -9,7 +9,7 @@ tmp=$(mktemp --tmpdir -d nixpkgs-dep-license.XXXXXX)

99exitHandler() {

1010 exitCode=$?

1111 rm -rf "$tmp"

12− exit $exitCode

12+ return $exitCode

1313}

1414

1515trap "exitHandler" EXIT

maintainers/scripts/doc/escape-code-markup.pynew file+97

@@ -0,0 +1,97 @@

1+#! /usr/bin/env nix-shell

2+#! nix-shell -I nixpkgs=channel:nixos-unstable -i python3 -p python3 -p python3.pkgs.lxml

4+"""

5+Pandoc will strip any markup within code elements so

6+let’s escape them so that they can be handled manually.

7+"""

9+import lxml.etree as ET

10+import re

11+import sys

12+

13+def replace_element_by_text(el: ET.Element, text: str) -> None:

14+ """

15+ Author: bernulf

16+ Source: https://stackoverflow.com/a/10520552/160386

17+ SPDX-License-Identifier: CC-BY-SA-3.0

18+ """

19+ text = text + (el.tail or "")

20+ parent = el.getparent()

21+ if parent is not None:

22+ previous = el.getprevious()

23+ if previous is not None:

24+ previous.tail = (previous.tail or "") + text

25+ else:

26+ parent.text = (parent.text or "") + text

27+ parent.remove(el)

28+

29+DOCBOOK_NS = "http://docbook.org/ns/docbook"

30+

31+# List of elements that pandoc’s DocBook reader strips markup from.

32+# https://github.com/jgm/pandoc/blob/master/src/Text/Pandoc/Readers/DocBook.hs

33+code_elements = [

34+ # CodeBlock

35+ "literallayout",

36+ "screen",

37+ "programlisting",

38+ # Code (inline)

39+ "classname",

40+ "code",

41+ "filename",

42+ "envar",

43+ "literal",

44+ "computeroutput",

45+ "prompt",

46+ "parameter",

47+ "option",

48+ "markup",

49+ "wordasword",

50+ "command",

51+ "varname",

52+ "function",

53+ "type",

54+ "symbol",

55+ "constant",

56+ "userinput",

57+ "systemitem",

58+]

59+

60+XMLNS_REGEX = re.compile(r'\s+xmlns(?::[^=]+)?="[^"]*"')

61+ROOT_ELEMENT_REGEX = re.compile(r'^\s*<[^>]+>')

62+

63+def remove_xmlns(match: re.Match) -> str:

64+ """

65+ Removes xmlns attributes.

66+

67+ Expects a match containing an opening tag.

68+ """

69+ return XMLNS_REGEX.sub('', match.group(0))

70+

71+if __name__ == '__main__':

72+ assert len(sys.argv) >= 3, "usage: escape-code-markup.py <input> <output>"

73+

74+ tree = ET.parse(sys.argv[1])

75+ name_predicate = " or ".join([f"local-name()='{el}'" for el in code_elements])

76+

77+ for markup in tree.xpath(f"//*[({name_predicate}) and namespace-uri()='{DOCBOOK_NS}']/*"):

78+ text = ET.tostring(markup, encoding=str)

79+

80+ # tostring adds xmlns attributes to the element we want to stringify

81+ # as if it was supposed to be usable standalone.

82+ # We are just converting it to CDATA so we do not care.

83+ # Let’s strip the namespace declarations to keep the code clean.

84+ #

85+ # Note that this removes even namespaces that were potentially

86+ # in the original file. Though, that should be very rare –

87+ # most of the time, we will stringify empty DocBook elements

88+ # like <xref> or <co> or, at worst, <link> with xlink:href attribute.

89+ #

90+ # Also note that the regex expects the root element to be first

91+ # thing in the string. But that should be fine, the tostring method

92+ # does not produce XML declaration or doctype by default.

93+ text = ROOT_ELEMENT_REGEX.sub(remove_xmlns, text)

94+

95+ replace_element_by_text(markup, text)

96+

97+ tree.write(sys.argv[2])

maintainers/scripts/doc/replace-xrefs-by-empty-links.pynew file+32

@@ -0,0 +1,32 @@

1+#! /usr/bin/env nix-shell

2+#! nix-shell -I nixpkgs=channel:nixos-unstable -i python3 -p python3 -p python3.pkgs.lxml

4+"""

5+Pandoc will try to resolve xrefs and replace them with regular links.

6+let’s replace them with links with empty labels which MyST

7+and our pandoc filters recognize as cross-references.

8+"""

10+import lxml.etree as ET

11+import sys

12+

13+XLINK_NS = "http://www.w3.org/1999/xlink"

14+

15+ns = {

16+ "db": "http://docbook.org/ns/docbook",

17+}

18+

19+

20+if __name__ == '__main__':

21+ assert len(sys.argv) >= 3, "usage: replace-xrefs-by-empty-links.py <input> <output>"

22+

23+ tree = ET.parse(sys.argv[1])

24+ for xref in tree.findall(".//db:xref", ns):

25+ text = ET.tostring(xref, encoding=str)

26+ parent = xref.getparent()

27+ link = parent.makeelement('link')

28+ target_name = xref.get("linkend")

29+ link.set(f"{{{XLINK_NS}}}href", f"#{target_name}")

30+ parent.replace(xref, link)

31+

32+ tree.write(sys.argv[2])

maintainers/scripts/doc/unknown-code-language.luanew file+12

@@ -0,0 +1,12 @@

1+--[[

2+Adds “unknown” class to CodeBlock AST nodes without any classes.

4+This will cause Pandoc to use fenced code block, which we prefer.

5+]]

7+function CodeBlock(elem)

8+ if #elem.classes == 0 then

9+ elem.classes:insert('unknown')

10+ return elem

11+ end

12+end

maintainers/scripts/feature-freeze-teams.plnew file+98

@@ -0,0 +1,98 @@

1+#!/usr/bin/env nix-shell

2+#!nix-shell -i perl -p perl -p perlPackages.JSON perlPackages.LWPUserAgent perlPackages.LWPProtocolHttps perlPackages.TermReadKey

4+# This script generates a list of teams to ping for the Feature Freeze announcement on Discourse.

5+# It's intended to be used by Release Managers before creating such posts.

6+#

7+# The script interactively reads a GitHub username and a corresponding GitHub Personal Access token.

8+# This is required to access the GitHub Teams API so the token needs at least the read:org privilege.

10+## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::ProhibitBacktickOperators)

11+use strict;

12+use warnings;

13+use Carp;

14+use Cwd 'abs_path';

15+use File::Basename;

16+use JSON qw(decode_json);

17+use LWP::UserAgent;

18+use Term::ReadKey qw(ReadLine ReadMode);

19+

20+sub github_team_members {

21+ my ($team_name, $username, $token) = @_;

22+ my @ret;

23+

24+ my $req = HTTP::Request->new('GET', "https://api.github.com/orgs/NixOS/teams/$team_name/members", [ 'Accept' => 'application/vnd.github.v3+json' ]);

25+ $req->authorization_basic($username, $token);

26+ my $response = LWP::UserAgent->new->request($req);

27+

28+ if ($response->is_success) {

29+ my $content = decode_json($response->decoded_content);

30+ foreach (@{$content}) {

31+ push @ret, $_->{'login'};

32+ }

33+ } else {

34+ print {*STDERR} "!! Requesting members of GitHub Team '$team_name' failed: $response->status_line";

35+ }

36+

37+ return \@ret;

38+}

39+

40+# Read GitHub credentials

41+print {*STDERR} 'GitHub username: ';

42+my $github_user = ReadLine(0);

43+ReadMode('noecho');

44+print {*STDERR} 'GitHub personal access token (no echo): ';

45+my $github_token = ReadLine(0);

46+ReadMode('restore');

47+print {*STDERR} "\n";

48+chomp $github_user;

49+chomp $github_token;

50+

51+# Read nix output

52+my $nix_version = `nix --version`;

53+my $out;

54+my $lib_path = abs_path(dirname(__FILE__)) . '../../../lib';

55+if ($nix_version =~ m/2[.]3[.]/msx) {

56+ $out = `nix eval --json '(import $lib_path).teams'` || croak 'nix eval failed';

57+} else {

58+ $out = `nix --extra-experimental-features nix-command eval --json --impure --expr '(import $lib_path).teams'` || croak('nix eval failed');

59+}

60+my $data = decode_json($out);

61+

62+# Process teams

63+print {*STDERR} "\n";

64+while (my ($team_nix_key, $team_config) = each %{$data}) {

65+ # Ignore teams that don't want to be or can't be pinged

66+ if (not defined $team_config->{enableFeatureFreezePing} or not $team_config->{enableFeatureFreezePing}) {

67+ next;

68+ }

69+ if (not defined $team_config->{shortName}) {

70+ print {*STDERR} "!! The team with the nix key '$team_nix_key' has no shortName set - ignoring";

71+ next;

72+ }

73+ # Team name

74+ print {*STDERR} "$team_config->{shortName}:";

75+ # GitHub Teams

76+ my @github_members;

77+ if (defined $team_config->{githubTeams}) {

78+ foreach (@{$team_config->{githubTeams}}) {

79+ print {*STDERR} " \@NixOS/${_}";

80+ push @github_members, @{github_team_members($_, $github_user, $github_token)};

81+ }

82+ }

83+ my %github_members = map { $_ => 1 } @github_members;

84+ # Members

85+ if (defined $team_config->{members}) {

86+ foreach (@{$team_config->{members}}) {

87+ my %user = %{$_};

88+ my $github_handle = $user{'github'};

89+ # Ensure we don't ping team members twice (as team member and directly)

90+ if (defined $github_members{$github_handle}) {

91+ next;

92+ }

93+ print {*STDERR} " \@$github_handle";

94+ }

95+ }

96+

97+ print {*STDERR} "\n";

98+}

maintainers/scripts/find-tarballs.nix+1−1

@@ -37,7 +37,7 @@ let

3737 keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { };

3838

3939 immediateDependenciesOf = drv:

40− concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv ["meta" "passthru"]));

40+ concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv (["meta" "passthru"] ++ optionals (drv?passthru) (attrNames drv.passthru))));

4141

4242 derivationsIn = x:

4343 if !canEval x then []

maintainers/scripts/haskell/dependencies.nixnew file+10

@@ -0,0 +1,10 @@

1+# Nix script to calculate the Haskell dependencies of every haskellPackage. Used by ./hydra-report.hs.

2+let

3+ pkgs = import ../../.. {};

4+ inherit (pkgs) lib;

5+ getDeps = _: pkg: {

6+ deps = builtins.filter (x: !isNull x) (map (x: x.pname or null) (pkg.propagatedBuildInputs or []));

7+ broken = (pkg.meta.hydraPlatforms or [null]) == [];

8+ };

9+in

10+ lib.mapAttrs getDeps pkgs.haskellPackages

maintainers/scripts/haskell/hydra-report.hs+115−33

@@ -26,6 +26,8 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca

2626{-# LANGUAGE ScopedTypeVariables #-}

2727{-# LANGUAGE TupleSections #-}

2828{-# OPTIONS_GHC -Wall #-}

29+{-# LANGUAGE ViewPatterns #-}

30+{-# LANGUAGE TupleSections #-}

2931

3032import Control.Monad (forM_, (<=<))

3133import Control.Monad.Trans (MonadIO (liftIO))

@@ -41,7 +43,7 @@ import Data.List.NonEmpty (NonEmpty, nonEmpty)

4143import qualified Data.List.NonEmpty as NonEmpty

4244import Data.Map.Strict (Map)

4345import qualified Data.Map.Strict as Map

44−import Data.Maybe (fromMaybe, mapMaybe)

46+import Data.Maybe (fromMaybe, mapMaybe, isNothing)

4547import Data.Monoid (Sum (Sum, getSum))

4648import Data.Sequence (Seq)

4749import qualified Data.Sequence as Seq

@@ -70,6 +72,12 @@ import System.Directory (XdgDirectory (XdgCache), getXdgDirectory)

7072import System.Environment (getArgs)

7173import System.Process (readProcess)

7274import Prelude hiding (id)

75+import Data.List (sortOn)

76+import Control.Concurrent.Async (concurrently)

77+import Control.Exception (evaluate)

78+import qualified Data.IntMap.Strict as IntMap

79+import qualified Data.IntSet as IntSet

80+import Data.Bifunctor (second)

7381

7482newtype JobsetEvals = JobsetEvals

7583 { evals :: Seq Eval

@@ -134,20 +142,17 @@ hydraEvalCommand = "hydra-eval-jobs"

134142hydraEvalParams :: [String]

135143hydraEvalParams = ["-I", ".", "pkgs/top-level/release-haskell.nix"]

136144

137−handlesCommand :: FilePath

138−handlesCommand = "nix-instantiate"

139−

140−handlesParams :: [String]

141−handlesParams = ["--eval", "--strict", "--json", "-"]

145+nixExprCommand :: FilePath

146+nixExprCommand = "nix-instantiate"

142147

143−handlesExpression :: String

144−handlesExpression = "with import ./. {}; with lib; zipAttrsWith (_: builtins.head) (mapAttrsToList (_: v: if v ? github then { \"${v.email}\" = v.github; } else {}) (import maintainers/maintainer-list.nix))"

148+nixExprParams :: [String]

149+nixExprParams = ["--eval", "--strict", "--json"]

145150

146151-- | This newtype is used to parse a Hydra job output from @hydra-eval-jobs@.

147152-- The only field we are interested in is @maintainers@, which is why this

148153-- is just a newtype.

149154--

150−-- Note that there are occassionally jobs that don't have a maintainers

155+-- Note that there are occasionally jobs that don't have a maintainers

151156-- field, which is why this has to be @Maybe Text@.

152157newtype Maintainers = Maintainers { maintainers :: Maybe Text }

153158 deriving stock (Generic, Show)

@@ -195,13 +200,49 @@ type EmailToGitHubHandles = Map Text Text

195200-- @@

196201type MaintainerMap = Map Text (NonEmpty Text)

197202

198−-- | Generate a mapping of Hydra job names to maintainer GitHub handles.

203+-- | Information about a package which lists its dependencies and whether the

204+-- package is marked broken.

205+data DepInfo = DepInfo {

206+ deps :: Set Text,

207+ broken :: Bool

208+}

209+ deriving stock (Generic, Show)

210+ deriving anyclass (FromJSON, ToJSON)

211+

212+-- | Map from package names to their DepInfo. This is the data we get out of a

213+-- nix call.

214+type DependencyMap = Map Text DepInfo

215+

216+-- | Map from package names to its broken state, number of reverse dependencies (fst) and

217+-- unbroken reverse dependencies (snd).

218+type ReverseDependencyMap = Map Text (Int, Int)

219+

220+-- | Calculate the (unbroken) reverse dependencies of a package by transitively

221+-- going through all packages if it’s a dependency of them.

222+calculateReverseDependencies :: DependencyMap -> ReverseDependencyMap

223+calculateReverseDependencies depMap = Map.fromDistinctAscList $ zip keys (zip (rdepMap False) (rdepMap True))

224+ where

225+ -- This code tries to efficiently invert the dependency map and calculate

226+ -- it’s transitive closure by internally identifying every pkg with it’s index

227+ -- in the package list and then using memoization.

228+ keys = Map.keys depMap

229+ pkgToIndexMap = Map.fromDistinctAscList (zip keys [0..])

230+ intDeps = zip [0..] $ (\DepInfo{broken,deps} -> (broken,mapMaybe (`Map.lookup` pkgToIndexMap) $ Set.toList deps)) <$> Map.elems depMap

231+ rdepMap onlyUnbroken = IntSet.size <$> resultList

232+ where

233+ resultList = go <$> [0..]

234+ oneStepMap = IntMap.fromListWith IntSet.union $ (\(key,(_,deps)) -> (,IntSet.singleton key) <$> deps) <=< filter (\(_, (broken,_)) -> not (broken && onlyUnbroken)) $ intDeps

235+ go pkg = IntSet.unions (oneStep:((resultList !!) <$> IntSet.toList oneStep))

236+ where oneStep = IntMap.findWithDefault mempty pkg oneStepMap

237+

238+-- | Generate a mapping of Hydra job names to maintainer GitHub handles. Calls

239+-- hydra-eval-jobs and the nix script ./maintainer-handles.nix.

199240getMaintainerMap :: IO MaintainerMap

200241getMaintainerMap = do

201242 hydraJobs :: HydraJobs <-

202− readJSONProcess hydraEvalCommand hydraEvalParams "" "Failed to decode hydra-eval-jobs output: "

243+ readJSONProcess hydraEvalCommand hydraEvalParams "Failed to decode hydra-eval-jobs output: "

203244 handlesMap :: EmailToGitHubHandles <-

204− readJSONProcess handlesCommand handlesParams handlesExpression "Failed to decode nix output for lookup of github handles: "

245+ readJSONProcess nixExprCommand ("maintainers/scripts/haskell/maintainer-handles.nix":nixExprParams) "Failed to decode nix output for lookup of github handles: "

205246 pure $ Map.mapMaybe (splitMaintainersToGitHubHandles handlesMap) hydraJobs

206247 where

207248 -- Split a comma-spearated string of Maintainers into a NonEmpty list of

@@ -211,6 +252,12 @@ getMaintainerMap = do

211252 splitMaintainersToGitHubHandles handlesMap (Maintainers maint) =

212253 nonEmpty . mapMaybe (`Map.lookup` handlesMap) . Text.splitOn ", " $ fromMaybe "" maint

213254

255+-- | Get the a map of all dependencies of every package by calling the nix

256+-- script ./dependencies.nix.

257+getDependencyMap :: IO DependencyMap

258+getDependencyMap =

259+ readJSONProcess nixExprCommand ("maintainers/scripts/haskell/dependencies.nix":nixExprParams) "Failed to decode nix output for lookup of dependencies: "

260+

214261-- | Run a process that produces JSON on stdout and and decode the JSON to a

215262-- data type.

216263--

@@ -219,11 +266,10 @@ readJSONProcess

219266 :: FromJSON a

220267 => FilePath -- ^ Filename of executable.

221268 -> [String] -- ^ Arguments

222− -> String -- ^ stdin to pass to the process

223269 -> String -- ^ String to prefix to JSON-decode error.

224270 -> IO a

225−readJSONProcess exe args input err = do

226− output <- readProcess exe args input

271+readJSONProcess exe args err = do

272+ output <- readProcess exe args ""

227273 let eitherDecodedOutput = eitherDecodeStrict' . encodeUtf8 . Text.pack $ output

228274 case eitherDecodedOutput of

229275 Left decodeErr -> error $ err <> decodeErr <> "\nRaw: '" <> take 1000 output <> "'"

@@ -264,7 +310,13 @@ platformIcon (Platform x) = case x of

264310data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord)

265311newtype Platform = Platform {platform :: Text} deriving (Show, Eq, Ord)

266312newtype Table row col a = Table (Map (row, col) a)

267−type StatusSummary = Map Text (Table Text Platform BuildResult, Set Text)

313+data SummaryEntry = SummaryEntry {

314+ summaryBuilds :: Table Text Platform BuildResult,

315+ summaryMaintainers :: Set Text,

316+ summaryReverseDeps :: Int,

317+ summaryUnbrokenReverseDeps :: Int

318+}

319+type StatusSummary = Map Text SummaryEntry

268320

269321instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where

270322 Table l <> Table r = Table (Map.unionWith (<>) l r)

@@ -275,11 +327,11 @@ instance Functor (Table row col) where

275327instance Foldable (Table row col) where

276328 foldMap f (Table a) = foldMap f a

277329

278−buildSummary :: MaintainerMap -> Seq Build -> StatusSummary

279−buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary

330+buildSummary :: MaintainerMap -> ReverseDependencyMap -> Seq Build -> StatusSummary

331+buildSummary maintainerMap reverseDependencyMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary

280332 where

281− unionSummary (Table l, l') (Table r, r') = (Table $ Map.union l r, l' <> r')

282− toSummary Build{finished, buildstatus, job, id, system} = Map.singleton name (Table (Map.singleton (set, Platform system) (BuildResult state id)), maintainers)

333+ unionSummary (SummaryEntry (Table lb) lm lr lu) (SummaryEntry (Table rb) rm rr ru) = SummaryEntry (Table $ Map.union lb rb) (lm <> rm) (max lr rr) (max lu ru)

334+ toSummary Build{finished, buildstatus, job, id, system} = Map.singleton name (SummaryEntry (Table (Map.singleton (set, Platform system) (BuildResult state id))) maintainers reverseDeps unbrokenReverseDeps)

283335 where

284336 state :: BuildState

285337 state = case (finished, buildstatus) of

@@ -297,6 +349,7 @@ buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap

297349 name = maybe packageName NonEmpty.last splitted

298350 set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted

299351 maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap)

352+ (reverseDeps, unbrokenReverseDeps) = Map.findWithDefault (0,0) name reverseDependencyMap

300353

301354readBuildReports :: IO (Eval, UTCTime, Seq Build)

302355readBuildReports = do

@@ -339,25 +392,29 @@ makeSearchLink evalId linkLabel query = "[" <> linkLabel <> "](" <> "https://hyd

339392statusToNumSummary :: StatusSummary -> NumSummary

340393statusToNumSummary = fmap getSum . foldMap (fmap Sum . jobTotals)

341394

342−jobTotals :: (Table Text Platform BuildResult, a) -> Table Platform BuildState Int

343−jobTotals (Table mapping, _) = getSum <$> Table (Map.foldMapWithKey (\(_, platform) (BuildResult buildstate _) -> Map.singleton (platform, buildstate) (Sum 1)) mapping)

395+jobTotals :: SummaryEntry -> Table Platform BuildState Int

396+jobTotals (summaryBuilds -> Table mapping) = getSum <$> Table (Map.foldMapWithKey (\(_, platform) (BuildResult buildstate _) -> Map.singleton (platform, buildstate) (Sum 1)) mapping)

344397

345398details :: Text -> [Text] -> [Text]

346399details summary content = ["<details><summary>" <> summary <> " </summary>", ""] <> content <> ["</details>", ""]

347400

348−printBuildSummary :: Eval -> UTCTime -> StatusSummary -> Text

401+printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text

349402printBuildSummary

350403 Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}}

351404 fetchTime

352− summary =

405+ summary

406+ topBrokenRdeps =

353407 Text.unlines $

354− headline <> totals

408+ headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""]

409+ <> totals

355410 <> optionalList "#### Maintained packages with build failure" (maintainedList fails)

356411 <> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps)

357412 <> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr)

358413 <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails)

359414 <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps)

360415 <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr)

416+ <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps)

417+ <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""]

361418 <> footer

362419 where

363420 footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.sh)*"]

@@ -365,7 +422,7 @@ printBuildSummary

365422 [ "#### Build summary"

366423 , ""

367424 ]

368− <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT (statusToNumSummary summary)

425+ <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary

369426 headline =

370427 [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)"

371428 , "*evaluation ["

@@ -380,24 +437,49 @@ printBuildSummary

380437 <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime)

381438 <> "*"

382439 ]

383− jobsByState predicate = Map.filter (predicate . foldl' min Success . fmap state . fst) summary

440+ brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " "

441+ numSummary = statusToNumSummary summary

442+ jobsByState predicate = Map.filter (predicate . worstState) summary

443+ worstState = foldl' min Success . fmap state . summaryBuilds

384444 fails = jobsByState (== Failed)

385445 failedDeps = jobsByState (== DependencyFailed)

386446 unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut)

387− withMaintainer = Map.mapMaybe (\(x, m) -> (x,) <$> nonEmpty (Set.toList m))

388− withoutMaintainer = Map.mapMaybe (\(x, m) -> if Set.null m then Just x else Nothing)

447+ withMaintainer = Map.mapMaybe (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e)))

448+ withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing)

389449 optionalList heading list = if null list then mempty else [heading] <> list

390450 optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list

391451 maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer

392− unmaintainedList = showBuild <=< Map.toList . withoutMaintainer

393− showBuild (name, table) = printJob id name (table, "")

452+ unmaintainedList = showBuild <=< sortOn (\(snd -> x) -> (negate (summaryUnbrokenReverseDeps x), negate (summaryReverseDeps x))) . Map.toList . withoutMaintainer

453+ showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else ""))

394454 showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers)))

455+ tldr = case (errors, warnings) of

456+ ([],[]) -> [":green_circle: **Ready to merge**"]

457+ ([],_) -> [":yellow_circle: **Potential issues**"]

458+ _ -> [":red_circle: **Branch not mergeable**"]

459+ warnings =

460+ if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <>

461+ if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <>

462+ if' (Unfinished == maybe Success worstState maintainedJob) "`maintained` jobset is not finished."

463+ errors =

464+ if' (isNothing mergeableJob) "No `mergeable` job found." <>

465+ if' (isNothing maintainedJob) "No `maintained` job found." <>

466+ if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <>

467+ if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <>

468+ if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux."

469+ if' p e = if p then [e] else mempty

470+ outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m

471+ maintainedJob = Map.lookup "maintained" summary

472+ mergeableJob = Map.lookup "mergeable" summary

395473

396474printMaintainerPing :: IO ()

397475printMaintainerPing = do

398− maintainerMap <- getMaintainerMap

476+ (maintainerMap, (reverseDependencyMap, topBrokenRdeps)) <- concurrently getMaintainerMap do

477+ depMap <- getDependencyMap

478+ rdepMap <- evaluate . calculateReverseDependencies $ depMap

479+ let tops = take 50 . sortOn (negate . snd) . fmap (second fst) . filter (\x -> maybe False broken $ Map.lookup (fst x) depMap) . Map.toList $ rdepMap

480+ pure (rdepMap, tops)

399481 (eval, fetchTime, buildReport) <- readBuildReports

400− putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap buildReport)))

482+ putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap reverseDependencyMap buildReport) topBrokenRdeps))

401483

402484printMarkBrokenList :: IO ()

403485printMarkBrokenList = do

maintainers/scripts/haskell/maintained-broken-pkgs.nixnew file+22

@@ -0,0 +1,22 @@

1+let

2+ nixpkgs = import ../../..;

3+ inherit (nixpkgs {}) haskellPackages lib;

4+ maintainedPkgs = lib.filterAttrs (

5+ _: v: builtins.length (v.meta.maintainers or []) > 0

6+ ) haskellPackages;

7+ brokenPkgs = lib.filterAttrs (_: v: v.meta.broken) maintainedPkgs;

8+ transitiveBrokenPkgs = lib.filterAttrs

9+ (_: v: !(builtins.tryEval (v.outPath or null)).success && !v.meta.broken)

10+ maintainedPkgs;

11+ infoList = pkgs: lib.concatStringsSep "\n" (lib.mapAttrsToList (name: drv: "${name} ${(builtins.elemAt drv.meta.maintainers 0).github}") pkgs);

12+in {

13+ report = ''

14+ BROKEN:

15+ ${infoList brokenPkgs}

16+

17+ TRANSITIVE BROKEN:

18+ ${infoList transitiveBrokenPkgs}

19+ '';

20+ transitiveErrors =

21+ builtins.attrValues transitiveBrokenPkgs;

22+}

maintainers/scripts/haskell/maintainer-handles.nixnew file+7

@@ -0,0 +1,7 @@

1+# Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs.

2+let

3+ pkgs = import ../../.. {};

4+ maintainers = import ../../maintainer-list.nix;

5+ inherit (pkgs) lib;

6+ mkMailGithubPair = _: maintainer: if maintainer ? github then { "${maintainer.email}" = maintainer.github; } else {};

7+in lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers)

maintainers/scripts/haskell/mark-broken.sh+7−5

@@ -17,9 +17,9 @@ trap "rm ${tmpfile}" 0

1717

1818echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script."

1919echo "Generating a list of broken builds and displaying for manual confirmation ..."

20−maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > $tmpfile

20+maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile"

2121

22−$EDITOR $tmpfile

22+$EDITOR "$tmpfile"

2323

2424tail -n +3 "$broken_config" >> "$tmpfile"

2525

@@ -28,10 +28,12 @@ broken-packages:

2828 # These packages don't compile.

2929EOF

3030

31+# clear environment here to avoid things like allowing broken builds in

3132sort -iu "$tmpfile" >> "$broken_config"

32−maintainers/scripts/haskell/regenerate-hackage-packages.sh

33−maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

34−maintainers/scripts/haskell/regenerate-hackage-packages.sh

33+clear="env -u HOME -u NIXPKGS_CONFIG"

34+$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh

35+$clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

36+$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh

3537

3638if [[ "${1:-}" == "--do-commit" ]]; then

3739git add $broken_config

maintainers/scripts/haskell/merge-and-open-pr.shnew file+122

@@ -0,0 +1,122 @@

1+#! /usr/bin/env nix-shell

2+#! nix-shell -i bash -p git gh -I nixpkgs=.

3+#

4+# Script to merge the currently open haskell-updates PR into master, bump the

5+# Stackage version and Hackage versions, and open the next haskell-updates PR.

7+set -eu -o pipefail

9+# exit after printing first argument to this function

10+function die {

11+ # echo the first argument

12+ echo "ERROR: $1"

13+ echo "Aborting!"

14+

15+ exit 1

16+}

17+

18+function help {

19+ echo "Usage: $0 HASKELL_UPDATES_PR_NUM"

20+ echo "Merge the currently open haskell-updates PR into master, and open the next one."

21+ echo

22+ echo " -h, --help print this help"

23+ echo " HASKELL_UPDATES_PR_NUM number of the currently open PR on NixOS/nixpkgs"

24+ echo " for the haskell-updates branch"

25+ echo

26+ echo "Example:"

27+ echo " \$ $0 137340"

28+

29+ exit 1

30+}

31+

32+# Read in the current haskell-updates PR number from the command line.

33+while [[ $# -gt 0 ]]; do

34+ key="$1"

35+

36+ case $key in

37+ -h|--help)

38+ help

39+ ;;

40+ *)

41+ curr_haskell_updates_pr_num="$1"

42+ shift

43+ ;;

44+ esac

45+done

46+

47+if [[ -z "${curr_haskell_updates_pr_num-}" ]] ; then

48+ die "You must pass the current haskell-updates PR number as the first argument to this script."

49+fi

50+

51+# Make sure you have gh authentication setup.

52+if ! gh auth status 2>/dev/null ; then

53+ die "You must setup the \`gh\` command. Run \`gh auth login\`."

54+fi

55+

56+# Fetch nixpkgs to get an up-to-date origin/haskell-updates branch.

57+echo "Fetching origin..."

58+git fetch origin >/dev/null

59+

60+# Make sure we are currently on a local haskell-updates branch.

61+curr_branch="$(git rev-parse --abbrev-ref HEAD)"

62+if [[ "$curr_branch" != "haskell-updates" ]]; then

63+ die "Current branch is not called \"haskell-updates\"."

64+fi

65+

66+# Make sure our local haskell-updates branch is on the same commit as

67+# origin/haskell-updates.

68+curr_branch_commit="$(git rev-parse haskell-updates)"

69+origin_haskell_updates_commit="$(git rev-parse origin/haskell-updates)"

70+if [[ "$curr_branch_commit" != "$origin_haskell_updates_commit" ]]; then

71+ die "Current branch is not at the same commit as origin/haskell-updates"

72+fi

73+

74+# Merge the current open haskell-updates PR.

75+echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..."

76+gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num"

77+

78+# Update the list of Haskell package versions in NixOS on Hackage.

79+echo "Updating list of Haskell package versions in NixOS on Hackage..."

80+./maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh

81+

82+# Update stackage, Hackage hashes, and regenerate Haskell package set

83+echo "Updating Stackage..."

84+./maintainers/scripts/haskell/update-stackage.sh --do-commit

85+echo "Updating Hackage hashes..."

86+./maintainers/scripts/haskell/update-hackage.sh --do-commit

87+echo "Regenerating Hackage packages..."

88+./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit

89+

90+# Push these new commits to the haskell-updates branch

91+echo "Pushing commits just created to the remote haskell-updates branch..."

92+git push

93+

94+# Open new PR

95+new_pr_body=$(cat <<EOF

96+### This Merge

97+

98+This PR is the regular merge of the \`haskell-updates\` branch into \`master\`.

99+

100+This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at [cdepillabout/nix-haskell-updates-status](https://github.com/cdepillabout/nix-haskell-updates-status).

101+

102+We roughly aim to merge these \`haskell-updates\` PRs at least once every two weeks. See the @NixOS/haskell [team calendar](https://cloud.maralorn.de/apps/calendar/p/H6migHmKX7xHoTFa) for who is currently in charge of this branch.

103+

104+### haskellPackages Workflow Summary

105+

106+Our workflow is currently described in [\`pkgs/development/haskell-modules/HACKING.md\`](https://github.com/NixOS/nixpkgs/blob/haskell-updates/pkgs/development/haskell-modules/HACKING.md).

107+

108+The short version is this:

109+* We regularly update the Stackage and Hackage pins on \`haskell-updates\` (normally at the beginning of a merge window).

110+* The community fixes builds of Haskell packages on that branch.

111+* We aim at at least one merge of \`haskell-updates\` into \`master\` every two weeks.

112+* We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.

113+* If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)

114+

115+---

116+

117+This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions.

118+EOF

119+)

120+

121+echo "Opening a PR for the next haskell-updates merge cycle..."

122+gh pr create --repo NixOS/nixpkgs --base master --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body"

maintainers/scripts/haskell/regenerate-hackage-packages.sh+1−1

@@ -20,7 +20,7 @@ HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}"

2020# See: https://github.com/NixOS/nixpkgs/pull/122023

2121export LC_ALL=C.UTF-8

2222

23−extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'

23+extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'

2424unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)"

2525config_dir=pkgs/development/haskell-modules/configuration-hackage2nix

2626

maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh+1−1

@@ -12,4 +12,4 @@ dont-distribute-packages:

1212EOF

1313

1414echo "Regenerating list of transitive broken packages ..."

15−echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | sort -i >> $config_file

15+echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | LC_ALL=C.UTF-8 sort -i >> $config_file

maintainers/scripts/haskell/test-configurations.nixnew file+136

@@ -0,0 +1,136 @@

1+/* Nix expression to test for regressions in the Haskell configuration overlays.

3+ test-configurations.nix determines all attributes touched by given Haskell

4+ configuration overlays (i. e. pkgs/development/haskell-modules/configuration-*.nix)

5+ and builds all derivations (or at least a reasonable subset) affected by

6+ these overrides.

8+ By default, it checks `configuration-{common,nix,ghc-8.10.x}.nix`. You can

9+ invoke it like this:

10+

11+ nix-build maintainers/scripts/haskell/test-configurations.nix --keep-going

12+

13+ It is possible to specify other configurations:

14+

15+ nix-build maintainers/scripts/haskell/test-configurations.nix \

16+ --arg files '[ "configuration-ghc-9.0.x.nix" "configuration-ghc-9.2.x.nix" ]' \

17+ --keep-going

18+

19+ You can also just supply a single string:

20+

21+ nix-build maintainers/scripts/haskell/test-configurations.nix \

22+ --argstr files "configuration-arm.nix" --keep-going

23+

24+ You can even supply full paths which is handy, as it allows for tab-completing

25+ the configurations:

26+

27+ nix-build maintainers/scripts/haskell/test-configurations.nix \

28+ --argstr files pkgs/development/haskell-modules/configuration-arm.nix \

29+ --keep-going

30+

31+ By default, derivation that fail to evaluate are skipped, unless they are

32+ “just” marked as broken. You can check for other eval errors like this:

33+

34+ nix-build maintainers/scripts/haskell/test-configurations.nix \

35+ --arg skipEvalErrors false --keep-going

36+

37+ You can also disable checking broken packages by passing a nixpkgs config:

38+

39+ nix-build maintainers/scripts/haskell/test-configurations.nix \

40+ --arg config '{ allowBroken = false; }' --keep-going

41+

42+ By default the haskell.packages.ghc*Binary sets used for bootstrapping GHC

43+ are _not_ tested. You can change this using:

44+

45+ nix-build maintainers/scripts/haskell/test-configurations.nix \

46+ --arg skipBinaryGHCs false --keep-going

47+

48+*/

49+{ files ? [

50+ "configuration-common.nix"

51+ "configuration-nix.nix"

52+ "configuration-ghc-8.10.x.nix"

53+ ]

54+, nixpkgsPath ? ../../..

55+, config ? { allowBroken = true; }

56+, skipEvalErrors ? true

57+, skipBinaryGHCs ? true

58+}:

59+

60+let

61+ pkgs = import nixpkgsPath { inherit config; };

62+ inherit (pkgs) lib;

63+

64+ # see usage explanation for the input format `files` allows

65+ files' = builtins.map builtins.baseNameOf (

66+ if !builtins.isList files then [ files ] else files

67+ );

68+

69+ setsForFile = fileName:

70+ let

71+ # extract the unique part of the config's file name

72+ configName = builtins.head (

73+ builtins.match "configuration-(.+).nix" fileName

74+ );

75+ # match the major and minor version of the GHC the config is intended for, if any

76+ configVersion = lib.concatStrings (

77+ builtins.match "ghc-([0-9]+).([0-9]+).x" configName

78+ );

79+ # return all package sets under haskell.packages matching the version components

80+ setsForVersion = builtins.map (name: pkgs.haskell.packages.${name}) (

81+ builtins.filter (setName:

82+ lib.hasPrefix "ghc${configVersion}" setName

83+ && (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName))

84+ ) (

85+ builtins.attrNames pkgs.haskell.packages

86+ )

87+ );

88+

89+ defaultSets = [ pkgs.haskellPackages ];

90+ in {

91+ # use plain haskellPackages for the version-agnostic files

92+ # TODO(@sternenseemann): also consider currently selected versioned sets

93+ "common" = defaultSets;

94+ "nix" = defaultSets;

95+ "arm" = defaultSets;

96+ "darwin" = defaultSets;

97+ }.${configName} or setsForVersion;

98+

99+ # attribute set that has all the attributes of haskellPackages set to null

100+ availableHaskellPackages = builtins.listToAttrs (

101+ builtins.map (attr: lib.nameValuePair attr null) (

102+ builtins.attrNames pkgs.haskellPackages

103+ )

104+ );

105+

106+ # evaluate a configuration and only return the attributes changed by it,

107+ # pass availableHaskellPackages as super in case intersectAttrs is used

108+ overriddenAttrs = fileName: builtins.attrNames (

109+ lib.fix (self:

110+ import (nixpkgsPath + "/pkgs/development/haskell-modules/${fileName}") {

111+ haskellLib = pkgs.haskell.lib.compose;

112+ inherit pkgs;

113+ } self availableHaskellPackages

114+ )

115+ );

116+

117+ # list of derivations that are affected by overrides in the given configuration

118+ # overlays. For common, nix, darwin etc. only the derivation from the default

119+ # package set will be emitted.

120+ packages = builtins.filter (v:

121+ lib.warnIf (v.meta.broken or false) "${v.pname} is marked as broken" (

122+ v != null

123+ && (skipEvalErrors -> (builtins.tryEval (v.outPath or v)).success)

124+ )

125+ ) (

126+ lib.concatMap (fileName:

127+ let

128+ sets = setsForFile fileName;

129+ attrs = overriddenAttrs fileName;

130+ in

131+ lib.concatMap (set: builtins.map (attr: set.${attr}) attrs) sets

132+ ) files'

133+ );

134+in

135+

136+packages

maintainers/scripts/haskell/update-stackage.sh+26−24

@@ -1,25 +1,39 @@

11#! /usr/bin/env nix-shell

22#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=.

3+# shellcheck shell=bash

45set -eu -o pipefail

6−tmpfile=$(mktemp "update-stackage.XXXXXXX")

7−# shellcheck disable=SC2064

7+# Stackage solver to use, LTS or Nightly

8+# (should be capitalized like the display name)

9+SOLVER=LTS

10+TMP_TEMPLATE=update-stackage.XXXXXXX

11+readonly SOLVER

12+readonly TMP_TEMPLATE

13+

14+toLower() {

15+ printf "%s" "$1" | tr '[:upper:]' '[:lower:]'

16+}

17+

18+tmpfile=$(mktemp "$TMP_TEMPLATE")

19+tmpfile_new=$(mktemp "$TMP_TEMPLATE")

820

921stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml"

1022

11−trap "rm ${tmpfile} ${tmpfile}.new" 0

12−touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.

23+trap 'rm "${tmpfile}" "${tmpfile_new}"' 0

24+touch "$tmpfile" "$tmpfile_new" # Creating files here so that trap creates no errors.

1325

14−curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile"

15−old_version=$(grep "# Stackage Nightly" $stackage_config | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/')

16−version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile")

26+curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile"

27+old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ $[A-Za-z]\+ [0-9.-]\+$$/\1/g')

28+version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")"

1729

1830if [[ "$old_version" == "$version" ]]; then

1931 echo "No new stackage version"

2032 exit 0 # Nothing to do

2133fi

2234

35+echo "Updating Stackage from $old_version to $version."

36+

2337# Create a simple yaml version of the file.

2438sed -r \

2539 -e '/^--/d' \

@@ -28,10 +42,10 @@ sed -r \

2842 -e 's|,$||' \

2943 -e '/installed$/d' \

3044 -e '/^$/d' \

31− < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"

45+ < "${tmpfile}" | sort --ignore-case >"${tmpfile_new}"

3246

3347cat > $stackage_config << EOF

34−# Stackage Nightly $version

48+# Stackage $version

3549# This file is auto-generated by

3650# maintainers/scripts/haskell/update-stackage.sh

3751default-package-overrides:

@@ -39,29 +53,17 @@ EOF

3953

4054# Drop restrictions on some tools where we always want the latest version.

4155sed -r \

42− -e '/ cabal-install /d' \

4356 -e '/ cabal2nix /d' \

44− -e '/ cabal2spec /d' \

4557 -e '/ distribution-nixpkgs /d' \

46− -e '/ git-annex /d' \

47− -e '/ hindent /d' \

48− -e '/ hledger/d' \

49− -e '/ hlint /d' \

50− -e '/ hoogle /d' \

51− -e '/ hopenssl /d' \

5258 -e '/ jailbreak-cabal /d' \

53− -e '/ json-autotype/d' \

5459 -e '/ language-nix /d' \

55− -e '/ shake /d' \

56− -e '/ ShellCheck /d' \

57− -e '/ stack /d' \

58− -e '/ weeder /d' \

59− < "${tmpfile}.new" >> $stackage_config

60+ -e '/ cabal-install /d' \

61+ < "${tmpfile_new}" >> $stackage_config

6062

6163if [[ "${1:-}" == "--do-commit" ]]; then

6264git add $stackage_config

6365git commit -F - << EOF

64−haskellPackages: stackage-nightly $old_version -> $version

66+haskellPackages: stackage $old_version -> $version

6567

6668This commit has been generated by maintainers/scripts/haskell/update-stackage.sh

6769EOF

maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.shnew file+22

@@ -0,0 +1,22 @@

1+#! /usr/bin/env nix-shell

2+#! nix-shell -i bash -p nix curl gnused -I nixpkgs=.

4+# On Hackage every package description shows a category "Distributions" which

5+# lists a "NixOS" version.

6+# This script uploads a csv to hackage which will update the displayed versions

7+# based on the current versions in nixpkgs. This happens with a simple http

8+# request.

10+# For authorization you just need to have any valid hackage account. This

11+# script uses the `username` and `password-command` field from your

12+# ~/.cabal/config file.

13+

14+# e.g. username: maralorn

15+# password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.)

16+# Those fields are specified under `upload` on the `cabal` man page.

17+

18+package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"

19+username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //")

20+password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //")

21+curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv

22+echo

maintainers/scripts/luarocks-packages.csv+87−87

@@ -1,87 +1,87 @@

1−# nix name, luarocks name, server, version,luaversion,maintainers

2−alt-getopt,,,,,arobyn

3−ansicolors,,,,,

4−argparse,,,,,

5−basexx,,,,,

6−binaryheap,,,,,vcunat

7−bit32,,,,lua5_1,lblasc

8−busted,,,,,

9−cassowary,,,,,marsam alerque

10−cjson,lua-cjson,,,,

11−compat53,,,,,vcunat

12−cosmo,,,,,marsam

13−coxpcall,,,1.17.0-1,,

14−cqueues,,,,,vcunat

15−cyrussasl,,,,,

16−digestif,,,,lua5_3,

17−dkjson,,,,,

18−fifo,,,,,

19−http,,,,,vcunat

20−inspect,,,,,

21−ldbus,,http://luarocks.org/dev,,,

22−ldoc,,,,,

23−lgi,,,,,

24−linenoise,,,,,

25−ljsyscall,,,,lua5_1,lblasc

26−lpeg,,,,,vyp

27−lpeg_patterns,,,,,

28−lpeglabel,,,,,

29−lpty,,,,,

30−lrexlib-gnu,,,,,

31−lrexlib-pcre,,,,,vyp

32−lrexlib-posix,,,,,

33−ltermbox,,,,,

34−lua-cmsgpack,,,,,

35−lua-iconv,,,,,

36−lua-lsp,,http://luarocks.org/dev,,,

37−lua-messagepack,,,,,

38−lua-resty-http,,,,,

39−lua-resty-jwt,,,,,

40−lua-resty-openidc,,,,,

41−lua-resty-openssl,,,,,

42−lua-resty-session,,,,,

43−lua-term,,,,,

44−lua-toml,,,,,

45−lua-zlib,,,,,koral

46−lua_cliargs,,,,,

47−luabitop,,,,,

48−luacheck,,,,,

49−luacov,,,,,

50−luadbi,,,,,

51−luadbi-mysql,,,,,

52−luadbi-postgresql,,,,,

53−luadbi-sqlite3,,,,,

54−luadoc,,,,,

55−luaepnf,,,,,

56−luaevent,,,,,

57−luaexpat,,,1.3.0-1,,arobyn flosse

58−luaffi,,http://luarocks.org/dev,,,

59−luafilesystem,,,1.7.0-2,,flosse

60−lualogging,,,,,

61−luaossl,,,,lua5_1,

62−luaposix,,,,,vyp lblasc

63−luarepl,,,,,

64−luasec,,,,,flosse

65−luasocket,,,,,

66−luasql-sqlite3,,,,,vyp

67−luassert,,,,,

68−luasystem,,,,,

69−luautf8,,,,,pstn

70−luazip,,,,,

71−lua-yajl,,,,,pstn

72−luuid,,,,,

73−luv,,,,,

74−lyaml,,,,,lblasc

75−markdown,,,,,

76−mediator_lua,,,,,

77−mpack,,,,,

78−moonscript,,,,,arobyn

79−nvim-client,,,,,

80−penlight,,,,,

81−rapidjson,,,,,

82−readline,,,,,

83−say,,,,,

84−std__debug,std._debug,,,,

85−std_normalize,std.normalize,,,,

86−stdlib,,,,,vyp

87−vstruct,,,,,

1+name,src,ref,server,version,luaversion,maintainers

2+alt-getopt,,,,,,arobyn

3+bit32,,,,5.3.0-1,lua5_1,lblasc

4+argparse,https://github.com/luarocks/argparse.git,,,,,

5+basexx,https://github.com/teto/basexx.git,,,,,

6+binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat

7+busted,,,,,,

8+cassowary,,,,,,marsam alerque

9+compat53,,,,0.7-1,,vcunat

10+cosmo,,,,,,marsam

11+coxpcall,,,,1.17.0-1,,

12+cqueues,,,,,,vcunat

13+cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,,

14+digestif,https://github.com/astoff/digestif.git,,,0.2-1,lua5_3,

15+dkjson,,,,,,

16+fifo,,,,,,

17+gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,lua5_1,

18+http,,,,0.3-0,,vcunat

19+inspect,,,,,,

20+ldbus,,,http://luarocks.org/dev,,,

21+ldoc,https://github.com/stevedonovan/LDoc.git,,,,,

22+lgi,,,,,,

23+linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,,

24+ljsyscall,,,,,lua5_1,lblasc

25+lpeg,,,,,,vyp

26+lpeg_patterns,,,,,,

27+lpeglabel,,,,,,

28+lpty,,,,,,

29+lrexlib-gnu,,,,,,

30+lrexlib-pcre,,,,,,vyp

31+lrexlib-posix,,,,,,

32+lua-cjson,,,,,,

33+lua-cmsgpack,,,,,,

34+lua-iconv,,,,,,

35+lua-lsp,,,,,,

36+lua-messagepack,,,,,,

37+lua-resty-http,,,,,,

38+lua-resty-jwt,,,,,,

39+lua-resty-openidc,,,,,,

40+lua-resty-openssl,,,,,,

41+lua-resty-session,,,,,,

42+lua-term,,,,,,

43+lua-toml,,,,,,

44+lua-zlib,,,,,,koral

45+lua_cliargs,https://github.com/amireh/lua_cliargs.git,,,,,

46+luabitop,https://github.com/teto/luabitop.git,,,,,

47+luacheck,,,,,,

48+luacov,,,,,,

49+luadbi,,,,,,

50+luadbi-mysql,,,,,,

51+luadbi-postgresql,,,,,,

52+luadbi-sqlite3,,,,,,

53+luaepnf,,,,,,

54+luaevent,,,,,,

55+luaexpat,,,,1.4.1-1,,arobyn flosse

56+luaffi,,,http://luarocks.org/dev,,,

57+luafilesystem,,,,1.7.0-2,,flosse

58+lualogging,,,,,,

59+luaossl,,,,,lua5_1,

60+luaposix,,,,34.1.1-1,,vyp lblasc

61+luarepl,,,,,,

62+luasec,,,,,,flosse

63+luasocket,,,,,,

64+luasql-sqlite3,,,,,,vyp

65+luassert,,,,,,

66+luasystem,,,,,,

67+luaunbound,,,,,

68+luautf8,,,,,,pstn

69+luazip,,,,,,

70+lua-yajl,,,,,,pstn

71+luuid,,,,,,

72+luv,,,,1.43.0-0,,

73+lyaml,,,,,,lblasc

74+markdown,,,,,,

75+mediator_lua,,,,,,

76+mpack,,,,,,

77+moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn

78+nvim-client,https://github.com/neovim/lua-client.git,,,,,

79+penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque

80+plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1,

81+rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,

82+readline,,,,,,

83+say,https://github.com/Olivine-Labs/say.git,,,,,

84+std._debug,https://github.com/lua-stdlib/_debug.git,,,,,

85+std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,

86+stdlib,,,,41.2.2,,vyp

87+vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,

maintainers/scripts/pluginupdate.py+358−212

@@ -1,4 +1,4 @@

1−# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py

1+# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py

33# format:

44# $ nix run nixpkgs.python3Packages.black -c black update.py

@@ -8,6 +8,7 @@

88# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py

1010import argparse

11+import csv

1112import functools

1213import http

1314import json

@@ -28,6 +29,7 @@ from pathlib import Path

2829from typing import Dict, List, Optional, Tuple, Union, Any, Callable

2930from urllib.parse import urljoin, urlparse

3031from tempfile import NamedTemporaryFile

32+from dataclasses import dataclass, asdict

3133

3234import git

3335

@@ -41,8 +43,6 @@ LOG_LEVELS = {

4143}

4244

4345log = logging.getLogger()

44−log.addHandler(logging.StreamHandler())

45−

4646

4747def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2):

4848 """Retry calling the decorated function using an exponential backoff.

@@ -74,35 +74,103 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa

7474

7575 return deco_retry

7676

77+@dataclass

78+class FetchConfig:

79+ proc: int

80+ github_token: str

81+

7782

78−def make_request(url: str) -> urllib.request.Request:

79− token = os.getenv("GITHUB_API_TOKEN")

83+def make_request(url: str, token=None) -> urllib.request.Request:

8084 headers = {}

8185 if token is not None:

8286 headers["Authorization"] = f"token {token}"

8387 return urllib.request.Request(url, headers=headers)

8488

8589

90+# a dictionary of plugins and their new repositories

91+Redirects = Dict['PluginDesc', 'Repo']

92+

8693class Repo:

8794 def __init__(

88− self, owner: str, name: str, branch: str, alias: Optional[str]

95+ self, uri: str, branch: str

8996 ) -> None:

90− self.owner = owner

91− self.name = name

92− self.branch = branch

93− self.alias = alias

94− self.redirect: Dict[str, str] = {}

97+ self.uri = uri

98+ '''Url to the repo'''

99+ self._branch = branch

100+ # Redirect is the new Repo to use

101+ self.redirect: Optional['Repo'] = None

102+ self.token = "dummy_token"

95103

96− def url(self, path: str) -> str:

97− return urljoin(f"https://github.com/{self.owner}/{self.name}/", path)

104+ @property

105+ def name(self):

106+ return self.uri.split('/')[-1]

98107

108+ @property

109+ def branch(self):

110+ return self._branch or "HEAD"

111+

112+ def __str__(self) -> str:

113+ return f"{self.uri}"

99114 def __repr__(self) -> str:

100− return f"Repo({self.owner}, {self.name})"

115+ return f"Repo({self.name}, {self.uri})"

116+

117+ @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)

118+ def has_submodules(self) -> bool:

119+ return True

120+

121+ @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)

122+ def latest_commit(self) -> Tuple[str, datetime]:

123+ log.debug("Latest commit")

124+ loaded = self._prefetch(None)

125+ updated = datetime.strptime(loaded['date'], "%Y-%m-%dT%H:%M:%S%z")

126+

127+ return loaded['rev'], updated

128+

129+ def _prefetch(self, ref: Optional[str]):

130+ cmd = ["nix-prefetch-git", "--quiet", "--fetch-submodules", self.uri]

131+ if ref is not None:

132+ cmd.append(ref)

133+ log.debug(cmd)

134+ data = subprocess.check_output(cmd)

135+ loaded = json.loads(data)

136+ return loaded

137+

138+ def prefetch(self, ref: Optional[str]) -> str:

139+ print("Prefetching")

140+ loaded = self._prefetch(ref)

141+ return loaded["sha256"]

142+

143+ def as_nix(self, plugin: "Plugin") -> str:

144+ return f'''fetchgit {{

145+ url = "{self.uri}";

146+ rev = "{plugin.commit}";

147+ sha256 = "{plugin.sha256}";

148+ }}'''

149+

150+

151+class RepoGitHub(Repo):

152+ def __init__(

153+ self, owner: str, repo: str, branch: str

154+ ) -> None:

155+ self.owner = owner

156+ self.repo = repo

157+ self.token = None

158+ '''Url to the repo'''

159+ super().__init__(self.url(""), branch)

160+ log.debug("Instantiating github repo owner=%s and repo=%s", self.owner, self.repo)

161+

162+ @property

163+ def name(self):

164+ return self.repo

165+

166+ def url(self, path: str) -> str:

167+ res = urljoin(f"https://github.com/{self.owner}/{self.repo}/", path)

168+ return res

101169

102170 @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)

103171 def has_submodules(self) -> bool:

104172 try:

105− req = make_request(self.url(f"blob/{self.branch}/.gitmodules"))

173+ req = make_request(self.url(f"blob/{self.branch}/.gitmodules"), self.token)

106174 urllib.request.urlopen(req, timeout=10).close()

107175 except urllib.error.HTTPError as e:

108176 if e.code == 404:

@@ -114,9 +182,10 @@ class Repo:

114182 @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)

115183 def latest_commit(self) -> Tuple[str, datetime]:

116184 commit_url = self.url(f"commits/{self.branch}.atom")

117− commit_req = make_request(commit_url)

185+ log.debug("Sending request to %s", commit_url)

186+ commit_req = make_request(commit_url, self.token)

118187 with urllib.request.urlopen(commit_req, timeout=10) as req:

119− self.check_for_redirect(commit_url, req)

188+ self._check_for_redirect(commit_url, req)

120189 xml = req.read()

121190 root = ET.fromstring(xml)

122191 latest_entry = root.find(ATOM_ENTRY)

@@ -131,46 +200,89 @@ class Repo:

131200 updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ")

132201 return Path(str(url.path)).name, updated

133202

134− def check_for_redirect(self, url: str, req: http.client.HTTPResponse):

203+ def _check_for_redirect(self, url: str, req: http.client.HTTPResponse):

135204 response_url = req.geturl()

136205 if url != response_url:

137206 new_owner, new_name = (

138207 urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]

139208 )

140− end_line = "\n" if self.alias is None else f" as {self.alias}\n"

141− plugin_line = "{owner}/{name}" + end_line

142209

143− old_plugin = plugin_line.format(owner=self.owner, name=self.name)

144− new_plugin = plugin_line.format(owner=new_owner, name=new_name)

145− self.redirect[old_plugin] = new_plugin

210+ new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch)

211+ self.redirect = new_repo

146212

147− def prefetch_git(self, ref: str) -> str:

148− data = subprocess.check_output(

149− ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref]

150− )

151− return json.loads(data)["sha256"]

213+

214+ def prefetch(self, commit: str) -> str:

215+ if self.has_submodules():

216+ sha256 = super().prefetch(commit)

217+ else:

218+ sha256 = self.prefetch_github(commit)

219+ return sha256

152220

153221 def prefetch_github(self, ref: str) -> str:

154− data = subprocess.check_output(

155− ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]

156− )

222+ cmd = ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]

223+ log.debug("Running %s", cmd)

224+ data = subprocess.check_output(cmd)

157225 return data.strip().decode("utf-8")

158226

227+ def as_nix(self, plugin: "Plugin") -> str:

228+ if plugin.has_submodules:

229+ submodule_attr = "\n fetchSubmodules = true;"

230+ else:

231+ submodule_attr = ""

232+

233+ return f'''fetchFromGitHub {{

234+ owner = "{self.owner}";

235+ repo = "{self.repo}";

236+ rev = "{plugin.commit}";

237+ sha256 = "{plugin.sha256}";{submodule_attr}

238+ }}'''

159239

240+

241+@dataclass(frozen=True)

242+class PluginDesc:

243+ repo: Repo

244+ branch: str

245+ alias: Optional[str]

246+

247+ @property

248+ def name(self):

249+ if self.alias is None:

250+ return self.repo.name

251+ else:

252+ return self.alias

253+

254+ def __lt__(self, other):

255+ return self.repo.name < other.repo.name

256+

257+ @staticmethod

258+ def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> 'PluginDesc':

259+ branch = row["branch"]

260+ repo = make_repo(row['repo'], branch.strip())

261+ repo.token = config.github_token

262+ return PluginDesc(repo, branch.strip(), row["alias"])

263+

264+

265+ @staticmethod

266+ def load_from_string(config: FetchConfig, line: str) -> 'PluginDesc':

267+ branch = "HEAD"

268+ alias = None

269+ uri = line

270+ if " as " in uri:

271+ uri, alias = uri.split(" as ")

272+ alias = alias.strip()

273+ if "@" in uri:

274+ uri, branch = uri.split("@")

275+ repo = make_repo(uri.strip(), branch.strip())

276+ repo.token = config.github_token

277+ return PluginDesc(repo, branch.strip(), alias)

278+

279+@dataclass

160280class Plugin:

161− def __init__(

162− self,

163− name: str,

164− commit: str,

165− has_submodules: bool,

166− sha256: str,

167− date: Optional[datetime] = None,

168− ) -> None:

169− self.name = name

170− self.commit = commit

171− self.has_submodules = has_submodules

172− self.sha256 = sha256

173− self.date = date

281+ name: str

282+ commit: str

283+ has_submodules: bool

284+ sha256: str

285+ date: Optional[datetime] = None

174286

175287 @property

176288 def normalized_name(self) -> str:

@@ -187,6 +299,28 @@ class Plugin:

187299 return copy

188300

189301

302+def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[PluginDesc]:

303+ log.debug("Load plugins from csv %s", input_file)

304+ plugins = []

305+ with open(input_file, newline='') as csvfile:

306+ log.debug("Writing into %s", input_file)

307+ reader = csv.DictReader(csvfile,)

308+ for line in reader:

309+ plugin = PluginDesc.load_from_csv(config, line)

310+ plugins.append(plugin)

311+

312+ return plugins

313+

314+def run_nix_expr(expr):

315+ with CleanEnvironment():

316+ cmd = ["nix", "eval", "--extra-experimental-features",

317+ "nix-command", "--impure", "--json", "--expr", expr]

318+ log.debug("Running command %s", cmd)

319+ out = subprocess.check_output(cmd)

320+ data = json.loads(out)

321+ return data

322+

323+

190324class Editor:

191325 """The configuration of the update script."""

192326

@@ -195,21 +329,126 @@ class Editor:

195329 name: str,

196330 root: Path,

197331 get_plugins: str,

198− generate_nix: Callable[[List[Tuple[str, str, Plugin]], str], None],

199332 default_in: Optional[Path] = None,

200333 default_out: Optional[Path] = None,

201334 deprecated: Optional[Path] = None,

202335 cache_file: Optional[str] = None,

203336 ):

337+ log.debug("get_plugins:", get_plugins)

204338 self.name = name

205339 self.root = root

206340 self.get_plugins = get_plugins

207− self.generate_nix = generate_nix

208341 self.default_in = default_in or root.joinpath(f"{name}-plugin-names")

209342 self.default_out = default_out or root.joinpath("generated.nix")

210343 self.deprecated = deprecated or root.joinpath("deprecated.json")

211344 self.cache_file = cache_file or f"{name}-plugin-cache.json"

212345

346+ def get_current_plugins(self) -> List[Plugin]:

347+ """To fill the cache"""

348+ data = run_nix_expr(self.get_plugins)

349+ plugins = []

350+ for name, attr in data.items():

351+ print("get_current_plugins: name %s" % name)

352+ p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])

353+ plugins.append(p)

354+ return plugins

355+

356+ def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]:

357+ '''CSV spec'''

358+ return load_plugins_from_csv(config, plugin_file)

359+

360+ def generate_nix(self, plugins, outfile: str):

361+ '''Returns nothing for now, writes directly to outfile'''

362+ raise NotImplementedError()

363+

364+ def get_update(self, input_file: str, outfile: str, config: FetchConfig):

365+ cache: Cache = Cache(self.get_current_plugins(), self.cache_file)

366+ _prefetch = functools.partial(prefetch, cache=cache)

367+

368+ def update() -> dict:

369+ plugins = self.load_plugin_spec(config, input_file)

370+

371+ try:

372+ pool = Pool(processes=config.proc)

373+ results = pool.map(_prefetch, plugins)

374+ finally:

375+ cache.store()

376+

377+ plugins, redirects = check_results(results)

378+

379+ self.generate_nix(plugins, outfile)

380+

381+ return redirects

382+

383+ return update

384+

385+

386+ @property

387+ def attr_path(self):

388+ return self.name + "Plugins"

389+

390+ def get_drv_name(self, name: str):

391+ return self.attr_path + "." + name

392+

393+ def rewrite_input(self, *args, **kwargs):

394+ return rewrite_input(*args, **kwargs)

395+

396+ def create_parser(self):

397+ parser = argparse.ArgumentParser(

398+ description=(f"""

399+ Updates nix derivations for {self.name} plugins.\n

400+ By default from {self.default_in} to {self.default_out}"""

401+ )

402+ )

403+ parser.add_argument(

404+ "--add",

405+ dest="add_plugins",

406+ default=[],

407+ action="append",

408+ help=f"Plugin to add to {self.attr_path} from Github in the form owner/repo",

409+ )

410+ parser.add_argument(

411+ "--input-names",

412+ "-i",

413+ dest="input_file",

414+ default=self.default_in,

415+ help="A list of plugins in the form owner/repo",

416+ )

417+ parser.add_argument(

418+ "--out",

419+ "-o",

420+ dest="outfile",

421+ default=self.default_out,

422+ help="Filename to save generated nix code",

423+ )

424+ parser.add_argument(

425+ "--proc",

426+ "-p",

427+ dest="proc",

428+ type=int,

429+ default=30,

430+ help="Number of concurrent processes to spawn. Setting --github-token allows higher values.",

431+ )

432+ parser.add_argument(

433+ "--github-token",

434+ "-t",

435+ type=str,

436+ default=os.getenv("GITHUB_API_TOKEN"),

437+ help="""Allows to set --proc to higher values.

438+ Uses GITHUB_API_TOKEN environment variables as the default value.""",

439+ )

440+ parser.add_argument(

441+ "--no-commit", "-n", action="store_true", default=False,

442+ help="Whether to autocommit changes"

443+ )

444+ parser.add_argument(

445+ "--debug", "-d", choices=LOG_LEVELS.keys(),

446+ default=logging.getLevelName(logging.WARN),

447+ help="Adjust log level"

448+ )

449+ return parser

450+

451+

213452

214453class CleanEnvironment(object):

215454 def __enter__(self) -> None:

@@ -226,52 +465,33 @@ class CleanEnvironment(object):

226465 self.empty_config.close()

227466

228467

229−def get_current_plugins(editor: Editor) -> List[Plugin]:

230− with CleanEnvironment():

231− out = subprocess.check_output(["nix", "eval", "--json", editor.get_plugins])

232− data = json.loads(out)

233− plugins = []

234− for name, attr in data.items():

235− p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])

236− plugins.append(p)

237− return plugins

238−

239−

240468def prefetch_plugin(

241− user: str,

242− repo_name: str,

243− branch: str,

244− alias: Optional[str],

469+ p: PluginDesc,

245470 cache: "Optional[Cache]" = None,

246−) -> Tuple[Plugin, Dict[str, str]]:

247− log.info("Prefetching plugin %s", repo_name)

248− repo = Repo(user, repo_name, branch, alias)

471+) -> Tuple[Plugin, Optional[Repo]]:

472+ repo, branch, alias = p.repo, p.branch, p.alias

473+ name = alias or p.repo.name

474+ commit = None

475+ log.info(f"Fetching last commit for plugin {name} from {repo.uri}@{branch}")

249476 commit, date = repo.latest_commit()

250− has_submodules = repo.has_submodules()

251477 cached_plugin = cache[commit] if cache else None

252478 if cached_plugin is not None:

253− cached_plugin.name = alias or repo_name

479+ log.debug("Cache hit !")

480+ cached_plugin.name = name

254481 cached_plugin.date = date

255482 return cached_plugin, repo.redirect

256483

257− print(f"prefetch {user}/{repo_name}")

258− if has_submodules:

259− sha256 = repo.prefetch_git(commit)

260− else:

261− sha256 = repo.prefetch_github(commit)

484+ has_submodules = repo.has_submodules()

485+ log.debug(f"prefetch {name}")

486+ sha256 = repo.prefetch(commit)

262487

263488 return (

264− Plugin(alias or repo_name, commit, has_submodules, sha256, date=date),

489+ Plugin(name, commit, has_submodules, sha256, date=date),

265490 repo.redirect,

266491 )

267492

268493

269−def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin:

270− plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line))

271− return plugin

272−

273−

274−def print_download_error(plugin: str, ex: Exception):

494+def print_download_error(plugin: PluginDesc, ex: Exception):

275495 print(f"{plugin}: {ex}", file=sys.stderr)

276496 ex_traceback = ex.__traceback__

277497 tb_lines = [

@@ -280,19 +500,22 @@ def print_download_error(plugin: str, ex: Exception):

280500 ]

281501 print("\n".join(tb_lines))

282502

283−

284503def check_results(

285− results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]]

286−) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]:

287− failures: List[Tuple[str, Exception]] = []

504+ results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]]

505+) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]:

506+ ''' '''

507+ failures: List[Tuple[PluginDesc, Exception]] = []

288508 plugins = []

289− redirects: Dict[str, str] = {}

290− for (owner, name, result, redirect) in results:

509+ redirects: Redirects = {}

510+ for (pdesc, result, redirect) in results:

291511 if isinstance(result, Exception):

292− failures.append((name, result))

512+ failures.append((pdesc, result))

293513 else:

294− plugins.append((owner, name, result))

295− redirects.update(redirect)

514+ new_pdesc = pdesc

515+ if redirect is not None:

516+ redirects.update({pdesc: redirect})

517+ new_pdesc = PluginDesc(redirect, pdesc.branch, pdesc.alias)

518+ plugins.append((new_pdesc, result))

296519

297520 print(f"{len(results) - len(failures)} plugins were checked", end="")

298521 if len(failures) == 0:

@@ -306,31 +529,16 @@ def check_results(

306529

307530 sys.exit(1)

308531

309−

310−def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]:

311− branch = "master"

312− alias = None

313− name, repo = line.split("/")

314− if " as " in repo:

315− repo, alias = repo.split(" as ")

316− alias = alias.strip()

317− if "@" in repo:

318− repo, branch = repo.split("@")

319−

320− return (name.strip(), repo.strip(), branch.strip(), alias)

321−

322−

323−def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]:

324− plugins = []

325− with open(plugin_file) as f:

326− for line in f:

327− plugin = parse_plugin_line(line)

328− if not plugin[0]:

329− msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]"

330− print(msg, file=sys.stderr)

331− sys.exit(1)

332− plugins.append(plugin)

333− return plugins

532+def make_repo(uri: str, branch) -> Repo:

533+ '''Instantiate a Repo with the correct specialization depending on server (gitub spec)'''

534+ # dumb check to see if it's of the form owner/repo (=> github) or https://...

535+ res = urlparse(uri)

536+ if res.netloc in [ "github.com", ""]:

537+ res = res.path.strip('/').split('/')

538+ repo = RepoGitHub(res[0], res[1], branch)

539+ else:

540+ repo = Repo(uri.strip(), branch)

541+ return repo

334542

335543

336544def get_cache_path(cache_file_name: str) -> Optional[Path]:

@@ -387,38 +595,38 @@ class Cache:

387595

388596

389597def prefetch(

390− args: Tuple[str, str, str, Optional[str]], cache: Cache

391−) -> Tuple[str, str, Union[Exception, Plugin], dict]:

392− assert len(args) == 4

393− owner, repo, branch, alias = args

598+ pluginDesc: PluginDesc, cache: Cache

599+) -> Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]:

394600 try:

395− plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache)

601+ plugin, redirect = prefetch_plugin(pluginDesc, cache)

396602 cache[plugin.commit] = plugin

397− return (owner, repo, plugin, redirect)

603+ return (pluginDesc, plugin, redirect)

398604 except Exception as e:

399− return (owner, repo, e, {})

605+ return (pluginDesc, e, None)

606+

400607

401608

402609def rewrite_input(

610+ config: FetchConfig,

403611 input_file: Path,

404612 deprecated: Path,

405− redirects: Dict[str, str] = None,

406− append: Tuple = (),

613+ # old pluginDesc and the new

614+ redirects: Redirects = {},

615+ append: List[PluginDesc] = [],

407616):

408− with open(input_file, "r") as f:

409− lines = f.readlines()

617+ plugins = load_plugins_from_csv(config, input_file,)

410618

411− lines.extend(append)

619+ plugins.extend(append)

412620

413621 if redirects:

414− lines = [redirects.get(line, line) for line in lines]

415622

416623 cur_date_iso = datetime.now().strftime("%Y-%m-%d")

417624 with open(deprecated, "r") as f:

418625 deprecations = json.load(f)

419− for old, new in redirects.items():

420− old_plugin = fetch_plugin_from_pluginline(old)

421− new_plugin = fetch_plugin_from_pluginline(new)

626+ for pdesc, new_repo in redirects.items():

627+ new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias)

628+ old_plugin, _ = prefetch_plugin(pdesc)

629+ new_plugin, _ = prefetch_plugin(new_pdesc)

422630 if old_plugin.normalized_name != new_plugin.normalized_name:

423631 deprecations[old_plugin.normalized_name] = {

424632 "new": new_plugin.normalized_name,

@@ -428,58 +636,14 @@ def rewrite_input(

428636 json.dump(deprecations, f, indent=4, sort_keys=True)

429637 f.write("\n")

430638

431− lines = sorted(lines, key=str.casefold)

432−

433639 with open(input_file, "w") as f:

434− f.writelines(lines)

435−

436−

437−def parse_args(editor: Editor):

438− parser = argparse.ArgumentParser(

439− description=(

440− f"Updates nix derivations for {editor.name} plugins"

441− f"By default from {editor.default_in} to {editor.default_out}"

442− )

443− )

444− parser.add_argument(

445− "--add",

446− dest="add_plugins",

447− default=[],

448− action="append",

449− help=f"Plugin to add to {editor.name}Plugins from Github in the form owner/repo",

450− )

451− parser.add_argument(

452− "--input-names",

453− "-i",

454− dest="input_file",

455− default=editor.default_in,

456− help="A list of plugins in the form owner/repo",

457− )

458− parser.add_argument(

459− "--out",

460− "-o",

461− dest="outfile",

462− default=editor.default_out,

463− help="Filename to save generated nix code",

464− )

465− parser.add_argument(

466− "--proc",

467− "-p",

468− dest="proc",

469− type=int,

470− default=30,

471− help="Number of concurrent processes to spawn.",

472− )

473− parser.add_argument(

474− "--no-commit", "-n", action="store_true", default=False,

475− help="Whether to autocommit changes"

476− )

477− parser.add_argument(

478− "--debug", "-d", choices=LOG_LEVELS.keys(),

479− default=logging.getLevelName(logging.WARN),

480− help="Adjust log level"

481− )

482− return parser.parse_args()

640+ log.debug("Writing into %s", input_file)

641+ # fields = dataclasses.fields(PluginDesc)

642+ fieldnames = ['repo', 'branch', 'alias']

643+ writer = csv.DictWriter(f, fieldnames, dialect='unix', quoting=csv.QUOTE_NONE)

644+ writer.writeheader()

645+ for plugin in sorted(plugins):

646+ writer.writerow(asdict(plugin))

483647

484648

485649def commit(repo: git.Repo, message: str, files: List[Path]) -> None:

@@ -492,64 +656,46 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None:

492656 print("no changes in working tree to commit")

493657

494658

495−def get_update(input_file: str, outfile: str, proc: int, editor: Editor):

496− cache: Cache = Cache(get_current_plugins(editor), editor.cache_file)

497− _prefetch = functools.partial(prefetch, cache=cache)

498−

499− def update() -> dict:

500− plugin_names = load_plugin_spec(input_file)

501−

502− try:

503− pool = Pool(processes=proc)

504− results = pool.map(_prefetch, plugin_names)

505− finally:

506− cache.store()

507−

508− plugins, redirects = check_results(results)

509−

510− editor.generate_nix(plugins, outfile)

511−

512− return redirects

513659

514− return update

515−

516−

517−def update_plugins(editor: Editor):

660+def update_plugins(editor: Editor, args):

518661 """The main entry function of this module. All input arguments are grouped in the `Editor`."""

519662

520− args = parse_args(editor)

521663 log.setLevel(LOG_LEVELS[args.debug])

522−

523664 log.info("Start updating plugins")

524− nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)

525− update = get_update(args.input_file, args.outfile, args.proc, editor)

665+ fetch_config = FetchConfig(args.proc, args.github_token)

666+ update = editor.get_update(args.input_file, args.outfile, fetch_config)

526667

527668 redirects = update()

528− rewrite_input(args.input_file, editor.deprecated, redirects)

669+ editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, redirects)

529670

530671 autocommit = not args.no_commit

531672

673+ nixpkgs_repo = None

532674 if autocommit:

533− commit(nixpkgs_repo, f"{editor.name}Plugins: update", [args.outfile])

675+ nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)

676+ commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile])

534677

535678 if redirects:

536679 update()

537680 if autocommit:

538681 commit(

539682 nixpkgs_repo,

540− f"{editor.name}Plugins: resolve github repository redirects",

683+ f"{editor.attr_path}: resolve github repository redirects",

541684 [args.outfile, args.input_file, editor.deprecated],

542685 )

543686

544687 for plugin_line in args.add_plugins:

545− rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",))

688+ pdesc = PluginDesc.load_from_string(fetch_config, plugin_line)

689+ append = [ pdesc ]

690+ editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=append)

546691 update()

547− plugin = fetch_plugin_from_pluginline(plugin_line)

692+ plugin, _ = prefetch_plugin(pdesc, )

548693 if autocommit:

549694 commit(

550695 nixpkgs_repo,

551− "{editor}Plugins.{name}: init at {version}".format(

552− editor=editor.name, name=plugin.normalized_name, version=plugin.version

696+ "{drv_name}: init at {version}".format(

697+ drv_name=editor.get_drv_name(plugin.normalized_name),

698+ version=plugin.version

553699 ),

554700 [args.outfile, args.input_file],

555701 )

maintainers/scripts/rebuild-amount.sh+86−79

@@ -4,123 +4,130 @@ set -e

44# --print: avoid dependency on environment

55optPrint=

66if [ "$1" == "--print" ]; then

7− optPrint=true

8− shift

7+ optPrint=true

8+ shift

99fi

1010

1111if [ "$#" != 1 ] && [ "$#" != 2 ]; then

12− cat <<-EOF

13− Usage: $0 [--print] commit-spec [commit-spec]

14− You need to be in a git-controlled nixpkgs tree.

15− The current state of the tree will be used if the second commit is missing.

16− EOF

17− exit 1

12+ cat <<EOF

13+ Usage: $0 [--print] from-commit-spec [to-commit-spec]

14+ You need to be in a git-controlled nixpkgs tree.

15+ The current state of the tree will be used if the second commit is missing.

16+

17+ Examples:

18+ effect of latest commit:

19+ $ $0 HEAD^

20+ $ $0 --print HEAD^

21+ effect of the whole patch series for 'staging' branch:

22+ $ $0 origin/staging staging

23+EOF

24+ exit 1

1825fi

1926

2027# A slightly hacky way to get the config.

2128parallel="$(echo 'config.rebuild-amount.parallel or false' | nix-repl . 2>/dev/null \

22− | grep -v '^$nix-repl.*$\?$' | tail -n 1 || true)"

29+ | grep -v '^$nix-repl.*$\?$' | tail -n 1 || true)"

2330

24−echo "Estimating rebuild amount by counting changed Hydra jobs."

31+echo "Estimating rebuild amount by counting changed Hydra jobs (parallel=${parallel:-unset})."

2532

2633toRemove=()

2734

2835cleanup() {

29− rm -rf "${toRemove[@]}"

36+ rm -rf "${toRemove[@]}"

3037}

3138trap cleanup EXIT SIGINT SIGQUIT ERR

3239

3340MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX'

3441

3542nixexpr() {

36− cat <<-EONIX

37− let

38− lib = import $1/lib;

39− hydraJobs = import $1/pkgs/top-level/release.nix

40− # Compromise: accuracy vs. resources needed for evaluation.

41− { supportedSystems = cfg.systems or [ "x86_64-linux" "x86_64-darwin" ]; };

42− cfg = (import $1 {}).config.rebuild-amount or {};

43−

44− recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };

45−

46− # hydraJobs leaves recurseForDerivations as empty attrmaps;

47− # that would break nix-env and we also need to recurse everywhere.

48− tweak = lib.mapAttrs

49− (name: val:

50− if name == "recurseForDerivations" then true

51− else if lib.isAttrs val && val.type or null != "derivation"

52− then recurseIntoAttrs (tweak val)

53− else val

54− );

55−

56− # Some of these contain explicit references to platform(s) we want to avoid;

57− # some even (transitively) depend on ~/.nixpkgs/config.nix (!)

58− blacklist = [

59− "tarball" "metrics" "manual"

60− "darwin-tested" "unstable" "stdenvBootstrapTools"

61− "moduleSystem" "lib-tests" # these just confuse the output

62− ];

63−

64− in

65− tweak (builtins.removeAttrs hydraJobs blacklist)

66− EONIX

43+ cat <<EONIX

44+ let

45+ lib = import $1/lib;

46+ hydraJobs = import $1/pkgs/top-level/release.nix

47+ # Compromise: accuracy vs. resources needed for evaluation.

48+ { supportedSystems = cfg.systems or [ "x86_64-linux" "x86_64-darwin" ]; };

49+ cfg = (import $1 {}).config.rebuild-amount or {};

50+

51+ recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };

52+

53+ # hydraJobs leaves recurseForDerivations as empty attrmaps;

54+ # that would break nix-env and we also need to recurse everywhere.

55+ tweak = lib.mapAttrs

56+ (name: val:

57+ if name == "recurseForDerivations" then true

58+ else if lib.isAttrs val && val.type or null != "derivation"

59+ then recurseIntoAttrs (tweak val)

60+ else val

61+ );

62+

63+ # Some of these contain explicit references to platform(s) we want to avoid;

64+ # some even (transitively) depend on ~/.nixpkgs/config.nix (!)

65+ blacklist = [

66+ "tarball" "metrics" "manual"

67+ "darwin-tested" "unstable" "stdenvBootstrapTools"

68+ "moduleSystem" "lib-tests" # these just confuse the output

69+ ];

70+

71+ in

72+ tweak (builtins.removeAttrs hydraJobs blacklist)

73+EONIX

6774}

6875

6976# Output packages in tree $2 that weren't in $1.

7077# Changing the output hash or name is taken as a change.

7178# Extra nix-env parameters can be in $3

7279newPkgs() {

73− # We use files instead of pipes, as running multiple nix-env processes

74− # could eat too much memory for a standard 4GiB machine.

75− local -a list

76− for i in 1 2; do

77− local l="$($MKTEMP)"

78− list[$i]="$l"

79− toRemove+=("$l")

80−

81− local expr="$($MKTEMP)"

82− toRemove+=("$expr")

83− nixexpr "${!i}" > "$expr"

84−

85− nix-env -f "$expr" -qaP --no-name --out-path --show-trace $3 \

86− | sort > "${list[$i]}" &

87−

88− if [ "$parallel" != "true" ]; then

89− wait

90− fi

91− done

92−

93− wait

94− comm -13 "${list[@]}"

80+ # We use files instead of pipes, as running multiple nix-env processes

81+ # could eat too much memory for a standard 4GiB machine.

82+ local -a list

83+ for i in 1 2; do

84+ local l="$($MKTEMP)"

85+ list[$i]="$l"

86+ toRemove+=("$l")

87+

88+ local expr="$($MKTEMP)"

89+ toRemove+=("$expr")

90+ nixexpr "${!i}" > "$expr"

91+

92+ nix-env -f "$expr" -qaP --no-name --out-path --show-trace $3 \

93+ | sort > "${list[$i]}" &

94+

95+ if [ "$parallel" != "true" ]; then

96+ wait

97+ fi

98+ done

99+

100+ wait

101+ comm -13 "${list[@]}"

95102}

96103

97104# Prepare nixpkgs trees.

98105declare -a tree

99106for i in 1 2; do

100− if [ -n "${!i}" ]; then # use the given commit

101− dir="$($MKTEMP -d)"

102− tree[$i]="$dir"

103− toRemove+=("$dir")

104−

105− git clone --shared --no-checkout --quiet . "${tree[$i]}"

106− (cd "${tree[$i]}" && git checkout --quiet "${!i}")

107− else #use the current tree

108− tree[$i]="$(pwd)"

109− fi

107+ if [ -n "${!i}" ]; then # use the given commit

108+ dir="$($MKTEMP -d)"

109+ tree[$i]="$dir"

110+ toRemove+=("$dir")

111+

112+ git clone --shared --no-checkout --quiet . "${tree[$i]}"

113+ (cd "${tree[$i]}" && git checkout --quiet "${!i}")

114+ else #use the current tree

115+ tree[$i]="$(pwd)"

116+ fi

110117done

111118

112119newlist="$($MKTEMP)"

113120toRemove+=("$newlist")

114121# Notes:

115−# - the evaluation is done on x86_64-linux, like on Hydra.

116−# - using $newlist file so that newPkgs() isn't in a sub-shell (because of toRemove)

122+# - the evaluation is done on x86_64-linux, like on Hydra.

123+# - using $newlist file so that newPkgs() isn't in a sub-shell (because of toRemove)

117124newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist"

118125

119126# Hacky: keep only the last word of each attribute path and sort.

120127sed -n 's/$[^. ]*\.$*$[^. ]*$ .*$/\2/p' < "$newlist" \

121− | sort | uniq -c

128+ | sort | uniq -c

122129

123130if [ -n "$optPrint" ]; then

124− echo

125− cat "$newlist"

131+ echo

132+ cat "$newlist"

126133fi

maintainers/scripts/remove-old-aliases.pynew file+211

@@ -0,0 +1,211 @@

1+#!/usr/bin/env nix-shell

2+#!nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ ])" nix

3+"""

4+A program to remove old aliases or convert old aliases to throws

5+Example usage:

6+./maintainers/scripts/remove-old-aliases.py --year 2018 --file ./pkgs/top-level/aliases.nix

8+Check this file with mypy after every change!

9+$ mypy --strict maintainers/scripts/remove-old-aliases.py

10+"""

11+import argparse

12+import shutil

13+import subprocess

14+from datetime import date as datetimedate

15+from datetime import datetime

16+from pathlib import Path

17+

18+

19+def process_args() -> argparse.Namespace:

20+ """process args"""

21+ arg_parser = argparse.ArgumentParser()

22+ arg_parser.add_argument(

23+ "--year", required=True, type=int, help="operate on aliases older than $year"

24+ )

25+ arg_parser.add_argument(

26+ "--month",

27+ type=int,

28+ default=1,

29+ help="operate on aliases older than $year-$month",

30+ )

31+ arg_parser.add_argument(

32+ "--only-throws",

33+ action="store_true",

34+ help="only operate on throws. e.g remove throws older than $date",

35+ )

36+ arg_parser.add_argument("--file", required=True, type=Path, help="alias file")

37+ arg_parser.add_argument(

38+ "--dry-run", action="store_true", help="don't modify files, only print results"

39+ )

40+ return arg_parser.parse_args()

41+

42+

43+def get_date_lists(

44+ txt: list[str], cutoffdate: datetimedate, only_throws: bool

45+) -> tuple[list[str], list[str], list[str]]:

46+ """get a list of lines in which the date is older than $cutoffdate"""

47+ date_older_list: list[str] = []

48+ date_older_throw_list: list[str] = []

49+ date_sep_line_list: list[str] = []

50+

51+ for lineno, line in enumerate(txt, start=1):

52+ line = line.rstrip()

53+ my_date = None

54+ for string in line.split():

55+ string = string.strip(":")

56+ try:

57+ # strip ':' incase there is a string like 2019-11-01:

58+ my_date = datetime.strptime(string, "%Y-%m-%d").date()

59+ except ValueError:

60+ try:

61+ my_date = datetime.strptime(string, "%Y-%m").date()

62+ except ValueError:

63+ continue

64+

65+ if (

66+ my_date is None

67+ or my_date > cutoffdate

68+ or "preserve, reason:" in line.lower()

69+ ):

70+ continue

71+

72+ if "=" not in line:

73+ date_sep_line_list.append(f"{lineno} {line}")

74+ # 'if' lines could be complicated

75+ elif "if " in line and "if =" not in line:

76+ print(f"RESOLVE MANUALLY {line}")

77+ elif "throw" in line:

78+ date_older_throw_list.append(line)

79+ elif not only_throws:

80+ date_older_list.append(line)

81+

82+ return (

83+ date_older_list,

84+ date_sep_line_list,

85+ date_older_throw_list,

86+ )

87+

88+

89+def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:

90+ """convert a list of lines to throws"""

91+ converted_list = []

92+ for line in date_older_list.copy():

93+ indent: str = " " * (len(line) - len(line.lstrip()))

94+ before_equal = ""

95+ after_equal = ""

96+ try:

97+ before_equal, after_equal = (x.strip() for x in line.split("=", maxsplit=2))

98+ except ValueError as err:

99+ print(err, line, "\n")

100+ date_older_list.remove(line)

101+ continue

102+

103+ alias = before_equal.strip()

104+ after_equal_list = [x.strip(";:") for x in after_equal.split()]

105+

106+ converted = (

107+ f"{indent}{alias} = throw \"'{alias}' has been renamed to/replaced by"

108+ f" '{after_equal_list.pop(0)}'\";"

109+ f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}'

110+ )

111+ converted_list.append((line, converted))

112+

113+ return converted_list

114+

115+

116+def generate_text_to_write(

117+ txt: list[str],

118+ date_older_list: list[str],

119+ converted_to_throw: list[tuple[str, str]],

120+ date_older_throw_list: list[str],

121+) -> list[str]:

122+ """generate a list of text to be written to the aliasfile"""

123+ text_to_write: list[str] = []

124+ for line in txt:

125+ text_to_append: str = ""

126+ if converted_to_throw:

127+ for tupl in converted_to_throw:

128+ if line == tupl[0]:

129+ text_to_append = f"{tupl[1]}\n"

130+ if line not in date_older_list and line not in date_older_throw_list:

131+ text_to_append = f"{line}\n"

132+ if text_to_append:

133+ text_to_write.append(text_to_append)

134+

135+ return text_to_write

136+

137+

138+def write_file(

139+ aliasfile: Path,

140+ text_to_write: list[str],

141+) -> None:

142+ """write file"""

143+ temp_aliasfile = Path(f"{aliasfile}.raliases")

144+ with open(temp_aliasfile, "w", encoding="utf-8") as far:

145+ for line in text_to_write:

146+ far.write(line)

147+ print("\nChecking the syntax of the new aliasfile")

148+ try:

149+ subprocess.run(

150+ ["nix-instantiate", "--eval", temp_aliasfile],

151+ check=True,

152+ stdout=subprocess.DEVNULL,

153+ )

154+ except subprocess.CalledProcessError:

155+ print(

156+ "\nSyntax check failed,",

157+ "there may have been a line which only has\n"

158+ 'aliasname = "reason why";\n'

159+ "when it should have been\n"

160+ 'aliasname = throw "reason why";',

161+ )

162+ temp_aliasfile.unlink()

163+ return

164+ shutil.move(f"{aliasfile}.raliases", aliasfile)

165+ print(f"{aliasfile} modified! please verify with 'git diff'.")

166+

167+

168+def main() -> None:

169+ """main"""

170+ args = process_args()

171+

172+ only_throws = args.only_throws

173+ aliasfile = Path(args.file).absolute()

174+ cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date()

175+

176+ txt: list[str] = (aliasfile.read_text(encoding="utf-8")).splitlines()

177+

178+ date_older_list: list[str] = []

179+ date_sep_line_list: list[str] = []

180+ date_older_throw_list: list[str] = []

181+

182+ date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists(

183+ txt, cutoffdate, only_throws

184+ )

185+

186+ converted_to_throw: list[tuple[str, str]] = []

187+ if date_older_list:

188+ converted_to_throw = convert_to_throw(date_older_list)

189+ print(" Will be converted to throws. ".center(100, "-"))

190+ for l_n in date_older_list:

191+ print(l_n)

192+

193+ if date_older_throw_list:

194+ print(" Will be removed. ".center(100, "-"))

195+ for l_n in date_older_throw_list:

196+ print(l_n)

197+

198+ if date_sep_line_list:

199+ print(" On separate line, resolve manually. ".center(100, "-"))

200+ for l_n in date_sep_line_list:

201+ print(l_n)

202+

203+ if not args.dry_run:

204+ text_to_write = generate_text_to_write(

205+ txt, date_older_list, converted_to_throw, date_older_throw_list

206+ )

207+ write_file(aliasfile, text_to_write)

208+

209+

210+if __name__ == "__main__":

211+ main()

maintainers/scripts/update-luarocks-packages+207−125

@@ -1,136 +1,218 @@

11#!/usr/bin/env nix-shell

2−#!nix-shell update-luarocks-shell.nix -i bash

3−

4−# You'll likely want to use

5−# ``

6−# nixpkgs $ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix

7−# ``

8−# to update all libraries in that folder.

9−# to debug, redirect stderr to stdout with 2>&1

10−

11−# stop the script upon C-C

12−set -eu -o pipefail

13−

14−CSV_FILE="maintainers/scripts/luarocks-packages.csv"

2+#!nix-shell update-luarocks-shell.nix -i python3

4+# format:

5+# $ nix run nixpkgs.python3Packages.black -c black update.py

6+# type-check:

7+# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py

8+# linted:

9+# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py

10+

11+import inspect

12+import os

13+import tempfile

14+import shutil

15+from dataclasses import dataclass

16+import subprocess

17+import csv

18+import logging

19+import textwrap

20+from multiprocessing.dummy import Pool

21+

22+from typing import List, Tuple, Optional

23+from pathlib import Path

24+

25+log = logging.getLogger()

26+log.addHandler(logging.StreamHandler())

27+

28+ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore

29+from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment

30+

31+PKG_LIST="maintainers/scripts/luarocks-packages.csv"

1532TMP_FILE="$(mktemp)"

16−# Set in the update-luarocks-shell.nix

17−NIXPKGS_PATH="$LUAROCKS_NIXPKGS_PATH"

18−export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"

19−

20−# 10 is a pretty arbitrary number of simultaneous jobs, but it is generally

21−# impolite to hit a webserver with *too* many simultaneous connections :)

22−PARALLEL_JOBS=1

23−

24−exit_trap() {

25− local lc="$BASH_COMMAND" rc=$?

26− test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2

27−}

33+GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix"

34+LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"

2835

29−print_help() {

30− echo "Usage: $0 <GENERATED_FILE>"

31− echo "(most likely pkgs/development/lua-modules/generated-packages.nix)"

32− echo ""

33− echo " -c <CSV_FILE> to set the list of luarocks package to generate"

34− exit 1

35−}

36−

37−if [ $# -lt 1 ]; then

38− print_help

39− exit 1

40−fi

41−

42−trap exit_trap EXIT

43−

44−while getopts ":hc:" opt; do

45− case $opt in

46− h)

47− print_help

48− ;;

49− c)

50− echo "Loading package list from $OPTARG !" >&2

51− CSV_FILE="$OPTARG"

52− ;;

53− \?)

54− echo "Invalid option: -$OPTARG" >&2

55− ;;

56− esac

57− shift $((OPTIND - 1))

58−done

59−

60−GENERATED_NIXFILE="$1"

61−

62−HEADER="

63−/* ${GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!

36+HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!

6437Regenerate it with:

65−nixpkgs$ ${0} ${GENERATED_NIXFILE}

38+nixpkgs$ ./maintainers/scripts/update-luarocks-packages

6639

67−These packages are manually refined in lua-overrides.nix

40+You can customize the generated packages in pkgs/development/lua-modules/overrides.nix

6841*/

69−{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args:

70−self: super:

71−with self;

72−{

73−"

42+""".format(GENERATED_NIXFILE=GENERATED_NIXFILE)

7443

75−FOOTER="

76−}

77−/* GENERATED */

78−"

79−

80−function convert_pkg() {

81− nix_pkg_name="$1"

82− lua_pkg_name="$2"

83− server="$3"

84− pkg_version="$4"

85− lua_version="$5"

86− maintainers="$6"

87−

88− if [ "${nix_pkg_name:0:1}" == "#" ]; then

89− echo "Skipping comment ${*}" >&2

90− return

91− fi

92− if [ -z "$lua_pkg_name" ]; then

93− echo "Using nix_name as lua_pkg_name for '$nix_pkg_name'" >&2

94− lua_pkg_name="$nix_pkg_name"

95− fi

96−

97− echo "Building expression for $lua_pkg_name (version $pkg_version) from server [$server]" >&2

98− luarocks_args=(nix)

99− if [[ -n $server ]]; then

100− luarocks_args+=("--only-server=$server")

101− fi

102− if [[ -n $maintainers ]]; then

103− luarocks_args+=("--maintainers=$maintainers")

104− fi

105− if [[ -n $lua_version ]]; then

106− lua_drv_path=$(nix-build --no-out-link "$NIXPKGS_PATH" -A "$lua_version")

107− luarocks_args+=("--lua-dir=$lua_drv_path/bin")

108− fi

109− luarocks_args+=("$lua_pkg_name")

110− if [[ -n $pkg_version ]]; then

111− luarocks_args+=("$pkg_version")

112− fi

113− echo "Running 'luarocks ${luarocks_args[*]}'" >&2

114− if drv="$nix_pkg_name = $(luarocks "${luarocks_args[@]}")"; then

115− echo "$drv"

116− else

117− echo "Failed to convert $nix_pkg_name" >&2

118− return 1

119− fi

44+FOOTER="""

12045}

46+/* GENERATED - do not edit this file */

47+"""

48+

49+@dataclass

50+class LuaPlugin:

51+ name: str

52+ '''Name of the plugin, as seen on luarocks.org'''

53+ src: str

54+ '''address to the git repository'''

55+ ref: Optional[str]

56+ '''git reference (branch name/tag)'''

57+ version: Optional[str]

58+ '''Set it to pin a package '''

59+ server: Optional[str]

60+ '''luarocks.org registers packages under different manifests.

61+ Its value can be 'http://luarocks.org/dev'

62+ '''

63+ luaversion: Optional[str]

64+ '''Attribue of the lua interpreter if a package is available only for a specific lua version'''

65+ maintainers: Optional[str]

66+ ''' Optional string listing maintainers separated by spaces'''

67+

68+ @property

69+ def normalized_name(self) -> str:

70+ return self.name.replace(".", "-")

71+

72+# rename Editor to LangUpdate/ EcosystemUpdater

73+class LuaEditor(Editor):

74+ def get_current_plugins(self):

75+ return []

76+

77+ def load_plugin_spec(self, input_file) -> List[LuaPlugin]:

78+ luaPackages = []

79+ csvfilename=input_file

80+ log.info("Loading package descriptions from %s", csvfilename)

81+

82+ with open(csvfilename, newline='') as csvfile:

83+ reader = csv.DictReader(csvfile,)

84+ for row in reader:

85+ # name,server,version,luaversion,maintainers

86+ plugin = LuaPlugin(**row)

87+ luaPackages.append(plugin)

88+ return luaPackages

89+

90+ def generate_nix(

91+ self,

92+ results: List[Tuple[LuaPlugin, str]],

93+ outfilename: str

94+ ):

95+

96+ with tempfile.NamedTemporaryFile("w+") as f:

97+ f.write(HEADER)

98+ header2 = textwrap.dedent(

99+ # header2 = inspect.cleandoc(

100+ """

101+ { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args:

102+ final: prev:

103+ {

104+ """)

105+ f.write(header2)

106+ for (plugin, nix_expr) in results:

107+ f.write(f"{plugin.normalized_name} = {nix_expr}")

108+ f.write(FOOTER)

109+ f.flush()

110+

111+ # if everything went fine, move the generated file to its destination

112+ # using copy since move doesn't work across disks

113+ shutil.copy(f.name, outfilename)

114+

115+ print(f"updated {outfilename}")

116+

117+ @property

118+ def attr_path(self):

119+ return "luaPackages"

120+

121+ def get_update(self, input_file: str, outfile: str, config: FetchConfig):

122+ _prefetch = generate_pkg_nix

123+

124+ def update() -> dict:

125+ plugin_specs = self.load_plugin_spec(input_file)

126+ sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower())

127+

128+ try:

129+ pool = Pool(processes=config.proc)

130+ results = pool.map(_prefetch, sorted_plugin_specs)

131+ finally:

132+ pass

133+

134+ self.generate_nix(results, outfile)

135+

136+ redirects = {}

137+ return redirects

138+

139+ return update

140+

141+ def rewrite_input(self, input_file: str, *args, **kwargs):

142+ # vim plugin reads the file before update but that shouldn't be our case

143+ # not implemented yet

144+ # fieldnames = ['name', 'server', 'version', 'luaversion', 'maintainers']

145+ # input_file = "toto.csv"

146+ # with open(input_file, newline='') as csvfile:

147+ # writer = csv.DictWriter(csvfile, fieldnames=fieldnames)

148+ # writer.writeheader()

149+ # for row in reader:

150+ # # name,server,version,luaversion,maintainers

151+ # plugin = LuaPlugin(**row)

152+ # luaPackages.append(plugin)

153+ pass

154+

155+def generate_pkg_nix(plug: LuaPlugin):

156+ '''

157+ Generate nix expression for a luarocks package

158+ Our cache key associates "p.name-p.version" to its rockspec

159+ '''

160+ log.debug("Generating nix expression for %s", plug.name)

161+ cmd = [ "luarocks", "nix"]

162+

163+

164+ if plug.maintainers:

165+ cmd.append(f"--maintainers={plug.maintainers}")

166+

167+ # updates plugin directly from its repository

168+ print("server: [%s]" % plug.server)

169+ # if plug.server == "src":

170+ if plug.src != "":

171+ if plug.src is None:

172+ msg = "src must be set when 'version' is set to \"src\" for package %s" % plug.name

173+ log.error(msg)

174+ raise RuntimeError(msg)

175+ log.debug("Updating from source %s", plug.src)

176+ cmd.append(plug.src)

177+ # update the plugin from luarocks

178+ else:

179+ cmd.append(plug.name)

180+ if plug.version and plug.version != "src":

181+

182+ cmd.append(plug.version)

183+

184+ if plug.server != "src" and plug.server:

185+ cmd.append(f"--only-server={plug.server}")

186+

187+ if plug.luaversion:

188+ with CleanEnvironment():

189+ local_pkgs = str(ROOT.resolve())

190+ cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"]

191+

192+ log.debug("running %s", ' '.join(cmd2))

193+ lua_drv_path=subprocess.check_output(cmd2, text=True).strip()

194+ cmd.append(f"--lua-dir={lua_drv_path}/bin")

195+

196+ log.debug("running %s", ' '.join(cmd))

197+ output = subprocess.check_output(cmd, text=True)

198+ output = "callPackage(" + output.strip() + ") {};\n\n"

199+ return (plug, output)

200+

201+def main():

202+

203+ editor = LuaEditor("lua", ROOT, '',

204+ default_in = ROOT.joinpath(PKG_LIST),

205+ default_out = ROOT.joinpath(GENERATED_NIXFILE)

206+ )

207+

208+ parser = editor.create_parser()

209+ args = parser.parse_args()

121210

122−# params needed when called via callPackage

123−echo "$HEADER" | tee "$TMP_FILE"

124−

125−# Ensure parallel can run our bash function

126−export -f convert_pkg

127−export SHELL=bash

128−# Read each line in the csv file and run convert_pkg for each, in parallel

129−parallel --group --keep-order --halt now,fail=1 --jobs "$PARALLEL_JOBS" --colsep ',' convert_pkg {} <"$CSV_FILE" | tee -a "$TMP_FILE"

130−

131−# close the set

132−echo "$FOOTER" | tee -a "$TMP_FILE"

211+ update_plugins(editor, args)

133212

134−cp "$TMP_FILE" "$GENERATED_NIXFILE"

135213

136−# vim: set ts=4 sw=4 ft=sh:

214+if __name__ == "__main__":

215+

216+ main()

217+

218+# vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 :

maintainers/scripts/update-luarocks-shell.nix+4−3

@@ -1,12 +1,13 @@

11{ nixpkgs ? import ../.. { }

22}:

33with nixpkgs;

4+let

5+ pyEnv = python3.withPackages(ps: [ ps.GitPython ]);

6+in

47mkShell {

58 packages = [

6− bash

9+ pyEnv

710 luarocks-nix

811 nix-prefetch-scripts

9− parallel

1012 ];

11− LUAROCKS_NIXPKGS_PATH = toString nixpkgs.path;

1213}

maintainers/scripts/update-ruby-packages+4−1

@@ -6,7 +6,10 @@ set -euf -o pipefail

66(

77 cd pkgs/development/ruby-modules/with-packages

88 rm -f gemset.nix Gemfile.lock

9− bundle lock

9+ # Since bundler 2+, the lock command generates a platform-dependent

10+ # Gemfile.lock, hence causing to bundix to generate a gemset tied to the

11+ # platform from where it was executed.

12+ BUNDLE_FORCE_RUBY_PLATFORM=1 bundle lock

1013 bundix

1114 mv gemset.nix ../../../top-level/ruby-packages.nix

1215 rm -f Gemfile.lock

maintainers/scripts/update.nix+3−3

@@ -103,7 +103,7 @@ let

103103 pathContent = lib.attrByPath prefix null pkgs;

104104 in

105105 if pathContent == null then

106− builtins.throw "Attribute path `${path}` does not exists."

106+ builtins.throw "Attribute path `${path}` does not exist."

107107 else

108108 packagesWithPath prefix (path: pkg: builtins.hasAttr "updateScript" pkg)

109109 pathContent;

@@ -115,7 +115,7 @@ let

115115 package = lib.attrByPath (lib.splitString "." path) null pkgs;

116116 in

117117 if package == null then

118− builtins.throw "Package with an attribute name `${path}` does not exists."

118+ builtins.throw "Package with an attribute name `${path}` does not exist."

119119 else if ! builtins.hasAttr "updateScript" package then

120120 builtins.throw "Package with an attribute name `${path}` does not have a `passthru.updateScript` attribute defined."

121121 else

@@ -147,7 +147,7 @@ let

147147

148148 to run update script for specific package, or

149149

150− % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.isList pkg.updateScript && builtins.length pkg.updateScript >= 1 && (let script = builtins.head pkg.updateScript; in builtins.isAttrs script && script.name == "gnome-update-script"))'

150+ % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: pkg.updateScript.name or null == "gnome-update-script")'

151151

152152 to run update script for all packages matching given predicate, or

153153

maintainers/scripts/update.py+5−1

@@ -88,6 +88,10 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra

8888 async with merge_lock:

8989 await check_subprocess('git', 'add', *change['files'], cwd=worktree)

9090 commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change)

91+ if 'commitMessage' in change:

92+ commit_message = change['commitMessage']

93+ elif 'commitBody' in change:

94+ commit_message = commit_message + '\n\n' + change['commitBody']

9195 await check_subprocess('git', 'commit', '--quiet', '-m', commit_message, cwd=worktree)

9296 await check_subprocess('git', 'cherry-pick', branch)

9397

@@ -114,7 +118,7 @@ async def check_changes(package: Dict, worktree: str, update_info: str):

114118 changes[0]['newVersion'] = json.loads((await obtain_new_version_process.stdout.read()).decode('utf-8'))

115119

116120 if 'files' not in changes[0]:

117− changed_files_process = await check_subprocess('git', 'diff', '--name-only', stdout=asyncio.subprocess.PIPE, cwd=worktree)

121+ changed_files_process = await check_subprocess('git', 'diff', '--name-only', 'HEAD', stdout=asyncio.subprocess.PIPE, cwd=worktree)

118122 changed_files = (await changed_files_process.stdout.read()).splitlines()

119123 changes[0]['files'] = changed_files

120124

maintainers/scripts/vanity.sh+19−19