8081 files changed+233757−274838
5081 more files changed are not listed.
.editorconfig−5
@@ -55,11 +55,6 @@ trim_trailing_whitespace = unset
5555[*.lock]
5656indent_size = unset
5757
58−# trailing whitespace is an actual syntax element of classic Markdown/
59−# CommonMark to enforce a line break
60−[*.md]
61−trim_trailing_whitespace = unset
62−
6358[eggs.nix]
6459trim_trailing_whitespace = unset
6560
.git-blame-ignore-revsdeleted−32
@@ -1,32 +0,0 @@
1−# This file contains a list of commits that are not likely what you
2−# are looking for in a blame, such as mass reformatting or renaming.
3−# You can set this file as a default ignore file for blame by running
4−# the following command.
5−#
6−# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
7−#
8−# To temporarily not use this file add
9−# --ignore-revs-file=""
10−# to your blame command.
11−#
12−# The ignoreRevsFile can't be set globally due to blame failing if the file isn't present.
13−# To not have to set the option in every repository it is needed in,
14−# save the following script in your path with the name "git-bblame"
15−# now you can run
16−# $ git bblame $FILE
17−# to use the .git-blame-ignore-revs file if it is present.
18−#
19−# #!/usr/bin/env bash
20−# repo_root=$(git rev-parse --show-toplevel)
21−# if [[ -e $repo_root/.git-blame-ignore-revs ]]; then
22−# git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@
23−# else
24−# git blame $@
25−# fi
26−
27−
28−# nixos/modules/rename: Sort alphabetically
29−1f71224fe86605ef4cd23ed327b3da7882dad382
30−
31−# nixos: fix module paths in rename.nix
32−d08ede042b74b8199dc748323768227b88efcf7c
.github/CODEOWNERS+48−41
@@ -10,6 +10,9 @@
1010# IMPORTANT NOTE: in order to actually get pinged, commit access is required.
1111# This also holds true for GitHub teams. Since almost none of our teams have write
1212# permissions, you need to list all members of the team with commit access individually.
13+# We still add the team to the list next to its members, this helps keeping things
14+# in sync. (Put non team members before the team to distinguish them.)
15+# See https://github.com/NixOS/nixpkgs/issues/124085 for more details
1316
1417# This file
1518/.github/CODEOWNERS @edolstra
@@ -36,13 +39,12 @@
3639/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer
3740/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
3841/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
39−/pkgs/stdenv/generic @Ericson2314 @matthewbauer
42+/pkgs/stdenv/generic @Ericson2314 @matthewbauer @cab404
4043/pkgs/stdenv/cross @Ericson2314 @matthewbauer
41−/pkgs/build-support/cc-wrapper @Ericson2314
42−/pkgs/build-support/bintools-wrapper @Ericson2314
44+/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
45+/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
4346/pkgs/build-support/setup-hooks @Ericson2314
44−/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
45−/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
47+/pkgs/build-support/setup-hooks/auto-patchelf.sh @aszlig
4648
4749# Nixpkgs build-support
4850/pkgs/build-support/writers @lassulus @Profpatsch
@@ -75,12 +77,6 @@
7577# NixOS integration test driver
7678/nixos/lib/test-driver @tfc
7779
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−
8480# Updaters
8581## update.nix
8682/maintainers/scripts/update.nix @jtojnar
@@ -95,7 +91,8 @@
9591/pkgs/development/python-modules @FRidh @jonringer
9692/doc/languages-frameworks/python.section.md @FRidh
9793/pkgs/development/tools/poetry2nix @adisbladis
98−/pkgs/development/interpreters/python/hooks @FRidh @jonringer
94+/pkgs/development/interpreters/python/hooks @FRidh @jonringer @DavHau
95+/pkgs/development/interpreters/python/conda @DavHau
9996
10097# Haskell
10198/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @expipiplus1
@@ -107,13 +104,13 @@
107104/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1
108105
109106# Perl
110−/pkgs/development/interpreters/perl @stigtsp @zakame
111−/pkgs/top-level/perl-packages.nix @stigtsp @zakame
112−/pkgs/development/perl-modules @stigtsp @zakame
107+/pkgs/development/interpreters/perl @volth @stigtsp @zakame
108+/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame
109+/pkgs/development/perl-modules @volth @stigtsp @zakame
113110
114111# R
115−/pkgs/applications/science/math/R @jbedo
116−/pkgs/development/r-modules @jbedo
112+/pkgs/applications/science/math/R @jbedo @bcdarwin
113+/pkgs/development/r-modules @jbedo @bcdarwin
117114
118115# Ruby
119116/pkgs/development/interpreters/ruby @marsam
@@ -124,6 +121,10 @@
124121/pkgs/build-support/rust @zowoq
125122/doc/languages-frameworks/rust.section.md @zowoq
126123
124+# Darwin-related
125+/pkgs/stdenv/darwin @NixOS/darwin-maintainers
126+/pkgs/os-specific/darwin @NixOS/darwin-maintainers
127+
127128# C compilers
128129/pkgs/development/compilers/gcc @matthewbauer
129130/pkgs/development/compilers/llvm @matthewbauer
@@ -132,6 +133,15 @@
132133/pkgs/top-level/unix-tools.nix @matthewbauer
133134/pkgs/development/tools/xcbuild @matthewbauer
134135
136+# Beam-related (Erlang, Elixir, LFE, etc)
137+/pkgs/development/beam-modules @gleber
138+/pkgs/development/interpreters/erlang @gleber
139+/pkgs/development/interpreters/lfe @gleber
140+/pkgs/development/interpreters/elixir @gleber
141+/pkgs/development/tools/build-managers/rebar @gleber
142+/pkgs/development/tools/build-managers/rebar3 @gleber
143+/pkgs/development/tools/erlang @gleber
144+
135145# Audio
136146/nixos/modules/services/audio/botamusique.nix @mweinelt
137147/nixos/modules/services/audio/snapserver.nix @mweinelt
@@ -199,7 +209,7 @@
199209/pkgs/development/idris-modules @Infinisil
200210
201211# Bazel
202−/pkgs/development/tools/build-managers/bazel @Profpatsch
212+/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch
203213
204214# NixOS modules for e-mail and dns services
205215/nixos/modules/services/mail/mailman.nix @peti
@@ -227,24 +237,25 @@
227237/nixos/tests/prometheus-exporters.nix @WilliButz
228238
229239# PHP interpreter, packages, extensions, tests and documentation
230−/doc/languages-frameworks/php.section.md @aanderse @etu @globin @ma27 @talyz
231−/nixos/tests/php @aanderse @etu @globin @ma27 @talyz
232−/pkgs/build-support/build-pecl.nix @aanderse @etu @globin @ma27 @talyz
233−/pkgs/development/interpreters/php @jtojnar @aanderse @etu @globin @ma27 @talyz
234−/pkgs/development/php-packages @aanderse @etu @globin @ma27 @talyz
235−/pkgs/top-level/php-packages.nix @jtojnar @aanderse @etu @globin @ma27 @talyz
240+/doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz
241+/nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz
242+/pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz
243+/pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz
244+/pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz
245+/pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz
236246
237247# Podman, CRI-O modules and related
238−/nixos/modules/virtualisation/containers.nix @zowoq @adisbladis
239−/nixos/modules/virtualisation/cri-o.nix @zowoq @adisbladis
240−/nixos/modules/virtualisation/podman @zowoq @adisbladis
241−/nixos/tests/cri-o.nix @zowoq @adisbladis
242−/nixos/tests/podman @zowoq @adisbladis
248+/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis
249+/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq @adisbladis
250+/nixos/modules/virtualisation/podman @NixOS/podman @zowoq @adisbladis
251+/nixos/tests/cri-o.nix @NixOS/podman @zowoq @adisbladis
252+/nixos/tests/podman @NixOS/podman @zowoq @adisbladis
243253
244254# Docker tools
245−/pkgs/build-support/docker @roberth
246−/nixos/tests/docker-tools* @roberth
247−/doc/builders/images/dockertools.section.md @roberth
255+/pkgs/build-support/docker @roberth @utdemir
256+/nixos/tests/docker-tools-overlay.nix @roberth
257+/nixos/tests/docker-tools.nix @roberth
258+/doc/builders/images/dockertools.xml @roberth
248259
249260# Blockchains
250261/pkgs/applications/blockchains @mmahut @RaghavSood
@@ -256,8 +267,8 @@
256267/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
257268
258269# GNOME
259−/pkgs/desktops/gnome @jtojnar @hedning
260−/pkgs/desktops/gnome/extensions @piegamesde @jtojnar @hedning
270+/pkgs/desktops/gnome @NixOS/GNOME @jtojnar @hedning
271+/pkgs/desktops/gnome/extensions @piegamesde @NixOS/GNOME @jtojnar @hedning
261272
262273# Cinnamon
263274/pkgs/desktops/cinnamon @mkg20001
@@ -278,14 +289,10 @@
278289
279290# Matrix
280291/pkgs/servers/heisenbridge @piegamesde
281−/pkgs/servers/matrix-conduit @piegamesde
292+/pkgs/servers/matrix-conduit @piegamesde @pstn
282293/pkgs/servers/matrix-synapse/matrix-appservice-irc @piegamesde
283294/nixos/modules/services/misc/heisenbridge.nix @piegamesde
284295/nixos/modules/services/misc/matrix-appservice-irc.nix @piegamesde
285−/nixos/modules/services/misc/matrix-conduit.nix @piegamesde
296+/nixos/modules/services/misc/matrix-conduit.nix @piegamesde @pstn
286297/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
298+/nixos/tests/matrix-conduit.nix @piegamesde @pstn
.github/PULL_REQUEST_TEMPLATE.md+10−15
@@ -1,10 +1,16 @@
1−###### Description of changes
2−
31<!--
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.
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
69-->
710
11+###### Motivation for this change
12+
13+
814###### Things done
915
1016<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
@@ -28,14 +34,3 @@ For new packages please briefly describe the package or provide a link to its ho
2834 - [ ] (Module addition) Added a release notes entry if adding a new NixOS module
2935 - [ ] (Release notes changes) Ran `nixos/doc/manual/md-to-db.sh` to update generated release notes
3036- [ ] 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/labeler.yml+4
@@ -5,6 +5,10 @@
55 - pkgs/development/libraries/agda/**/*
66 - pkgs/top-level/agda-packages.nix
77
8+"6.topic: bsd":
9+ - pkgs/os-specific/bsd/**/*
10+ - pkgs/stdenv/freebsd/**/*
11+
812"6.topic: cinnamon":
913 - pkgs/desktops/cinnamon/**/*
1014
.github/workflows/backport.yml+1−7
@@ -2,19 +2,13 @@ name: Backport
22on:
33 pull_request_target:
44 types: [closed, labeled]
5−
6−# WARNING:
7−# When extending this action, be aware that $GITHUB_TOKEN allows write access to
8−# the GitHub repository. This means that it should not evaluate user input in a
9−# way that allows code injection.
10−
115jobs:
126 backport:
137 name: Backport Pull Request
148 if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
159 runs-on: ubuntu-latest
1610 steps:
17− - uses: actions/checkout@v3
11+ - uses: actions/checkout@v2
1812 with:
1913 # required to find all branches
2014 fetch-depth: 0
.github/workflows/basic-eval.yml+10−16
@@ -1,26 +1,20 @@
11name: Basic evaluation checks
22
33on:
4− workflow_dispatch
5− # pull_request:
6− # branches:
7− # - master
8− # - release-**
9− # push:
10− # branches:
11− # - master
12− # - release-**
4+ pull_request:
5+ branches:
6+ - master
7+ - release-**
8+ push:
9+ branches:
10+ - master
11+ - release-**
1312jobs:
1413 tests:
1514 runs-on: ubuntu-latest
1615 # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
1716 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 }}'
17+ - uses: actions/checkout@v2
18+ - uses: cachix/install-nix-action@v16
2519 # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset
2620 - 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@v2
25+ uses: peter-evans/commit-comment@v1
2626 with:
2727 body: |
2828 @${{ github.actor }}, you pushed a commit directly to master/release branch
.github/workflows/editorconfig.yml+2−2
@@ -24,11 +24,11 @@ jobs:
2424 - name: print list of changed files
2525 run: |
2626 cat "$HOME/changed_files"
27− - uses: actions/checkout@v3
27+ - uses: actions/checkout@v2
2828 with:
2929 # pull_request_target checks out the base branch by default
3030 ref: refs/pull/${{ github.event.pull_request.number }}/merge
31− - uses: cachix/install-nix-action@v17
31+ - uses: cachix/install-nix-action@v16
3232 with:
3333 # nixpkgs commit is pinned so that it doesn't break
3434 # editorconfig-checker 2.4.0
.github/workflows/labels.yml+1−6
@@ -4,11 +4,6 @@ on:
44 pull_request_target:
55 types: [edited, opened, synchronize, reopened]
66
7−# WARNING:
8−# When extending this action, be aware that $GITHUB_TOKEN allows some write
9−# access to the GitHub API. This means that it should not evaluate user input in
10−# a way that allows code injection.
11−
127permissions:
138 contents: read
149 pull-requests: write
@@ -18,7 +13,7 @@ jobs:
1813 runs-on: ubuntu-latest
1914 if: github.repository_owner == 'NixOS'
2015 steps:
21− - uses: actions/labeler@v4
16+ - uses: actions/labeler@v3
2217 with:
2318 repo-token: ${{ secrets.GITHUB_TOKEN }}
2419 sync-labels: true
.github/workflows/manual-nixos.yml+3−3
@@ -14,17 +14,17 @@ jobs:
1414 runs-on: ubuntu-latest
1515 if: github.repository_owner == 'NixOS'
1616 steps:
17− - uses: actions/checkout@v3
17+ - uses: actions/checkout@v2
1818 with:
1919 # pull_request_target checks out the base branch by default
2020 ref: refs/pull/${{ github.event.pull_request.number }}/merge
21− - uses: cachix/install-nix-action@v17
21+ - uses: cachix/install-nix-action@v16
2222 with:
2323 # explicitly enable sandbox
2424 extra_nix_config: sandbox = true
2525 - uses: cachix/cachix-action@v10
2626 with:
27− # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
27+ # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.
2828 name: nixpkgs-ci
2929 signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
3030 - name: Building NixOS manual
.github/workflows/manual-nixpkgs.yml+3−3
@@ -14,17 +14,17 @@ jobs:
1414 runs-on: ubuntu-latest
1515 if: github.repository_owner == 'NixOS'
1616 steps:
17− - uses: actions/checkout@v3
17+ - uses: actions/checkout@v2
1818 with:
1919 # pull_request_target checks out the base branch by default
2020 ref: refs/pull/${{ github.event.pull_request.number }}/merge
21− - uses: cachix/install-nix-action@v17
21+ - uses: cachix/install-nix-action@v16
2222 with:
2323 # explicitly enable sandbox
2424 extra_nix_config: sandbox = true
2525 - uses: cachix/cachix-action@v10
2626 with:
27− # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
27+ # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.
2828 name: nixpkgs-ci
2929 signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
3030 - name: Building Nixpkgs manual
.github/workflows/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@v3
18+ - uses: actions/checkout@v2
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@v17
22+ - uses: cachix/install-nix-action@v16
2323 - name: Check DocBook files generated from Markdown are consistent
2424 run: |
2525 nixos/doc/manual/md-to-db.sh
.github/workflows/pending-set.yml−5
@@ -3,11 +3,6 @@ name: "set pending status"
33on:
44 pull_request_target:
55
6−# WARNING:
7−# When extending this action, be aware that $GITHUB_TOKEN allows write access to
8−# the GitHub repository. This means that it should not evaluate user input in a
9−# way that allows code injection.
10−
116jobs:
127 action:
138 runs-on: ubuntu-latest
.github/workflows/periodic-merge-24h.yml+2−2
@@ -38,7 +38,7 @@ jobs:
3838 into: staging-21.11
3939 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
4040 steps:
41− - uses: actions/checkout@v3
41+ - uses: actions/checkout@v2
4242
4343 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
4444 uses: devmasx/merge-branch@1.4.0
@@ -49,7 +49,7 @@ jobs:
4949 github_token: ${{ secrets.GITHUB_TOKEN }}
5050
5151 - name: Comment on failure
52− uses: peter-evans/create-or-update-comment@v2
52+ uses: peter-evans/create-or-update-comment@v1
5353 if: ${{ failure() }}
5454 with:
5555 issue-number: 105153
.github/workflows/periodic-merge-6h.yml+2−2
@@ -32,7 +32,7 @@ jobs:
3232 into: staging
3333 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
3434 steps:
35− - uses: actions/checkout@v3
35+ - uses: actions/checkout@v2
3636
3737 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
3838 uses: devmasx/merge-branch@1.4.0
@@ -43,7 +43,7 @@ jobs:
4343 github_token: ${{ secrets.GITHUB_TOKEN }}
4444
4545 - name: Comment on failure
46− uses: peter-evans/create-or-update-comment@v2
46+ uses: peter-evans/create-or-update-comment@v1
4747 if: ${{ failure() }}
4848 with:
4949 issue-number: 105153
.github/workflows/update-terraform-providers.yml+8−9
@@ -10,8 +10,8 @@ jobs:
1010 if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master
1111 runs-on: ubuntu-latest
1212 steps:
13− - uses: actions/checkout@v3
14− - uses: cachix/install-nix-action@v17
13+ - uses: actions/checkout@v2
14+ - uses: cachix/install-nix-action@v16
1515 - name: setup
1616 id: setup
1717 run: |
@@ -25,22 +25,21 @@ jobs:
2525 git commit -m "${{ steps.setup.outputs.title }}" providers.json
2626 popd
2727 - name: create PR
28− uses: peter-evans/create-pull-request@v4
28+ uses: peter-evans/create-pull-request@v3
2929 with:
3030 body: |
31− Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
31+ Automatic update of terraform providers.
3232
33− Check that all providers build with:
34− ```
35− @ofborg build terraform-full
36− ```
33+ Created by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
34+
35+ Check that all providers build with `@ofborg build terraform-full`
3736 branch: terraform-providers-update
3837 delete-branch: false
3938 labels: "2.status: work-in-progress"
4039 title: ${{ steps.setup.outputs.title }}
4140 token: ${{ secrets.GITHUB_TOKEN }}
4241 - name: comment on failure
43− uses: peter-evans/create-or-update-comment@v2
42+ uses: peter-evans/create-or-update-comment@v1
4443 if: ${{ failure() }}
4544 with:
4645 issue-number: 153416
CONTRIBUTING.md+1−42
@@ -20,7 +20,7 @@ Below is a short excerpt of some points in there:
2020 ```
2121 (pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
2222
23− (Motivation for change. Link to release notes. Additional information.)
23+ (Motivation for change. Additional information.)
2424 ```
2525
2626 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).
@@ -29,7 +29,6 @@ Below is a short excerpt of some points in there:
2929
3030 * nginx: init at 2.0.1
3131 * firefox: 54.0.1 -> 55.0
32− https://www.mozilla.org/en-US/firefox/55.0/releasenotes/
3332 * nixos/hydra: add bazBaz option
3433
3534 Dual baz behavior is needed to do foo.
@@ -53,46 +52,6 @@ In addition to writing properly formatted commit messages, it's important to inc
5352
5453For package version upgrades and such a one-line commit message is usually sufficient.
5554
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−
9655## Backporting changes
9756
9857Follow 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).
README.md+1−6
@@ -1,10 +1,5 @@
11<p align="center">
2− <a href="https://nixos.org#gh-light-mode-only">
3− <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png" width="500px" alt="NixOS logo"/>
4− </a>
5− <a href="https://nixos.org#gh-dark-mode-only">
6− <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png" width="500px" alt="NixOS logo"/>
7− </a>
2+ <a href="https://nixos.org/nixos"><img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="NixOS logo" /></a>
83</p>
94
105<p align="center">
doc/builders/fetchers.chapter.md+12−16
@@ -6,11 +6,11 @@ When using Nix, you will frequently need to download source code and other files
66
77Because 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.
88
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.
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`](#sec-pkgs-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.
1010
1111## `fetchurl` and `fetchzip` {#fetchurl}
1212
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.
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.
1414
1515```nix
1616{ stdenv, fetchurl }:
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
2424}
2525```
2626
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.
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.
2828
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.
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.
3030
3131Most other fetchers return a directory rather than a single file.
3232
@@ -38,9 +38,9 @@ Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha25
3838
3939Used 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`.
4040
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.
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.
4242
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:
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 infomation:
4444
4545```nix
4646{ stdenv, fetchgit }:
@@ -72,23 +72,19 @@ Used with Mercurial. Expects `url`, `rev`, and `sha256`.
7272
7373A 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.
7474
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−
7975## `fetchFromGitHub` {#fetchfromgithub}
8076
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.
77+`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.
8278
8379`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.
8480
8581## `fetchFromGitLab` {#fetchfromgitlab}
8682
87−This is used with GitLab repositories. The arguments expected are very similar to `fetchFromGitHub` above.
83+This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above.
8884
8985## `fetchFromGitiles` {#fetchfromgitiles}
9086
91−This is used with Gitiles repositories. The arguments expected are similar to `fetchgit`.
87+This is used with Gitiles repositories. The arguments expected are similar to fetchgit.
9288
9389## `fetchFromBitbucket` {#fetchfrombitbucket}
9490
@@ -96,11 +92,11 @@ This is used with BitBucket repositories. The arguments expected are very simila
9692
9793## `fetchFromSavannah` {#fetchfromsavannah}
9894
99−This is used with Savannah repositories. The arguments expected are very similar to `fetchFromGitHub` above.
95+This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above.
10096
10197## `fetchFromRepoOrCz` {#fetchfromrepoorcz}
10298
103−This is used with repo.or.cz repositories. The arguments expected are very similar to `fetchFromGitHub` above.
99+This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.
104100
105101## `fetchFromSourcehut` {#fetchfromsourcehut}
106102
@@ -111,4 +107,4 @@ or "hg"), `domain` and `fetchSubmodules`.
111107
112108If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit`
113109or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,
114−respectively. Otherwise, the fetcher uses `fetchzip`.
110+respectively. Otherwise the fetcher uses `fetchzip`.
doc/builders/images/dockertools.section.md+8−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−Now the Docker CLI will display a reasonable date and sort the images as expected:
90+and now the Docker CLI will display a reasonable date and sort the images as expected:
9191
9292```ShellSession
9393$ docker images
@@ -95,7 +95,7 @@ REPOSITORY TAG IMAGE ID CREATED SIZE
9595hello latest de2bf4786de6 About a minute ago 25.2MB
9696```
9797
98−However, the produced images will not be binary reproducible.
98+however, the produced images will not be binary reproducible.
9999
100100## buildLayeredImage {#ssec-pkgs-dockerTools-buildLayeredImage}
101101
@@ -119,13 +119,13 @@ Create a Docker image with many of the store paths being on their own layer to i
119119
120120`contents` _optional_
121121
122−: Top-level paths in the container. Either a single derivation, or a list of derivations.
122+: Top level paths in the container. Either a single derivation, or a list of derivations.
123123
124124 *Default:* `[]`
125125
126126`config` _optional_
127127
128−: Run-time configuration of the container. A full list of the options are available at in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
128+: Run-time configuration of the container. A full list of the options are available at in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
129129
130130 *Default:* `{}`
131131
@@ -195,9 +195,9 @@ pkgs.dockerTools.buildLayeredImage {
195195
196196Increasing the `maxLayers` increases the number of layers which have a chance to be shared between different images.
197197
198−Modern Docker installations support up to 128 layers, but older versions support as few as 42.
198+Modern Docker installations support up to 128 layers, however older versions support as few as 42.
199199
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.
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.
201201
202202The 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.
203203
@@ -213,7 +213,7 @@ The image produced by running the output script can be piped directly into `dock
213213$(nix-build) | docker load
214214```
215215
216−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:
217217
218218```ShellSession
219219$(nix-build) | gzip --fast | skopeo copy docker-archive:/dev/stdin docker://some_docker_registry/myimage:tag
doc/builders/images/ocitools.section.md+3−3
@@ -1,10 +1,10 @@
11# pkgs.ociTools {#sec-pkgs-ociTools}
22
3−`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that, it makes no assumptions about the container runner you choose to use to run the created container.
3+`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that it makes no assumptions about the container runner you choose to use to run the created container.
44
55## buildContainer {#ssec-pkgs-ociTools-buildContainer}
66
7−This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory. The nix store of the container will contain all referenced dependencies of the given command.
7+This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command.
88
99The parameters of `buildContainer` with an example value are described below:
1010
@@ -30,7 +30,7 @@ buildContainer {
3030}
3131```
3232
33−- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container.
33+- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container
3434
3535- `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs)
3636
doc/builders/images/snaptools.section.md+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
44
55## Basic usage {#sec-citrix-base}
66
7−The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix.
7+The tarball archive needs to be downloaded manually as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store the package can be built and installed with Nix.
88
9−## Citrix Self-service {#sec-citrix-selfservice}
9+## Citrix Selfservice {#sec-citrix-selfservice}
1010
11−The [self-service](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions.
11+The [selfservice](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions.
1212
13−In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that, you can configure the `selfservice` like this:
13+In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that you can configure the `selfservice` like this:
1414
1515```ShellSession
1616$ storebrowse -C ~/Downloads/receiverconfig.cr
@@ -19,7 +19,7 @@ $ selfservice
1919
2020## Custom certificates {#sec-citrix-custom-certs}
2121
22−The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`:
22+The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`:
2323
2424```nix
2525with import <nixpkgs> { config.allowUnfree = true; };
doc/builders/packages/eclipse.section.md+5−5
@@ -8,9 +8,9 @@ Nixpkgs provides a number of packages that will install Eclipse in its various f
88$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description
99```
1010
11−Once an Eclipse variant is installed, it can be run using the `eclipse` command, as expected. From within Eclipse, it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.
11+Once an Eclipse variant is installed it can be run using the `eclipse` command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.
1212
13−If you prefer to install plugins in a more declarative manner, then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add:
13+If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add
1414
1515```nix
1616packageOverrides = pkgs: {
@@ -22,15 +22,15 @@ packageOverrides = pkgs: {
2222}
2323```
2424
25−to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running:
25+to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running
2626
2727```ShellSession
2828$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description
2929```
3030
31−If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.
31+If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.
3232
33−Expanding the previous example with two plugins using the above functions, we have:
33+Expanding the previous example with two plugins using the above functions we have
3434
3535```nix
3636packageOverrides = pkgs: {
doc/builders/packages/elm.section.md+1−1
@@ -1,6 +1,6 @@
11# Elm {#sec-elm}
22
3−To start a development environment, run:
3+To start a development environment do
44
55```ShellSession
66nix-shell -p elmPackages.elm elmPackages.elm-format
doc/builders/packages/emacs.section.md+3−3
@@ -20,7 +20,7 @@ The Emacs package comes with some extra helpers to make it easier to configure.
2020}
2121```
2222
23−You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provides a `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts.
23+You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts.
2424
2525```nix
2626{
@@ -101,9 +101,9 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
101101}
102102```
103103
104−This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command.
104+This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing `-q` to the Emacs command.
105105
106−Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope'`.
106+Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`.
107107
108108```nix
109109overrides = self: super: rec {
doc/builders/packages/etc-files.section.md+4−4
@@ -1,10 +1,10 @@
11# /etc files {#etc}
22
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.
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.
44
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.
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.
66
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.
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 varaibles `NIX_ETC_PROTOCOLS` and `NIX_ETC_SERVICES` to the corresponding files in the package through a _setup-hook_.
88
99
1010```bash
@@ -15,4 +15,4 @@ NIX_ETC_SERVICES=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/e
1515NIX_ETC_PROTOCOLS=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/protocols
1616```
1717
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`.
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 variable are *not set*, then it will attempt to find the files at the default location within _/etc_.
doc/builders/packages/firefox.section.md+8−7
@@ -2,7 +2,7 @@
22
33## Build wrapped Firefox with extensions and policies {#build-wrapped-firefox-with-extensions-and-policies}
44
5−The `wrapFirefox` function allows to pass policies, preferences and extensions that are available to Firefox. With the help of `fetchFirefoxAddon` this allows to build a Firefox version that already comes with add-ons pre-installed:
5+The `wrapFirefox` function allows to pass policies, preferences and extension that are available to Firefox. With the help of `fetchFirefoxAddon` this allows build a Firefox version that already comes with addons pre-installed:
66
77```nix
88{
@@ -40,12 +40,13 @@ The `wrapFirefox` function allows to pass policies, preferences and extensions t
4040}
4141```
4242
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.
43+If `nixExtensions != null` then all manually installed addons 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 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.
4747
4848## Troubleshooting {#sec-firefox-troubleshooting}
49−If add-ons are marked as broken or the signature is invalid, make sure you have Firefox ESR installed. Normal Firefox does not provide the ability anymore to disable signature verification for add-ons thus nix add-ons get disabled by the normal Firefox binary.
49+If addons 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 addons thus nix addons get disabled by the normal Firefox binary.
50+
51+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.
5052
51−If add-ons do not appear installed despite being defined in your nix configuration file, reset the local add-on state of your Firefox profile by clicking `Help -> More Troubleshooting Information -> Refresh Firefox`. This can happen if you switch from manual add-on mode to nix add-on mode and then back to manual mode and then again to nix add-on mode.
doc/builders/packages/fish.section.md+1−1
@@ -36,7 +36,7 @@ using `buildFishPlugin` and running unit tests with the `fishtape` test runner.
3636## Fish wrapper {#sec-fish-wrapper}
3737
3838The `wrapFish` package is a wrapper around Fish which can be used to create
39−Fish shells initialized with some plugins as well as completions, configuration
39+Fish shells initialised with some plugins as well as completions, configuration
4040snippets and functions sourced from the given paths. This provides a convenient
4141way to test Fish plugins and scripts without having to alter the environment.
4242
doc/builders/packages/fuse.section.md+2−2
@@ -24,10 +24,10 @@ packages on macOS:
2424 checking for fuse.h... no
2525 configure: error: No fuse.h found.
2626
27−This happens on autoconf based projects that use `AC_CHECK_HEADERS` or
27+This happens on autoconf based projects that uses `AC_CHECK_HEADERS` or
2828`AC_CHECK_LIBS` to detect libfuse, and will occur even when the `fuse` package
2929is included in `buildInputs`. It happens because libfuse headers throw an error
30−on macOS if the `FUSE_USE_VERSION` macro is undefined. Many projects do define
30+on macOS if the `FUSE_USE_VERSION` macro is undefined. Many proejcts do define
3131`FUSE_USE_VERSION`, but only inside C source files. This results in the above
3232error at configure time because the configure script would attempt to compile
3333sample FUSE programs without defining `FUSE_USE_VERSION`.
doc/builders/packages/ibus.section.md+3−3
@@ -6,7 +6,7 @@ This package is an ibus-based completion method to speed up typing.
66
77IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html).
88
9−On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
9+On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
1010
1111```nix
1212{ pkgs, ... }: {
@@ -19,7 +19,7 @@ On NixOS, you need to explicitly enable `ibus` with given engines before customi
1919
2020## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell}
2121
22−The IBus engine is based on `hunspell` to support completion in many languages. By default, the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
22+The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
2323
2424```nix
2525ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; }
@@ -31,7 +31,7 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe
3131
3232The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
3333
34−On NixOS, it can be installed using the following expression:
34+On NixOS it can be installed using the following expression:
3535
3636```nix
3737{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }
doc/builders/packages/linux.section.md+7−7
@@ -4,7 +4,7 @@ The Nix expressions to build the Linux kernel are in [`pkgs/os-specific/linux/ke
44
55The function that builds the kernel has an argument `kernelPatches` which should be a list of `{name, patch, extraConfig}` attribute sets, where `name` is the name of the patch (which is included in the kernel’s `meta.description` attribute), `patch` is the patch itself (possibly compressed), and `extraConfig` (optional) is a string specifying extra options to be concatenated to the kernel configuration file (`.config`).
66
7−The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e., has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package:
7+The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package:
88
99```nix
1010modulesTree = [kernel]
@@ -14,19 +14,19 @@ 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
19192. 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 a copy from the old config (e.g., `config-2.6.21-i686-smp`) to the new one (e.g., `config-2.6.22-i686-smp`).
23+ 1. Make an copy from the old config (e.g. `config-2.6.21-i686-smp`) to the new one (e.g. `config-2.6.22-i686-smp`).
2424
25− 2. Copy the config file for this platform (e.g., `config-2.6.22-i686-smp`) to `.config` in the kernel source tree.
25+ 2. Copy the config file for this platform (e.g. `config-2.6.22-i686-smp`) to `.config` in the kernel source tree.
2626
27− 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e., don’t enable some feature on `i686` and disable it on `x86_64`).
27+ 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on `i686` and disable it on `x86_64`).
2828
29− 4. If needed, you can also run `make menuconfig`:
29+ 4. If needed you can also run `make menuconfig`:
3030
3131 ```ShellSession
3232 $ nix-env -f "<nixpkgs>" -iA ncurses
@@ -34,7 +34,7 @@ How to add a new (major) version of the Linux kernel to Nixpkgs:
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
39394. 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
doc/builders/packages/locales.section.md+2−2
@@ -1,5 +1,5 @@
11# Locales {#locales}
22
3−To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats, Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.
3+To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.
44
5−On non-NixOS distributions, this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.
5+On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.
doc/builders/packages/nginx.section.md+2−2
@@ -4,8 +4,8 @@
44
55## ETags on static files served from the Nix store {#sec-nginx-etag}
66
7−HTTP has a couple of different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` header. This doesn't give the desired behavior when the file is in the Nix store because all file timestamps are set to 0 (for reasons related to build reproducibility).
7+HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility).
88
9−Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g., a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.
9+Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.
1010
1111As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of `/nix/store`, the hash in the store path is used as the `ETag` header in the HTTP response, thus providing proper caching functionality. This happens automatically; you do not need to do modify any configuration to get this behavior.
doc/builders/packages/opengl.section.md+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
44
55- `fzf` : `fzf-share`
66
7−E.g. `fzf` can then be used in the `.bashrc` like this:
7+E.g. `fzf` can then used in the `.bashrc` like this:
88
99```bash
1010source "$(fzf-share)/completion.bash"
doc/builders/packages/steam.section.md+8−8
@@ -2,20 +2,20 @@
22
33## Steam in Nix {#sec-steam-nix}
44
5−Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in `$HOME`.
5+Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in \$HOME.
66
77Nix problems and constraints:
88
9−- We don't have `/bin/bash` and many scripts point there. Same thing for `/usr/bin/python`.
9+- We don't have `/bin/bash` and many scripts point there. Similarly for `/usr/bin/python`.
1010- We don't have the dynamic loader in `/lib`.
11−- The `steam.sh` script in `$HOME` cannot be patched, as it is checked and rewritten by steam.
11+- The `steam.sh` script in \$HOME can not be patched, as it is checked and rewritten by steam.
1212- The steam binary cannot be patched, it's also checked.
1313
1414The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.
1515
1616## How to play {#sec-steam-play}
1717
18−Use `programs.steam.enable = true;` if you want to add steam to `systemPackages` and also enable a few workarounds as well as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro Controller.
18+Use `programs.steam.enable = true;` if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr.
1919
2020## Troubleshooting {#sec-steam-troub}
2121
@@ -32,7 +32,7 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages`
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 conflicts 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 conflics 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`
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,7 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages`
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 use it, install the `steam-run` package 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-native` package and run the game with
6060
6161```
6262steam-run ./foo
doc/builders/packages/urxvt.section.md+4−4
@@ -4,7 +4,7 @@ Urxvt, also known as rxvt-unicode, is a highly customizable terminal emulator.
44
55## Configuring urxvt {#sec-urxvt-conf}
66
7−In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as:
7+In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as
88
99```nix
1010rxvt-unicode.override {
@@ -58,14 +58,14 @@ rxvt-unicode.override {
5858
5959## Packaging urxvt plugins {#sec-urxvt-pkg}
6060
61−Urxvt plugins resides in `pkgs/applications/misc/rxvt-unicode-plugins`. To add a new plugin, create an expression in a subdirectory and add the package to the set in `pkgs/applications/misc/rxvt-unicode-plugins/default.nix`.
61+Urxvt plugins resides in `pkgs/applications/misc/rxvt-unicode-plugins`. To add a new plugin create an expression in a subdirectory and add the package to the set in `pkgs/applications/misc/rxvt-unicode-plugins/default.nix`.
6262
6363A plugin can be any kind of derivation, the only requirement is that it should always install perl scripts in `$out/lib/urxvt/perl`. Look for existing plugins for examples.
6464
65−If the plugin is itself a Perl package that needs to be imported from other plugins or scripts, add the following passthrough:
65+If the plugin is itself a perl package that needs to be imported from other plugins or scripts, add the following passthrough:
6666
6767```nix
6868passthru.perlPackages = [ "self" ];
6969```
7070
71−This will make the urxvt wrapper pick up the dependency and set up the Perl path accordingly.
71+This will make the urxvt wrapper pick up the dependency and set up the perl path accordingly.
doc/builders/packages/weechat.section.md+5−5
@@ -1,6 +1,6 @@
1−# WeeChat {#sec-weechat}
1+# Weechat {#sec-weechat}
22
3−WeeChat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration, such as:
3+Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as
44
55```nix
66weechat.override {configure = {availablePlugins, ...}: {
@@ -13,7 +13,7 @@ If the `configure` function returns an attrset without the `plugins` attribute,
1313
1414The plugins currently available are `python`, `perl`, `ruby`, `guile`, `tcl` and `lua`.
1515
16−The Python and Perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute:
16+The python and perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute:
1717
1818```nix
1919weechat.override { configure = {availablePlugins, ...}: {
@@ -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.xml+1
@@ -7,4 +7,5 @@
77 </para>
88 <xi:include href="special/fhs-environments.section.xml" />
99 <xi:include href="special/mkshell.section.xml" />
10+ <xi:include href="special/invalidateFetcherByDrvHash.section.xml" />
1011</chapter>
doc/builders/special/fhs-environments.section.md−2
@@ -45,5 +45,3 @@ One can create a simple environment using a `shell.nix` like that:
4545```
4646
4747Running `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/invalidateFetcherByDrvHash.section.mdnew file+31
@@ -0,0 +1,31 @@
1+
2+## `invalidateFetcherByDrvHash` {#sec-pkgs-invalidateFetcherByDrvHash}
3+
4+Use the derivation hash to invalidate the output via name, for testing.
5+
6+Type: `(a@{ name, ... } -> Derivation) -> a -> Derivation`
7+
8+Normally, fixed output derivations can and should be cached by their output
9+hash only, but for testing we want to re-fetch everytime the fetcher changes.
10+
11+Changes to the fetcher become apparent in the drvPath, which is a hash of
12+how to fetch, rather than a fixed store path.
13+By inserting this hash into the name, we can make sure to re-run the fetcher
14+every time the fetcher changes.
15+
16+This relies on the assumption that Nix isn't clever enough to reuse its
17+database of local store contents to optimize fetching.
18+
19+You might notice that the "salted" name derives from the normal invocation,
20+not the final derivation. `invalidateFetcherByDrvHash` has to invoke the fetcher
21+function twice: once to get a derivation hash, and again to produce the final
22+fixed output derivation.
23+
24+Example:
25+
26+ tests.fetchgit = invalidateFetcherByDrvHash fetchgit {
27+ name = "nix-source";
28+ url = "https://github.com/NixOS/nix";
29+ rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
30+ sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
31+ };
doc/builders/testers.chapter.mddeleted−82
@@ -1,82 +0,0 @@
1−# Testers {#chap-testers}
2−This chapter describes several testing builders which are available in the <literal>testers</literal> namespace.
3−
4−## `testVersion` {#tester-testVersion}
5−
6−Checks the command output contains the specified version
7−
8−Although simplistic, this test assures that the main program
9−can run. While there's no substitute for a real test case,
10−it does catch dynamic linking errors and such. It also provides
11−some protection against accidentally building the wrong version,
12−for example when using an 'old' hash in a fixed-output derivation.
13−
14−Examples:
15−
16−```nix
17−passthru.tests.version = testVersion { package = hello; };
18−
19−passthru.tests.version = testVersion {
20− package = seaweedfs;
21− command = "weed version";
22−};
23−
24−passthru.tests.version = testVersion {
25− package = key;
26− command = "KeY --help";
27− # Wrong '2.5' version in the code. Drop on next version.
28− version = "2.5";
29−};
30−```
31−
32−## `testEqualDerivation` {#tester-testEqualDerivation}
33−
34−Checks that two packages produce the exact same build instructions.
35−
36−This can be used to make sure that a certain difference of configuration,
37−such as the presence of an overlay does not cause a cache miss.
38−
39−When the derivations are equal, the return value is an empty file.
40−Otherwise, the build log explains the difference via `nix-diff`.
41−
42−Example:
43−
44−```nix
45−testEqualDerivation
46− "The hello package must stay the same when enabling checks."
47− hello
48− (hello.overrideAttrs(o: { doCheck = true; }))
49−```
50−
51−## `invalidateFetcherByDrvHash` {#tester-invalidateFetcherByDrvHash}
52−
53−Use the derivation hash to invalidate the output via name, for testing.
54−
55−Type: `(a@{ name, ... } -> Derivation) -> a -> Derivation`
56−
57−Normally, fixed output derivations can and should be cached by their output
58−hash only, but for testing we want to re-fetch everytime the fetcher changes.
59−
60−Changes to the fetcher become apparent in the drvPath, which is a hash of
61−how to fetch, rather than a fixed store path.
62−By inserting this hash into the name, we can make sure to re-run the fetcher
63−every time the fetcher changes.
64−
65−This relies on the assumption that Nix isn't clever enough to reuse its
66−database of local store contents to optimize fetching.
67−
68−You might notice that the "salted" name derives from the normal invocation,
69−not the final derivation. `invalidateFetcherByDrvHash` has to invoke the fetcher
70−function twice: once to get a derivation hash, and again to produce the final
71−fixed output derivation.
72−
73−Example:
74−
75−```nix
76−tests.fetchgit = invalidateFetcherByDrvHash fetchgit {
77− name = "nix-source";
78− url = "https://github.com/NixOS/nix";
79− rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
80− sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
81−};
82−```
doc/builders/trivial-builders.chapter.md+3−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 round-trip and can speed up a build.
38+Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
3939
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}
@@ -219,5 +219,5 @@ produces an output path `/nix/store/<hash>-runtime-references` containing
219219/nix/store/<hash>-hello-2.10
220220```
221221
222−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
223223by `hi`'s output.
doc/contributing/coding-conventions.chapter.md+7−8
@@ -214,15 +214,15 @@ Most of the time, these are the same. For instance, the package `e2fsprogs` has
214214
215215There are a few naming guidelines:
216216
217−- The `pname` attribute _should_ be identical to the upstream package name.
217+- The `name` attribute _should_ be identical to the upstream package name.
218218
219−- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer" instead of `"MPlayer"`.
219+- The `name` attribute _must not_ contain uppercase letters — e.g., `"mplayer-1.0rc2"` instead of `"MPlayer-1.0rc2"`.
220220
221−- The `version` attribute _must_ start with a digit e.g`"0.3.1rc2".
221+- The version part of the `name` attribute _must_ start with a digit (following a dash) — e.g., `"hello-0.3.1rc2"`.
222222
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.
223+- 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"`.
224224
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.
225+- 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.
226226
227227- 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)
228228
@@ -540,11 +540,10 @@ If you do need to do create this sort of patch file, one way to do so is with gi
540540
541541If 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`:
542542
543−- `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it.
544543- `stripLen`: Remove the first `stripLen` components of pathnames in the patch.
545544- `extraPrefix`: Prefix pathnames by this string.
546−- `excludes`: Exclude files matching these patterns (applies after the above arguments).
547−- `includes`: Include only files matching these patterns (applies after the above arguments).
545+- `excludes`: Exclude files matching this pattern.
546+- `includes`: Include only files matching this pattern.
548547- `revert`: Revert the patch.
549548
550549Note 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.
doc/contributing/reviewing-contributions.chapter.md+3−3
@@ -122,10 +122,10 @@ Reviewing process:
122122 - [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.
123123- Ensure that the module tests, if any, are succeeding.
124124- Ensure that the introduced options are correct.
125− - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).
125+ - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated).
126126 - Description, default and example should be provided.
127127- Ensure that option changes are backward compatible.
128− - `mkRenamedOptionModuleWith` provides a way to make option changes backward compatible.
128+ - `mkRenamedOptionModule` and `mkAliasOptionModule` functions provide way to make option changes backward compatible.
129129- Ensure that removed options are declared with `mkRemovedOptionModule`
130130- Ensure that changes that are not backward compatible are mentioned in release notes.
131131- Ensure that documentations affected by the change is updated.
@@ -157,7 +157,7 @@ Reviewing process:
157157
158158- Ensure that the module tests, if any, are succeeding.
159159- Ensure that the introduced options are correct.
160− - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).
160+ - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated).
161161 - Description, default and example should be provided.
162162- Ensure that module `meta` field is present
163163 - Maintainers should be declared in `meta.maintainers`.
doc/contributing/submitting-changes.chapter.md+1−1
@@ -96,7 +96,7 @@ 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. `git rm -rf pkgs/applications/misc/jbidwatcher`
99+1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`
1001001. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`).
1011011. 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
doc/functions/library/attrsets.xml+1−1
@@ -1474,7 +1474,7 @@ lib.attrsets.zipAttrsWith
14741474 <section xml:id="function-library-lib.attrsets.zipAttrs">
14751475 <title><function>lib.attrsets.zipAttrs</function></title>
14761476
1477− <subtitle><literal>zipAttrs :: [ AttrSet ] -> AttrSet</literal>
1477+ <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal>
14781478 </subtitle>
14791479
14801480 <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" />
doc/hooks/index.xmldeleted−10
@@ -1,10 +0,0 @@
1−<chapter xmlns="http://docbook.org/ns/docbook"
2− xmlns:xlink="http://www.w3.org/1999/xlink"
3− xmlns:xi="http://www.w3.org/2001/XInclude"
4− xml:id="chap-hooks">
5− <title>Hooks reference</title>
6− <para>
7− Nixpkgs has several hook packages that augment the stdenv phases.
8− </para>
9− <xi:include href="./postgresql-test-hook.section.xml" />
10−</chapter>
doc/hooks/postgresql-test-hook.section.mddeleted−59
@@ -1,59 +0,0 @@
1−
2−# `postgresqlTestHook` {#sec-postgresqlTestHook}
3−
4−This hook starts a PostgreSQL server during the `checkPhase`. Example:
5−
6−```nix
7−{ stdenv, postgresql, postgresqlTestHook }:
8−stdenv.mkDerivation {
9−
10− # ...
11−
12− checkInputs = [
13− postgresql
14− postgresqlTestHook
15− ];
16−}
17−```
18−
19−If you use a custom `checkPhase`, remember to add the `runHook` calls:
20−```nix
21− checkPhase ''
22− runHook preCheck
23−
24− # ... your tests
25−
26− runHook postCheck
27− ''
28−```
29−
30−## Variables {#sec-postgresqlTestHook-variables}
31−
32−The hook logic will read a number of variables and set them to a default value if unset or empty.
33−
34−Exported variables:
35−
36− - `PGDATA`: location of server files.
37− - `PGHOST`: location of UNIX domain socket directory; the default `host` in a connection string.
38− - `PGUSER`: user to create / log in with, default: `test_user`.
39− - `PGDATABASE`: database name, default: `test_db`.
40−
41−Bash-only variables:
42−
43− - `postgresqlTestUserOptions`: SQL options to use when creating the `$PGUSER` role, default: `LOGIN`.
44− - `postgresqlTestSetupSQL`: SQL commands to run as database administrator after startup, default: statements that create `$PGUSER` and `$PGDATABASE`.
45− - `postgresqlTestSetupCommands`: bash commands to run after database start, defaults to running `$postgresqlTestSetupSQL` as database administrator.
46− - `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended.
47− - `postgresqlStartCommands`: defaults to `pg_ctl start`.
48−
49−## TCP and the Nix sandbox {#sec-postgresqlTestHook-tcp}
50−
51−`postgresqlEnableTCP` relies on network sandboxing, which is not available on macOS and some custom Nix installations, resulting in flaky tests.
52−For this reason, it is disabled by default.
53−
54−The preferred solution is to make the test suite use a UNIX domain socket connection. This is the default behavior when no `host` connection parameter is provided.
55−Some test suites hardcode a value for `host` though, so a patch may be required. If you can upstream the patch, you can make `host` default to the `PGHOST` environment variable when set. Otherwise, you can patch it locally to omit the `host` connection string parameter altogether.
56−
57−::: {.note}
58−The error `libpq: failed (could not receive data from server: Connection refused` is generally an indication that the test suite is trying to connect through TCP.
59−:::
doc/languages-frameworks/chicken.section.mddeleted−49
@@ -1,49 +0,0 @@
1−# CHICKEN {#sec-chicken}
2−
3−[CHICKEN](https://call-cc.org/) is a
4−[R⁵RS](https://schemers.org/Documents/Standards/R5RS/HTML/)-compliant Scheme
5−compiler. It includes an interactive mode and a custom package format, "eggs".
6−
7−## Using Eggs
8−
9−Eggs described in nixpkgs are available inside the
10−`chickenPackages.chickenEggs` attrset. Including an egg as a build input is
11−done in the typical Nix fashion. For example, to include support for [SRFI
12−189](https://srfi.schemers.org/srfi-189/srfi-189.html) in a derivation, one
13−might write:
14−
15−```nix
16− buildInputs = [
17− chicken
18− chickenPackages.chickenEggs.srfi-189
19− ];
20−```
21−
22−Both `chicken` and its eggs have a setup hook which configures the environment
23−variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`.
24−
25−## Updating Eggs
26−
27−nixpkgs only knows about a subset of all published eggs. It uses
28−[egg2nix](https://github.com/the-kenny/egg2nix) to generate a
29−package set from a list of eggs to include.
30−
31−The package set is regenerated by running the following shell commands:
32−
33−```
34−$ nix-shell -p chickenPackages.egg2nix
35−$ cd pkgs/development/compilers/chicken/5/
36−$ egg2nix eggs.scm > eggs.nix
37−```
38−
39−## Adding Eggs
40−
41−When we run `egg2nix`, we obtain one collection of eggs with
42−mutually-compatible versions. This means that when we add new eggs, we may
43−need to update existing eggs. To keep those separate, follow the procedure for
44−updating eggs before including more eggs.
45−
46−To include more eggs, edit `pkgs/development/compilers/chicken/5/eggs.scm`.
47−The first section of this file lists eggs which are required by `egg2nix`
48−itself; all other eggs go into the second section. After editing, follow the
49−procedure for updating eggs.
doc/languages-frameworks/cuda.section.mddeleted−34
@@ -1,34 +0,0 @@
1−# CUDA {#cuda}
2−
3−CUDA-only packages are stored in the `cudaPackages` packages set. This set
4−includes the `cudatoolkit`, portions of the toolkit in separate derivations,
5−`cudnn`, `cutensor` and `nccl`.
6−
7−A package set is available for each CUDA version, so for example
8−`cudaPackages_11_6`. Within each set is a matching version of the above listed
9−packages. Additionally, other versions of the packages that are packaged and
10−compatible are available as well. For example, there can be a
11−`cudaPackages.cudnn_8_3_2` package.
12−
13−To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional
14−```nix
15−cudaSupport ? false
16−cudaPackages ? {}
17−```
18−
19−When using `callPackage`, you can choose to pass in a different variant, e.g.
20−when a different version of the toolkit suffices
21−```nix
22−mypkg = callPackage { cudaPackages = cudaPackages_11_5; }
23−```
24−
25−If another version of say `cudnn` or `cutensor` is needed, you can override the
26−package set to make it the default. This guarantees you get a consistent package
27−set.
28−```nix
29−mypkg = let
30− cudaPackages = cudaPackages_11_5.overrideScope' (final: prev {
31− cudnn = prev.cudnn_8_3_2;
32− }});
33−in callPackage { inherit cudaPackages; };
34−```
doc/languages-frameworks/gnome.section.md+2−16
@@ -42,21 +42,7 @@ 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 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−```
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.
6046
6147To 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.
6248
@@ -112,7 +98,7 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti
11298
11399- []{#ssec-gnome-hooks-dconf} `dconf.lib` is a dependency of `wrapGAppsHook`, which then also adds it to the `GIO_EXTRA_MODULES` variable.
114100
115−- []{#ssec-gnome-hooks-hicolor-icon-theme} `hicolor-icon-theme`’s setup hook will add icon themes to `XDG_ICON_DIRS`.
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`.
116102
117103- []{#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`.
118104
doc/languages-frameworks/go.section.md+1−5
@@ -142,8 +142,4 @@ Removes the pre-existing vendor directory. This should only be used if the depen
142142
143143### `subPackages` {#var-go-subPackages}
144144
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.
145+Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built.
doc/languages-frameworks/index.xml−2
@@ -9,10 +9,8 @@
99 <xi:include href="android.section.xml" />
1010 <xi:include href="beam.section.xml" />
1111 <xi:include href="bower.section.xml" />
12− <xi:include href="chicken.section.xml" />
1312 <xi:include href="coq.section.xml" />
1413 <xi:include href="crystal.section.xml" />
15− <xi:include href="cuda.section.xml" />
1614 <xi:include href="dhall.section.xml" />
1715 <xi:include href="dotnet.section.xml" />
1816 <xi:include href="emscripten.section.xml" />
doc/languages-frameworks/javascript.section.md+2−24
@@ -85,7 +85,7 @@ you will still need to commit the modified version of the lock files, but at lea
8585
8686each 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
8787
88−## Javascript packages inside nixpkgs {#javascript-packages-nixpkgs}
88+## javascript packages inside nixpkgs {#javascript-packages-nixpkgs}
8989
9090The `pkgs/development/node-packages` folder contains a generated collection of
9191[NPM packages](https://npmjs.com/) that can be installed with the Nix package
@@ -121,14 +121,12 @@ requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blo
121121 };
122122```
123123
124−### Adding and Updating Javascript packages in nixpkgs
125−
126124To add a package from NPM to nixpkgs:
127125
1281261. Modify `pkgs/development/node-packages/node-packages.json` to add, update
129127 or remove package entries to have it included in `nodePackages` and
130128 `nodePackages_latest`.
131−2. Run the script: `./pkgs/development/node-packages/generate.sh`.
129+2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`.
1321303. Build your new package to test your changes:
133131 `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
134132 To build against the latest stable Current Node.js version (e.g. 14.x):
@@ -139,26 +137,6 @@ For more information about the generation process, consult the
139137[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
140138tool.
141139
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−
162140## Tool specific instructions {#javascript-tool-specific}
163141
164142### node2nix {#javascript-node2nix}
doc/languages-frameworks/ocaml.section.md+3−7
@@ -38,12 +38,8 @@ Here is a simple package example.
3838
3939- It uses the `fetchFromGitHub` fetcher to get its source.
4040
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.
41+- `useDune2 = true` ensures that the latest version of Dune is used for the
42+ build (this may become the default value in a future release).
4743
4844- It sets the optional `doCheck` attribute such that tests will be run with
4945 `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is
@@ -71,7 +67,7 @@ Here is a simple package example.
7167buildDunePackage rec {
7268 pname = "angstrom";
7369 version = "0.15.0";
74− duneVersion = "2";
70+ useDune2 = true;
7571
7672 minimalOCamlVersion = "4.04";
7773
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
66
77- For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support.
88
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:
9+- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this:
1010
1111 ```nix
1212 texlive.combine {
doc/languages-frameworks/vim.section.md+2−5
@@ -18,7 +18,7 @@ Adding custom .vimrc lines can be done using the following code:
1818
1919```nix
2020vim_configurable.customize {
21− # `name` optionally specifies the name of the executable and package
21+ # `name` specifies the name of the executable and package
2222 name = "vim-with-plugins";
2323
2424 vimrcConfig.customRC = ''
@@ -28,9 +28,6 @@ vim_configurable.customize {
2828```
2929
3030This configuration is used when Vim is invoked with the command specified as name, in this case `vim-with-plugins`.
31−You can also omit `name` to customize Vim itself. See the
32−[definition of `vimUtils.makeCustomizable`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-utils.nix#L408)
33−for all supported options.
3431
3532For Neovim the `configure` argument can be overridden to achieve the same:
3633
@@ -289,7 +286,7 @@ Sample output1:
289286"reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
290287 name = "reload";
291288 src = fetchgit {
292− url = "https://github.com/xolox/vim-reload";
289+ url = "git://github.com/xolox/vim-reload";
293290 rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1";
294291 sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh";
295292 };
doc/manual.xml−2
@@ -25,10 +25,8 @@
2525 <title>Builders</title>
2626 <xi:include href="builders/fetchers.chapter.xml" />
2727 <xi:include href="builders/trivial-builders.chapter.xml" />
28− <xi:include href="builders/testers.chapter.xml" />
2928 <xi:include href="builders/special.xml" />
3029 <xi:include href="builders/images.xml" />
31− <xi:include href="hooks/index.xml" />
3230 <xi:include href="languages-frameworks/index.xml" />
3331 <xi:include href="builders/packages/index.xml" />
3432 </part>
doc/stdenv/cross-compilation.chapter.md+10−35
@@ -78,46 +78,21 @@ 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 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:
81+Putting this all together, that means we have dependencies in the form "host → target", in at most the following six combinations:
8682
8783#### Possible dependency types {#possible-dependency-types}
8884
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)`.
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 |
11793
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.
11994
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`.
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)`.
12196
12297### Cross packaging cookbook {#ssec-cross-cookbook}
12398
doc/stdenv/meta.chapter.md−34
@@ -175,40 +175,6 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For
175175
176176NixOS 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).
177177
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−
212178### `timeout` {#var-meta-timeout}
213179
214180A 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`.
doc/stdenv/stdenv.chapter.md+2−56
@@ -125,7 +125,7 @@ The extension of `PATH` with dependencies, alluded to above, proceeds according
125125A dependency is said to be **propagated** when some of its other-transitive (non-immediate) downstream dependencies also need it as an immediate dependency.
126126[^footnote-stdenv-propagated-dependencies]
127127
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:
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 how respectively its host and target platforms are "offset" from the depending derivation’s platforms. The following table summarize the different combinations that can be obtained:
129129
130130| `host → target` | attribute name | offset |
131131| ------------------- | ------------------- | -------- |
@@ -317,60 +317,6 @@ The script will be usually run from the root of the Nixpkgs repository but you s
317317
318318For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`.
319319
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−
374320## Phases {#sec-stdenv-phases}
375321
376322`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.
@@ -1097,7 +1043,7 @@ You can also specify a `runtimeDependencies` variable which lists dependencies t
10971043
10981044In 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.
10991045
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.
1046+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.
11011047
11021048The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories.
11031049
doc/using/overlays.chapter.md+2−18
@@ -77,7 +77,7 @@ In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear
7777
7878 The Nixpkgs attribute is `openblas` for ILP64 (integer width = 64 bits) and `openblasCompat` for LP64 (integer width = 32 bits). `openblasCompat` is the default.
7979
80−- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS and CBLAS)
80+- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS)
8181
8282 The Nixpkgs attribute is `lapack-reference`.
8383
@@ -117,23 +117,7 @@ $ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH n
117117
118118Intel MKL requires an `openmp` implementation when running with multiple processors. By default, `mkl` will use Intel's `iomp` implementation if no other is specified, but this is a runtime-only dependency and binary compatible with the LLVM implementation. To use that one instead, Intel recommends users set it with `LD_PRELOAD`. Note that `mkl` is only available on `x86_64-linux` and `x86_64-darwin`. Moreover, Hydra is not building and distributing pre-compiled binaries using it.
119119
120−To override `blas` and `lapack` with its reference implementations (i.e. for development purposes), one can use the following overlay:
121−
122−```nix
123−self: super:
124−
125−{
126− blas = super.blas.override {
127− blasProvider = self.lapack-reference;
128− };
129−
130− lapack = super.lapack.override {
131− lapackProvider = self.lapack-reference;
132− };
133−}
134−```
135−
136−For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). The attributes `blas` and `lapack` are `LP64` by default. Their `ILP64` version are provided through the attributes `blas-ilp64` and `lapack-ilp64`. Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following:
120+For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following:
137121
138122```nix
139123{ stdenv, blas, lapack, ... }:
doc/using/overrides.chapter.md+2−6
@@ -39,18 +39,14 @@ The function `overrideAttrs` allows overriding the attribute set passed to a `st
3939Example usage:
4040
4141```nix
42−helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: {
42+helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
4343 separateDebugInfo = true;
4444});
4545```
4646
4747In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package.
4848
49−The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.
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`.
49+The argument `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.
5450
5551::: {.note}
5652Note 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).
lib/attrsets.nix+3−114
@@ -4,8 +4,8 @@
44let
55 inherit (builtins) head tail length;
66 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;
7+ inherit (lib.strings) concatStringsSep sanitizeDerivationName;
8+ inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all;
99in
1010
1111rec {
@@ -78,103 +78,6 @@ rec {
7878 in attrByPath attrPath (abort errorMsg);
7979
8080
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
101−
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;
177−
17881 /* Return the specified attributes from a set.
17982
18083 Example:
@@ -424,7 +327,7 @@ rec {
424327 isDerivation "foobar"
425328 => false
426329 */
427− isDerivation = x: x.type or null == "derivation";
330+ isDerivation = x: isAttrs x && x ? type && x.type == "derivation";
428331
429332 /* Converts a store path to a fake derivation. */
430333 toDerivation = path:
@@ -574,20 +477,6 @@ rec {
574477 overrideExisting = old: new:
575478 mapAttrs (name: value: new.${name} or value) old;
576479
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−
591480 /* Get a package output.
592481 If no output is found, fallback to `.out` and then to the default.
593482
lib/customisation.nix+2−49
@@ -117,55 +117,8 @@ rec {
117117 callPackageWith = autoArgs: fn: args:
118118 let
119119 f = if lib.isFunction fn then fn else import fn;
120− fargs = lib.functionArgs f;
121−
122− # All arguments that will be passed to the function
123− # This includes automatic ones and ones passed explicitly
124− allArgs = builtins.intersectAttrs fargs autoArgs // args;
125−
126− # A list of argument names that the function requires, but
127− # wouldn't be passed to it
128− missingArgs = lib.attrNames
129− # Filter out arguments that have a default value
130− (lib.filterAttrs (name: value: ! value)
131− # Filter out arguments that would be passed
132− (removeAttrs fargs (lib.attrNames allArgs)));
133−
134− # Get a list of suggested argument names for a given missing one
135− getSuggestions = arg: lib.pipe (autoArgs // args) [
136− lib.attrNames
137− # Only use ones that are at most 2 edits away. While mork would work,
138− # levenshteinAtMost is only fast for 2 or less.
139− (lib.filter (lib.strings.levenshteinAtMost 2 arg))
140− # Put strings with shorter distance first
141− (lib.sort (x: y: lib.strings.levenshtein x arg < lib.strings.levenshtein y arg))
142− # Only take the first couple results
143− (lib.take 3)
144− # Quote all entries
145− (map (x: "\"" + x + "\""))
146− ];
147−
148− prettySuggestions = suggestions:
149− if suggestions == [] then ""
150− else if lib.length suggestions == 1 then ", did you mean ${lib.elemAt suggestions 0}?"
151− else ", did you mean ${lib.concatStringsSep ", " (lib.init suggestions)} or ${lib.last suggestions}?";
152−
153− errorForArg = arg:
154− let
155− loc = builtins.unsafeGetAttrPos arg fargs;
156− # loc' can be removed once lib/minver.nix is >2.3.4, since that includes
157− # https://github.com/NixOS/nix/pull/3468 which makes loc be non-null
158− loc' = if loc != null then loc.file + ":" + toString loc.line
159− else if ! lib.isFunction fn then
160− toString fn + lib.optionalString (lib.sources.pathIsDirectory fn) "/default.nix"
161− else "<unknown location>";
162− in "Function called without required argument \"${arg}\" at "
163− + "${loc'}${prettySuggestions (getSuggestions arg)}";
164−
165− # Only show the error for the first missing argument
166− error = errorForArg (lib.head missingArgs);
167−
168− in if missingArgs == [] then makeOverridable f allArgs else throw error;
120+ auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
121+ in makeOverridable f (auto // args);
169122
170123
171124 /* Like callPackage, but for a function that returns an attribute
lib/default.nix+9−17
@@ -11,9 +11,6 @@ let
1111 callLibs = file: import file { lib = self; };
1212 in {
1313
14− # interacting with flakes
15− flakes = callLibs ./flakes.nix;
16−
1714 # often used, or depending on very little
1815 trivial = callLibs ./trivial.nix;
1916 fixedPoints = callLibs ./fixed-points.nix;
@@ -62,7 +59,6 @@ let
6259 # linux kernel configuration
6360 kernel = callLibs ./kernel.nix;
6461
65− inherit (self.flakes) callLocklessFlake;
6662 inherit (builtins) add addErrorContext attrNames concatLists
6763 deepSeq elem elemAt filter genericClosure genList getAttr
6864 hasAttr head isAttrs isBool isInt isList isString length
@@ -70,10 +66,9 @@ let
7066 stringLength sub substring tail trace;
7167 inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor
7268 bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
73− importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum
74− info showWarnings nixpkgsVersion version isInOldestRelease
75− mod compare splitByAndCompare
76− functionArgs setFunctionArgs isFunction toFunction
69+ importJSON importTOML warn warnIf throwIfNot checkListOfEnum
70+ info showWarnings nixpkgsVersion version
71+ mod compare splitByAndCompare functionArgs setFunctionArgs isFunction
7772 toHexString toBaseDigits;
7873 inherit (self.fixedPoints) fix fix' converge extends composeExtensions
7974 composeManyExtensions makeExtensible makeExtensibleWithCustomName;
@@ -83,10 +78,9 @@ let
8378 mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond
8479 genAttrs isDerivation toDerivation optionalAttrs
8580 zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
86− recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin
81+ recursiveUpdate matchAttrs overrideExisting getOutput getBin
8782 getLib getDev getMan chooseDevOutputs zipWithNames zip
88− recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets
89− updateManyAttrsByPath;
83+ recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets;
9084 inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1
9185 concatMap flatten remove findSingle findFirst any all count
9286 optional optionals toList range partition zipListsWith zipLists
@@ -98,8 +92,7 @@ let
9892 concatImapStringsSep makeSearchPath makeSearchPathOutput
9993 makeLibraryPath makeBinPath optionalString
10094 hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
101− escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars
102− escapeRegex escapeXML replaceChars lowerChars
95+ escapeShellArg escapeShellArgs escapeRegex escapeXML replaceChars lowerChars
10396 upperChars toLower toUpper addContextFrom splitString
10497 removePrefix removeSuffix versionOlder versionAtLeast
10598 getName getVersion
@@ -113,21 +106,20 @@ let
113106 makeScope makeScopeWithSplicing;
114107 inherit (self.meta) addMetaAttrs dontDistribute setName updateName
115108 appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
116− hiPrioSet getLicenseFromSpdxId getExe;
109+ hiPrioSet getLicenseFromSpdxId;
117110 inherit (self.sources) pathType pathIsDirectory cleanSourceFilter
118111 cleanSource sourceByRegex sourceFilesBySuffices
119112 commitIdFromGitRepo cleanSourceWith pathHasContext
120113 canCleanSource pathIsRegularFile pathIsGitRepo;
121114 inherit (self.modules) evalModules setDefaultModuleLocation
122− unifyModuleSyntax applyModuleArgsIfFunction mergeModules
115+ unifyModuleSyntax applyIfFunction mergeModules
123116 mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
124117 pushDownProperties dischargeProperties filterOverrides
125118 sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
126119 mkOptionDefault mkDefault mkImageMediaOverride mkForce mkVMOverride
127120 mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions
128121 mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
129− mkRenamedOptionModule mkRenamedOptionModuleWith
130− mkMergedOptionModule mkChangedOptionModule
122+ mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule
131123 mkAliasOptionModule mkDerivedConfig doRename;
132124 inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
133125 mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption
lib/flakes.nixdeleted−22
@@ -1,22 +0,0 @@
1−{ lib }:
2−
3−rec {
4−
5− /* imports a flake.nix without acknowledging its lock file, useful for
6− referencing subflakes from a parent flake. The second argument allows
7− specifying the inputs of this flake.
8−
9− Example:
10− callLocklessFlake {
11− path = ./directoryContainingFlake;
12− inputs = { inherit nixpkgs; };
13− }
14− */
15− callLocklessFlake = { path, inputs ? { } }:
16− let
17− self = { outPath = path; } //
18− ((import (path + "/flake.nix")).outputs (inputs // { self = self; }));
19− in
20− self;
21−
22−}
lib/generators.nix+2−47
@@ -10,7 +10,7 @@
1010 * are mostly generators themselves, called with
1111 * their respective default values; they can be reused.
1212 *
13− * Tests can be found in ./tests/misc.nix
13+ * Tests can be found in ./tests.nix
1414 * Documentation in the manual, #sec-generators
1515 */
1616{ lib }:
@@ -108,7 +108,7 @@ rec {
108108 * The mk* configuration attributes can generically change
109109 * the way sections and key-value strings are generated.
110110 *
111− * For more examples see the test cases in ./tests/misc.nix.
111+ * For more examples see the test cases in ./tests.nix.
112112 */
113113 toINI = {
114114 # apply transformations (e.g. escapes) to section names
@@ -130,51 +130,6 @@ rec {
130130 # map input to ini sections
131131 mapAttrsToStringsSep "\n" mkSection attrsOfAttrs;
132132
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−
178133 /* Generate a git-config file from an attrset.
179134 *
180135 * It has two major differences from the regular INI format:
lib/licenses.nix−10
@@ -389,11 +389,6 @@ in mkLicense lset) ({
389389 free = false;
390390 };
391391
392− generaluser = {
393− fullName = "GeneralUser GS License v2.0";
394− url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources
395− };
396−
397392 gpl1Only = {
398393 spdxId = "GPL-1.0-only";
399394 fullName = "GNU General Public License v1.0 only";
@@ -612,11 +607,6 @@ in mkLicense lset) ({
612607 fullName = "Enlightenment License (e16)";
613608 };
614609
615− mit0 = {
616− spdxId = "MIT-0";
617− fullName = "MIT No Attribution";
618− };
619−
620610 mpl10 = {
621611 spdxId = "MPL-1.0";
622612 fullName = "Mozilla Public License 1.0";
lib/lists.nix+8−9
@@ -4,7 +4,6 @@
44let
55 inherit (lib.strings) toInt;
66 inherit (lib.trivial) compare min;
7− inherit (lib.attrsets) mapAttrs;
87in
98rec {
109
@@ -341,15 +340,15 @@ rec {
341340 groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
342341 => { true = 12; false = 3; }
343342 */
344− groupBy' = op: nul: pred: lst: mapAttrs (name: foldl op nul) (groupBy pred lst);
343+ groupBy' = op: nul: pred: lst:
344+ foldl' (r: e:
345+ let
346+ key = pred e;
347+ in
348+ r // { ${key} = op (r.${key} or nul) e; }
349+ ) {} lst;
345350
346− groupBy = builtins.groupBy or (
347− pred: foldl' (r: e:
348− let
349− key = pred e;
350− in
351− r // { ${key} = (r.${key} or []) ++ [e]; }
352− ) {});
351+ groupBy = groupBy' (sum: e: sum ++ [e]) [];
353352
354353 /* Merges two lists of the same size together. If the sizes aren't the same
355354 the merging stops at the shortest. How both lists are merged is defined
lib/meta.nix−14
@@ -126,18 +126,4 @@ rec {
126126 lib.warn "getLicenseFromSpdxId: No license matches the given SPDX ID: ${licstr}"
127127 { shortName = licstr; }
128128 );
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)}";
143129}
lib/modules.nix+45−185
@@ -9,7 +9,7 @@ let
99 catAttrs
1010 concatLists
1111 concatMap
12− concatStringsSep
12+ count
1313 elem
1414 filter
1515 findFirst
@@ -46,22 +46,7 @@ let
4646 showFiles
4747 showOption
4848 unknownModule
49− literalExpression
5049 ;
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−
6550in
6651
6752rec {
@@ -113,10 +98,6 @@ rec {
11398 args ? {}
11499 , # This would be remove in the future, Prefer _module.check option instead.
115100 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
120101 }:
121102 let
122103 withWarnings = x:
@@ -145,7 +126,7 @@ rec {
145126 # this module is used, to avoid conflicts and allow chaining of
146127 # extendModules.
147128 internalModule = rec {
148− _file = "lib/modules.nix";
129+ _file = ./modules.nix;
149130
150131 key = _file;
151132
@@ -158,94 +139,8 @@ rec {
158139 # a `_module.args.pkgs = import (fetchTarball { ... }) {}` won't
159140 # start a download when `pkgs` wasn't evaluated.
160141 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− '';
142+ internal = true;
143+ description = "Arguments passed to each module.";
249144 };
250145
251146 _module.check = mkOption {
@@ -256,7 +151,8 @@ rec {
256151 };
257152
258153 _module.freeformType = mkOption {
259− type = types.nullOr types.optionType;
154+ # Disallow merging for now, but could be implemented nicely with a `types.optionType`
155+ type = types.nullOr (types.uniq types.attrs);
260156 internal = true;
261157 default = null;
262158 description = ''
@@ -345,17 +241,15 @@ rec {
345241 modules ? [],
346242 specialArgs ? {},
347243 prefix ? [],
348− extensionOffset ? length modules,
349244 }:
350245 evalModules (evalModulesArgs // {
351246 modules = regularModules ++ modules;
352247 specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
353248 prefix = extendArgs.prefix or evalModulesArgs.prefix;
354− inherit extensionOffset;
355249 });
356250
357251 type = lib.types.submoduleWith {
358− inherit modules specialArgs extensionOffset;
252+ inherit modules specialArgs;
359253 };
360254
361255 result = withWarnings {
@@ -375,11 +269,11 @@ rec {
375269 # Like unifyModuleSyntax, but also imports paths and calls functions if necessary
376270 loadModule = args: fallbackFile: fallbackKey: m:
377271 if isFunction m || isAttrs m then
378− unifyModuleSyntax fallbackFile fallbackKey (applyModuleArgsIfFunction fallbackKey m args)
272+ unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args)
379273 else if isList m then
380274 let defs = [{ file = fallbackFile; value = m; }]; in
381275 throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}"
382− else unifyModuleSyntax (toString m) (toString m) (applyModuleArgsIfFunction (toString m) (import m) args);
276+ else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args);
383277
384278 /*
385279 Collects all modules recursively into the form
@@ -476,7 +370,7 @@ rec {
476370 config = addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"]));
477371 };
478372
479− applyModuleArgsIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then
373+ applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then
480374 let
481375 # Module arguments are resolved in a strict manner when attribute set
482376 # deconstruction is used. As the arguments are now defined with the
@@ -581,61 +475,26 @@ rec {
581475 [{ inherit (module) file; inherit value; }]
582476 ) configs;
583477
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−
600478 resultsByName = mapAttrs (name: decls:
601479 # We're descending into attribute ‘name’.
602480 let
603481 loc = prefix ++ [name];
604482 defns = defnsByName.${name} or [];
605483 defns' = defnsByName'.${name} or [];
606− optionDecls = filter (m: isOption m.options) decls;
484+ nrOptions = count (m: isOption m.options) decls;
607485 in
608− if length optionDecls == length decls then
486+ if nrOptions == length decls then
609487 let opt = fixupOptionType loc (mergeOptionDecls loc decls);
610488 in {
611489 matchedOptions = evalOptionValue loc opt defns';
612490 unmatchedDefns = [];
613491 }
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− }"
492+ else if nrOptions != 0 then
493+ let
494+ firstOption = findFirst (m: isOption m.options) "" decls;
495+ firstNonOption = findFirst (m: !isOption m.options) "" decls;
496+ in
497+ throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'."
639498 else
640499 mergeModules' loc decls defns) declsByName;
641500
@@ -702,9 +561,17 @@ rec {
702561 throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}."
703562 else
704563 let
564+ /* Add the modules of the current option to the list of modules
565+ already collected. The options attribute except either a list of
566+ submodules or a submodule. For each submodule, we add the file of the
567+ current option declaration as the file use for the submodule. If the
568+ submodule defines any filename, then we ignore the enclosing option file. */
569+ options' = toList opt.options.options;
570+
705571 getSubModules = opt.options.type.getSubModules or null;
706572 submodules =
707573 if getSubModules != null then map (setDefaultModuleLocation opt._file) getSubModules ++ res.options
574+ else if opt.options ? options then map (coerceOption opt._file) options' ++ res.options
708575 else res.options;
709576 in opt.options // res //
710577 { declarations = res.declarations ++ [opt._file];
@@ -887,13 +754,26 @@ rec {
887754 compare = a: b: (a.priority or 1000) < (b.priority or 1000);
888755 in sort compare defs';
889756
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
757+ /* Hack for backward compatibility: convert options of type
758+ optionSet to options of type submodule. FIXME: remove
759+ eventually. */
893760 fixupOptionType = loc: opt:
894− if opt.type.getSubModules or null == null
895− then opt // { type = opt.type or types.unspecified; }
896− else opt // { type = opt.type.substSubModules opt.options; options = []; };
761+ let
762+ options = opt.options or
763+ (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
764+ f = tp:
765+ let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet");
766+ in
767+ if tp.name == "option set" || tp.name == "submodule" then
768+ throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}."
769+ else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options)
770+ else if optionSetIn "listOf" then types.listOf (types.submodule options)
771+ else if optionSetIn "nullOr" then types.nullOr (types.submodule options)
772+ else tp;
773+ in
774+ if opt.type.getSubModules or null == null
775+ then opt // { type = f (opt.type or types.unspecified); }
776+ else opt // { type = opt.type.substSubModules opt.options; options = []; };
897777
898778
899779 /* Properties. */
@@ -1025,26 +905,6 @@ rec {
1025905 use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'.";
1026906 };
1027907
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−
1048908 /* Return a module that causes a warning to be shown if any of the "from"
1049909 option is defined; the defined values can be used in the "mergeFn" to set
1050910 the "to" value.
lib/options.nix+4−2
@@ -79,6 +79,8 @@ rec {
7979 visible ? null,
8080 # Whether the option can be set only once
8181 readOnly ? null,
82+ # Deprecated, used by types.optionSet.
83+ options ? null
8284 } @ attrs:
8385 attrs // { _type = "option"; };
8486
@@ -120,7 +122,7 @@ rec {
120122 Example:
121123 mkPackageOption pkgs "GHC" {
122124 default = [ "ghc" ];
123− example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
125+ example = "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])";
124126 }
125127 => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; }
126128 */
@@ -229,7 +231,7 @@ rec {
229231 then true
230232 else opt.visible or true;
231233 readOnly = opt.readOnly or false;
232− type = opt.type.description or "unspecified";
234+ type = opt.type.description or null;
233235 }
234236 // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; }
235237 // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }
lib/strings.nix+5−196
@@ -17,7 +17,6 @@ rec {
1717 head
1818 isInt
1919 isList
20− isAttrs
2120 isString
2221 match
2322 parseDrvName
@@ -254,7 +253,10 @@ rec {
254253 => false
255254 */
256255 hasInfix = infix: content:
257− builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
256+ let
257+ drop = x: substring 1 (stringLength x) x;
258+ in hasPrefix infix content
259+ || content != "" && hasInfix infix (drop content);
258260
259261 /* Convert a string to a list of characters (i.e. singleton strings).
260262 This allows you to, e.g., map a function over each character. However,
@@ -325,65 +327,6 @@ rec {
325327 */
326328 escapeShellArgs = concatMapStringsSep " " escapeShellArg;
327329
328− /* Test whether the given name is a valid POSIX shell variable name.
329−
330− Type: string -> bool
331−
332− Example:
333− isValidPosixName "foo_bar000"
334− => true
335− isValidPosixName "0-bad.jpg"
336− => false
337− */
338− isValidPosixName = name: match "[a-zA-Z_][a-zA-Z0-9_]*" name != null;
339−
340− /* Translate a Nix value into a shell variable declaration, with proper escaping.
341−
342− Supported value types are strings (mapped to regular variables), lists of strings
343− (mapped to Bash-style arrays) and attribute sets of strings (mapped to Bash-style
344− associative arrays). Note that "strings" include string-coercible values like paths.
345−
346− Strings are translated into POSIX sh-compatible code; lists and attribute sets
347− assume a shell that understands Bash syntax (e.g. Bash or ZSH).
348−
349− Type: string -> (string | listOf string | attrsOf string) -> string
350−
351− Example:
352− ''
353− ${toShellVar "foo" "some string"}
354− [[ "$foo" == "some string" ]]
355− ''
356− */
357− toShellVar = name: value:
358− lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" (
359− if isAttrs value then
360− "declare -A ${name}=(${
361− concatStringsSep " " (lib.mapAttrsToList (n: v:
362− "[${escapeShellArg n}]=${escapeShellArg v}"
363− ) value)
364− })"
365− else if isList value then
366− "declare -a ${name}=(${escapeShellArgs value})"
367− else
368− "${name}=${escapeShellArg value}"
369− );
370−
371− /* Translate an attribute set into corresponding shell variable declarations
372− using `toShellVar`.
373−
374− Type: attrsOf (string | listOf string | attrsOf string) -> string
375−
376− Example:
377− let
378− foo = "value";
379− bar = foo;
380− in ''
381− ${toShellVars { inherit foo bar; }}
382− [[ "$foo" == "$bar" ]]
383− ''
384− */
385− toShellVars = vars: concatStringsSep "\n" (lib.mapAttrsToList toShellVar vars);
386−
387330 /* Turn a string into a Nix expression representing that string
388331
389332 Type: string -> string
@@ -813,14 +756,7 @@ rec {
813756 sanitizeDerivationName pkgs.hello
814757 => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10"
815758 */
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 [
759+ sanitizeDerivationName = string: lib.pipe string [
824760 # Get rid of string context. This is safe under the assumption that the
825761 # resulting string is only used as a derivation name
826762 unsafeDiscardStringContext
@@ -838,131 +774,4 @@ rec {
838774 (x: if stringLength x == 0 then "unknown" else x)
839775 ];
840776
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;
968777}
lib/systems/default.nix+1−2
@@ -105,8 +105,7 @@ rec {
105105 else if final.isAarch64 then "arm64"
106106 else if final.isx86_32 then "i386"
107107 else if final.isx86_64 then "x86_64"
108− else if final.isMips32 then "mips"
109− else if final.isMips64 then "mips" # linux kernel does not distinguish mips32/mips64
108+ else if final.isMips then "mips"
110109 else if final.isPower then "powerpc"
111110 else if final.isRiscV then "riscv"
112111 else if final.isS390 then "s390"
lib/systems/doubles.nix+2−8
@@ -26,7 +26,7 @@ let
2626
2727 # Linux
2828 "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
29− "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "mips64el-linux"
29+ "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux"
3030 "powerpc64-linux" "powerpc64le-linux" "riscv32-linux"
3131 "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux"
3232
@@ -74,8 +74,6 @@ in {
7474 mips = filterDoubles predicates.isMips;
7575 mmix = filterDoubles predicates.isMmix;
7676 riscv = filterDoubles predicates.isRiscV;
77− riscv32 = filterDoubles predicates.isRiscV32;
78− riscv64 = filterDoubles predicates.isRiscV64;
7977 vc4 = filterDoubles predicates.isVc4;
8078 or1k = filterDoubles predicates.isOr1k;
8179 m68k = filterDoubles predicates.isM68k;
@@ -89,11 +87,7 @@ in {
8987 darwin = filterDoubles predicates.isDarwin;
9088 freebsd = filterDoubles predicates.isFreeBSD;
9189 # Should be better, but MinGW is unclear.
92− gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; })
93− ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; })
94− ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; })
95− ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabin32; })
96− ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabi64; });
90+ 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; });
9791 illumos = filterDoubles predicates.isSunOS;
9892 linux = filterDoubles predicates.isLinux;
9993 netbsd = filterDoubles predicates.isNetBSD;
lib/systems/examples.nix−20
@@ -93,26 +93,6 @@ rec {
9393 config = "mipsel-unknown-linux-gnu";
9494 } // platforms.fuloong2f_n32;
9595
96− # MIPS ABI table transcribed from here: https://wiki.debian.org/Multiarch/Tuples
97−
98− # can execute on 32bit chip
99− mips-linux-gnu = { config = "mips-linux-gnu"; } // platforms.gcc_mips32r2_o32;
100− mipsel-linux-gnu = { config = "mipsel-linux-gnu"; } // platforms.gcc_mips32r2_o32;
101− mipsisa32r6-linux-gnu = { config = "mipsisa32r6-linux-gnu"; } // platforms.gcc_mips32r6_o32;
102− mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-linux-gnu"; } // platforms.gcc_mips32r6_o32;
103−
104− # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers
105− mips64-linux-gnuabin32 = { config = "mips64-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
106− mips64el-linux-gnuabin32 = { config = "mips64el-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
107− mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32;
108− mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32;
109−
110− # 64bit pointers
111− mips64-linux-gnuabi64 = { config = "mips64-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
112− mips64el-linux-gnuabi64 = { config = "mips64el-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
113− mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-linux-gnuabi64"; } // platforms.gcc_mips64r6_64;
114− mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-linux-gnuabi64"; } // platforms.gcc_mips64r6_64;
115−
11696 muslpi = raspberryPi // {
11797 config = "armv6l-unknown-linux-musleabihf";
11898 };
lib/systems/inspect.nix+1−8
@@ -13,19 +13,12 @@ rec {
1313 isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
1414 isPowerPC = { cpu = cpuTypes.powerpc; };
1515 isPower = { cpu = { family = "power"; }; };
16− isPower64 = { cpu = { family = "power"; bits = 64; }; };
1716 isx86 = { cpu = { family = "x86"; }; };
1817 isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
1918 isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
2019 isMips = { cpu = { family = "mips"; }; };
21− isMips32 = { cpu = { family = "mips"; bits = 32; }; };
22− isMips64 = { cpu = { family = "mips"; bits = 64; }; };
23− isMips64n32 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "n32"; }; };
24− isMips64n64 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "64"; }; };
2520 isMmix = { cpu = { family = "mmix"; }; };
2621 isRiscV = { cpu = { family = "riscv"; }; };
27− isRiscV32 = { cpu = { family = "riscv"; bits = 32; }; };
28− isRiscV64 = { cpu = { family = "riscv"; bits = 64; }; };
2922 isSparc = { cpu = { family = "sparc"; }; };
3023 isWasm = { cpu = { family = "wasm"; }; };
3124 isMsp430 = { cpu = { family = "msp430"; }; };
@@ -64,7 +57,7 @@ rec {
6457
6558 isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
6659 isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf ];
67− isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ];
60+ isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
6861 isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
6962
7063 isEfi = map (family: { cpu.family = family; })
lib/systems/parse.nix+2−9
@@ -359,20 +359,13 @@ rec {
359359 ];
360360 };
361361 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"; };
369362
370363 musleabi = { float = "soft"; };
371364 musleabihf = { float = "hard"; };
372365 musl = {};
373366
374− uclibceabi = { float = "soft"; };
375− uclibceabihf = { float = "hard"; };
367+ uclibceabihf = { float = "soft"; };
368+ uclibceabi = { float = "hard"; };
376369 uclibc = {};
377370
378371 unknown = {};
lib/systems/platforms.nix+1−48
@@ -1,10 +1,3 @@
1−# Note: lib/systems/default.nix takes care of producing valid,
2−# fully-formed "platform" values (e.g. hostPlatform, buildPlatform,
3−# targetPlatform, etc) containing at least the minimal set of attrs
4−# required (see types.parsedPlatform in lib/systems/parse.nix). This
5−# file takes an already-valid platform and further elaborates it with
6−# optional fields; currently these are: linux-kernel, gcc, and rustc.
7−
81{ lib }:
92rec {
103 pc = {
@@ -489,43 +482,6 @@ rec {
489482 };
490483 };
491484
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−
529485 ##
530486 ## Other
531487 ##
@@ -543,9 +499,6 @@ rec {
543499 };
544500 };
545501
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.
549502 select = platform:
550503 # x86
551504 /**/ if platform.isx86 then pc
@@ -568,5 +521,5 @@ rec {
568521
569522 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
570523
571− else { };
524+ else pc;
572525}
lib/tests/flakes/subflakeTest/flake.nixdeleted−8
@@ -1,8 +0,0 @@
1−{
2− outputs = { self, subflake, callLocklessFlake }: rec {
3− x = (callLocklessFlake {
4− path = subflake;
5− inputs = {};
6− }).subflakeOutput;
7− };
8−}
lib/tests/flakes/subflakeTest/subflake/flake.nixdeleted−5
@@ -1,5 +0,0 @@
1−{
2− outputs = { self }: {
3− subflakeOutput = 1;
4− };
5−}
lib/tests/misc.nix+1−429
@@ -22,15 +22,6 @@ in
2222
2323runTests {
2424
25−# FLAKES
26−
27− testCallLocklessFlake = {
28− expr = callLocklessFlake {
29− path = ./flakes/subflakeTest;
30− inputs = { subflake = ./flakes/subflakeTest/subflake; inherit callLocklessFlake; };
31− };
32− expected = { x = 1; outPath = ./flakes/subflakeTest; };
33− };
3425
3526# TRIVIAL
3627
@@ -260,56 +251,6 @@ runTests {
260251 expected = ""test" 'test' < & >";
261252 };
262253
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−
313254# LISTS
314255
315256 testFilter = {
@@ -530,66 +471,6 @@ runTests {
530471 '';
531472 };
532473
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−
593474 /* right now only invocation check */
594475 testToJSONSimple =
595476 let val = {
@@ -768,11 +649,6 @@ runTests {
768649 expected = "foo";
769650 };
770651
771− testSanitizeDerivationNameUnicode = testSanitizeDerivationName {
772− name = "fö";
773− expected = "f-";
774− };
775−
776652 testSanitizeDerivationNameAscii = testSanitizeDerivationName {
777653 name = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
778654 expected = "-+--.-0123456789-=-?-ABCDEFGHIJKLMNOPQRSTUVWXYZ-_-abcdefghijklmnopqrstuvwxyz-";
@@ -815,7 +691,7 @@ runTests {
815691
816692 locs = filter (o: ! o.internal) (optionAttrSetToDocList options);
817693 in map (o: o.loc) locs;
818− expected = [ [ "_module" "args" ] [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
694+ expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
819695 };
820696
821697 testCartesianProductOfEmptySet = {
@@ -885,308 +761,4 @@ runTests {
885761 { a = 3; b = 30; c = 300; }
886762 ];
887763 };
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− };
1192764}
lib/tests/modules.sh+1−33
@@ -62,13 +62,6 @@ checkConfigError() {
6262checkConfigOutput '^false$' config.enable ./declare-enable.nix
6363checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix
6464
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
71−
7265# Check integer types.
7366# unsigned
7467checkConfigOutput '^42$' config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix
@@ -247,11 +240,6 @@ checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-
247240checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix
248241checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix
249242checkConfigOutput '^"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
255243
256244## types.anything
257245# Check that attribute sets are merged recursively
@@ -293,7 +281,7 @@ checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix
293281
294282# moduleType
295283checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix
296−checkConfigOutput '^"a b y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
284+checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
297285checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix
298286
299287## emptyValue's
@@ -311,26 +299,6 @@ checkConfigOutput "10" config.processedToplevel ./raw.nix
311299checkConfigError "The option .multiple. is defined multiple times" config.multiple ./raw.nix
312300checkConfigOutput "bar" config.priorities ./raw.nix
313301
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
333−
334302cat <<EOF
335303====== module tests ======
336304$pass Pass
lib/tests/modules/adhoc-freeformType-survives-type-merge.nixdeleted−14
@@ -1,14 +0,0 @@
1−{ lib, ... }: {
2− options.dummy = lib.mkOption { type = lib.types.anything; default = {}; };
3− freeformType =
4− let
5− a = lib.types.attrsOf (lib.types.submodule { options.bar = lib.mkOption { }; });
6− in
7− # modifying types like this breaks type merging.
8− # This test makes sure that type merging is not performed when only a single declaration exists.
9− # Don't modify types in practice!
10− a // {
11− merge = loc: defs: { freeformItems = a.merge loc defs; };
12− };
13− config.foo.bar = "ok";
14−}
lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nixdeleted−10
@@ -1,10 +0,0 @@
1−{ lib, ... }:
2−let
3− inherit (lib) mkOption types;
4−in
5−{
6− options.bare-submodule.deep = mkOption {
7− type = types.int;
8− default = 2;
9− };
10−}
lib/tests/modules/declare-bare-submodule-deep-option.nixdeleted−10
@@ -1,10 +0,0 @@
1−{ lib, ... }:
2−let
3− inherit (lib) mkOption types;
4−in
5−{
6− options.bare-submodule.deep = mkOption {
7− type = types.int;
8− default = 2;
9− };
10−}
lib/tests/modules/declare-bare-submodule-nested-option.nixdeleted−19
@@ -1,19 +0,0 @@
1−{ config, lib, ... }:
2−let
3− inherit (lib) mkOption types;
4−in
5−{
6− options.bare-submodule = mkOption {
7− type = types.submoduleWith {
8− shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig;
9− modules = [
10− {
11− options.nested = mkOption {
12− type = types.int;
13− default = 1;
14− };
15− }
16− ];
17− };
18− };
19−}
lib/tests/modules/declare-bare-submodule.nixdeleted−18
@@ -1,18 +0,0 @@
1−{ config, lib, ... }:
2−let
3− inherit (lib) mkOption types;
4−in
5−{
6− options.bare-submodule = mkOption {
7− type = types.submoduleWith {
8− modules = [ ];
9− shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig;
10− };
11− default = {};
12− };
13−
14− # config-dependent options: won't recommend, but useful for making this test parameterized
15− options.shorthandOnlyDefinesConfig = mkOption {
16− default = false;
17− };
18−}
lib/tests/modules/declare-set.nixdeleted−12
@@ -1,12 +0,0 @@
1−{ lib, ... }:
2−
3−{
4− options.set = lib.mkOption {
5− default = { };
6− example = { a = 1; };
7− type = lib.types.attrsOf lib.types.int;
8− description = ''
9− Some descriptive text
10− '';
11− };
12−}
lib/tests/modules/define-bare-submodule-values.nixdeleted−4
@@ -1,4 +0,0 @@
1−{
2− bare-submodule.nested = 42;
3− bare-submodule.deep = 420;
4−}
lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nixdeleted−1
@@ -1 +0,0 @@
1−{ shorthandOnlyDefinesConfig = true; }
lib/tests/modules/extendModules-168767-imports.nixdeleted−41
@@ -1,41 +0,0 @@
1−{ lib
2−, extendModules
3−, ...
4−}:
5−with lib;
6−{
7− imports = [
8−
9− {
10− options.sub = mkOption {
11− default = { };
12− type = types.submodule (
13− { config
14− , extendModules
15− , ...
16− }:
17− {
18− options.value = mkOption {
19− type = types.int;
20− };
21−
22− options.specialisation = mkOption {
23− default = { };
24− inherit
25− (extendModules {
26− modules = [{
27− specialisation = mkOverride 0 { };
28− }];
29− })
30− type;
31− };
32− }
33− );
34− };
35− }
36−
37− { config.sub.value = 1; }
38−
39−
40− ];
41−}
lib/tests/modules/freeform-submodules.nixdeleted−22
@@ -1,22 +0,0 @@
1−{ lib, options, ... }: with lib.types; {
2−
3− options.fooDeclarations = lib.mkOption {
4− default = (options.free.type.getSubOptions [])._freeformOptions.foo.declarations;
5− };
6−
7− options.free = lib.mkOption {
8− type = submodule {
9− config._module.freeformType = lib.mkMerge [
10− (attrsOf (submodule {
11− options.foo = lib.mkOption {};
12− }))
13− (attrsOf (submodule {
14− options.bar = lib.mkOption {};
15− }))
16− ];
17− };
18− };
19−
20− config.free.xxx.foo = 10;
21− config.free.yyy.bar = 10;
22−}
lib/tests/modules/optionTypeFile.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ config, lib, ... }: {
2−
3− _file = "optionTypeFile.nix";
4−
5− options.theType = lib.mkOption {
6− type = lib.types.optionType;
7− };
8−
9− options.theOption = lib.mkOption {
10− type = config.theType;
11− default = {};
12− };
13−
14− config.theType = lib.mkMerge [
15− (lib.types.submodule {
16− options.nested = lib.mkOption {
17− type = lib.types.int;
18− };
19− })
20− (lib.types.submodule {
21− _file = "other.nix";
22− options.nested = lib.mkOption {
23− type = lib.types.str;
24− };
25− })
26− ];
27−
28−}
lib/tests/modules/optionTypeMerging.nixdeleted−27
@@ -1,27 +0,0 @@
1−{ config, lib, ... }: {
2−
3− options.theType = lib.mkOption {
4− type = lib.types.optionType;
5− };
6−
7− options.theOption = lib.mkOption {
8− type = config.theType;
9− };
10−
11− config.theType = lib.mkMerge [
12− (lib.types.submodule {
13− options.int = lib.mkOption {
14− type = lib.types.int;
15− default = 10;
16− };
17− })
18− (lib.types.submodule {
19− options.str = lib.mkOption {
20− type = lib.types.str;
21− };
22− })
23− ];
24−
25− config.theOption.str = "hello";
26−
27−}
lib/tests/systems.nix+2−5
@@ -17,11 +17,8 @@ with lib.systems.doubles; lib.runTests {
1717
1818 testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];
1919 testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
20− testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
20+ testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ];
2121 testmmix = mseteq mmix [ "mmix-mmixware" ];
22− testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ];
23− testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ];
24− testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ];
2522 testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
2623
2724 testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
@@ -31,7 +28,7 @@ with lib.systems.doubles; lib.runTests {
3128 testredox = mseteq redox [ "x86_64-redox" ];
3229 testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
3330 testillumos = mseteq illumos [ "x86_64-solaris" ];
34− testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ];
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" "m68k-linux" "s390-linux" "s390x-linux" ];
3532 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" ];
3633 testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
3734 testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
lib/trivial.nix+1−58
@@ -166,30 +166,6 @@ rec {
166166 /* Returns the current nixpkgs release number as string. */
167167 release = lib.strings.fileContents ../.version;
168168
169− /* The latest release that is supported, at the time of release branch-off,
170− if applicable.
171−
172− Ideally, out-of-tree modules should be able to evaluate cleanly with all
173− supported Nixpkgs versions (master, release and old release until EOL).
174− So if possible, deprecation warnings should take effect only when all
175− out-of-tree expressions/libs/modules can upgrade to the new way without
176− losing support for supported Nixpkgs versions.
177−
178− This release number allows deprecation warnings to be implemented such that
179− they take effect as soon as the oldest release reaches end of life. */
180− oldestSupportedRelease =
181− # Update on master only. Do not backport.
182− 2111;
183−
184− /* Whether a feature is supported in all supported releases (at the time of
185− release branch-off, if applicable). See `oldestSupportedRelease`. */
186− isInOldestRelease =
187− /* Release number of feature introduction as an integer, e.g. 2111 for 21.11.
188− Set it to the upcoming release, matching the nixpkgs/.version file.
189− */
190− release:
191− release <= lib.trivial.oldestSupportedRelease;
192−
193169 /* Returns the current nixpkgs release code name.
194170
195171 On each release the first letter is bumped and a new animal is chosen
@@ -347,14 +323,7 @@ rec {
347323
348324 Type: bool -> string -> a -> a
349325 */
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;
326+ warnIf = cond: msg: if cond then warn msg else id;
358327
359328 /*
360329 Like the `assert b; e` expression, but with a custom error message and
@@ -378,13 +347,6 @@ rec {
378347 */
379348 throwIfNot = cond: msg: if cond then x: x else throw msg;
380349
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−
388350 /* Check if the elements in a list are valid values from a enum, returning the identity function, or throwing an error message otherwise.
389351
390352 Example:
@@ -441,25 +403,6 @@ rec {
441403 isFunction = f: builtins.isFunction f ||
442404 (f ? __functor && isFunction (f.__functor f));
443405
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−
463406 /* Convert the given positive integer to a string of its hexadecimal
464407 representation. For example:
465408
lib/types.nix+19−64
@@ -61,11 +61,7 @@ let
6161 boolToString
6262 ;
6363
64− inherit (lib.modules)
65− mergeDefinitions
66− fixupOptionType
67− mergeOptionDecls
68− ;
64+ inherit (lib.modules) mergeDefinitions;
6965 outer_types =
7066rec {
7167 isType = type: x: (x._type or "") == type;
@@ -368,21 +364,13 @@ rec {
368364 emptyValue = { value = {}; };
369365 };
370366
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.
367+ # derivation is a reserved keyword.
378368 package = mkOptionType {
379369 name = "package";
380370 check = x: isDerivation x || isStorePath x;
381371 merge = loc: defs:
382372 let res = mergeOneOption loc defs;
383− in if builtins.isPath res || (builtins.isString res && ! builtins.hasContext res)
384− then toDerivation res
385− else res;
373+ in if isDerivation res then res else toDerivation res;
386374 };
387375
388376 shellPackage = package // {
@@ -522,7 +510,7 @@ rec {
522510
523511 functionTo = elemType: mkOptionType {
524512 name = "functionTo";
525− description = "function that evaluates to a(n) ${elemType.description}";
513+ description = "function that evaluates to a(n) ${elemType.name}";
526514 check = isFunction;
527515 merge = loc: defs:
528516 fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue;
@@ -537,58 +525,22 @@ rec {
537525 modules = toList modules;
538526 };
539527
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−
567528 submoduleWith =
568529 { modules
569530 , specialArgs ? {}
570531 , 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
576532 }@attrs:
577533 let
578534 inherit (lib.modules) evalModules;
579535
580− shorthandToModule = if shorthandOnlyDefinesConfig == false
581− then value: value
582− else value: { config = value; };
536+ coerce = unify: value: if isFunction value
537+ then setFunctionArgs (args: unify (value args)) (functionArgs value)
538+ else unify (if shorthandOnlyDefinesConfig then { config = value; } else value);
583539
584540 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)
541+ if isAttrs value || isFunction value then
542+ # Annotate the value with the location of its definition for better error messages
543+ coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value
592544 else value
593545 ) defs;
594546
@@ -625,7 +577,6 @@ rec {
625577 (base.extendModules {
626578 modules = [ { _module.args.name = last loc; } ] ++ allModules defs;
627579 prefix = loc;
628− extensionOffset = extensionOffset + length defs;
629580 }).config;
630581 emptyValue = { value = {}; };
631582 getSubOptions = prefix: (base.extendModules
@@ -657,11 +608,7 @@ rec {
657608 then lhs.specialArgs // rhs.specialArgs
658609 else throw "A submoduleWith option is declared multiple times with the same specialArgs \"${toString (attrNames intersecting)}\"";
659610 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
611+ if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig
665612 then lhs.shorthandOnlyDefinesConfig
666613 else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values";
667614 };
@@ -755,6 +702,14 @@ rec {
755702 nestedTypes.finalType = finalType;
756703 };
757704
705+ # Obsolete alternative to configOf. It takes its option
706+ # declarations from the ‘options’ attribute of containing option
707+ # declaration.
708+ optionSet = mkOptionType {
709+ name = "optionSet";
710+ description = "option set";
711+ deprecationMessage = "Use `types.submodule' instead";
712+ };
758713 # Augment the given type with an additional type check function.
759714 addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };
760715
maintainers/maintainer-list.nix+39−528
@@ -380,12 +380,6 @@
380380 githubId = 209175;
381381 name = "Alesya Huzik";
382382 };
383− aidalgol = {
384− email = "aidalgol+nixpkgs@fastmail.net";
385− github = "aidalgol";
386− githubId = 2313201;
387− name = "Aidan Gauland";
388− };
389383 aij = {
390384 email = "aij+git@mrph.org";
391385 github = "aij";
@@ -525,12 +519,6 @@
525519 githubId = 38869148;
526520 name = "Alex Eyre";
527521 };
528− algram = {
529− email = "aliasgram@gmail.com";
530− github = "Algram";
531− githubId = 5053729;
532− name = "Alias Gram";
533− };
534522 alibabzo = {
535523 email = "alistair.bill@gmail.com";
536524 github = "alibabzo";
@@ -681,18 +669,6 @@
681669 githubId = 858965;
682670 name = "Andrew Morsillo";
683671 };
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− };
696672 andehen = {
697673 email = "git@andehen.net";
698674 github = "andehen";
@@ -841,13 +817,6 @@
841817 githubId = 5327697;
842818 name = "Anatolii Prylutskyi";
843819 };
844− anselmschueler = {
845− email = "mail@anselmschueler.com";
846− github = "schuelermine";
847− githubId = 48802534;
848− name = "Anselm Schüler";
849− matrix = "@schuelermine:matrix.org";
850− };
851820 antoinerg = {
852821 email = "roygobeil.antoine@gmail.com";
853822 github = "antoinerg";
@@ -960,12 +929,6 @@
960929 githubId = 1296771;
961930 name = "Anders Riutta";
962931 };
963− arjan-s = {
964− email = "github@anymore.nl";
965− github = "arjan-s";
966− githubId = 10400299;
967− name = "Arjan Schrijver";
968− };
969932 arkivm = {
970933 email = "vikram186@gmail.com";
971934 github = "arkivm";
@@ -1068,8 +1031,8 @@
10681031 name = "Kirill Boltaev";
10691032 };
10701033 ashley = {
1071− email = "ashley@kira64.xyz";
1072− github = "kira64xyz";
1034+ email = "personavinny@protonmail.com";
1035+ github = "paranoidcat";
10731036 githubId = 84152630;
10741037 name = "Ashley Chiara";
10751038 };
@@ -1332,24 +1295,12 @@
13321295 githubId = 127523;
13331296 name = "Herman Fries";
13341297 };
1335− BarinovMaxim = {
1336− name = "Barinov Maxim";
1337− email = "barinov274@gmail.com";
1338− github = "barinov274";
1339− githubId = 54442153;
1340− };
13411298 barrucadu = {
13421299 email = "mike@barrucadu.co.uk";
13431300 github = "barrucadu";
13441301 githubId = 75235;
13451302 name = "Michael Walker";
13461303 };
1347− bartsch = {
1348− email = "consume.noise@gmail.com";
1349− github = "bartsch";
1350− githubId = 3390885;
1351− name = "Daniel Martin";
1352− };
13531304 bartuka = {
13541305 email = "wand@hey.com";
13551306 github = "wandersoncferreira";
@@ -1409,12 +1360,6 @@
14091360 githubId = 164148;
14101361 name = "Ben Darwin";
14111362 };
1412− bdd = {
1413− email = "bdd@mindcast.org";
1414− github = "bdd";
1415− githubId = 11135;
1416− name = "Berk D. Demir";
1417− };
14181363 bdesham = {
14191364 email = "benjamin@esham.io";
14201365 github = "bdesham";
@@ -1737,12 +1682,6 @@
17371682 githubId = 355401;
17381683 name = "Brian Hicks";
17391684 };
1740− brianmcgee = {
1741− name = "Brian McGee";
1742− email = "brian@41north.dev";
1743− github = "brianmcgee";
1744− githubId = 1173648;
1745− };
17461685 Br1ght0ne = {
17471686 email = "brightone@protonmail.com";
17481687 github = "Br1ght0ne";
@@ -1831,12 +1770,6 @@
18311770 githubId = 7214361;
18321771 name = "Roman Gerasimenko";
18331772 };
1834− builditluc = {
1835− email = "builditluc@icloud.com";
1836− github = "builditluc";
1837− githubId = 37375448;
1838− name = "Buildit";
1839− };
18401773 bburdette = {
18411774 email = "bburdette@protonmail.com";
18421775 github = "bburdette";
@@ -1956,12 +1889,6 @@
19561889 githubId = 82591;
19571890 name = "Carl Sverre";
19581891 };
1959− carpinchomug = {
1960− email = "aki.suda@protonmail.com";
1961− github = "carpinchomug";
1962− githubId = 101536256;
1963− name = "Akiyoshi Suda";
1964− };
19651892 cartr = {
19661893 email = "carter.sande@duodecima.technology";
19671894 github = "cartr";
@@ -2086,12 +2013,6 @@
20862013 githubId = 8228888;
20872014 name = "Charlie Hanley";
20882015 };
2089− charlesbaynham = {
2090− email = "charlesbaynham@gmail.com";
2091− github = "charlesbaynham";
2092− githubId = 4397637;
2093− name = "Charles Baynham";
2094− };
20952016 CharlesHD = {
20962017 email = "charleshdespointes@gmail.com";
20972018 github = "CharlesHD";
@@ -2132,6 +2053,12 @@
21322053 githubId = 18648043;
21332054 name = "Daniel Cartwright";
21342055 };
2056+ chiiruno = {
2057+ email = "okinan@protonmail.com";
2058+ github = "chiiruno";
2059+ githubId = 30435868;
2060+ name = "Okina Matara";
2061+ };
21352062 Chili-Man = {
21362063 email = "dr.elhombrechile@gmail.com";
21372064 name = "Diego Rodriguez";
@@ -2248,12 +2175,6 @@
22482175 githubId = 42220376;
22492176 name = "Charlotte Van Petegem";
22502177 };
2251− cigrainger = {
2252− name = "Christopher Grainger";
2253− email = "chris@amplified.ai";
2254− github = "cigrainger";
2255− githubId = 3984794;
2256− };
22572178 ciil = {
22582179 email = "simon@lackerbauer.com";
22592180 github = "ciil";
@@ -2297,13 +2218,12 @@
22972218 ckie = {
22982219 email = "nixpkgs-0efe364@ckie.dev";
22992220 github = "ckiee";
2300− githubId = 25263210;
2221+ githubId = 2526321;
23012222 keys = [{
23022223 longkeyid = "rsa4096/0x13E79449C0525215";
23032224 fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215";
23042225 }];
23052226 name = "ckie";
2306− matrix = "@ckie:ckie.dev";
23072227 };
23082228 clkamp = {
23092229 email = "c@lkamp.de";
@@ -2498,23 +2418,6 @@
24982418 githubId = 5510514;
24992419 name = "Conrad Mearns";
25002420 };
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− };
25182421 couchemar = {
25192422 email = "couchemar@yandex.ru";
25202423 github = "couchemar";
@@ -2874,12 +2777,6 @@
28742777 githubId = 49904992;
28752778 name = "Dawid Sowa";
28762779 };
2877− dbeckwith = {
2878− email = "djbsnx@gmail.com";
2879− github = "dbeckwith";
2880− githubId = 1279939;
2881− name = "Daniel Beckwith";
2882− };
28832780 dbirks = {
28842781 email = "david@birks.dev";
28852782 github = "dbirks";
@@ -3881,13 +3778,6 @@
38813778 githubId = 222467;
38823779 name = "Dmitry Ivanov";
38833780 };
3884− ethindp = {
3885− name = "Ethin Probst";
3886− email = "harlydavidsen@gmail.com";
3887− matrix = "@ethindp:the-gdn.net";
3888− github = "ethindp";
3889− githubId = 8030501;
3890− };
38913781 Etjean = {
38923782 email = "et.jean@outlook.fr";
38933783 github = "Etjean";
@@ -4124,18 +4014,11 @@
41244014 matrix = "@felschr:matrix.org";
41254015 github = "felschr";
41264016 githubId = 3314323;
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− ];
4017+ name = "Felix Tenley";
4018+ keys = [{
4019+ longkeyid = "ed25519/0x910ACB9F6BD26F58";
4020+ fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";
4021+ }];
41394022 };
41404023 ffinkdevs = {
41414024 email = "fink@h0st.space";
@@ -4311,12 +4194,7 @@
43114194 githubId = 119691;
43124195 name = "Michael Gough";
43134196 };
4314− freax13 = {
4315− email = "erbse.13@gmx.de";
4316− github = "freax13";
4317− githubId = 14952658;
4318− name = "Tom Dohrmann";
4319− };
4197+
43204198 fredeb = {
43214199 email = "im@fredeb.dev";
43224200 github = "fredeeb";
@@ -4560,12 +4438,6 @@
45604438 githubId = 3217744;
45614439 name = "Peter Ferenczy";
45624440 };
4563− ghostbuster91 = {
4564− name = "Kasper Kondzielski";
4565− email = "kghost0@gmail.com";
4566− github = "ghostbuster91";
4567− githubId = 5662622;
4568− };
45694441 ghuntley = {
45704442 email = "ghuntley@ghuntley.com";
45714443 github = "ghuntley";
@@ -4720,12 +4592,6 @@
47204592 githubId = 4656860;
47214593 name = "Gaute Ravndal";
47224594 };
4723− graysonhead = {
4724− email = "grayson@graysonhead.net";
4725− github = "graysonhead";
4726− githubId = 6179496;
4727− name = "Grayson Head";
4728− };
47294595 grburst = {
47304596 email = "GRBurst@protonmail.com";
47314597 github = "GRBurst";
@@ -4754,12 +4620,6 @@
47544620 githubId = 201997;
47554621 name = "Eric Seidel";
47564622 };
4757− grindhold = {
4758− name = "grindhold";
4759− email = "grindhold+nix@skarphed.org";
4760− github = "grindhold";
4761− githubId = 2592640;
4762− };
47634623 gspia = {
47644624 email = "iahogsp@gmail.com";
47654625 github = "gspia";
@@ -4778,12 +4638,6 @@
47784638 githubId = 343415;
47794639 name = "Greg Roodt";
47804640 };
4781− grnnja = {
4782− email = "grnnja@gmail.com";
4783− github = "grnnja";
4784− githubId = 31556469;
4785− name = "Prem Netsuwan";
4786− };
47874641 gruve-p = {
47884642 email = "groestlcoin@gmail.com";
47894643 github = "gruve-p";
@@ -5499,12 +5353,6 @@
54995353 githubId = 41924494;
55005354 name = "Ivar";
55015355 };
5502− iwanb = {
5503− email = "tracnar@gmail.com";
5504− github = "iwanb";
5505− githubId = 4035835;
5506− name = "Iwan";
5507− };
55085356 ixmatus = {
55095357 email = "parnell@digitalmentat.com";
55105358 github = "ixmatus";
@@ -5649,12 +5497,6 @@
56495497 githubId = 488556;
56505498 name = "Javier Aguirre";
56515499 };
5652− jayesh-bhoot = {
5653− name = "Jayesh Bhoot";
5654− email = "jayesh@bhoot.sh";
5655− github = "jayesh-bhoot";
5656− githubId = 1915507;
5657− };
56585500 jb55 = {
56595501 email = "jb55@jb55.com";
56605502 github = "jb55";
@@ -5760,12 +5602,6 @@
57605602 github = "jduan";
57615603 githubId = 452450;
57625604 };
5763− jdupak = {
5764− name = "Jakub Dupak";
5765− email = "dev@jakubdupak.com";
5766− github = "jdupak";
5767− githubId = 22683640;
5768− };
57695605 jecaro = {
57705606 email = "jeancharles.quillet@gmail.com";
57715607 github = "jecaro";
@@ -5986,12 +5822,6 @@
59865822 githubId = 587870;
59875823 name = "Jonathan Mettes";
59885824 };
5989− jmgilman = {
5990− email = "joshuagilman@gmail.com";
5991− github = "jmgilman";
5992− githubId = 2308444;
5993− name = "Joshua Gilman";
5994− };
59955825 jo1gi = {
59965826 email = "joakimholm@protonmail.com";
59975827 github = "jo1gi";
@@ -6503,12 +6333,6 @@
65036333 githubId = 37185887;
65046334 name = "Calvin Kim";
65056335 };
6506− keldu = {
6507− email = "mail@keldu.de";
6508− github = "keldu";
6509− githubId = 15373888;
6510− name = "Claudius Holeksa";
6511− };
65126336 kennyballou = {
65136337 email = "kb@devnulllabs.io";
65146338 github = "kennyballou";
@@ -6885,6 +6709,12 @@
68856709 githubId = 99639;
68866710 name = "Pawel Kruszewski";
68876711 };
6712+ ktosiek = {
6713+ email = "tomasz.kontusz@gmail.com";
6714+ github = "ktosiek";
6715+ githubId = 278013;
6716+ name = "Tomasz Kontusz";
6717+ };
68886718 kubukoz = {
68896719 email = "kubukoz@gmail.com";
68906720 github = "kubukoz";
@@ -7218,13 +7048,6 @@
72187048 githubId = 1769386;
72197049 name = "Liam Diprose";
72207050 };
7221− libjared = {
7222− email = "jared@perrycode.com";
7223− github = "libjared";
7224− githubId = 3746656;
7225− matrix = "@libjared:matrix.org";
7226− name = "Jared Perry";
7227− };
72287051 liff = {
72297052 email = "liff@iki.fi";
72307053 github = "liff";
@@ -7255,13 +7078,6 @@
72557078 githubId = 714;
72567079 name = "Lily Ballard";
72577080 };
7258− lilyinstarlight = {
7259− email = "lily@lily.flowers";
7260− matrix = "@lily:lily.flowers";
7261− github = "lilyinstarlight";
7262− githubId = 298109;
7263− name = "Lily Foster";
7264− };
72657081 limeytexan = {
72667082 email = "limeytexan@gmail.com";
72677083 github = "limeytexan";
@@ -7372,29 +7188,6 @@
73727188 githubId = 1267527;
73737189 name = "Daniel Firth";
73747190 };
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− };
73987191 lopsided98 = {
73997192 email = "benwolsieffer@gmail.com";
74007193 github = "lopsided98";
@@ -7885,16 +7678,6 @@
78857678 githubId = 279868;
78867679 name = "Matti Kariluoma";
78877680 };
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− };
78987681 maurer = {
78997682 email = "matthew.r.maurer+nix@gmail.com";
79007683 github = "maurer";
@@ -7941,12 +7724,6 @@
79417724 githubId = 1187050;
79427725 name = "Maximilian Huber";
79437726 };
7944− maximsmol = {
7945− email = "maximsmol@gmail.com";
7946− github = "maximsmol";
7947− githubId = 1472826;
7948− name = "Max Smolin";
7949− };
79507727 maxxk = {
79517728 email = "maxim.krivchikov@gmail.com";
79527729 github = "maxxk";
@@ -8169,24 +7946,12 @@
81697946 githubId = 668926;
81707947 name = "Maximilian Güntner";
81717948 };
8172− mh = {
8173− email = "68288772+markus-heinrich@users.noreply.github.com";
8174− github = "markus-heinrich";
8175− githubId = 68288772;
8176− name = "Markus Heinrich";
8177− };
81787949 mhaselsteiner = {
81797950 email = "magdalena.haselsteiner@gmx.at";
81807951 github = "mhaselsteiner";
81817952 githubId = 20536514;
81827953 name = "Magdalena Haselsteiner";
81837954 };
8184− mh182 = {
8185− email = "mh182@chello.at";
8186− github = "mh182";
8187− githubId = 9980864;
8188− name = "Max Hofer";
8189− };
81907955 mic92 = {
81917956 email = "joerg@thalheim.io";
81927957 matrix = "@mic92:nixos.dev";
@@ -8360,17 +8125,6 @@
83608125 githubId = 1776903;
83618126 name = "Andrew Abbott";
83628127 };
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− };
83748128 mitchmindtree = {
83758129 email = "mail@mitchellnordine.com";
83768130 github = "mitchmindtree";
@@ -8617,17 +8371,6 @@
86178371 githubId = 3073833;
86188372 name = "Massimo Redaelli";
86198373 };
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− };
86318374 mrkkrp = {
86328375 email = "markkarpov92@gmail.com";
86338376 github = "mrkkrp";
@@ -8668,7 +8411,7 @@
86688411 };
86698412 msfjarvis = {
86708413 github = "msfjarvis";
8671− githubId = 13348378;
8414+ githubId = 3348378;
86728415 name = "Harsh Shandilya";
86738416 email = "nixos@msfjarvis.dev";
86748417 keys = [{
@@ -8772,17 +8515,6 @@
87728515 githubId = 25388474;
87738516 name = "Matej Urbas";
87748517 };
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− };
87868518 mvnetbiz = {
87878519 email = "mvnetbiz@gmail.com";
87888520 matrix = "@mvtva:matrix.org";
@@ -8881,12 +8613,6 @@
88818613 fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE";
88828614 }];
88838615 };
8884− nbr = {
8885− email = "nbr@users.noreply.github.com";
8886− github = "nbr";
8887− githubId = 3819225;
8888− name = "Nick Braga";
8889− };
88908616 nbren12 = {
88918617 email = "nbren12@gmail.com";
88928618 github = "nbren12";
@@ -8922,12 +8648,6 @@
89228648 githubId = 3747396;
89238649 name = "Nathan Isom";
89248650 };
8925− neilmayhew = {
8926− email = "nix@neil.mayhew.name";
8927− github = "neilmayhew";
8928− githubId = 166791;
8929− name = "Neil Mayhew";
8930− };
89318651 nelsonjeppesen = {
89328652 email = "nix@jeppesen.io";
89338653 github = "NelsonJeppesen";
@@ -9056,12 +8776,6 @@
90568776 githubId = 8214542;
90578777 name = "Nicolò Balzarotti";
90588778 };
9059− nidabdella = {
9060− name = "Mohamed Nidabdella";
9061− email = "nidabdella.mohamed@gmail.com";
9062− github = "nidabdella";
9063− githubId = 8083813;
9064− };
90658779 NieDzejkob = {
90668780 email = "kuba@kadziolka.net";
90678781 github = "NieDzejkob";
@@ -9367,12 +9081,6 @@
93679081 githubId = 158758;
93689082 name = "Oliver Dunkl";
93699083 };
9370− ofek = {
9371− email = "oss@ofek.dev";
9372− github = "ofek";
9373− githubId = 9677399;
9374− name = "Ofek Lev";
9375− };
93769084 offline = {
93779085 email = "jaka@x-truder.net";
93789086 github = "offlinehacker";
@@ -9467,12 +9175,6 @@
94679175 githubId = 23431373;
94689176 name = "Christoph Neidahl";
94699177 };
9470− opeik = {
9471− email = "sandro@stikic.com";
9472− github = "opeik";
9473− githubId = 11566773;
9474− name = "Sandro Stikić";
9475− };
94769178 orbekk = {
94779179 email = "kjetil.orbekk@gmail.com";
94789180 github = "orbekk";
@@ -9631,13 +9333,6 @@
96319333 githubId = 71795;
96329334 name = "Mica Semrick";
96339335 };
9634− papojari = {
9635− email = "papojari-git.ovoid@aleeas.com";
9636− matrix = "@papojari:artemislena.eu";
9637− github = "papojari";
9638− githubId = 81317317;
9639− name = "papojari";
9640− };
96419336 paraseba = {
96429337 email = "paraseba@gmail.com";
96439338 github = "paraseba";
@@ -10035,12 +9730,6 @@
100359730 fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A";
100369731 }];
100379732 };
10038− podocarp = {
10039− email = "xdjiaxd@gmail.com";
10040− github = "podocarp";
10041− githubId = 10473184;
10042− name = "Jia Xiaodong";
10043− };
100449733 polendri = {
100459734 email = "paul@ijj.li";
100469735 github = "polendri";
@@ -10081,12 +9770,6 @@
100819770 fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0";
100829771 }];
100839772 };
10084− ppenguin = {
10085− name = "Jeroen Versteeg";
10086− email = "hieronymusv@gmail.com";
10087− github = "ppenguin";
10088− githubId = 17690377;
10089− };
100909773 ppom = {
100919774 name = "Paco Pompeani";
100929775 email = "paco@ecomail.io";
@@ -10300,12 +9983,6 @@
103009983 githubId = 115877;
103019984 name = "Kenny Shen";
103029985 };
10303− quag = {
10304− email = "quaggy@gmail.com";
10305− github = "quag";
10306− githubId = 35086;
10307− name = "Jonathan Wright";
10308− };
103099986 queezle = {
103109987 email = "git@queezle.net";
103119988 github = "qzle";
@@ -10449,16 +10126,6 @@
1044910126 githubId = 16487165;
1045010127 name = "Rafael Basso";
1045110128 };
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− };
1046210129 rbrewer = {
1046310130 email = "rwb123@gmail.com";
1046410131 github = "rbrewer123";
@@ -10585,18 +10252,6 @@
1058510252 githubId = 22803888;
1058610253 name = "Lu Hongxu";
1058710254 };
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− };
1060010255 rgrunbla = {
1060110256 email = "remy@grunblatt.org";
1060210257 github = "rgrunbla";
@@ -10621,13 +10276,6 @@
1062110276 githubId = 6047658;
1062210277 name = "Ryan Horiguchi";
1062310278 };
10624− rhysmdnz = {
10625− email = "rhys@memes.nz";
10626− matrix = "@rhys:memes.nz";
10627− github = "rhysmdnz";
10628− githubId = 2162021;
10629− name = "Rhys Davies";
10630− };
1063110279 ribose-jeffreylau = {
1063210280 name = "Jeffrey Lau";
1063310281 email = "jeffrey.lau@ribose.com";
@@ -11126,22 +10774,28 @@
1112610774 githubId = 132835;
1112710775 name = "Samuel Dionne-Riel";
1112810776 };
10777+ samuelgrf = {
10778+ email = "s@muel.gr";
10779+ github = "samuelgrf";
10780+ githubId = 67663538;
10781+ name = "Samuel Gräfenstein";
10782+ keys = [
10783+ {
10784+ longkeyid = "rsa4096/0xDE75F92E318123F0";
10785+ fingerprint = "6F2E 2A90 423C 8111 BFF2 895E DE75 F92E 3181 23F0";
10786+ }
10787+ {
10788+ longkeyid = "rsa4096/0xEF76A063F15C63C8";
10789+ fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8";
10790+ }
10791+ ];
10792+ };
1112910793 samuelrivas = {
1113010794 email = "samuelrivas@gmail.com";
1113110795 github = "samuelrivas";
1113210796 githubId = 107703;
1113310797 name = "Samuel Rivas";
1113410798 };
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− };
1114510799 sander = {
1114610800 email = "s.vanderburg@tudelft.nl";
1114710801 github = "svanderburg";
@@ -11248,16 +10902,6 @@
1124810902 email = "schristopher@konputa.com";
1124910903 name = "Scott Christopher";
1125010904 };
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−};
1126110905 scode = {
1126210906 email = "peter.schuller@infidyne.com";
1126310907 github = "scode";
@@ -11308,12 +10952,6 @@
1130810952 githubId = 19472270;
1130910953 name = "Sebastian";
1131010954 };
11311− sebastianblunt = {
11312− name = "Sebastian Blunt";
11313− email = "nix@sebastianblunt.com";
11314− github = "sebastianblunt";
11315− githubId = 47431204;
11316− };
1131710955 sebbadk = {
1131810956 email = "sebastian@sebba.dk";
1131910957 github = "SEbbaDK";
@@ -11368,12 +11006,6 @@
1136811006 githubId = 307899;
1136911007 name = "Gurkan Gur";
1137011008 };
11371− serge = {
11372− email = "sb@canva.com";
11373− github = "serge-belov";
11374− githubId = 38824235;
11375− name = "Serge Belov";
11376− };
1137711009 sersorrel = {
1137811010 email = "ash@sorrel.sh";
1137911011 github = "sersorrel";
@@ -11418,12 +11050,6 @@
1141811050 githubId = 1151264;
1141911051 name = "Sebastian Graf";
1142011052 };
11421− shadaj = {
11422− email = "shadaj@users.noreply.github.com";
11423− github = "shadaj";
11424− githubId = 543055;
11425− name = "Shadaj Laddad";
11426− };
1142711053 shahrukh330 = {
1142811054 email = "shahrukh330@gmail.com";
1142911055 github = "shahrukh330";
@@ -11464,12 +11090,6 @@
1146411090 githubId = 293035;
1146511091 name = "Shawn Dellysse";
1146611092 };
11467− shawn8901 = {
11468− email = "shawn8901@googlemail.com";
11469− github = "shawn8901";
11470− githubId = 12239057;
11471− name = "Shawn8901";
11472− };
1147311093 shazow = {
1147411094 email = "andrey.petrov@shazow.net";
1147511095 github = "shazow";
@@ -11620,12 +11240,6 @@
1162011240 githubId = 2770647;
1162111241 name = "Simon Vandel Sillesen";
1162211242 };
11623− sir4ur0n = {
11624− email = "sir4ur0n@users.noreply.github.com";
11625− github = "sir4ur0n";
11626− githubId = 1204125;
11627− name = "sir4ur0n";
11628− };
1162911243 siraben = {
1163011244 email = "bensiraphob@gmail.com";
1163111245 matrix = "@siraben:matrix.org";
@@ -11951,17 +11565,6 @@
1195111565 githubId = 55607356;
1195211566 name = "Stephan Heßelmann";
1195311567 };
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− };
1196511568 stelcodes = {
1196611569 email = "stel@stel.codes";
1196711570 github = "stelcodes";
@@ -12063,12 +11666,6 @@
1206311666 githubId = 1694705;
1206411667 name = "Sam Stites";
1206511668 };
12066− strager = {
12067− email = "strager.nds@gmail.com";
12068− github = "strager";
12069− githubId = 48666;
12070− name = "Matthew \"strager\" Glazar";
12071− };
1207211669 stumoss = {
1207311670 email = "samoss@gmail.com";
1207411671 github = "stumoss";
@@ -12561,12 +12158,6 @@
1256112158 githubId = 844343;
1256212159 name = "Thiago K. Okada";
1256312160 };
12564− thibaultlemaire = {
12565− email = "thibault.lemaire@protonmail.com";
12566− github = "ThibaultLemaire";
12567− githubId = 21345269;
12568− name = "Thibault Lemaire";
12569− };
1257012161 thibautmarty = {
1257112162 email = "github@thibautmarty.fr";
1257212163 matrix = "@thibaut:thibautmarty.fr";
@@ -12813,13 +12404,6 @@
1281312404 githubId = 90456;
1281412405 name = "Rebecca (Bex) Kelly";
1281512406 };
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− };
1282312407 travisbhartwell = {
1282412408 email = "nafai@travishartwell.net";
1282512409 github = "travisbhartwell";
@@ -12988,12 +12572,6 @@
1298812572 githubId = 1983821;
1298912573 name = "Eric Wolf";
1299012574 };
12991− uakci = {
12992− name = "uakci";
12993− email = "uakci@uakci.pl";
12994− github = "uakci";
12995− githubId = 6961268;
12996− };
1299712575 udono = {
1299812576 email = "udono@virtual-things.biz";
1299912577 github = "udono";
@@ -13258,12 +12836,6 @@
1325812836 githubId = 118959;
1325912837 name = "VinyMeuh";
1326012838 };
13261− viraptor = {
13262− email = "nix@viraptor.info";
13263− github = "viraptor";
13264− githubId = 188063;
13265− name = "Stanisław Pitucha";
13266− };
1326712839 viric = {
1326812840 email = "viric@viric.name";
1326912841 github = "viric";
@@ -13294,12 +12866,6 @@
1329412866 githubId = 1771332;
1329512867 name = "László Vaskó";
1329612868 };
13297− vlinkz = {
13298− email = "vmfuentes64@gmail.com";
13299− github = "vlinkz";
13300− githubId = 20145996;
13301− name = "Victor Fuentes";
13302− };
1330312869 vlstill = {
1330412870 email = "xstill@fi.muni.cz";
1330512871 github = "vlstill";
@@ -13427,12 +12993,6 @@
1342712993 githubId = 34962284;
1342812994 name = "wchresta";
1342912995 };
13430− wdavidw = {
13431− name = "David Worms";
13432− email = "david@adaltas.com";
13433− github = "wdavidw";
13434− githubId = 46896;
13435− };
1343612996 wedens = {
1343712997 email = "kirill.wedens@gmail.com";
1343812998 name = "wedens";
@@ -13592,7 +13152,7 @@
1359213152 name = "Andrei Pampu";
1359313153 };
1359413154 wolfangaukang = {
13595− email = "clone.gleeful135+nixpkgs@anonaddy.me";
13155+ email = "liquid.query960@4wrd.cc";
1359613156 github = "wolfangaukang";
1359713157 githubId = 8378365;
1359813158 name = "P. R. d. O.";
@@ -13645,13 +13205,6 @@
1364513205 github = "wunderbrick";
1364613206 githubId = 52174714;
1364713207 };
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− };
1365513208 wyvie = {
1365613209 email = "elijahrum@gmail.com";
1365713210 github = "wyvie";
@@ -14211,12 +13764,6 @@
1421113764 github = "deifactor";
1421213765 githubId = 30192992;
1421313766 };
14214− deinferno = {
14215− name = "deinferno";
14216− email = "14363193+deinferno@users.noreply.github.com";
14217− github = "deinferno";
14218− githubId = 14363193;
14219− };
1422013767 fzakaria = {
1422113768 name = "Farid Zakaria";
1422213769 email = "farid.m.zakaria@gmail.com";
@@ -14340,12 +13887,6 @@
1434013887 github = "zbioe";
1434113888 githubId = 7332055;
1434213889 };
14343− zendo = {
14344− name = "zendo";
14345− email = "linzway@qq.com";
14346− github = "zendo";
14347− githubId = 348013;
14348− };
1434913890 zenithal = {
1435013891 name = "zenithal";
1435113892 email = "i@zenithal.me";
@@ -14413,12 +13954,6 @@
1441313954 github = "jpagex";
1441413955 githubId = 635768;
1441513956 };
14416− vbrandl = {
14417− name = "Valentin Brandl";
14418− email = "mail+nixpkgs@vbrandl.net";
14419− github = "vbrandl";
14420− githubId = 20639051;
14421− };
1442213957 portothree = {
1442313958 name = "Gustavo Porto";
1442413959 email = "gustavoporto@ya.ru";
@@ -14454,28 +13989,4 @@
1445413989 github = "nigelgbanks";
1445513990 githubId = 487373;
1445613991 };
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− };
1448113992}
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− return $exitCode
12+ exit $exitCode
1313}
1414
1515trap "exitHandler" EXIT
maintainers/scripts/feature-freeze-teams.pldeleted−98
@@ -1,98 +0,0 @@
1−#!/usr/bin/env nix-shell
2−#!nix-shell -i perl -p perl -p perlPackages.JSON perlPackages.LWPUserAgent perlPackages.LWPProtocolHttps perlPackages.TermReadKey
3−
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.
9−
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/haskell/maintained-broken-pkgs.nixdeleted−22
@@ -1,22 +0,0 @@
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/merge-and-open-pr.sh+1−1
@@ -99,7 +99,7 @@ This PR is the regular merge of the \`haskell-updates\` branch into \`master\`.
9999
100100This 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).
101101
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.
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/Mw5WLnzsP7fC4Zky) for who is currently in charge of this branch.
103103
104104### haskellPackages Workflow Summary
105105
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 ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
23+extraction_derivation='with import ./. {}; runCommand "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/update-stackage.sh+12−25
@@ -1,38 +1,26 @@
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
43
54set -eu -o pipefail
65
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")
6+tmpfile=$(mktemp "update-stackage.XXXXXXX")
7+# shellcheck disable=SC2064
208
219stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml"
2210
23−trap 'rm "${tmpfile}" "${tmpfile_new}"' 0
24−touch "$tmpfile" "$tmpfile_new" # Creating files here so that trap creates no errors.
11+trap "rm ${tmpfile} ${tmpfile}.new" 0
12+touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
2513
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")"
14+curl -L -s "https://stackage.org/lts/cabal.config" >"$tmpfile"
15+old_version=$(grep "# Stackage" $stackage_config | sed -E 's/.*([0-9]{2}\.[0-9]+)/\1/')
16+version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.lts-//p" "$tmpfile")
2917
3018if [[ "$old_version" == "$version" ]]; then
3119 echo "No new stackage version"
3220 exit 0 # Nothing to do
3321fi
3422
35−echo "Updating Stackage from $old_version to $version."
23+echo "Updating Stackage LTS from $old_version to $version."
3624
3725# Create a simple yaml version of the file.
3826sed -r \
@@ -42,10 +30,10 @@ sed -r \
4230 -e 's|,$||' \
4331 -e '/installed$/d' \
4432 -e '/^$/d' \
45− < "${tmpfile}" | sort --ignore-case >"${tmpfile_new}"
33+ < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
4634
4735cat > $stackage_config << EOF
48−# Stackage $version
36+# Stackage LTS $version
4937# This file is auto-generated by
5038# maintainers/scripts/haskell/update-stackage.sh
5139default-package-overrides:
@@ -57,13 +45,12 @@ sed -r \
5745 -e '/ distribution-nixpkgs /d' \
5846 -e '/ jailbreak-cabal /d' \
5947 -e '/ language-nix /d' \
60− -e '/ cabal-install /d' \
61− < "${tmpfile_new}" >> $stackage_config
48+ < "${tmpfile}.new" >> $stackage_config
6249
6350if [[ "${1:-}" == "--do-commit" ]]; then
6451git add $stackage_config
6552git commit -F - << EOF
66−haskellPackages: stackage $old_version -> $version
53+haskellPackages: stackage-lts $old_version -> $version
6754
6855This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
6956EOF
maintainers/scripts/luarocks-packages.csv+3−4
@@ -52,7 +52,7 @@ luadbi-postgresql,,,,,,
5252luadbi-sqlite3,,,,,,
5353luaepnf,,,,,,
5454luaevent,,,,,,
55−luaexpat,,,,1.4.1-1,,arobyn flosse
55+luaexpat,,,,1.3.0-1,,arobyn flosse
5656luaffi,,,http://luarocks.org/dev,,,
5757luafilesystem,,,,1.7.0-2,,flosse
5858lualogging,,,,,,
@@ -64,12 +64,11 @@ luasocket,,,,,,
6464luasql-sqlite3,,,,,,vyp
6565luassert,,,,,,
6666luasystem,,,,,,
67−luaunbound,,,,,
6867luautf8,,,,,,pstn
6968luazip,,,,,,
7069lua-yajl,,,,,,pstn
7170luuid,,,,,,
72−luv,,,,1.43.0-0,,
71+luv,,,,1.42.0-0,,
7372lyaml,,,,,,lblasc
7473markdown,,,,,,
7574mediator_lua,,,,,,
@@ -82,6 +81,6 @@ rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
8281readline,,,,,,
8382say,https://github.com/Olivine-Labs/say.git,,,,,
8483std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
85−std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
84+std.normalize,git://github.com/lua-stdlib/normalize.git,,,,,
8685stdlib,,,,41.2.2,,vyp
8786vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
maintainers/scripts/pluginupdate.py+108−135
@@ -8,7 +8,6 @@
88# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
99
1010import argparse
11−import csv
1211import functools
1312import http
1413import json
@@ -29,7 +28,7 @@ from pathlib import Path
2928from typing import Dict, List, Optional, Tuple, Union, Any, Callable
3029from urllib.parse import urljoin, urlparse
3130from tempfile import NamedTemporaryFile
32−from dataclasses import dataclass, asdict
31+from dataclasses import dataclass
3332
3433import git
3534
@@ -86,31 +85,21 @@ def make_request(url: str, token=None) -> urllib.request.Request:
8685 headers["Authorization"] = f"token {token}"
8786 return urllib.request.Request(url, headers=headers)
8887
89−
90−# a dictionary of plugins and their new repositories
91−Redirects = Dict['PluginDesc', 'Repo']
92−
9388class Repo:
9489 def __init__(
95− self, uri: str, branch: str
90+ self, uri: str, branch: str, alias: Optional[str]
9691 ) -> None:
9792 self.uri = uri
9893 '''Url to the repo'''
99− self._branch = branch
100− # Redirect is the new Repo to use
101− self.redirect: Optional['Repo'] = None
94+ self.branch = branch
95+ self.alias = alias
96+ self.redirect: Dict[str, str] = {}
10297 self.token = "dummy_token"
10398
10499 @property
105100 def name(self):
106101 return self.uri.split('/')[-1]
107102
108− @property
109− def branch(self):
110− return self._branch or "HEAD"
111−
112− def __str__(self) -> str:
113− return f"{self.uri}"
114103 def __repr__(self) -> str:
115104 return f"Repo({self.name}, {self.uri})"
116105
@@ -120,7 +109,6 @@ class Repo:
120109
121110 @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
122111 def latest_commit(self) -> Tuple[str, datetime]:
123− log.debug("Latest commit")
124112 loaded = self._prefetch(None)
125113 updated = datetime.strptime(loaded['date'], "%Y-%m-%dT%H:%M:%S%z")
126114
@@ -136,7 +124,6 @@ class Repo:
136124 return loaded
137125
138126 def prefetch(self, ref: Optional[str]) -> str:
139− print("Prefetching")
140127 loaded = self._prefetch(ref)
141128 return loaded["sha256"]
142129
@@ -150,22 +137,21 @@ class Repo:
150137
151138class RepoGitHub(Repo):
152139 def __init__(
153− self, owner: str, repo: str, branch: str
140+ self, owner: str, repo: str, branch: str, alias: Optional[str]
154141 ) -> None:
155142 self.owner = owner
156143 self.repo = repo
157144 self.token = None
158145 '''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)
146+ super().__init__(self.url(""), branch, alias)
147+ log.debug("Instantiating github repo %s/%s", self.owner, self.repo)
161148
162149 @property
163150 def name(self):
164151 return self.repo
165152
166153 def url(self, path: str) -> str:
167− res = urljoin(f"https://github.com/{self.owner}/{self.repo}/", path)
168− return res
154+ return urljoin(f"https://github.com/{self.owner}/{self.name}/", path)
169155
170156 @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
171157 def has_submodules(self) -> bool:
@@ -182,7 +168,6 @@ class RepoGitHub(Repo):
182168 @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
183169 def latest_commit(self) -> Tuple[str, datetime]:
184170 commit_url = self.url(f"commits/{self.branch}.atom")
185− log.debug("Sending request to %s", commit_url)
186171 commit_req = make_request(commit_url, self.token)
187172 with urllib.request.urlopen(commit_req, timeout=10) as req:
188173 self._check_for_redirect(commit_url, req)
@@ -206,9 +191,12 @@ class RepoGitHub(Repo):
206191 new_owner, new_name = (
207192 urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
208193 )
194+ end_line = "\n" if self.alias is None else f" as {self.alias}\n"
195+ plugin_line = "{owner}/{name}" + end_line
209196
210− new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch)
211− self.redirect = new_repo
197+ old_plugin = plugin_line.format(owner=self.owner, name=self.name)
198+ new_plugin = plugin_line.format(owner=new_owner, name=new_name)
199+ self.redirect[old_plugin] = new_plugin
212200
213201
214202 def prefetch(self, commit: str) -> str:
@@ -219,9 +207,9 @@ class RepoGitHub(Repo):
219207 return sha256
220208
221209 def prefetch_github(self, ref: str) -> str:
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)
210+ data = subprocess.check_output(
211+ ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]
212+ )
225213 return data.strip().decode("utf-8")
226214
227215 def as_nix(self, plugin: "Plugin") -> str:
@@ -238,7 +226,7 @@ class RepoGitHub(Repo):
238226 }}'''
239227
240228
241−@dataclass(frozen=True)
229+@dataclass
242230class PluginDesc:
243231 repo: Repo
244232 branch: str
@@ -251,38 +239,21 @@ class PluginDesc:
251239 else:
252240 return self.alias
253241
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)
278242
279−@dataclass
280243class Plugin:
281− name: str
282− commit: str
283− has_submodules: bool
284− sha256: str
285− date: Optional[datetime] = None
244+ def __init__(
245+ self,
246+ name: str,
247+ commit: str,
248+ has_submodules: bool,
249+ sha256: str,
250+ date: Optional[datetime] = None,
251+ ) -> None:
252+ self.name = name
253+ self.commit = commit
254+ self.has_submodules = has_submodules
255+ self.sha256 = sha256
256+ self.date = date
286257
287258 @property
288259 def normalized_name(self) -> str:
@@ -299,27 +270,6 @@ class Plugin:
299270 return copy
300271
301272
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−
323273
324274class Editor:
325275 """The configuration of the update script."""
@@ -343,19 +293,19 @@ class Editor:
343293 self.deprecated = deprecated or root.joinpath("deprecated.json")
344294 self.cache_file = cache_file or f"{name}-plugin-cache.json"
345295
346− def get_current_plugins(self) -> List[Plugin]:
296+ def get_current_plugins(self):
347297 """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
298+ return get_current_plugins(self)
355299
356300 def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]:
357− '''CSV spec'''
358− return load_plugins_from_csv(config, plugin_file)
301+ plugins = []
302+ with open(plugin_file) as f:
303+ for line in f:
304+ if line.startswith("#"):
305+ continue
306+ plugin = parse_plugin_line(config, line)
307+ plugins.append(plugin)
308+ return plugins
359309
360310 def generate_nix(self, plugins, outfile: str):
361311 '''Returns nothing for now, writes directly to outfile'''
@@ -366,11 +316,11 @@ class Editor:
366316 _prefetch = functools.partial(prefetch, cache=cache)
367317
368318 def update() -> dict:
369− plugins = self.load_plugin_spec(config, input_file)
319+ plugin_names = self.load_plugin_spec(config, input_file)
370320
371321 try:
372322 pool = Pool(processes=config.proc)
373− results = pool.map(_prefetch, plugins)
323+ results = pool.map(_prefetch, plugin_names)
374324 finally:
375325 cache.store()
376326
@@ -465,10 +415,23 @@ class CleanEnvironment(object):
465415 self.empty_config.close()
466416
467417
418+def get_current_plugins(editor: Editor) -> List[Plugin]:
419+ with CleanEnvironment():
420+ cmd = ["nix", "eval", "--extra-experimental-features", "nix-command", "--impure", "--json", "--expr", editor.get_plugins]
421+ log.debug("Running command %s", cmd)
422+ out = subprocess.check_output(cmd)
423+ data = json.loads(out)
424+ plugins = []
425+ for name, attr in data.items():
426+ p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
427+ plugins.append(p)
428+ return plugins
429+
430+
468431def prefetch_plugin(
469432 p: PluginDesc,
470433 cache: "Optional[Cache]" = None,
471−) -> Tuple[Plugin, Optional[Repo]]:
434+) -> Tuple[Plugin, Dict[str, str]]:
472435 repo, branch, alias = p.repo, p.branch, p.alias
473436 name = alias or p.repo.name
474437 commit = None
@@ -482,7 +445,7 @@ def prefetch_plugin(
482445 return cached_plugin, repo.redirect
483446
484447 has_submodules = repo.has_submodules()
485− log.debug(f"prefetch {name}")
448+ print(f"prefetch {name}")
486449 sha256 = repo.prefetch(commit)
487450
488451 return (
@@ -491,7 +454,12 @@ def prefetch_plugin(
491454 )
492455
493456
494−def print_download_error(plugin: PluginDesc, ex: Exception):
457+def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin:
458+ plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line))
459+ return plugin
460+
461+
462+def print_download_error(plugin: str, ex: Exception):
495463 print(f"{plugin}: {ex}", file=sys.stderr)
496464 ex_traceback = ex.__traceback__
497465 tb_lines = [
@@ -500,22 +468,20 @@ def print_download_error(plugin: PluginDesc, ex: Exception):
500468 ]
501469 print("\n".join(tb_lines))
502470
471+
503472def check_results(
504− results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]]
505−) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]:
473+ results: List[Tuple[PluginDesc, Union[Exception, Plugin], Dict[str, str]]]
474+) -> Tuple[List[Tuple[PluginDesc, Plugin]], Dict[str, str]]:
506475 ''' '''
507− failures: List[Tuple[PluginDesc, Exception]] = []
476+ failures: List[Tuple[str, Exception]] = []
508477 plugins = []
509− redirects: Redirects = {}
478+ redirects: Dict[str, str] = {}
510479 for (pdesc, result, redirect) in results:
511480 if isinstance(result, Exception):
512− failures.append((pdesc, result))
481+ failures.append((pdesc.name, result))
513482 else:
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))
483+ plugins.append((pdesc, result))
484+ redirects.update(redirect)
519485
520486 print(f"{len(results) - len(failures)} plugins were checked", end="")
521487 if len(failures) == 0:
@@ -529,17 +495,31 @@ def check_results(
529495
530496 sys.exit(1)
531497
532−def make_repo(uri: str, branch) -> Repo:
498+def make_repo(uri, branch, alias) -> Repo:
533499 '''Instantiate a Repo with the correct specialization depending on server (gitub spec)'''
534500 # 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)
501+ res = uri.split('/')
502+ if len(res) <= 2:
503+ repo = RepoGitHub(res[0], res[1], branch, alias)
539504 else:
540− repo = Repo(uri.strip(), branch)
505+ repo = Repo(uri.strip(), branch, alias)
541506 return repo
542507
508+def parse_plugin_line(config: FetchConfig, line: str) -> PluginDesc:
509+ branch = "HEAD"
510+ alias = None
511+ uri = line
512+ if " as " in uri:
513+ uri, alias = uri.split(" as ")
514+ alias = alias.strip()
515+ if "@" in uri:
516+ uri, branch = uri.split("@")
517+
518+ repo = make_repo(uri.strip(), branch.strip(), alias)
519+ repo.token = config.github_token
520+
521+ return PluginDesc(repo, branch.strip(), alias)
522+
543523
544524def get_cache_path(cache_file_name: str) -> Optional[Path]:
545525 xdg_cache = os.environ.get("XDG_CACHE_HOME", None)
@@ -596,37 +576,36 @@ class Cache:
596576
597577def prefetch(
598578 pluginDesc: PluginDesc, cache: Cache
599−) -> Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]:
579+) -> Tuple[PluginDesc, Union[Exception, Plugin], dict]:
600580 try:
601581 plugin, redirect = prefetch_plugin(pluginDesc, cache)
602582 cache[plugin.commit] = plugin
603583 return (pluginDesc, plugin, redirect)
604584 except Exception as e:
605− return (pluginDesc, e, None)
606−
585+ return (pluginDesc, e, {})
607586
608587
609588def rewrite_input(
610589 config: FetchConfig,
611590 input_file: Path,
612591 deprecated: Path,
613− # old pluginDesc and the new
614− redirects: Redirects = {},
615− append: List[PluginDesc] = [],
592+ redirects: Dict[str, str] = None,
593+ append: Tuple = (),
616594):
617− plugins = load_plugins_from_csv(config, input_file,)
595+ with open(input_file, "r") as f:
596+ lines = f.readlines()
618597
619− plugins.extend(append)
598+ lines.extend(append)
620599
621600 if redirects:
601+ lines = [redirects.get(line, line) for line in lines]
622602
623603 cur_date_iso = datetime.now().strftime("%Y-%m-%d")
624604 with open(deprecated, "r") as f:
625605 deprecations = json.load(f)
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)
606+ for old, new in redirects.items():
607+ old_plugin = fetch_plugin_from_pluginline(config, old)
608+ new_plugin = fetch_plugin_from_pluginline(config, new)
630609 if old_plugin.normalized_name != new_plugin.normalized_name:
631610 deprecations[old_plugin.normalized_name] = {
632611 "new": new_plugin.normalized_name,
@@ -636,14 +615,10 @@ def rewrite_input(
636615 json.dump(deprecations, f, indent=4, sort_keys=True)
637616 f.write("\n")
638617
618+ lines = sorted(lines, key=str.casefold)
619+
639620 with open(input_file, "w") as f:
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))
621+ f.writelines(lines)
647622
648623
649624def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
@@ -685,11 +660,9 @@ def update_plugins(editor: Editor, args):
685660 )
686661
687662 for plugin_line in args.add_plugins:
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)
663+ editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",))
691664 update()
692− plugin, _ = prefetch_plugin(pdesc, )
665+ plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line)
693666 if autocommit:
694667 commit(
695668 nixpkgs_repo,
maintainers/scripts/remove-old-aliases.py+6−15
@@ -28,11 +28,6 @@ def process_args() -> argparse.Namespace:
2828 default=1,
2929 help="operate on aliases older than $year-$month",
3030 )
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− )
3631 arg_parser.add_argument("--file", required=True, type=Path, help="alias file")
3732 arg_parser.add_argument(
3833 "--dry-run", action="store_true", help="don't modify files, only print results"
@@ -41,7 +36,7 @@ def process_args() -> argparse.Namespace:
4136
4237
4338def get_date_lists(
44− txt: list[str], cutoffdate: datetimedate, only_throws: bool
39+ txt: list[str], cutoffdate: datetimedate
4540) -> tuple[list[str], list[str], list[str]]:
4641 """get a list of lines in which the date is older than $cutoffdate"""
4742 date_older_list: list[str] = []
@@ -62,11 +57,7 @@ def get_date_lists(
6257 except ValueError:
6358 continue
6459
65− if (
66− my_date is None
67− or my_date > cutoffdate
68− or "preserve, reason:" in line.lower()
69− ):
60+ if my_date is None or my_date > cutoffdate:
7061 continue
7162
7263 if "=" not in line:
@@ -76,7 +67,7 @@ def get_date_lists(
7667 print(f"RESOLVE MANUALLY {line}")
7768 elif "throw" in line:
7869 date_older_throw_list.append(line)
79− elif not only_throws:
70+ else:
8071 date_older_list.append(line)
8172
8273 return (
@@ -169,7 +160,6 @@ def main() -> None:
169160 """main"""
170161 args = process_args()
171162
172− only_throws = args.only_throws
173163 aliasfile = Path(args.file).absolute()
174164 cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date()
175165
@@ -180,12 +170,13 @@ def main() -> None:
180170 date_older_throw_list: list[str] = []
181171
182172 date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists(
183− txt, cutoffdate, only_throws
173+ txt, cutoffdate
184174 )
185175
186176 converted_to_throw: list[tuple[str, str]] = []
177+ converted_to_throw = convert_to_throw(date_older_list)
178+
187179 if date_older_list:
188− converted_to_throw = convert_to_throw(date_older_list)
189180 print(" Will be converted to throws. ".center(100, "-"))
190181 for l_n in date_older_list:
191182 print(l_n)
maintainers/scripts/update-luarocks-packages+8−5
@@ -25,8 +25,8 @@ from pathlib import Path
2525log = logging.getLogger()
2626log.addHandler(logging.StreamHandler())
2727
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
28+ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent
29+from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache
3030
3131PKG_LIST="maintainers/scripts/luarocks-packages.csv"
3232TMP_FILE="$(mktemp)"
@@ -118,7 +118,7 @@ class LuaEditor(Editor):
118118 def attr_path(self):
119119 return "luaPackages"
120120
121− def get_update(self, input_file: str, outfile: str, config: FetchConfig):
121+ def get_update(self, input_file: str, outfile: str, proc: int):
122122 _prefetch = generate_pkg_nix
123123
124124 def update() -> dict:
@@ -126,14 +126,14 @@ class LuaEditor(Editor):
126126 sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower())
127127
128128 try:
129− pool = Pool(processes=config.proc)
129+ pool = Pool(processes=proc)
130130 results = pool.map(_prefetch, sorted_plugin_specs)
131131 finally:
132132 pass
133133
134134 self.generate_nix(results, outfile)
135135
136− redirects = {}
136+ redirects = []
137137 return redirects
138138
139139 return update
@@ -181,9 +181,11 @@ def generate_pkg_nix(plug: LuaPlugin):
181181
182182 cmd.append(plug.version)
183183
184+ #
184185 if plug.server != "src" and plug.server:
185186 cmd.append(f"--only-server={plug.server}")
186187
188+
187189 if plug.luaversion:
188190 with CleanEnvironment():
189191 local_pkgs = str(ROOT.resolve())
@@ -207,6 +209,7 @@ def main():
207209
208210 parser = editor.create_parser()
209211 args = parser.parse_args()
212+ log.setLevel(LOG_LEVELS[args.debug])
210213
211214 update_plugins(editor, args)
212215
maintainers/team-list.nix+1−359
@@ -3,19 +3,12 @@
33 # Required
44 members = [ maintainer1 maintainer2 ];
55 scope = "Maintain foo packages.";
6− shortName = "foo";
7− # Optional
8− enableFeatureFreezePing = true;
9− githubTeams = [ "my-subsystem" ];
106 };
117
128 where
139
1410 - `members` is the list of maintainers belonging to the group,
1511 - `scope` describes the scope of the group.
16− - `shortName` short human-readable name
17− - `enableFeatureFreezePing` will ping this team during the Feature Freeze announcements on releases
18− - `githubTeams` will ping specified GitHub teams as well
1912
2013 More fields may be added in the future.
2114
@@ -34,7 +27,6 @@ with lib.maintainers; {
3427 m1cr0man
3528 ];
3629 scope = "Maintain ACME-related packages and modules.";
37− shortName = "ACME";
3830 };
3931
4032 bazel = {
@@ -49,8 +41,6 @@ with lib.maintainers; {
4941 ylecornec
5042 ];
5143 scope = "Bazel build tool & related tools https://bazel.build/";
52− shortName = "Bazel";
53− enableFeatureFreezePing = true;
5444 };
5545
5646 beam = {
@@ -63,32 +53,7 @@ with lib.maintainers; {
6353 minijackson
6454 yurrriq
6555 ];
66− githubTeams = [
67− "beam"
68− ];
6956 scope = "Maintain BEAM-related packages and modules.";
70− shortName = "BEAM";
71− enableFeatureFreezePing = true;
72− };
73−
74− blockchains = {
75− members = [
76− mmahut
77− RaghavSood
78− ];
79− scope = "Maintain Blockchain packages and modules.";
80− shortName = "Blockchains";
81− enableFeatureFreezePing = true;
82− };
83−
84− c = {
85− members = [
86− matthewbauer
87− mic92
88− ];
89− scope = "Maintain C libraries and tooling.";
90− shortName = "C";
91− enableFeatureFreezePing = true;
9257 };
9358
9459 cinnamon = {
@@ -96,49 +61,14 @@ with lib.maintainers; {
9661 mkg20001
9762 ];
9863 scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team.";
99− shortName = "Cinnamon";
100− enableFeatureFreezePing = true;
10164 };
10265
10366 chia = {
10467 members = [
68+ atemu
10569 lourkeur
10670 ];
10771 scope = "Maintain the Chia blockchain and its dependencies";
108− shortName = "Chia Blockchain";
109− };
110−
111− coq = {
112− members = [
113− cohencyril
114− Zimmi48
115− # gares has no entry in the maintainers list
116− siraben
117− vbgl
118− ];
119− scope = "Maintain the Coq theorem prover and related packages.";
120− shortName = "Coq";
121− enableFeatureFreezePing = true;
122− };
123−
124− darwin = {
125− members = [
126− toonn
127− ];
128− githubTeams = [
129− "darwin-maintainers"
130− ];
131− scope = "Maintain Darwin compatibility of packages and Darwin-only packages.";
132− shortName = "Darwin";
133− enableFeatureFreezePing = true;
134− };
135−
136− cosmopolitan = {
137− members = [
138− lourkeur
139− tomberek
140− ];
141− scope = "Maintain the Cosmopolitan LibC and related programs.";
14272 };
14373
14474 deshaw = {
@@ -147,7 +77,6 @@ with lib.maintainers; {
14777 limeytexan
14878 ];
14979 scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
150− shortName = "Shaw employees";
15180 };
15281
15382 determinatesystems = {
@@ -157,75 +86,11 @@ with lib.maintainers; {
15786 grahamc
15887 ];
15988 scope = "Group registration for packages maintained by Determinate Systems.";
160− shortName = "Determinate Systems employees";
161− };
162−
163− dhall = {
164− members = [
165− Gabriel439
166− ehmry
167− ];
168− scope = "Maintain Dhall and related packages.";
169− shortName = "Dhall";
170− enableFeatureFreezePing = true;
171− };
172−
173− docker = {
174− members = [
175− roberth
176− utdemir
177− ];
178− scope = "Maintain Docker and related tools.";
179− shortName = "DockerTools";
180− enableFeatureFreezePing = true;
181− };
182−
183− docs = {
184− members = [
185− ryantm
186− ];
187− scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";
188− shortName = "Docs";
189− enableFeatureFreezePing = true;
190− };
191−
192− emacs = {
193− members = [
194− adisbladis
195− ];
196− scope = "Maintain the Emacs editor and packages.";
197− shortName = "Emacs";
198− enableFeatureFreezePing = true;
199− };
200−
201− enlightenment = {
202− members = [
203− romildo
204− ];
205− githubTeams = [
206− "enlightenment"
207− ];
208− scope = "Maintain Enlightenment desktop environment and related packages.";
209− shortName = "Enlightenment";
210− enableFeatureFreezePing = true;
211− };
212−
213− # Dummy group for the "everyone else" section
214− feature-freeze-everyone-else = {
215− members = [ ];
216− githubTeams = [
217− "nixpkgs-committers"
218− "release-engineers"
219− ];
220− scope = "Dummy team for the #everyone else' section during feture freezes, not to be used as package maintainers!";
221− shortName = "Everyone else";
222− enableFeatureFreezePing = true;
22389 };
22490
22591 freedesktop = {
22692 members = [ jtojnar ];
22793 scope = "Maintain Freedesktop.org packages for graphical desktop.";
228− shortName = "freedesktop.org packaging";
22994 };
23095
23196 gcc = {
@@ -235,7 +100,6 @@ with lib.maintainers; {
235100 ericson2314
236101 ];
237102 scope = "Maintain GCC (GNU Compiler Collection) compilers";
238− shortName = "GCC";
239103 };
240104
241105 golang = {
@@ -250,24 +114,16 @@ with lib.maintainers; {
250114 zowoq
251115 ];
252116 scope = "Maintain Golang compilers.";
253− shortName = "Go";
254− enableFeatureFreezePing = true;
255117 };
256118
257119 gnome = {
258120 members = [
259− bobby285271
260121 hedning
261122 jtojnar
262123 dasj19
263124 maxeaubrey
264125 ];
265− githubTeams = [
266− "gnome"
267− ];
268126 scope = "Maintain GNOME desktop environment and platform.";
269− shortName = "GNOME";
270− enableFeatureFreezePing = true;
271127 };
272128
273129 haskell = {
@@ -277,12 +133,7 @@ with lib.maintainers; {
277133 maralorn
278134 sternenseemann
279135 ];
280− githubTeams = [
281− "haskell"
282− ];
283136 scope = "Maintain Haskell packages and infrastructure.";
284− shortName = "Haskell";
285− enableFeatureFreezePing = true;
286137 };
287138
288139 home-assistant = {
@@ -293,7 +144,6 @@ with lib.maintainers; {
293144 mic92
294145 ];
295146 scope = "Maintain the Home Assistant ecosystem";
296− shortName = "Home Assistant";
297147 };
298148
299149 iog = {
@@ -305,7 +155,6 @@ with lib.maintainers; {
305155 nrdxp
306156 ];
307157 scope = "Input-Output Global employees, which maintain critical software";
308− shortName = "Input-Output Global employees";
309158 };
310159
311160 jitsi = {
@@ -316,7 +165,6 @@ with lib.maintainers; {
316165 yuka
317166 ];
318167 scope = "Maintain Jitsi.";
319− shortName = "Jitsi";
320168 };
321169
322170 kubernetes = {
@@ -328,7 +176,6 @@ with lib.maintainers; {
328176 zowoq
329177 ];
330178 scope = "Maintain the Kubernetes package and module";
331− shortName = "Kubernetes";
332179 };
333180
334181 kodi = {
@@ -341,7 +188,6 @@ with lib.maintainers; {
341188 sephalon
342189 ];
343190 scope = "Maintain Kodi and related packages.";
344− shortName = "Kodi";
345191 };
346192
347193 linux-kernel = {
@@ -352,41 +198,6 @@ with lib.maintainers; {
352198 qyliss
353199 ];
354200 scope = "Maintain the Linux kernel.";
355− shortName = "Linux Kernel";
356− };
357−
358− lumina = {
359− members = [
360− romildo
361− ];
362− githubTeams = [
363− "lumina"
364− ];
365− scope = "Maintain lumina desktop environment and related packages.";
366− shortName = "Lumina";
367− enableFeatureFreezePing = true;
368− };
369−
370− lxqt = {
371− members = [
372− romildo
373− ];
374− githubTeams = [
375− "lxqt"
376− ];
377− scope = "Maintain LXQt desktop environment and related packages.";
378− shortName = "LXQt";
379− enableFeatureFreezePing = true;
380− };
381−
382− marketing = {
383− members = [
384− garbas
385− tomberek
386− ];
387− scope = "Marketing of Nix/NixOS/nixpkgs.";
388− shortName = "Marketing";
389− enableFeatureFreezePing = true;
390201 };
391202
392203 mate = {
@@ -395,7 +206,6 @@ with lib.maintainers; {
395206 romildo
396207 ];
397208 scope = "Maintain Mate desktop environment and related packages.";
398− shortName = "MATE";
399209 };
400210
401211 matrix = {
@@ -409,40 +219,6 @@ with lib.maintainers; {
409219 sumnerevans
410220 ];
411221 scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
412− shortName = "Matrix";
413− };
414−
415− mobile = {
416− members = [
417− samueldr
418− ];
419− scope = "Maintain Mobile NixOS.";
420− shortName = "Mobile";
421− enableFeatureFreezePing = true;
422− };
423−
424− nix = {
425− members = [
426− Profpatsch
427− eelco
428− grahamc
429− pierron
430− ];
431− scope = "Maintain the Nix package manager.";
432− shortName = "Nix/nix-cli ecosystem";
433− enableFeatureFreezePing = true;
434− };
435−
436− nixos-modules = {
437− members = [
438− ericson2314
439− infinisil
440− qyliss
441− roberth
442− ];
443− scope = "Maintain nixpkgs module system internals.";
444− shortName = "NixOS Modules / internals";
445− enableFeatureFreezePing = true;
446222 };
447223
448224 openstack = {
@@ -451,7 +227,6 @@ with lib.maintainers; {
451227 SuperSandro2000
452228 ];
453229 scope = "Maintain the ecosystem around OpenStack";
454− shortName = "OpenStack";
455230 };
456231
457232 pantheon = {
@@ -459,21 +234,7 @@ with lib.maintainers; {
459234 davidak
460235 bobby285271
461236 ];
462− githubTeams = [
463− "pantheon"
464− ];
465237 scope = "Maintain Pantheon desktop environment and platform.";
466− shortName = "Pantheon";
467− enableFeatureFreezePing = true;
468− };
469−
470− perl = {
471− members = [
472− sgo
473− ];
474− scope = "Maintain the Perl interpreter and Perl packages.";
475− shortName = "Perl";
476− enableFeatureFreezePing = true;
477238 };
478239
479240 php = {
@@ -485,12 +246,7 @@ with lib.maintainers; {
485246 ma27
486247 talyz
487248 ];
488− githubTeams = [
489− "php"
490− ];
491249 scope = "Maintain PHP related packages and extensions.";
492− shortName = "PHP";
493− enableFeatureFreezePing = true;
494250 };
495251
496252 podman = {
@@ -500,54 +256,7 @@ with lib.maintainers; {
500256 vdemeester
501257 zowoq
502258 ];
503− githubTeams = [
504− "podman"
505− ];
506259 scope = "Maintain Podman and CRI-O related packages and modules.";
507− shortName = "Podman";
508− enableFeatureFreezePing = true;
509− };
510−
511− postgres = {
512− members = [
513− thoughtpolice
514− ];
515− scope = "Maintain the PostgreSQL package and plugins along with the NixOS module.";
516− shortName = "PostgreSQL";
517− enableFeatureFreezePing = true;
518− };
519−
520− python = {
521− members = [
522− fridh
523− hexa
524− jonringer
525− ];
526− scope = "Maintain the Python interpreter and related packages.";
527− shortName = "Python";
528− enableFeatureFreezePing = true;
529− };
530−
531− qt-kde = {
532− members = [
533− ttuegel
534− ];
535− githubTeams = [
536− "qt-kde"
537− ];
538− scope = "Maintain the KDE desktop environment and Qt.";
539− shortName = "Qt / KDE";
540− enableFeatureFreezePing = true;
541− };
542−
543− r = {
544− members = [
545− bcdarwin
546− jbedo
547− ];
548− scope = "Maintain the R programming language and related packages.";
549− shortName = "R";
550− enableFeatureFreezePing = true;
551260 };
552261
553262 redcodelabs = {
@@ -557,38 +266,6 @@ with lib.maintainers; {
557266 wintrmvte
558267 ];
559268 scope = "Maintain Red Code Labs related packages and modules.";
560− shortName = "Red Code Labs";
561− };
562−
563− release = {
564− members = [ ];
565− githubTeams = [
566− "nixos-release-managers"
567− ];
568− scope = "Manage the current nixpkgs/NixOS release.";
569− shortName = "Release";
570− enableFeatureFreezePing = true;
571− };
572−
573− ruby = {
574− members = [
575− marsam
576− ];
577− scope = "Maintain the Ruby interpreter and related packages.";
578− shortName = "Ruby";
579− enableFeatureFreezePing = true;
580− };
581−
582− rust = {
583− members = [
584− andir
585− lnl7
586− mic92
587− zowoq
588− ];
589− scope = "Maintain the Rust compiler toolchain and nixpkgs integration.";
590− shortName = "Rust";
591− enableFeatureFreezePing = true;
592269 };
593270
594271 sage = {
@@ -599,7 +276,6 @@ with lib.maintainers; {
599276 collares
600277 ];
601278 scope = "Maintain SageMath and the dependencies that are likely to break it.";
602− shortName = "SageMath";
603279 };
604280
605281 sphinx = {
@@ -607,7 +283,6 @@ with lib.maintainers; {
607283 SuperSandro2000
608284 ];
609285 scope = "Maintain Sphinx related packages.";
610− shortName = "Sphinx";
611286 };
612287
613288 serokell = {
@@ -617,26 +292,6 @@ with lib.maintainers; {
617292 mkaito
618293 ];
619294 scope = "Group registration for Serokell employees who collectively maintain packages.";
620− shortName = "Serokell employees";
621− };
622−
623− systemd = {
624− members = [ ];
625− githubTeams = [
626− "systemd"
627− ];
628− scope = "Maintain systemd for NixOS.";
629− shortName = "systemd";
630− enableFeatureFreezePing = true;
631− };
632−
633− tests = {
634− members = [
635− tfc
636− ];
637− scope = "Maintain the NixOS VM test runner.";
638− shortName = "NixOS tests";
639− enableFeatureFreezePing = true;
640295 };
641296
642297 tts = {
@@ -645,18 +300,6 @@ with lib.maintainers; {
645300 mic92
646301 ];
647302 scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages";
648− shortName = "coqui-ai TTS";
649− };
650−
651− vim = {
652− members = [
653− jonringer
654− softinio
655− teto
656− ];
657− scope = "Maintain the vim and neovim text editors and related packages.";
658− shortName = "Vim/Neovim";
659− enableFeatureFreezePing = true;
660303 };
661304
662305 xfce = {
@@ -664,6 +307,5 @@ with lib.maintainers; {
664307 romildo
665308 ];
666309 scope = "Maintain Xfce desktop environment and related packages.";
667− shortName = "Xfce";
668310 };
669311}
nixos/doc/manual/administration/declarative-containers.section.md+1−1
@@ -40,7 +40,7 @@ section for details on container networking.)
4040To disable the container, just remove it from `configuration.nix` and
4141run `nixos-rebuild
4242 switch`. Note that this will not delete the root directory of the
43−container in `/var/lib/nixos-containers`. Containers can be destroyed using
43+container in `/var/lib/containers`. Containers can be destroyed using
4444the imperative method: `nixos-container destroy foo`.
4545
4646Declarative containers can be started and stopped using the
nixos/doc/manual/administration/imperative-containers.section.md+2−2
@@ -10,8 +10,8 @@ You create a container with identifier `foo` as follows:
1010# nixos-container create foo
1111```
1212
13−This creates the container's root directory in `/var/lib/nixos-containers/foo`
14−and a small configuration file in `/etc/nixos-containers/foo.conf`. It also
13+This creates the container's root directory in `/var/lib/containers/foo`
14+and a small configuration file in `/etc/containers/foo.conf`. It also
1515builds the container's initial system configuration and stores it in
1616`/nix/var/nix/profiles/per-container/foo/system`. You can modify the
1717initial configuration of the container on the command line. For
nixos/doc/manual/default.nix−4
@@ -14,10 +14,6 @@ with pkgs;
1414let
1515 lib = pkgs.lib;
1616
17− docbook_xsl_ns = pkgs.docbook-xsl-ns.override {
18− withManOptDedupPatch = true;
19− };
20−
2117 # We need to strip references to /nix/store/* from options,
2218 # including any `extraSources` if some modules came from elsewhere,
2319 # or else the build will fail.
nixos/doc/manual/installation/building-nixos.chapter.md → nixos/doc/manual/development/building-nixos.chapter.mdrenamed−31
@@ -30,37 +30,6 @@ To check the content of an ISO image, mount it like so:
3030# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso
3131```
3232
33−## Additional drivers or firmware {#sec-building-image-drivers}
34−
35−If you need additional (non-distributable) drivers or firmware in the
36−installer, you might want to extend these configurations.
37−
38−For example, to build the GNOME graphical installer ISO, but with support for
39−certain WiFi adapters present in some MacBooks, you can create the following
40−file at `modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix`:
41−
42−```nix
43−{ config, ... }:
44−
45−{
46− imports = [ ./installation-cd-graphical-gnome.nix ];
47−
48− boot.initrd.kernelModules = [ "wl" ];
49−
50− boot.kernelModules = [ "kvm-intel" "wl" ];
51− boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
52−}
53−```
54−
55−Then build it like in the example above:
56−
57−```ShellSession
58−$ git clone https://github.com/NixOS/nixpkgs.git
59−$ cd nixpkgs/nixos
60−$ export NIXPKGS_ALLOW_UNFREE=1
61−$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix
62−```
63−
6433## Technical Notes {#sec-building-image-tech-notes}
6534
6635The config value enforcement is implemented via `mkImageMediaOverride = mkOverride 60;`
nixos/doc/manual/development/development.xml+1
@@ -14,6 +14,7 @@
1414 <xi:include href="../from_md/development/building-parts.chapter.xml" />
1515 <xi:include href="../from_md/development/what-happens-during-a-system-switch.chapter.xml" />
1616 <xi:include href="../from_md/development/writing-documentation.chapter.xml" />
17+ <xi:include href="../from_md/development/building-nixos.chapter.xml" />
1718 <xi:include href="../from_md/development/nixos-tests.chapter.xml" />
1819 <xi:include href="../from_md/development/testing-installer.chapter.xml" />
1920</part>
nixos/doc/manual/development/option-declarations.section.md+18−19
@@ -27,10 +27,9 @@ The function `mkOption` accepts the following arguments.
2727
2828`type`
2929
30−: The type of the option (see [](#sec-option-types)). This
31− argument is mandatory for nixpkgs modules. Setting this is highly
32− recommended for the sake of documentation and type checking. In case it is
33− not set, a fallback type with unspecified behavior is used.
30+: The type of the option (see [](#sec-option-types)). It may be
31+ omitted, but that's not advisable since it may lead to errors that
32+ are hard to diagnose.
3433
3534`default`
3635
@@ -120,14 +119,14 @@ lib.mkOption {
120119```nix
121120lib.mkPackageOption pkgs "GHC" {
122121 default = [ "ghc" ];
123− example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
122+ example = "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])";
124123}
125124# is like
126125lib.mkOption {
127126 type = lib.types.package;
128127 default = pkgs.ghc;
129128 defaultText = lib.literalExpression "pkgs.ghc";
130− example = lib.literalExpression "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
129+ example = lib.literalExpression "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])";
131130 description = "The GHC package to use.";
132131}
133132```
@@ -146,26 +145,26 @@ As an example, we will take the case of display managers. There is a
146145central display manager module for generic display manager options and a
147146module file per display manager backend (sddm, gdm \...).
148147
149−There are two approaches we could take with this module structure:
148+There are two approach to this module structure:
150149
151−- Configuring the display managers independently by adding an enable
150+- Managing the display managers independently by adding an enable
152151 option to every display manager module backend. (NixOS)
153152
154−- Configuring the display managers in the central module by adding
155− an option to select which display manager backend to use.
153+- Managing the display managers in the central module by adding an
154+ option to select which display manager backend to use.
156155
157156Both approaches have problems.
158157
159158Making backends independent can quickly become hard to manage. For
160−display managers, there can only be one enabled at a time, but the
161−type system cannot enforce this restriction as there is no relation
162−between each backend's `enable` option. As a result, this restriction
163−has to be done explicitly by adding assertions in each display manager
164−backend module.
159+display managers, there can be only one enabled at a time, but the type
160+system can not enforce this restriction as there is no relation between
161+each backend `enable` option. As a result, this restriction has to be
162+done explicitely by adding assertions in each display manager backend
163+module.
165164
166−On the other hand, managing the display manager backends in the
167−central module will require changing the central module option every
168−time a new backend is added or removed.
165+On the other hand, managing the display managers backends in the central
166+module will require to change the central module option every time a new
167+backend is added or removed.
169168
170169By using extensible option types, it is possible to create a placeholder
171170option in the central module
@@ -176,7 +175,7 @@ and to extend it in each backend module
176175
177176As a result, `displayManager.enable` option values can be added without
178177changing the main service module file and the type system automatically
179−enforces that there can only be a single display manager enabled.
178+enforce that there can only be a single display manager enabled.
180179
181180::: {#ex-option-declaration-eot-service .example}
182181::: {.title}
nixos/doc/manual/development/option-types.section.md+4−12
@@ -16,14 +16,13 @@ merging is handled.
1616
1717`types.path`
1818
19−: A filesystem path is anything that starts with a slash when
20− coerced to a string. Even if derivations can be considered as
21− paths, the more specific `types.package` should be preferred.
19+: A filesystem path, defined as anything that when coerced to a string
20+ starts with a slash. Even if derivations can be considered as path,
21+ the more specific `types.package` should be preferred.
2222
2323`types.package`
2424
25−: A top-level store path. This can be an attribute set pointing
26− to a store path, like a derivation or a flake input.
25+: A derivation or a store path.
2726
2827`types.anything`
2928
@@ -75,13 +74,6 @@ merging is handled.
7574 should only be used when checking, merging and nested evaluation are not
7675 desirable.
7776
78−`types.optionType`
79−
80−: The type of an option's type. Its merging operation ensures that nested
81− options have the correct file location annotated, and that if possible,
82− multiple option definitions are correctly merged together. The main use
83− case is as the type of the `_module.freeformType` option.
84−
8577`types.attrs`
8678
8779: A free-form attribute set.
nixos/doc/manual/development/settings-options.section.md−14
@@ -32,20 +32,6 @@ type of this option should represent the format. The most common formats
3232have a predefined type and string generator already declared under
3333`pkgs.formats`:
3434
35−`pkgs.formats.javaProperties` { *`comment`* ? `"Generated with Nix"` }
36−
37−: A function taking an attribute set with values
38−
39− `comment`
40−
41− : A string to put at the start of the
42− file in a comment. It can have multiple
43− lines.
44−
45− It returns the `type`: `attrsOf str` and a function
46− `generate` to build a Java `.properties` file, taking
47− care of the correct escaping, etc.
48−
4935`pkgs.formats.json` { }
5036
5137: A function taking an empty attribute set (for future extensibility)
nixos/doc/manual/development/unit-handling.section.md+8−13
@@ -17,8 +17,7 @@ checks:
1717 them and comparing their contents. If they are different but only
1818 `X-Reload-Triggers` in the `[Unit]` section is changed, **reload** the unit.
1919 The NixOS module system allows setting these triggers with the option
20− [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services). There are
21− some additional keys in the `[Unit]` section that are ignored as well. If the
20+ [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services). If the
2221 unit files differ in any way, the following actions are performed:
2322
2423 - `.path` and `.slice` units are ignored. There is no need to restart them
@@ -34,9 +33,6 @@ checks:
3433 - The rest of the units (mostly `.service` units) are then **reload**ed if
3534 `X-ReloadIfChanged` in the `[Service]` section is set to `true` (exposed
3635 via [systemd.services.\<name\>.reloadIfChanged](#opt-systemd.services)).
37− A little exception is done for units that were deactivated in the meantime,
38− for example because they require a unit that got stopped before. These
39− are **start**ed instead of reloaded.
4036
4137 - If the reload flag is not set, some more flags decide if the unit is
4238 skipped. These flags are `X-RestartIfChanged` in the `[Service]` section
@@ -45,18 +41,17 @@ checks:
4541 `RefuseManualStop` in the `[Unit]` section, and `X-OnlyManualStart` in the
4642 `[Unit]` section.
4743
48− - Further behavior depends on the unit having `X-StopIfChanged` in the
49− `[Service]` section set to `true` (exposed via
44+ - The rest of the behavior is decided whether the unit has `X-StopIfChanged`
45+ in the `[Service]` section set (exposed via
5046 [systemd.services.\<name\>.stopIfChanged](#opt-systemd.services)). This is
5147 set to `true` by default and must be explicitly turned off if not wanted.
5248 If the flag is enabled, the unit is **stop**ped and then **start**ed. If
5349 not, the unit is **restart**ed. The goal of the flag is to make sure that
5450 the new unit never runs in the old environment which is still in place
55− before the activation script is run. This behavior is different when the
56− service is socket-activated, as outlined in the following steps.
51+ before the activation script is run.
5752
5853 - The last thing that is taken into account is whether the unit is a service
59− and socket-activated. If `X-StopIfChanged` is **not** set, the service
60− is **restart**ed with the others. If it is set, both the service and the
61− socket are **stop**ped and the socket is **start**ed, leaving socket
62− activation to start the service when it's needed.
54+ and socket-activated. Due to a bug, this is currently only done when
55+ `X-StopIfChanged` is set. If the unit is socket-activated, the socket is
56+ stopped and started, and the service is stopped and to be started by socket
57+ activation.
nixos/doc/manual/development/writing-modules.chapter.md−42
@@ -90,17 +90,6 @@ modules: `systemd.services` (the set of all systemd services) and
9090`systemd.timers` (the list of commands to be executed periodically by
9191`systemd`).
9292
93−Care must be taken when writing systemd services using `Exec*` directives. By
94−default systemd performs substitution on `%<char>` specifiers in these
95−directives, expands environment variables from `$FOO` and `${FOO}`, splits
96−arguments on whitespace, and splits commands on `;`. All of these must be escaped
97−to avoid unexpected substitution or splitting when interpolating into an `Exec*`
98−directive, e.g. when using an `extraArgs` option to pass additional arguments to
99−the service. The functions `utils.escapeSystemdExecArg` and
100−`utils.escapeSystemdExecArgs` are provided for this, see [Example: Escaping in
101−Exec directives](#exec-escaping-example) for an example. When using these
102−functions system environment substitution should *not* be disabled explicitly.
103−
10493::: {#locate-example .example}
10594::: {.title}
10695**Example: NixOS Module for the "locate" Service**
@@ -164,37 +153,6 @@ in {
164153```
165154:::
166155
167−::: {#exec-escaping-example .example}
168−::: {.title}
169−**Example: Escaping in Exec directives**
170−:::
171−```nix
172−{ config, lib, pkgs, utils, ... }:
173−
174−with lib;
175−
176−let
177− cfg = config.services.echo;
178− echoAll = pkgs.writeScript "echo-all" ''
179− #! ${pkgs.runtimeShell}
180− for s in "$@"; do
181− printf '%s\n' "$s"
182− done
183− '';
184− args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ];
185−in {
186− systemd.services.echo =
187− { description = "Echo to the journal";
188− wantedBy = [ "multi-user.target" ];
189− serviceConfig.Type = "oneshot";
190− serviceConfig.ExecStart = ''
191− ${echoAll} ${utils.escapeSystemdExecArgs args}
192− '';
193− };
194−}
195−```
196−:::
197−
198156```{=docbook}
199157<xi:include href="option-declarations.section.xml" />
200158<xi:include href="option-types.section.xml" />
nixos/doc/manual/development/writing-nixos-tests.section.md+36−52
@@ -5,9 +5,15 @@ A NixOS test is a Nix expression that has the following structure:
55```nix
66import ./make-test-python.nix {
77
8− # One or more machines:
8+ # Either the configuration of a single machine:
9+ machine =
10+ { config, pkgs, ... }:
11+ { configuration…
12+ };
13+
14+ # Or a set of machines:
915 nodes =
10− { machine =
16+ { machine1 =
1117 { config, pkgs, ... }: { … };
1218 machine2 =
1319 { config, pkgs, ... }: { … };
@@ -23,16 +29,17 @@ import ./make-test-python.nix {
2329
2430The attribute `testScript` is a bit of Python code that executes the
2531test (described below). During the test, it will start one or more
26−virtual machines, the configuration of which is described by
27−the attribute `nodes`.
28−
29−An example of a single-node test is
30−[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix).
31−It only needs a single machine to test whether users can log in
32+virtual machines, the configuration of which is described by the
33+attribute `machine` (if you need only one machine in your test) or by
34+the attribute `nodes` (if you need multiple machines). For instance,
35+[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix)
36+only needs a single machine to test whether users can log in
3237on the virtual console, whether device ownership is correctly maintained
33−when switching between consoles, and so on. An interesting multi-node test is
34−[`nfs/simple.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix).
35−It uses two client nodes to test correct locking across server crashes.
38+when switching between consoles, and so on. On the other hand,
39+[`nfs/simple.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix),
40+which tests NFS client and server functionality in the
41+Linux kernel (including whether locks are maintained across server
42+crashes), requires three machines: a server and two clients.
3643
3744There are a few special NixOS configuration options for test VMs:
3845
@@ -60,7 +67,8 @@ The test script is a sequence of Python statements that perform various
6067actions, such as starting VMs, executing commands in the VMs, and so on.
6168Each virtual machine is represented as an object stored in the variable
6269`name` if this is also the identifier of the machine in the declarative
63−config. If you specified a node `nodes.machine`, the following example starts the
70+config. If you didn\'t specify multiple machines using the `nodes`
71+attribute, it is just `machine`. The following example starts the
6472machine, waits until it has finished booting, then executes a command
6573and checks that the output is more-or-less correct:
6674
@@ -71,7 +79,7 @@ if not "Linux" in machine.succeed("uname"):
7179 raise Exception("Wrong OS")
7280```
7381
74−The first line is technically unnecessary; machines are implicitly started
82+The first line is actually unnecessary; machines are implicitly started
7583when you first execute an action on them (such as `wait_for_unit` or
7684`succeed`). If you have multiple machines, you can speed up the test by
7785starting them in parallel:
@@ -150,51 +158,37 @@ The following methods are available on machine objects:
150158 e.g., `send_chars("foobar\n")` will type the string `foobar`
151159 followed by the Enter key.
152160
153−`send_console`
154−
155−: Send keys to the kernel console. This allows interaction with the systemd
156− emergency mode, for example. Takes a string that is sent, e.g.,
157− `send_console("\n\nsystemctl default\n")`.
158−
159161`execute`
160162
161163: Execute a shell command, returning a list `(status, stdout)`.
162−
163− Commands are run with `set -euo pipefail` set:
164−
165− - If several commands are separated by `;` and one fails, the
166− command as a whole will fail.
167−
168− - For pipelines, the last non-zero exit status will be returned
169− (if there is one; otherwise zero will be returned).
170−
171− - Dereferencing unset variables fails the command.
172−
173− - It will wait for stdout to be closed.
174−
175164 If the command detaches, it must close stdout, as `execute` will wait
176165 for this to consume all output reliably. This can be achieved by
177166 redirecting stdout to stderr `>&2`, to `/dev/console`, `/dev/null` or
178167 a file. Examples of detaching commands are `sleep 365d &`, where the
179168 shell forks a new process that can write to stdout and `xclip -i`, where
180169 the `xclip` command itself forks without closing stdout.
181−
182170 Takes an optional parameter `check_return` that defaults to `True`.
183171 Setting this parameter to `False` will not check for the return code
184172 and return -1 instead. This can be used for commands that shut down
185173 the VM and would therefore break the pipe that would be used for
186174 retrieving the return code.
187175
188− A timeout for the command can be specified (in seconds) using the optional
189− `timeout` parameter, e.g., `execute(cmd, timeout=10)` or
190− `execute(cmd, timeout=None)`. The default is 900 seconds.
191−
192176`succeed`
193177
194178: Execute a shell command, raising an exception if the exit status is
195− not zero, otherwise returning the standard output. Similar to `execute`,
196− except that the timeout is `None` by default. See `execute` for details on
197− command execution.
179+ not zero, otherwise returning the standard output. Commands are run
180+ with `set -euo pipefail` set:
181+
182+ - If several commands are separated by `;` and one fails, the
183+ command as a whole will fail.
184+
185+ - For pipelines, the last non-zero exit status will be returned
186+ (if there is one, zero will be returned otherwise).
187+
188+ - Dereferencing unset variables fail the command.
189+
190+ - It will wait for stdout to be closed. See `execute` for the
191+ implications.
198192
199193`fail`
200194
@@ -204,13 +198,10 @@ The following methods are available on machine objects:
204198`wait_until_succeeds`
205199
206200: Repeat a shell command with 1-second intervals until it succeeds.
207− Has a default timeout of 900 seconds which can be modified, e.g.
208− `wait_until_succeeds(cmd, timeout=10)`. See `execute` for details on
209− command execution.
210201
211202`wait_until_fails`
212203
213−: Like `wait_until_succeeds`, but repeating the command until it fails.
204+: Repeat a shell command with 1-second intervals until it fails.
214205
215206`wait_for_unit`
216207
@@ -281,13 +272,6 @@ The following methods are available on machine objects:
281272 Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends
282273 the guest session.
283274
284−`console_interact`
285−
286−: Allows you to directly interact with QEMU's stdin. This should
287− only be used during test development, not in production tests.
288− Output from QEMU is only read line-wise. `Ctrl-c` kills QEMU and
289− `Ctrl-d` closes console and returns to the test runner.
290−
291275To test user units declared by `systemd.user.services` the optional
292276`user` argument can be used:
293277
@@ -306,7 +290,7 @@ For faster dev cycles it\'s also possible to disable the code-linters
306290```nix
307291import ./make-test-python.nix {
308292 skipLint = true;
309− nodes.machine =
293+ machine =
310294 { config, pkgs, ... }:
311295 { configuration…
312296 };
nixos/doc/manual/from_md/administration/declarative-containers.section.xml+2−2
@@ -48,8 +48,8 @@ containers.database = {
4848 <literal>configuration.nix</literal> and run
4949 <literal>nixos-rebuild switch</literal>. Note that this will not
5050 delete the root directory of the container in
51− <literal>/var/lib/nixos-containers</literal>. Containers can be
52− destroyed using the imperative method:
51+ <literal>/var/lib/containers</literal>. Containers can be destroyed
52+ using the imperative method:
5353 <literal>nixos-container destroy foo</literal>.
5454 </para>
5555 <para>
nixos/doc/manual/from_md/administration/imperative-containers.section.xml+2−3
@@ -14,9 +14,8 @@
1414</programlisting>
1515 <para>
1616 This creates the container’s root directory in
17− <literal>/var/lib/nixos-containers/foo</literal> and a small
18− configuration file in
19− <literal>/etc/nixos-containers/foo.conf</literal>. It also builds
17+ <literal>/var/lib/containers/foo</literal> and a small configuration
18+ file in <literal>/etc/containers/foo.conf</literal>. It also builds
2019 the container’s initial system configuration and stores it in
2120 <literal>/nix/var/nix/profiles/per-container/foo/system</literal>.
2221 You can modify the initial configuration of the container on the
nixos/doc/manual/from_md/installation/building-nixos.chapter.xml → nixos/doc/manual/from_md/development/building-nixos.chapter.xmlrenamed−34
@@ -43,40 +43,6 @@ $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd
4343 </para>
4444 <programlisting>
4545# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso
46−</programlisting>
47− </section>
48− <section xml:id="sec-building-image-drivers">
49− <title>Additional drivers or firmware</title>
50− <para>
51− If you need additional (non-distributable) drivers or firmware in
52− the installer, you might want to extend these configurations.
53− </para>
54− <para>
55− For example, to build the GNOME graphical installer ISO, but with
56− support for certain WiFi adapters present in some MacBooks, you
57− can create the following file at
58− <literal>modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix</literal>:
59− </para>
60− <programlisting language="bash">
61−{ config, ... }:
62−
63−{
64− imports = [ ./installation-cd-graphical-gnome.nix ];
65−
66− boot.initrd.kernelModules = [ "wl" ];
67−
68− boot.kernelModules = [ "kvm-intel" "wl" ];
69− boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
70−}
71−</programlisting>
72− <para>
73− Then build it like in the example above:
74− </para>
75− <programlisting>
76−$ git clone https://github.com/NixOS/nixpkgs.git
77−$ cd nixpkgs/nixos
78−$ export NIXPKGS_ALLOW_UNFREE=1
79−$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix
8046</programlisting>
8147 </section>
8248 <section xml:id="sec-building-image-tech-notes">
nixos/doc/manual/from_md/development/option-declarations.section.xml+19−22
@@ -38,11 +38,9 @@ options = {
3838 <listitem>
3939 <para>
4040 The type of the option (see
41− <xref linkend="sec-option-types" />). This argument is
42− mandatory for nixpkgs modules. Setting this is highly
43− recommended for the sake of documentation and type checking.
44− In case it is not set, a fallback type with unspecified
45− behavior is used.
41+ <xref linkend="sec-option-types" />). It may be omitted, but
42+ that’s not advisable since it may lead to errors that are hard
43+ to diagnose.
4644 </para>
4745 </listitem>
4846 </varlistentry>
@@ -183,14 +181,14 @@ lib.mkOption {
183181 <programlisting language="bash">
184182lib.mkPackageOption pkgs "GHC" {
185183 default = [ "ghc" ];
186− example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
184+ example = "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])";
187185}
188186# is like
189187lib.mkOption {
190188 type = lib.types.package;
191189 default = pkgs.ghc;
192190 defaultText = lib.literalExpression "pkgs.ghc";
193− example = lib.literalExpression "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
191+ example = lib.literalExpression "pkgs.haskell.package.ghc921.ghc.withPackages (hkgs: [ hkgs.primes ])";
194192 description = "The GHC package to use.";
195193}
196194</programlisting>
@@ -217,22 +215,21 @@ lib.mkOption {
217215 manager backend (sddm, gdm ...).
218216 </para>
219217 <para>
220− There are two approaches we could take with this module
221− structure:
218+ There are two approach to this module structure:
222219 </para>
223220 <itemizedlist>
224221 <listitem>
225222 <para>
226− Configuring the display managers independently by adding
227− an enable option to every display manager module
228− backend. (NixOS)
223+ Managing the display managers independently by adding an
224+ enable option to every display manager module backend.
225+ (NixOS)
229226 </para>
230227 </listitem>
231228 <listitem>
232229 <para>
233− Configuring the display managers in the central module
234− by adding an option to select which display manager
235− backend to use.
230+ Managing the display managers in the central module by
231+ adding an option to select which display manager backend
232+ to use.
236233 </para>
237234 </listitem>
238235 </itemizedlist>
@@ -241,16 +238,16 @@ lib.mkOption {
241238 </para>
242239 <para>
243240 Making backends independent can quickly become hard to
244− manage. For display managers, there can only be one enabled
245− at a time, but the type system cannot enforce this
246− restriction as there is no relation between each backend’s
241+ manage. For display managers, there can be only one enabled
242+ at a time, but the type system can not enforce this
243+ restriction as there is no relation between each backend
247244 <literal>enable</literal> option. As a result, this
248− restriction has to be done explicitly by adding assertions
245+ restriction has to be done explicitely by adding assertions
249246 in each display manager backend module.
250247 </para>
251248 <para>
252− On the other hand, managing the display manager backends in
253− the central module will require changing the central module
249+ On the other hand, managing the display managers backends in
250+ the central module will require to change the central module
254251 option every time a new backend is added or removed.
255252 </para>
256253 <para>
@@ -271,7 +268,7 @@ lib.mkOption {
271268 <para>
272269 As a result, <literal>displayManager.enable</literal> option
273270 values can be added without changing the main service module
274− file and the type system automatically enforces that there
271+ file and the type system automatically enforce that there
275272 can only be a single display manager enabled.
276273 </para>
277274 <anchor xml:id="ex-option-declaration-eot-service" />
nixos/doc/manual/from_md/development/option-types.section.xml+5−21
@@ -30,10 +30,10 @@
3030 </term>
3131 <listitem>
3232 <para>
33− A filesystem path is anything that starts with a slash when
34− coerced to a string. Even if derivations can be considered
35− as paths, the more specific <literal>types.package</literal>
36− should be preferred.
33+ A filesystem path, defined as anything that when coerced to
34+ a string starts with a slash. Even if derivations can be
35+ considered as path, the more specific
36+ <literal>types.package</literal> should be preferred.
3737 </para>
3838 </listitem>
3939 </varlistentry>
@@ -43,9 +43,7 @@
4343 </term>
4444 <listitem>
4545 <para>
46− A top-level store path. This can be an attribute set
47− pointing to a store path, like a derivation or a flake
48− input.
46+ A derivation or a store path.
4947 </para>
5048 </listitem>
5149 </varlistentry>
@@ -113,20 +111,6 @@
113111 </para>
114112 </listitem>
115113 </varlistentry>
116− <varlistentry>
117− <term>
118− <literal>types.optionType</literal>
119− </term>
120− <listitem>
121− <para>
122− The type of an option’s type. Its merging operation ensures
123− that nested options have the correct file location
124− annotated, and that if possible, multiple option definitions
125− are correctly merged together. The main use case is as the
126− type of the <literal>_module.freeformType</literal> option.
127− </para>
128− </listitem>
129− </varlistentry>
130114 <varlistentry>
131115 <term>
132116 <literal>types.attrs</literal>
nixos/doc/manual/from_md/development/settings-options.section.xml−32
@@ -53,38 +53,6 @@
5353 <literal>pkgs.formats</literal>:
5454 </para>
5555 <variablelist>
56− <varlistentry>
57− <term>
58− <literal>pkgs.formats.javaProperties</literal> {
59− <emphasis><literal>comment</literal></emphasis> ?
60− <literal>"Generated with Nix"</literal> }
61− </term>
62− <listitem>
63− <para>
64− A function taking an attribute set with values
65− </para>
66− <variablelist>
67− <varlistentry>
68− <term>
69− <literal>comment</literal>
70− </term>
71− <listitem>
72− <para>
73− A string to put at the start of the file in a comment.
74− It can have multiple lines.
75− </para>
76− </listitem>
77− </varlistentry>
78− </variablelist>
79− <para>
80− It returns the <literal>type</literal>:
81− <literal>attrsOf str</literal> and a function
82− <literal>generate</literal> to build a Java
83− <literal>.properties</literal> file, taking care of the
84− correct escaping, etc.
85− </para>
86− </listitem>
87− </varlistentry>
8856 <varlistentry>
8957 <term>
9058 <literal>pkgs.formats.json</literal> { }
nixos/doc/manual/from_md/development/unit-handling.section.xml+10−22
@@ -38,9 +38,8 @@
3838 <emphasis role="strong">reload</emphasis> the unit. The NixOS
3939 module system allows setting these triggers with the option
4040 <link linkend="opt-systemd.services">systemd.services.<name>.reloadTriggers</link>.
41− There are some additional keys in the <literal>[Unit]</literal>
42− section that are ignored as well. If the unit files differ in
43− any way, the following actions are performed:
41+ If the unit files differ in any way, the following actions are
42+ performed:
4443 </para>
4544 <itemizedlist>
4645 <listitem>
@@ -72,11 +71,6 @@
7271 <literal>[Service]</literal> section is set to
7372 <literal>true</literal> (exposed via
7473 <link linkend="opt-systemd.services">systemd.services.<name>.reloadIfChanged</link>).
75− A little exception is done for units that were deactivated
76− in the meantime, for example because they require a unit
77− that got stopped before. These are
78− <emphasis role="strong">start</emphasis>ed instead of
79− reloaded.
8074 </para>
8175 </listitem>
8276 <listitem>
@@ -94,10 +88,9 @@
9488 </listitem>
9589 <listitem>
9690 <para>
97− Further behavior depends on the unit having
91+ The rest of the behavior is decided whether the unit has
9892 <literal>X-StopIfChanged</literal> in the
99− <literal>[Service]</literal> section set to
100− <literal>true</literal> (exposed via
93+ <literal>[Service]</literal> section set (exposed via
10194 <link linkend="opt-systemd.services">systemd.services.<name>.stopIfChanged</link>).
10295 This is set to <literal>true</literal> by default and must
10396 be explicitly turned off if not wanted. If the flag is
@@ -107,22 +100,17 @@
107100 is <emphasis role="strong">restart</emphasis>ed. The goal of
108101 the flag is to make sure that the new unit never runs in the
109102 old environment which is still in place before the
110− activation script is run. This behavior is different when
111− the service is socket-activated, as outlined in the
112− following steps.
103+ activation script is run.
113104 </para>
114105 </listitem>
115106 <listitem>
116107 <para>
117108 The last thing that is taken into account is whether the
118− unit is a service and socket-activated. If
119− <literal>X-StopIfChanged</literal> is
120− <emphasis role="strong">not</emphasis> set, the service is
121− <emphasis role="strong">restart</emphasis>ed with the
122− others. If it is set, both the service and the socket are
123− <emphasis role="strong">stop</emphasis>ped and the socket is
124− <emphasis role="strong">start</emphasis>ed, leaving socket
125− activation to start the service when it’s needed.
109+ unit is a service and socket-activated. Due to a bug, this
110+ is currently only done when
111+ <literal>X-StopIfChanged</literal> is set. If the unit is
112+ socket-activated, the socket is stopped and started, and the
113+ service is stopped and to be started by socket activation.
126114 </para>
127115 </listitem>
128116 </itemizedlist>
nixos/doc/manual/from_md/development/writing-modules.chapter.xml−49
@@ -122,25 +122,6 @@
122122 services) and <literal>systemd.timers</literal> (the list of
123123 commands to be executed periodically by <literal>systemd</literal>).
124124 </para>
125− <para>
126− Care must be taken when writing systemd services using
127− <literal>Exec*</literal> directives. By default systemd performs
128− substitution on <literal>%<char></literal> specifiers in these
129− directives, expands environment variables from
130− <literal>$FOO</literal> and <literal>${FOO}</literal>, splits
131− arguments on whitespace, and splits commands on
132− <literal>;</literal>. All of these must be escaped to avoid
133− unexpected substitution or splitting when interpolating into an
134− <literal>Exec*</literal> directive, e.g. when using an
135− <literal>extraArgs</literal> option to pass additional arguments to
136− the service. The functions
137− <literal>utils.escapeSystemdExecArg</literal> and
138− <literal>utils.escapeSystemdExecArgs</literal> are provided for
139− this, see <link linkend="exec-escaping-example">Example: Escaping in
140− Exec directives</link> for an example. When using these functions
141− system environment substitution should <emphasis>not</emphasis> be
142− disabled explicitly.
143− </para>
144125 <anchor xml:id="locate-example" />
145126 <para>
146127 <emphasis role="strong">Example: NixOS Module for the
@@ -202,36 +183,6 @@ in {
202183 };
203184 };
204185}
205−</programlisting>
206− <anchor xml:id="exec-escaping-example" />
207− <para>
208− <emphasis role="strong">Example: Escaping in Exec
209− directives</emphasis>
210− </para>
211− <programlisting language="bash">
212−{ config, lib, pkgs, utils, ... }:
213−
214−with lib;
215−
216−let
217− cfg = config.services.echo;
218− echoAll = pkgs.writeScript "echo-all" ''
219− #! ${pkgs.runtimeShell}
220− for s in "$@"; do
221− printf '%s\n' "$s"
222− done
223− '';
224− args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ];
225−in {
226− systemd.services.echo =
227− { description = "Echo to the journal";
228− wantedBy = [ "multi-user.target" ];
229− serviceConfig.Type = "oneshot";
230− serviceConfig.ExecStart = ''
231− ${echoAll} ${utils.escapeSystemdExecArgs args}
232− '';
233− };
234−}
235186</programlisting>
236187 <xi:include href="option-declarations.section.xml" />
237188 <xi:include href="option-types.section.xml" />
nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml+56−95
@@ -6,9 +6,15 @@
66 <programlisting language="bash">
77import ./make-test-python.nix {
88
9− # One or more machines:
9+ # Either the configuration of a single machine:
10+ machine =
11+ { config, pkgs, ... }:
12+ { configuration…
13+ };
14+
15+ # Or a set of machines:
1016 nodes =
11− { machine =
17+ { machine1 =
1218 { config, pkgs, ... }: { … };
1319 machine2 =
1420 { config, pkgs, ... }: { … };
@@ -25,18 +31,18 @@ import ./make-test-python.nix {
2531 The attribute <literal>testScript</literal> is a bit of Python code
2632 that executes the test (described below). During the test, it will
2733 start one or more virtual machines, the configuration of which is
28− described by the attribute <literal>nodes</literal>.
29− </para>
30− <para>
31− An example of a single-node test is
32− <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"><literal>login.nix</literal></link>.
33− It only needs a single machine to test whether users can log in on
34− the virtual console, whether device ownership is correctly
35− maintained when switching between consoles, and so on. An
36− interesting multi-node test is
37− <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix"><literal>nfs/simple.nix</literal></link>.
38− It uses two client nodes to test correct locking across server
39− crashes.
34+ described by the attribute <literal>machine</literal> (if you need
35+ only one machine in your test) or by the attribute
36+ <literal>nodes</literal> (if you need multiple machines). For
37+ instance,
38+ <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"><literal>login.nix</literal></link>
39+ only needs a single machine to test whether users can log in on the
40+ virtual console, whether device ownership is correctly maintained
41+ when switching between consoles, and so on. On the other hand,
42+ <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix"><literal>nfs/simple.nix</literal></link>,
43+ which tests NFS client and server functionality in the Linux kernel
44+ (including whether locks are maintained across server crashes),
45+ requires three machines: a server and two clients.
4046 </para>
4147 <para>
4248 There are a few special NixOS configuration options for test VMs:
@@ -88,8 +94,9 @@ import ./make-test-python.nix {
8894 various actions, such as starting VMs, executing commands in the
8995 VMs, and so on. Each virtual machine is represented as an object
9096 stored in the variable <literal>name</literal> if this is also the
91− identifier of the machine in the declarative config. If you
92− specified a node <literal>nodes.machine</literal>, the following
97+ identifier of the machine in the declarative config. If you didn't
98+ specify multiple machines using the <literal>nodes</literal>
99+ attribute, it is just <literal>machine</literal>. The following
93100 example starts the machine, waits until it has finished booting,
94101 then executes a command and checks that the output is more-or-less
95102 correct:
@@ -101,7 +108,7 @@ if not "Linux" in machine.succeed("uname"):
101108 raise Exception("Wrong OS")
102109</programlisting>
103110 <para>
104− The first line is technically unnecessary; machines are implicitly
111+ The first line is actually unnecessary; machines are implicitly
105112 started when you first execute an action on them (such as
106113 <literal>wait_for_unit</literal> or <literal>succeed</literal>). If
107114 you have multiple machines, you can speed up the test by starting
@@ -256,27 +263,40 @@ start_all()
256263 </varlistentry>
257264 <varlistentry>
258265 <term>
259− <literal>send_console</literal>
266+ <literal>execute</literal>
260267 </term>
261268 <listitem>
262269 <para>
263− Send keys to the kernel console. This allows interaction
264− with the systemd emergency mode, for example. Takes a string
265− that is sent, e.g.,
266− <literal>send_console("\n\nsystemctl default\n")</literal>.
270+ Execute a shell command, returning a list
271+ <literal>(status, stdout)</literal>. If the command
272+ detaches, it must close stdout, as
273+ <literal>execute</literal> will wait for this to consume all
274+ output reliably. This can be achieved by redirecting stdout
275+ to stderr <literal>>&2</literal>, to
276+ <literal>/dev/console</literal>,
277+ <literal>/dev/null</literal> or a file. Examples of
278+ detaching commands are <literal>sleep 365d &</literal>,
279+ where the shell forks a new process that can write to stdout
280+ and <literal>xclip -i</literal>, where the
281+ <literal>xclip</literal> command itself forks without
282+ closing stdout. Takes an optional parameter
283+ <literal>check_return</literal> that defaults to
284+ <literal>True</literal>. Setting this parameter to
285+ <literal>False</literal> will not check for the return code
286+ and return -1 instead. This can be used for commands that
287+ shut down the VM and would therefore break the pipe that
288+ would be used for retrieving the return code.
267289 </para>
268290 </listitem>
269291 </varlistentry>
270292 <varlistentry>
271293 <term>
272− <literal>execute</literal>
294+ <literal>succeed</literal>
273295 </term>
274296 <listitem>
275297 <para>
276− Execute a shell command, returning a list
277− <literal>(status, stdout)</literal>.
278− </para>
279− <para>
298+ Execute a shell command, raising an exception if the exit
299+ status is not zero, otherwise returning the standard output.
280300 Commands are run with <literal>set -euo pipefail</literal>
281301 set:
282302 </para>
@@ -291,63 +311,22 @@ start_all()
291311 <listitem>
292312 <para>
293313 For pipelines, the last non-zero exit status will be
294− returned (if there is one; otherwise zero will be
295− returned).
314+ returned (if there is one, zero will be returned
315+ otherwise).
296316 </para>
297317 </listitem>
298318 <listitem>
299319 <para>
300− Dereferencing unset variables fails the command.
320+ Dereferencing unset variables fail the command.
301321 </para>
302322 </listitem>
303323 <listitem>
304324 <para>
305− It will wait for stdout to be closed.
325+ It will wait for stdout to be closed. See
326+ <literal>execute</literal> for the implications.
306327 </para>
307328 </listitem>
308329 </itemizedlist>
309− <para>
310− If the command detaches, it must close stdout, as
311− <literal>execute</literal> will wait for this to consume all
312− output reliably. This can be achieved by redirecting stdout
313− to stderr <literal>>&2</literal>, to
314− <literal>/dev/console</literal>,
315− <literal>/dev/null</literal> or a file. Examples of
316− detaching commands are <literal>sleep 365d &</literal>,
317− where the shell forks a new process that can write to stdout
318− and <literal>xclip -i</literal>, where the
319− <literal>xclip</literal> command itself forks without
320− closing stdout.
321− </para>
322− <para>
323− Takes an optional parameter <literal>check_return</literal>
324− that defaults to <literal>True</literal>. Setting this
325− parameter to <literal>False</literal> will not check for the
326− return code and return -1 instead. This can be used for
327− commands that shut down the VM and would therefore break the
328− pipe that would be used for retrieving the return code.
329− </para>
330− <para>
331− A timeout for the command can be specified (in seconds)
332− using the optional <literal>timeout</literal> parameter,
333− e.g., <literal>execute(cmd, timeout=10)</literal> or
334− <literal>execute(cmd, timeout=None)</literal>. The default
335− is 900 seconds.
336− </para>
337− </listitem>
338− </varlistentry>
339− <varlistentry>
340− <term>
341− <literal>succeed</literal>
342− </term>
343− <listitem>
344− <para>
345− Execute a shell command, raising an exception if the exit
346− status is not zero, otherwise returning the standard output.
347− Similar to <literal>execute</literal>, except that the
348− timeout is <literal>None</literal> by default. See
349− <literal>execute</literal> for details on command execution.
350− </para>
351330 </listitem>
352331 </varlistentry>
353332 <varlistentry>
@@ -368,10 +347,7 @@ start_all()
368347 <listitem>
369348 <para>
370349 Repeat a shell command with 1-second intervals until it
371− succeeds. Has a default timeout of 900 seconds which can be
372− modified, e.g.
373− <literal>wait_until_succeeds(cmd, timeout=10)</literal>. See
374− <literal>execute</literal> for details on command execution.
350+ succeeds.
375351 </para>
376352 </listitem>
377353 </varlistentry>
@@ -381,8 +357,8 @@ start_all()
381357 </term>
382358 <listitem>
383359 <para>
384− Like <literal>wait_until_succeeds</literal>, but repeating
385− the command until it fails.
360+ Repeat a shell command with 1-second intervals until it
361+ fails.
386362 </para>
387363 </listitem>
388364 </varlistentry>
@@ -526,21 +502,6 @@ machine.systemctl("list-jobs --no-pager", "any-user") # spaw
526502 </para>
527503 </listitem>
528504 </varlistentry>
529− <varlistentry>
530− <term>
531− <literal>console_interact</literal>
532− </term>
533− <listitem>
534− <para>
535− Allows you to directly interact with QEMU’s stdin. This
536− should only be used during test development, not in
537− production tests. Output from QEMU is only read line-wise.
538− <literal>Ctrl-c</literal> kills QEMU and
539− <literal>Ctrl-d</literal> closes console and returns to the
540− test runner.
541− </para>
542− </listitem>
543− </varlistentry>
544505 </variablelist>
545506 <para>
546507 To test user units declared by
@@ -565,7 +526,7 @@ machine.wait_for_unit("xautolock.service", "x-session-user")
565526 <programlisting language="bash">
566527import ./make-test-python.nix {
567528 skipLint = true;
568− nodes.machine =
529+ machine =
569530 { config, pkgs, ... }:
570531 { configuration…
571532 };
nixos/doc/manual/from_md/installation/installing-usb.section.xml+1−1
@@ -17,7 +17,7 @@ $ diskutil list
1717[..]
1818$ diskutil unmountDisk diskN
1919Unmount of all volumes on diskN was successful
20−$ sudo dd if=nix.iso of=/dev/rdiskN bs=1M
20+$ sudo dd if=nix.iso of=/dev/rdiskN
2121</programlisting>
2222 <para>
2323 Using the 'raw' <literal>rdiskN</literal> device instead of
nixos/doc/manual/from_md/installation/installing.chapter.xml+7−7
@@ -411,13 +411,6 @@ OK
411411 specify on which disk the GRUB boot loader is to be
412412 installed. Without it, NixOS cannot boot.
413413 </para>
414− <para>
415− If there are other operating systems running on the
416− machine before installing NixOS, the
417− <xref linkend="opt-boot.loader.grub.useOSProber" />
418− option can be set to <literal>true</literal> to
419− automatically add them to the grub menu.
420− </para>
421414 </listitem>
422415 </varlistentry>
423416 <varlistentry>
@@ -443,6 +436,13 @@ OK
443436 </listitem>
444437 </varlistentry>
445438 </variablelist>
439+ <para>
440+ If there are other operating systems running on the machine
441+ before installing NixOS, the
442+ <xref linkend="opt-boot.loader.grub.useOSProber" /> option can
443+ be set to <literal>true</literal> to automatically add them to
444+ the grub menu.
445+ </para>
446446 <para>
447447 If you need to configure networking for your machine the
448448 configuration options are described in
nixos/doc/manual/from_md/release-notes/rl-1803.section.xml−8
@@ -866,14 +866,6 @@
866866 package.
867867 </para>
868868 </listitem>
869− <listitem>
870− <para>
871− The vim/kakoune plugin updater now reads from a CSV file:
872− check
873− <literal>pkgs/applications/editors/vim/plugins/vim-plugin-names</literal>
874− out to see the new format
875− </para>
876− </listitem>
877869 </itemizedlist>
878870 </section>
879871</section>
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml+1−11
@@ -35,17 +35,7 @@
3535 This means, <literal>ip[6]tables</literal>,
3636 <literal>arptables</literal> and <literal>ebtables</literal>
3737 commands will actually show rules from some specific tables in
38− the <literal>nf_tables</literal> kernel subsystem. In case
39− you’re migrating from an older release without rebooting,
40− there might be cases where you end up with iptable rules
41− configured both in the legacy <literal>iptables</literal>
42− kernel backend, as well as in the <literal>nf_tables</literal>
43− backend. This can lead to confusing firewall behaviour. An
44− <literal>iptables-save</literal> after switching will complain
45− about <quote>iptables-legacy tables present</quote>. It’s
46− probably best to reboot after the upgrade, or manually
47− removing all legacy iptables rules (via the
48− <literal>iptables-legacy</literal> package).
38+ the <literal>nf_tables</literal> kernel subsystem.
4939 </para>
5040 </listitem>
5141 <listitem>
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+14−1320
@@ -15,14 +15,6 @@
1515 <section xml:id="sec-release-22.05-highlights">
1616 <title>Highlights</title>
1717 <itemizedlist>
18− <listitem>
19− <para>
20− The <literal>firefox</literal> browser on
21− <literal>x86_64-linux</literal> is now making use of
22− profile-guided optimization resulting in a much more
23− responsive browsing experience.
24− </para>
25− </listitem>
2618 <listitem>
2719 <para>
2820 <literal>security.acme.defaults</literal> has been added to
@@ -33,43 +25,6 @@
3325 <literal>services.nginx.virtualHosts.*.enableACME</literal>).
3426 </para>
3527 </listitem>
36− <listitem>
37− <para>
38− GNOME has been upgraded to 42. Please take a look at their
39− <link xlink:href="https://release.gnome.org/42/">Release
40− Notes</link> for details. Notably, it replaces gedit with
41− GNOME Text Editor, GNOME Terminal with GNOME Console (formerly
42− King’s Cross), and GNOME Screenshot with a tool built into the
43− Shell.
44− </para>
45− </listitem>
46− <listitem>
47− <para>
48− <literal>stdenv.mkDerivation</literal> now supports a
49− self-referencing <literal>finalAttrs:</literal> parameter
50− containing the final <literal>mkDerivation</literal> arguments
51− including overrides. <literal>drv.overrideAttrs</literal> now
52− supports two parameters
53− <literal>finalAttrs: previousAttrs:</literal>. This allows
54− packaging configuration to be overridden in a consistent
55− manner by providing an alternative to
56− <literal>rec {}</literal> syntax.
57− </para>
58− <para>
59− Additionally, <literal>passthru</literal> can now reference
60− <literal>finalAttrs.finalPackage</literal> containing the
61− final package, including attributes such as the output paths
62− and <literal>overrideAttrs</literal>.
63− </para>
64− <para>
65− New language integrations can be simplified by overriding a
66− <quote>prototype</quote> package containing the
67− language-specific logic. This removes the need for a extra
68− layer of overriding for the <quote>generic builder</quote>
69− arguments, thus removing a usability problem and source of
70− error.
71− </para>
72− </listitem>
7328 <listitem>
7429 <para>
7530 PHP 8.1 is now available
@@ -95,70 +50,6 @@
9550 granular distinction between reloads and restarts.
9651 </para>
9752 </listitem>
98− <listitem>
99− <para>
100− Systemd has been upgraded to the version 250.
101− </para>
102− </listitem>
103− <listitem>
104− <para>
105− Pulseaudio has been upgraded to version 15.0 and now
106− optionally
107− <link xlink:href="https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters">supports
108− additional Bluetooth audio codecs</link> like aptX or LDAC,
109− with codec switching support being available in
110− <literal>pavucontrol</literal>. This feature is disabled by
111− default but can be enabled by using
112− <literal>hardware.pulseaudio.package = pkgs.pulseaudioFull;</literal>.
113− Existing 3rd party modules that provided similar
114− functionality, like <literal>pulseaudio-modules-bt</literal>
115− or <literal>pulseaudio-hsphfpd</literal> are deprecated and
116− have been removed.
117− </para>
118− </listitem>
119− <listitem>
120− <para>
121− The new
122− <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook"><literal>postgresqlTestHook</literal></link>
123− runs a PostgreSQL server for the duration of package checks.
124− </para>
125− </listitem>
126− <listitem>
127− <para>
128− <link xlink:href="https://kops.sigs.k8s.io"><literal>kops</literal></link>
129− defaults to 1.22.4, which will enable
130− <link xlink:href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html">Instance
131− Metadata Service Version 2</link> and require tokens on new
132− clusters with Kubernetes 1.22. This will increase security by
133− default, but may break some types of workloads. See the
134− <link xlink:href="https://kops.sigs.k8s.io/releases/1.22-notes/">release
135− notes</link> for details.
136− </para>
137− </listitem>
138− <listitem>
139− <para>
140− Module authors can use
141− <literal>mkRenamedOptionModuleWith</literal> to automate the
142− deprecation cycle without annoying out-of-tree module authors
143− and their users.
144− </para>
145− </listitem>
146− <listitem>
147− <para>
148− The default GHC version has been updated from 8.10.7 to 9.0.2.
149− <literal>pkgs.haskellPackages</literal> and
150− <literal>pkgs.ghc</literal> will now use this version by
151− default.
152− </para>
153− </listitem>
154− <listitem>
155− <para>
156− The GNOME and Plasma installation CDs now use
157− <literal>pkgs.calamares</literal> and
158− <literal>pkgs.calamares-nixos-extensions</literal> to allow
159− users to easily install and set up NixOS with a GUI.
160− </para>
161− </listitem>
16253 </itemizedlist>
16354 </section>
16455 <section xml:id="sec-release-22.05-new-services">
@@ -188,13 +79,6 @@
18879 <link xlink:href="option.html#opt-services.matrix-conduit.enable">services.matrix-conduit</link>.
18980 </para>
19081 </listitem>
191− <listitem>
192− <para>
193− <link xlink:href="https://github.com/vvilhonen/nethoscope">nethoscope</link>,
194− listen to your network traffic. Available as
195− <link linkend="opt-programs.nethoscope.enable">programs.nethoscope</link>.
196− </para>
197− </listitem>
19882 <listitem>
19983 <para>
20084 <link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html">filebeat</link>,
@@ -213,7 +97,7 @@
21397 <para>
21498 <link xlink:href="https://frrouting.org/">FRRouting</link>, a
21599 popular suite of Internet routing protocol daemons (BGP, BFD,
216− OSPF, IS-IS, VRRP and others). Available as
100+ OSPF, IS-IS, VVRP and others). Available as
217101 <link linkend="opt-services.frr.babel.enable">services.frr</link>
218102 </para>
219103 </listitem>
@@ -224,13 +108,6 @@
224108 <link xlink:href="options.html#opt-services.heisenbridge.enable">services.heisenbridge</link>.
225109 </para>
226110 </listitem>
227− <listitem>
228− <para>
229− <link xlink:href="https://snowflake.torproject.org/">snowflake-proxy</link>,
230− a system to defeat internet censorship. Available as
231− <link xlink:href="options.html#opt-services.snowflake-proxy.enable">services.snowflake-proxy</link>.
232− </para>
233− </listitem>
234111 <listitem>
235112 <para>
236113 <link xlink:href="https://ergo.chat">ergochat</link>, a modern
@@ -284,15 +161,6 @@
284161 to be able to access the device.
285162 </para>
286163 </listitem>
287− <listitem>
288− <para>
289− <link xlink:href="https://github.com/mozilla-mobile/mozilla-vpn-client">mozillavpn</link>,
290− the client for the
291− <link xlink:href="https://vpn.mozilla.org/">Mozilla VPN</link>
292− service. Available as
293− <link xlink:href="options.html#opt-services.mozillavpn">services.mozillavpn</link>.
294− </para>
295− </listitem>
296164 <listitem>
297165 <para>
298166 <link xlink:href="https://github.com/mgumz/mtr-exporter">mtr-exporter</link>,
@@ -300,21 +168,6 @@
300168 <link xlink:href="options.html#opt-services.mtr-exporter.enable">services.mtr-exporter</link>.
301169 </para>
302170 </listitem>
303− <listitem>
304− <para>
305− <link xlink:href="https://github.com/prometheus-pve/prometheus-pve-exporter">prometheus-pve-exporter</link>,
306− a tool that exposes information from the Proxmox VE API for
307− use by Prometheus. Available as
308− <link xlink:href="options.html#opt-services.prometheus.exporters.pve">services.prometheus.exporters.pve</link>.
309− </para>
310− </listitem>
311− <listitem>
312− <para>
313− <link xlink:href="https://github.com/netbox-community/netbox">netbox</link>,
314− infrastructure resource modeling (IRM) tool. Available as
315− <link xlink:href="options.html#opt-services.netbox.enable">services.netbox</link>.
316− </para>
317− </listitem>
318171 <listitem>
319172 <para>
320173 <link xlink:href="https://tetrd.app">tetrd</link>, share your
@@ -369,17 +222,6 @@
369222 <link linkend="opt-services.prosody-filer.enable">services.prosody-filer</link>.
370223 </para>
371224 </listitem>
372− <listitem>
373− <para>
374− <link xlink:href="https://github.com/rfjakob/systembus-notify">systembus-notify</link>,
375− allow system level notifications to reach the users. Available
376− as
377− <link xlink:href="opt-services.systembus-notify.enable">services.systembus-notify</link>.
378− Please keep in mind that this service should only be enabled
379− on machines with fully trusted users, as any local user is
380− able to DoS user sessions by spamming notifications.
381− </para>
382− </listitem>
383225 <listitem>
384226 <para>
385227 <link xlink:href="https://github.com/audreyt/ethercalc">ethercalc</link>,
@@ -387,20 +229,6 @@
387229 <link xlink:href="options.html#opt-services.ethercalc.enable">services.ethercalc</link>.
388230 </para>
389231 </listitem>
390− <listitem>
391− <para>
392− <link xlink:href="https://nbd.sourceforge.io/">nbd</link>, a
393− Network Block Device server. Available as
394− <link xlink:href="options.html#opt-services.nbd.server.enable">services.nbd</link>.
395− </para>
396− </listitem>
397− <listitem>
398− <para>
399− <link xlink:href="https://github.com/Mic92/nix-ld">nix-ld</link>,
400− Run unpatched dynamic binaries on NixOS. Available as
401− <link xlink:href="options.html#opt-programs.nix-ld.enable">programs.nix-ld</link>.
402− </para>
403− </listitem>
404232 <listitem>
405233 <para>
406234 <link xlink:href="https://timetagger.app">timetagger</link>,
@@ -426,14 +254,6 @@
426254 <link xlink:href="options.html#opt-services.headscale.enable">services.headscale</link>
427255 </para>
428256 </listitem>
429− <listitem>
430− <para>
431− <link xlink:href="https://github.com/lakinduakash/linux-wifi-hotspot">create_ap</link>,
432− a module for creating wifi hotspots using the program
433− linux-wifi-hotspot. Available as
434− <link xlink:href="options.html#opt-services.create_ap.enable">services.create_ap</link>.
435− </para>
436− </listitem>
437257 <listitem>
438258 <para>
439259 <link xlink:href="https://0xerr0r.github.io/blocky/">blocky</link>,
@@ -441,20 +261,6 @@
441261 with many features.
442262 </para>
443263 </listitem>
444− <listitem>
445− <para>
446− <link xlink:href="https://clusterlabs.org/pacemaker/">pacemaker</link>
447− cluster resource manager
448− </para>
449− </listitem>
450− <listitem>
451− <para>
452− <link xlink:href="https://nifi.apache.org">nifi</link>, an
453− easy to use, powerful, and reliable system to process and
454− distribute data. Available as
455− <link xlink:href="options.html#opt-services.nifi.enable">services.nifi</link>.
456− </para>
457− </listitem>
458264 </itemizedlist>
459265 </section>
460266 <section xml:id="sec-release-22.05-incompatibilities">
@@ -522,85 +328,6 @@
522328 new versions will release.
523329 </para>
524330 </listitem>
525− <listitem>
526− <para>
527− The configuration and state directories used by
528− <literal>nixos-containers</literal> have been moved from
529− <literal>/etc/containers</literal> and
530− <literal>/var/lib/containers</literal> to
531− <literal>/etc/nixos-containers</literal> and
532− <literal>/var/lib/nixos-containers</literal>.
533− </para>
534− <para>
535− If you are changing <literal>system.stateVersion</literal> to
536− <literal>"22.05"</literal> manually on an existing
537− system you are responsible for migrating these directories
538− yourself.
539− </para>
540− <para>
541− This is to improve compatibility with
542− <literal>libcontainer</literal> based software such as Podman
543− and Skopeo which assumes they have ownership over
544− <literal>/etc/containers</literal>.
545− </para>
546− </listitem>
547− <listitem>
548− <para>
549− For new installations
550− <literal>virtualisation.oci-containers.backend</literal> is
551− now set to <literal>podman</literal> by default. If you still
552− want to use Docker on systems where
553− <literal>system.stateVersion</literal> is set to to
554− <literal>"22.05"</literal> set
555− <literal>virtualisation.oci-containers.backend = "docker";</literal>.Old
556− systems with older <literal>stateVersion</literal>s stay with
557− <quote>docker</quote>.
558− </para>
559− </listitem>
560− <listitem>
561− <para>
562− <literal>security.klogd</literal> was removed. Logging of
563− kernel messages is handled by systemd since Linux 3.5.
564− </para>
565− </listitem>
566− <listitem>
567− <para>
568− <literal>pkgs.ssmtp</literal> has been dropped due to the
569− program being unmaintained. <literal>pkgs.msmtp</literal> can
570− be used instead as a substitute <literal>sendmail</literal>
571− implementation. The corresponding options
572− <literal>services.ssmtp.*</literal> have been removed as well.
573− <literal>programs.msmtp.*</literal> can be used instead for an
574− equivalent setup. For example:
575− </para>
576− <programlisting language="bash">
577−{
578− # Original ssmtp configuration:
579− services.ssmtp = {
580− enable = true;
581− useTLS = true;
582− useSTARTTLS = true;
583− hostName = "smtp.example:587";
584− authUser = "someone";
585− authPassFile = "/secrets/password.txt";
586− };
587−
588− # Equivalent msmtp configuration:
589− programs.msmtp = {
590− enable = true;
591− accounts.default = {
592− tls = true;
593− tls_starttls = true;
594− auth = true;
595− host = "smtp.example";
596− port = 587;
597− user = "someone";
598− passwordeval = "cat /secrets/password.txt";
599− };
600− };
601−}
602−</programlisting>
603− </listitem>
604331 <listitem>
605332 <para>
606333 <literal>services.kubernetes.addons.dashboard</literal> was
@@ -618,92 +345,6 @@
618345 relying on the insecure behaviour before upgrading.
619346 </para>
620347 </listitem>
621− <listitem>
622− <para>
623− In the PowerDNS Recursor module
624− (<literal>services.pdns-recursor</literal>), default values of
625− several IP address-related NixOS options have been updated to
626− match the default upstream behavior. In particular, Recursor
627− by default will:
628− </para>
629− <itemizedlist spacing="compact">
630− <listitem>
631− <para>
632− listen on (and allows connections from) both IPv4 and IPv6
633− addresses
634− (<literal>services.pdns-recursor.dns.address</literal>,
635− <literal>services.pdns-recursor.dns.allowFrom</literal>);
636− </para>
637− </listitem>
638− <listitem>
639− <para>
640− allow only local connections to the REST API server
641− (<literal>services.pdns-recursor.api.allowFrom</literal>).
642− </para>
643− </listitem>
644− </itemizedlist>
645− </listitem>
646− <listitem>
647− <para>
648− In the ncdns module, the default value of
649− <literal>services.ncdns.address</literal> has been changed to
650− the IPv6 loopback address (<literal>::1</literal>).
651− </para>
652− </listitem>
653− <listitem>
654− <para>
655− <literal>openssh</literal> has been update to 8.9p1, changing
656− the FIDO security key middleware interface.
657− </para>
658− </listitem>
659− <listitem>
660− <para>
661− <literal>git</literal> no longer hardcodes the path to
662− openssh’ ssh binary to reduce the amount of rebuilds. If you
663− are using git with ssh remotes and do not have a ssh binary in
664− your enviroment consider adding <literal>openssh</literal> to
665− it or switching to <literal>gitFull</literal>.
666− </para>
667− </listitem>
668− <listitem>
669− <para>
670− <literal>services.k3s.enable</literal> no longer implies
671− <literal>systemd.enableUnifiedCgroupHierarchy = false</literal>,
672− and will default to the <quote>systemd</quote> cgroup driver
673− when using <literal>services.k3s.docker = true</literal>. This
674− change may require a reboot to take effect, and k3s may not be
675− able to run if the boot cgroup hierarchy does not match its
676− configuration. The previous behavior may be retained by
677− explicitly setting
678− <literal>systemd.enableUnifiedCgroupHierarchy = false</literal>
679− in your configuration.
680− </para>
681− </listitem>
682− <listitem>
683− <para>
684− <literal>fonts.fonts</literal> no longer includes ancient
685− bitmap fonts when both
686− <literal>config.services.xserver.enable</literal> and
687− <literal>config.nixpkgs.config.allowUnfree</literal> are
688− enabled. If you still want these fonts, use:
689− </para>
690− <programlisting language="bash">
691−{
692− fonts.fonts = [
693− pkgs.xorg.fontbhlucidatypewriter100dpi
694− pkgs.xorg.fontbhlucidatypewriter75dpi
695− pkgs.xorg.fontbh100dpi
696− ];
697−}
698−</programlisting>
699− </listitem>
700− <listitem>
701− <para>
702− <literal>services.prometheus.alertManagerTimeout</literal> has
703− been removed as it has been deprecated upstream and has no
704− effect.
705− </para>
706− </listitem>
707348 <listitem>
708349 <para>
709350 The DHCP server (<literal>services.dhcpd4</literal>,
@@ -728,286 +369,6 @@
728369 its reliance on python2.
729370 </para>
730371 </listitem>
731− <listitem>
732− <para>
733− <literal>services.ipfs.extraFlags</literal> is now escaped
734− with <literal>utils.escapeSystemdExecArgs</literal>. If you
735− rely on systemd interpolating <literal>extraFlags</literal> in
736− the service <literal>ExecStart</literal>, this will no longer
737− work.
738− </para>
739− </listitem>
740− <listitem>
741− <para>
742− <literal>hbase</literal> version 0.98.24 has been removed. The
743− package now defaults to version 2.4.11. Versions 1.7.1 and
744− 3.0.0-alpha-2 are also available.
745− </para>
746− </listitem>
747− <listitem>
748− <para>
749− <literal>services.paperless-ng</literal> was renamed to
750− <literal>services.paperless</literal>. Accordingly, the
751− <literal>paperless-ng-manage</literal> script (located in
752− <literal>dataDir</literal>) was renamed to
753− <literal>paperless-manage</literal>.
754− <literal>services.paperless</literal> now uses
755− <literal>paperless-ngx</literal>.
756− </para>
757− </listitem>
758− <listitem>
759− <para>
760− The <literal>matrix-synapse</literal> service
761− (<literal>services.matrix-synapse</literal>) has been
762− converted to use the <literal>settings</literal> option
763− defined in RFC42. This means that options that are part of
764− your <literal>homeserver.yaml</literal> configuration, and
765− that were specified at the top-level of the module
766− (<literal>services.matrix-synapse</literal>) now need to be
767− moved into
768− <literal>services.matrix-synapse.settings</literal>. And while
769− not all options you may use are defined in there, they are
770− still supported, because you can set arbitrary values in this
771− freeform type.
772− </para>
773− <para>
774− The <literal>listeners.*.bind_address</literal> option was
775− renamed to <literal>bind_addresses</literal> in order to match
776− the upstream <literal>homeserver.yaml</literal> option name.
777− It is now also a list of strings instead of a string.
778− </para>
779− <para>
780− An example to make the required migration clearer:
781− </para>
782− <para>
783− Before:
784− </para>
785− <programlisting language="bash">
786−{
787− services.matrix-synapse = {
788− enable = true;
789−
790− server_name = "example.com";
791− public_baseurl = "https://example.com:8448";
792−
793− enable_registration = false;
794− registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut";
795− macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l";
796−
797− tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
798− tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
799−
800− listeners = [ {
801− port = 8448;
802− bind_address = "";
803− type = "http";
804− tls = true;
805− resources = [ {
806− names = [ "client" ];
807− compress = true;
808− } {
809− names = [ "federation" ];
810− compress = false;
811− } ];
812− } ];
813−
814− };
815−}
816−</programlisting>
817− <para>
818− After:
819− </para>
820− <programlisting language="bash">
821−{
822− services.matrix-synapse = {
823− enable = true;
824−
825− # this attribute set holds all values that go into your homeserver.yaml configuration
826− # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for
827− # possible values.
828− settings = {
829− server_name = "example.com";
830− public_baseurl = "https://example.com:8448";
831−
832− enable_registration = false;
833− # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead
834−
835− tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
836− tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
837−
838− listeners = [ {
839− port = 8448;
840− bind_addresses = [
841− "::"
842− "0.0.0.0"
843− ];
844− type = "http";
845− tls = true;
846− resources = [ {
847− names = [ "client" ];
848− compress = true;
849− } {
850− names = [ "federation" ];
851− compress = false;
852− } ];
853− } ];
854− };
855−
856− extraConfigFiles = [
857− /run/keys/matrix-synapse/secrets.yaml
858− ];
859− };
860−}
861−</programlisting>
862− <para>
863− The secrets in your original config should be migrated into a
864− YAML file that is included via
865− <literal>extraConfigFiles</literal>.
866− </para>
867− <para>
868− Additionally a few option defaults have been synced up with
869− upstream default values, for example the
870− <literal>max_upload_size</literal> grew from
871− <literal>10M</literal> to <literal>50M</literal>. For the same
872− reason, the default <literal>media_store_path</literal> was
873− changed from <literal>${dataDir}/media</literal> to
874− <literal>${dataDir}/media_store</literal> if
875− <literal>system.stateVersion</literal> is at least
876− <literal>22.05</literal>. Files will need to be manually moved
877− to the new location if the <literal>stateVersion</literal> is
878− updated.
879− </para>
880− <para>
881− As of Synapse 1.58.0, the old groups/communities feature has
882− been disabled by default. It will be completely removed with
883− Synapse 1.61.0.
884− </para>
885− </listitem>
886− <listitem>
887− <para>
888− The Keycloak package (<literal>pkgs.keycloak</literal>) has
889− been switched from the Wildfly version, which will soon be
890− deprecated, to the Quarkus based version. The Keycloak service
891− (<literal>services.keycloak</literal>) has been updated to
892− accommodate the change and now differs from the previous
893− version in a few ways:
894− </para>
895− <itemizedlist>
896− <listitem>
897− <para>
898− <literal>services.keycloak.extraConfig</literal> has been
899− removed in favor of the new
900− <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">settings-style</link>
901− <link linkend="opt-services.keycloak.settings"><literal>services.keycloak.settings</literal></link>
902− option. The available options correspond directly to
903− parameters in <literal>conf/keycloak.conf</literal>. Some
904− of the most important parameters are documented as
905− suboptions, the rest can be found in the
906− <link xlink:href="https://www.keycloak.org/server/all-config">All
907− configuration section of the Keycloak Server Installation
908− and Configuration Guide</link>. While the new
909− configuration is much simpler and cleaner than the old
910− JBoss CLI one, this unfortunately mean that there’s no
911− straightforward way to convert an old configuration to the
912− new format and some settings may not even be available
913− anymore.
914− </para>
915− </listitem>
916− <listitem>
917− <para>
918− <literal>services.keycloak.frontendUrl</literal> was
919− removed and the frontend URL is now configured through the
920− <literal>hostname</literal> family of settings in
921− <link linkend="opt-services.keycloak.settings"><literal>services.keycloak.settings</literal></link>
922− instead. See the
923− <link xlink:href="https://www.keycloak.org/server/hostname">Hostname
924− section of the Keycloak Server Installation and
925− Configuration Guide</link> for more details. Additionally,
926− <literal>/auth</literal> was removed from the default
927− context path and needs to be added back in
928− <link linkend="opt-services.keycloak.settings.http-relative-path"><literal>services.keycloak.settings.http-relative-path</literal></link>
929− if you want to keep compatibility with your current
930− clients.
931− </para>
932− </listitem>
933− <listitem>
934− <para>
935− <literal>services.keycloak.bindAddress</literal>,
936− <literal>services.keycloak.forceBackendUrlToFrontendUrl</literal>,
937− <literal>services.keycloak.httpPort</literal> and
938− <literal>services.keycloak.httpsPort</literal> have been
939− removed in favor of their equivalent options in
940− <link linkend="opt-services.keycloak.settings"><literal>services.keycloak.settings</literal></link>.
941− <literal>httpPort</literal> and
942− <literal>httpsPort</literal> have additionally had their
943− types changed from <literal>str</literal> to
944− <literal>port</literal>.
945− </para>
946− <para>
947− The new names are as follows:
948− </para>
949− <itemizedlist spacing="compact">
950− <listitem>
951− <para>
952− <literal>bindAddress</literal>:
953− <link linkend="opt-services.keycloak.settings.http-host"><literal>services.keycloak.settings.http-host</literal></link>
954− </para>
955− </listitem>
956− <listitem>
957− <para>
958− <literal>forceBackendUrlToFrontendUrl</literal>:
959− <link linkend="opt-services.keycloak.settings.hostname-strict-backchannel"><literal>services.keycloak.settings.hostname-strict-backchannel</literal></link>
960− </para>
961− </listitem>
962− <listitem>
963− <para>
964− <literal>httpPort</literal>:
965− <link linkend="opt-services.keycloak.settings.http-port"><literal>services.keycloak.settings.http-port</literal></link>
966− </para>
967− </listitem>
968− <listitem>
969− <para>
970− <literal>httpsPort</literal>:
971− <link linkend="opt-services.keycloak.settings.https-port"><literal>services.keycloak.settings.https-port</literal></link>
972− </para>
973− </listitem>
974− </itemizedlist>
975− </listitem>
976− </itemizedlist>
977− <para>
978− For example, when using a reverse proxy the migration could
979− look like this:
980− </para>
981− <para>
982− Before:
983− </para>
984− <programlisting language="bash">
985− services.keycloak = {
986− enable = true;
987− httpPort = "8080";
988− frontendUrl = "https://keycloak.example.com/auth";
989− database.passwordFile = "/run/keys/db_password";
990− extraConfig = {
991− "subsystem=undertow"."server=default-server"."http-listener=default".proxy-address-forwarding = true;
992− };
993− };
994−</programlisting>
995− <para>
996− After:
997− </para>
998− <programlisting language="bash">
999− services.keycloak = {
1000− enable = true;
1001− settings = {
1002− http-port = 8080;
1003− hostname = "keycloak.example.com";
1004− http-relative-path = "/auth";
1005− proxy = "edge";
1006− };
1007− database.passwordFile = "/run/keys/db_password";
1008− };
1009−</programlisting>
1010− </listitem>
1011372 <listitem>
1012373 <para>
1013374 The MoinMoin wiki engine
@@ -1015,25 +376,6 @@
1015376 because Python 2 is being retired from nixpkgs.
1016377 </para>
1017378 </listitem>
1018− <listitem>
1019− <para>
1020− Services in the <literal>hadoop</literal> module previously
1021− set <literal>openFirewall</literal> to true by default. This
1022− has now been changed to false. Node definitions for multi-node
1023− clusters would need <literal>openFirewall = true;</literal> to
1024− be added to to hadoop services when upgrading from NixOS
1025− 21.11.
1026− </para>
1027− </listitem>
1028− <listitem>
1029− <para>
1030− <literal>services.hadoop.yarn.nodemanager</literal> now uses
1031− cgroup-based CPU limit enforcement by default. Additionally,
1032− the option <literal>useCGroups</literal> was added to
1033− nodemanagers as an easy way to switch back to the old
1034− behavior.
1035− </para>
1036− </listitem>
1037379 <listitem>
1038380 <para>
1039381 The <literal>wafHook</literal> hook now honors
@@ -1079,23 +421,6 @@
1079421 6.x</link> and renamed to <literal>gnome-secrets</literal>.
1080422 </para>
1081423 </listitem>
1082− <listitem>
1083− <para>
1084− <literal>services.gnome.experimental-features.realtime-scheduling</literal>
1085− option has been removed, as GNOME Shell now
1086− <link xlink:href="https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060">uses
1087− rtkit</link>. Use
1088− <literal>security.rtkit.enable = true;</literal> instead. As
1089− before, you will need to have it enabled using GSettings.
1090− </para>
1091− </listitem>
1092− <listitem>
1093− <para>
1094− <literal>services.telepathy</literal> will no longer be
1095− enabled by default for GNOME desktops, one should enable it in
1096− their configs if using Empathy or Polari.
1097− </para>
1098− </listitem>
1099424 <listitem>
1100425 <para>
1101426 If you previously used
@@ -1142,14 +467,6 @@
1142467 <literal>admin</literal> and <literal>password</literal>.
1143468 </para>
1144469 </listitem>
1145− <listitem>
1146− <para>
1147− The <literal>taskserver</literal> module no longer implicitly
1148− opens ports in the firewall configuration. This is now
1149− controlled through the option
1150− <literal>services.taskserver.openFirewall</literal>.
1151− </para>
1152− </listitem>
1153470 <listitem>
1154471 <para>
1155472 The <literal>autorestic</literal> package has been upgraded
@@ -1231,72 +548,11 @@
1231548 unmaintained
1232549 </para>
1233550 </listitem>
1234− <listitem>
1235− <para>
1236− <literal>pkgs._7zz</literal> is now correctly licensed as
1237− LGPL3+ and BSD3 with optional unfree unRAR licensed code
1238− </para>
1239− </listitem>
1240− <listitem>
1241− <para>
1242− The <literal>vim.customize</literal> function produced by
1243− <literal>vimUtils.makeCustomizable</literal> now has a
1244− slightly different interface:
1245− </para>
1246− <itemizedlist spacing="compact">
1247− <listitem>
1248− <para>
1249− The wrapper now includes everything in the given Vim
1250− derivation if <literal>name</literal> is
1251− <literal>"vim"</literal> (the default). This
1252− makes the <literal>wrapManual</literal> argument obsolete,
1253− but this behavior can be overriden by setting the
1254− <literal>standalone</literal> argument.
1255− </para>
1256− </listitem>
1257− <listitem>
1258− <para>
1259− All the executables present in the given derivation (or,
1260− in <literal>standalone</literal> mode, only the
1261− <literal>*vim</literal> ones) are wrapped. This makes the
1262− <literal>wrapGui</literal> argument obsolete.
1263− </para>
1264− </listitem>
1265− <listitem>
1266− <para>
1267− The <literal>vimExecutableName</literal> and
1268− <literal>gvimExecutableName</literal> arguments were
1269− replaced by a single <literal>executableName</literal>
1270− argument in which the shell variable
1271− <literal>$exe</literal> can be used to refer to the
1272− wrapped executable’s name.
1273− </para>
1274− </listitem>
1275− </itemizedlist>
1276− <para>
1277− See the comments in
1278− <literal>pkgs/applications/editors/vim/plugins/vim-utils.nix</literal>
1279− for more details.
1280− </para>
1281− <para>
1282− <literal>vimUtils.vimWithRC</literal> was removed. You should
1283− instead use <literal>customize</literal> on a Vim derivation,
1284− which now accepts <literal>vimrcFile</literal> and
1285− <literal>gvimrcFile</literal> arguments.
1286− </para>
1287− </listitem>
1288551 <listitem>
1289552 <para>
1290553 <literal>tilp2</literal> was removed together with its module
1291554 </para>
1292555 </listitem>
1293− <listitem>
1294− <para>
1295− The F-PROT antivirus (<literal>fprot</literal> package) and
1296− its service module were removed because it reached
1297− <link xlink:href="https://kb.cyren.com/av-support/index.php?/Knowledgebase/Article/View/434/0/end-of-sale--end-of-life-for-f-prot-and-csam">end-of-life</link>.
1298− </para>
1299− </listitem>
1300556 <listitem>
1301557 <para>
1302558 <literal>bird1</literal> and its modules
@@ -1317,16 +573,6 @@
1317573 <literal>true</literal>.
1318574 </para>
1319575 </listitem>
1320− <listitem>
1321− <para>
1322− The <literal>miller</literal> package has been upgraded from
1323− 5.10.3 to
1324− <link xlink:href="https://github.com/johnkerl/miller/releases/tag/v6.2.0">6.2.0</link>.
1325− See
1326− <link xlink:href="https://miller.readthedocs.io/en/latest/new-in-miller-6">What’s
1327− new in Miller 6</link>.
1328− </para>
1329− </listitem>
1330576 <listitem>
1331577 <para>
1332578 MultiMC has been replaced with the fork PolyMC due to upstream
@@ -1352,33 +598,6 @@
1352598 <literal>systemd.nspawn.<name>.execConfig.PrivateUsers = false</literal>
1353599 </para>
1354600 </listitem>
1355− <listitem>
1356− <para>
1357− <literal>systemd-shutdown</literal> is now properly linked on
1358− shutdown to unmount all filesystems and device mapper devices
1359− cleanly. This can be disabled using
1360− <literal>systemd.shutdownRamfs.enable</literal>.
1361− </para>
1362− </listitem>
1363− <listitem>
1364− <para>
1365− The Tor SOCKS proxy is now actually disabled if
1366− <literal>services.tor.client.enable</literal> is set to
1367− <literal>false</literal> (the default). If you are using this
1368− functionality but didn’t change the setting or set it to
1369− <literal>false</literal>, you now need to set it to
1370− <literal>true</literal>.
1371− </para>
1372− </listitem>
1373− <listitem>
1374− <para>
1375− <literal>services.github-runner</literal> has been hardened.
1376− Notably address families and system calls have been
1377− restricted, which may adversely affect some kinds of testing,
1378− e.g. using <literal>AF_BLUETOOTH</literal> to test bluetooth
1379− devices.
1380− </para>
1381− </listitem>
1382601 <listitem>
1383602 <para>
1384603 The terraform 0.12 compatibility has been removed and the
@@ -1397,18 +616,6 @@
1397616 directly.
1398617 </para>
1399618 </listitem>
1400− <listitem>
1401− <para>
1402− The <literal>dendrite</literal> package has been upgraded from
1403− 0.5.1 to
1404− <link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.5">0.6.5</link>.
1405− Instances configured with split sqlite databases, which has
1406− been the default in NixOS, require merging of the federation
1407− sender and signing key databases. See upstream
1408− <link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.0">release
1409− notes</link> on version 0.6.0 for details on database changes.
1410− </para>
1411− </listitem>
1412619 <listitem>
1413620 <para>
1414621 The existing <literal>pkgs.opentelemetry-collector</literal>
@@ -1423,21 +630,11 @@
1423630 <literal>otelcorecol</literal> and enjoy a 7x smaller binary.
1424631 </para>
1425632 </listitem>
1426− <listitem>
1427− <para>
1428− <literal>services.zookeeper</literal> has a new option
1429− <literal>jre</literal> for specifying the JRE to start
1430− zookeeper with. It defaults to the JRE that
1431− <literal>pkgs.zookeeper</literal> was wrapped with, instead of
1432− <literal>pkgs.jre</literal>. This changes the JRE to
1433− <literal>pkgs.jdk11_headless</literal> by default.
1434− </para>
1435− </listitem>
1436633 <listitem>
1437634 <para>
1438635 <literal>pkgs.pgadmin</literal> now refers to
1439− <literal>pkgs.pgadmin4</literal>. <literal>pgadmin3</literal>
1440− has been removed.
636+ <literal>pkgs.pgadmin4</literal>. If you still need pgadmin3,
637+ use <literal>pkgs.pgadmin3</literal>.
1441638 </para>
1442639 </listitem>
1443640 <listitem>
@@ -1452,58 +649,6 @@
1452649 include serif fonts.
1453650 </para>
1454651 </listitem>
1455− <listitem>
1456− <para>
1457− <literal>pkgs.epgstation</literal> has been upgraded from v1
1458− to v2, resulting in incompatible changes in the database
1459− scheme and configuration format.
1460− </para>
1461− </listitem>
1462− <listitem>
1463− <para>
1464− Some top-level settings under
1465− <link linkend="opt-services.epgstation.enable">services.epgstation</link>
1466− is now deprecated because it was redudant due to the same
1467− options being present in
1468− <link linkend="opt-services.epgstation.settings">services.epgstation.settings</link>.
1469− </para>
1470− </listitem>
1471− <listitem>
1472− <para>
1473− The option <literal>services.epgstation.basicAuth</literal>
1474− was removed because basic authentication support was dropped
1475− by upstream.
1476− </para>
1477− </listitem>
1478− <listitem>
1479− <para>
1480− The option
1481− <link linkend="opt-services.epgstation.database.passwordFile">services.epgstation.database.passwordFile</link>
1482− no longer has a default value. Make sure to set this option
1483− explicitly before upgrading. Change the database password if
1484− necessary.
1485− </para>
1486− </listitem>
1487− <listitem>
1488− <para>
1489− The
1490− <link linkend="opt-services.epgstation.settings">services.epgstation.settings</link>
1491− option now expects options for <literal>config.yml</literal>
1492− in EPGStation v2.
1493− </para>
1494− </listitem>
1495− <listitem>
1496− <para>
1497− Existing data for the
1498− <link linkend="opt-services.epgstation.enable">services.epgstation</link>
1499− module would have to be backed up prior to the upgrade. To
1500− back up exising data to
1501− <literal>/tmp/epgstation.bak</literal>, run
1502− <literal>sudo -u epgstation epgstation run backup /tmp/epgstation.bak</literal>.
1503− To import that data after to the upgrade, run
1504− <literal>sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak</literal>
1505− </para>
1506− </listitem>
1507652 <listitem>
1508653 <para>
1509654 <literal>switch-to-configuration</literal> (the script that is
@@ -1679,51 +824,6 @@
1679824 example.
1680825 </para>
1681826 </listitem>
1682− <listitem>
1683− <para>
1684− Existing <literal>resholve*</literal> functions have been
1685− renamed and nested under <literal>pkgs.resholve</literal>.
1686− Update uses to:
1687− </para>
1688− <itemizedlist spacing="compact">
1689− <listitem>
1690− <para>
1691− <literal>resholvePackage</literal> ->
1692− <literal>resholve.mkDerivation</literal>
1693− </para>
1694− </listitem>
1695− <listitem>
1696− <para>
1697− <literal>resholveScript</literal> ->
1698− <literal>resholve.writeScript</literal>
1699− </para>
1700− </listitem>
1701− <listitem>
1702− <para>
1703− <literal>resholveScriptBin</literal> ->
1704− <literal>resholve.writeScriptBin</literal>
1705− </para>
1706− </listitem>
1707− </itemizedlist>
1708− </listitem>
1709− <listitem>
1710− <para>
1711− <literal>pkgs.cosmopolitan</literal> no longer provides the
1712− <literal>cosmoc</literal> command. It has been moved to
1713− <literal>pkgs.cosmoc</literal>.
1714− </para>
1715− </listitem>
1716− <listitem>
1717− <para>
1718− <literal>pkgs.graalvmXX-ce</literal> packages no longer
1719− provide support for Python/Ruby/WASM, instead focusing only in
1720− Java and Native Image Support. If you need to add support
1721− back, please see the
1722− <literal>pkgs.graalvmCEPackages.mkGraal</literal> function to
1723− create your own customized version of GraalVM with support for
1724− what you need.
1725− </para>
1726− </listitem>
1727827 </itemizedlist>
1728828 </section>
1729829 <section xml:id="sec-release-22.05-notable-changes">
@@ -1788,8 +888,7 @@
1788888 Legacy options have been mapped to the corresponding
1789889 options under under
1790890 <link xlink:href="options.html#opt-nix.settings">nix.settings</link>
1791− and will be deprecated when NixOS 21.11 reaches end of
1792− life.
891+ but may be deprecated in the future.
1793892 </para>
1794893 </listitem>
1795894 <listitem>
@@ -1810,41 +909,6 @@
1810909 using the PyPy interpreter were added.
1811910 </para>
1812911 </listitem>
1813− <listitem>
1814− <para>
1815− Some improvements have been made to the
1816− <literal>hadoop</literal> module:
1817− </para>
1818− <itemizedlist spacing="compact">
1819− <listitem>
1820− <para>
1821− A <literal>gatewayRole</literal> option has been added,
1822− for deploying hadoop cluster configuration files to a node
1823− that does not have any active services
1824− </para>
1825− </listitem>
1826− <listitem>
1827− <para>
1828− Support for older versions of hadoop have been added to
1829− the module
1830− </para>
1831− </listitem>
1832− <listitem>
1833− <para>
1834− Overriding and extending site XML files has been made
1835− easier
1836− </para>
1837− </listitem>
1838− </itemizedlist>
1839− </listitem>
1840− <listitem>
1841− <para>
1842− The auto-upgrade service now accepts persistent (default:
1843− true) parameter. By default auto-upgrade will now run
1844− immediately if it would have been triggered at least once
1845− during the time when the timer was inactive.
1846− </para>
1847− </listitem>
1848912 <listitem>
1849913 <para>
1850914 If you are using Wayland you can choose to use the Ozone
@@ -1858,35 +922,6 @@
1858922 versions.
1859923 </para>
1860924 </listitem>
1861− <listitem>
1862− <para>
1863− A new option group
1864− <literal>systemd.network.wait-online</literal> was added, with
1865− options to configure
1866− <literal>systemd-networkd-wait-online.service</literal>:
1867− </para>
1868− <itemizedlist spacing="compact">
1869− <listitem>
1870− <para>
1871− <literal>anyInterface</literal> allows specifying that the
1872− network should be considered online when <emphasis>at
1873− least one</emphasis> interface is online (useful on
1874− laptops)
1875− </para>
1876− </listitem>
1877− <listitem>
1878− <para>
1879− <literal>timeout</literal> defines how long to wait for
1880− the network to come online
1881− </para>
1882− </listitem>
1883− <listitem>
1884− <para>
1885− <literal>extraArgs</literal> for everything else
1886− </para>
1887− </listitem>
1888− </itemizedlist>
1889− </listitem>
1890925 <listitem>
1891926 <para>
1892927 The <literal>influxdb2</literal> package was split into
@@ -1897,29 +932,6 @@
1897932 compatibilty, but will be removed at a later date.
1898933 </para>
1899934 </listitem>
1900− <listitem>
1901− <para>
1902− The <literal>unifi</literal> package was switched from
1903− <literal>unifi6</literal> to <literal>unifi7</literal>. Direct
1904− downgrades from Unifi 7 to Unifi 6 are not possible and
1905− require restoring from a backup made by Unifi 6.
1906− </para>
1907− </listitem>
1908− <listitem>
1909− <para>
1910− <literal>programs.zsh.autosuggestions.strategy</literal> now
1911− takes a list of strings instead of a string.
1912− </para>
1913− </listitem>
1914− <listitem>
1915− <para>
1916− The <literal>asterisk</literal> and
1917− <literal>asterisk-stable</literal> packages were switched from
1918− <literal>asterisk_18</literal> to the newly-packaged
1919− <literal>asterisk_19</literal>. Asterisk 13 and 17 have been
1920− removed as they have reached their end of life.
1921− </para>
1922− </listitem>
1923935 <listitem>
1924936 <para>
1925937 The <literal>services.unifi.openPorts</literal> option default
@@ -1928,15 +940,6 @@
1928940 using this default will print a warning when rebuilt.
1929941 </para>
1930942 </listitem>
1931− <listitem>
1932− <para>
1933− The <literal>services.unifi-video.openPorts</literal> option
1934− default value of <literal>true</literal> is now deprecated and
1935− will be changed to <literal>false</literal> in 22.11.
1936− Configurations using this default will print a warning when
1937− rebuilt.
1938− </para>
1939− </listitem>
1940943 <listitem>
1941944 <para>
1942945 <literal>security.acme</literal> certificates will now
@@ -1978,11 +981,9 @@
1978981 <para>
1979982 <link linkend="opt-programs.ssh.knownHosts">programs.ssh.knownHosts</link>
1980983 has gained an <literal>extraHostNames</literal> option to
1981− augment <literal>hostNames</literal>. It is now possible to
1982− use the attribute name of a <literal>knownHosts</literal>
1983− entry as the primary host name and specify secondary host
1984− names using <literal>extraHostNames</literal> without having
1985− to duplicate the primary host name.
984+ replace <literal>hostNames</literal>.
985+ <literal>hostNames</literal> is deprecated, but still
986+ available for now.
1986987 </para>
1987988 </listitem>
1988989 <listitem>
@@ -1993,36 +994,6 @@
1993994 configuration.
1994995 </para>
1995996 </listitem>
1996− <listitem>
1997− <para>
1998− The option
1999− <link linkend="opt-services.xserver.desktopManager.runXdgAutostartIfNone">services.xserver.desktopManager.runXdgAutostartIfNone</link>
2000− was added in order to automatically run XDG autostart files
2001− for sessions without a desktop manager. This replaces helpers
2002− like the <literal>dex</literal> package.
2003− </para>
2004− </listitem>
2005− <listitem>
2006− <para>
2007− When setting
2008− <link linkend="opt-i18n.inputMethod.enabled">i18n.inputMethod.enabled</link>
2009− to <literal>fcitx5</literal>, it no longer creates
2010− corresponding systemd user services. It now relies on XDG
2011− autostart files to start and work properly in your desktop
2012− sessions. If you are using only a window manager without a
2013− desktop manager, you need to enable
2014− <literal>services.xserver.desktopManager.runXdgAutostartIfNone</literal>
2015− or using the <literal>dex</literal> package to make
2016− <literal>fcitx5</literal> work.
2017− </para>
2018− </listitem>
2019− <listitem>
2020− <para>
2021− A new module was added for the Envoy reverse proxy, providing
2022− the options <literal>services.envoy.enable</literal> and
2023− <literal>services.envoy.settings</literal>.
2024− </para>
2025− </listitem>
2026997 <listitem>
2027998 <para>
2028999 The option <literal>services.duplicati.dataDir</literal> has
@@ -2032,10 +1003,10 @@
20321003 </listitem>
20331004 <listitem>
20341005 <para>
2035− The options <literal>boot.extraModprobeConfig</literal> and
2036− <literal>boot.blacklistedKernelModules</literal> now also take
2037− effect in the initrd by copying the file
2038− <literal>/etc/modprobe.d/nixos.conf</literal> into the initrd.
1006+ A new option
1007+ <literal>boot.initrd.extraModprobeConfig</literal> has been
1008+ added which can be used to configure kernel modules that are
1009+ loaded in the initrd.
20391010 </para>
20401011 </listitem>
20411012 <listitem>
@@ -2045,105 +1016,6 @@
20451016 instead of <literal>configuration.nix</literal>.
20461017 </para>
20471018 </listitem>
2048− <listitem>
2049− <para>
2050− ORY Kratos was updated to version 0.9.0-alpha.3, which
2051− introduces some breaking changes:
2052− </para>
2053− <itemizedlist spacing="compact">
2054− <listitem>
2055− <para>
2056− All endpoints at the Admin API are now exposed at
2057− <literal>/admin/</literal>. For example, endpoint
2058− <literal>https://kratos:4434/identities</literal> is now
2059− exposed at
2060− <literal>https://kratos:4434/admin/identities</literal>
2061− </para>
2062− </listitem>
2063− <listitem>
2064− <para>
2065− Configuration key
2066− <literal>selfservice.whitelisted_return_urls</literal> has
2067− been renamed to <literal>allowed_return_urls</literal>
2068− </para>
2069− </listitem>
2070− <listitem>
2071− <para>
2072− The <literal>password_identifier</literal> form field of
2073− the password login strategy has been renamed to
2074− <literal>identifier</literal> to make compatibility with
2075− passwordless flows possible.
2076− </para>
2077− </listitem>
2078− <listitem>
2079− <para>
2080− Instead of having a global
2081− <literal>default_schema_url</literal> which developers
2082− used to update their schema, you now need to define the
2083− <literal>default_schema_id</literal> which must reference
2084− schema ID in your config.
2085− </para>
2086− </listitem>
2087− <listitem>
2088− <para>
2089− Calling <literal>/self-service/recovery</literal> without
2090− flow ID or with an invalid flow ID while authenticated
2091− will now respond with an error instead of redirecting to
2092− the default page.
2093− </para>
2094− </listitem>
2095− <listitem>
2096− <para>
2097− If you are relying on the SQLite images, update your
2098− Docker Pull commands as follows:
2099− </para>
2100− <itemizedlist spacing="compact">
2101− <listitem>
2102− <para>
2103− <literal>docker pull oryd/kratos:{version}</literal>
2104− </para>
2105− </listitem>
2106− </itemizedlist>
2107− </listitem>
2108− <listitem>
2109− <para>
2110− Additionally, all passwords now have to be at least 8
2111− characters long.
2112− </para>
2113− </listitem>
2114− <listitem>
2115− <para>
2116− For more details, see:
2117− </para>
2118− <itemizedlist spacing="compact">
2119− <listitem>
2120− <para>
2121− <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1">Release
2122− Notes for v0.8.1-alpha-1</link>
2123− </para>
2124− </listitem>
2125− <listitem>
2126− <para>
2127− <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1">Release
2128− Notes for v0.8.2-alpha-1</link>
2129− </para>
2130− </listitem>
2131− <listitem>
2132− <para>
2133− <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.1">Release
2134− Notes for v0.9.0-alpha-1</link>
2135− </para>
2136− </listitem>
2137− <listitem>
2138− <para>
2139− <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.3">Release
2140− Notes for v0.9.0-alpha-3</link>
2141− </para>
2142− </listitem>
2143− </itemizedlist>
2144− </listitem>
2145− </itemizedlist>
2146− </listitem>
21471019 <listitem>
21481020 <para>
21491021 <literal>fetchFromSourcehut</literal> now allows fetching
@@ -2153,13 +1025,6 @@
21531025 <literal>true</literal>.
21541026 </para>
21551027 </listitem>
2156− <listitem>
2157− <para>
2158− A module for declarative configuration of openconnect VPN
2159− profiles was added under
2160− <literal>networking.openconnect</literal>.
2161− </para>
2162− </listitem>
21631028 <listitem>
21641029 <para>
21651030 The <literal>element-desktop</literal> package now has an
@@ -2179,15 +1044,6 @@
21791044 <literal>pkgs.theLoungePlugins.themes</literal>.
21801045 </para>
21811046 </listitem>
2182− <listitem>
2183− <para>
2184− The option
2185− <literal>services.xserver.videoDriver = [ "nvidia" ];</literal>
2186− will now also install
2187− <link xlink:href="https://github.com/elFarto/nvidia-vaapi-driver">nvidia
2188− VA-API drivers</link> by default.
2189− </para>
2190− </listitem>
21911047 <listitem>
21921048 <para>
21931049 The <literal>firmwareLinuxNonfree</literal> package has been
@@ -2242,35 +1098,9 @@
22421098 </listitem>
22431099 <listitem>
22441100 <para>
2245− <link linkend="opt-services.logrotate.enable">services.logrotate.enable</link>
2246− now defaults to true if any rotate path has been defined, and
2247− some paths have been added by default.
2248− </para>
2249− </listitem>
2250− <listitem>
2251− <para>
2252− The logrotate module also has been updated to freeform syntax:
2253− <link linkend="opt-services.logrotate.paths">services.logrotate.paths</link>
2254− and
2255− <link linkend="opt-services.logrotate.extraConfig">services.logrotate.extraConfig</link>
2256− will work, but issue deprecation warnings and
2257− <link linkend="opt-services.logrotate.settings">services.logrotate.settings</link>
2258− should now be used instead.
2259− </para>
2260− </listitem>
2261− <listitem>
2262− <para>
2263− <literal>security.pam.ussh</literal> has been added, which
2264− allows authorizing PAM sessions based on SSH
2265− <emphasis>certificates</emphasis> held within an SSH agent,
2266− using
2267− <link xlink:href="https://github.com/uber/pam-ussh">pam-ussh</link>.
2268− </para>
2269− </listitem>
2270− <listitem>
2271− <para>
2272− The <literal>vscode-extensions.ionide.ionide-fsharp</literal>
2273− package has been updated to 6.0.0 and now requires .NET 6.0.
1101+ <literal>services.logrotate.enable</literal> now defaults to
1102+ true if any rotate path has been defined, and some paths have
1103+ been added by default.
22741104 </para>
22751105 </listitem>
22761106 <listitem>
@@ -2298,24 +1128,6 @@
22981128 </listitem>
22991129 </itemizedlist>
23001130 </listitem>
2301− <listitem>
2302− <para>
2303− The <literal>polybar</literal> package has been updated from
2304− 3.5.7 to 3.6.2. See
2305− <link xlink:href="https://github.com/polybar/polybar/releases/tag/3.6.0">the
2306− changelog</link> for more details.
2307− </para>
2308− <itemizedlist spacing="compact">
2309− <listitem>
2310− <para>
2311− Breaking changes include changes to escaping rules in
2312− configuration values, changes in behavior when
2313− encountering invalid tag names, and changes to
2314− inter-process-messaging (IPC).
2315− </para>
2316− </listitem>
2317− </itemizedlist>
2318− </listitem>
23191131 <listitem>
23201132 <para>
23211133 Renamed option
@@ -2327,22 +1139,6 @@
23271139 warning.
23281140 </para>
23291141 </listitem>
2330− <listitem>
2331− <para>
2332− <literal>services.autorandr</literal> now allows for adding
2333− hooks and profiles declaratively.
2334− </para>
2335− </listitem>
2336− <listitem>
2337− <para>
2338− The <literal>pomerium-cli</literal> command has been moved out
2339− of the <literal>pomerium</literal> package into the
2340− <literal>pomerium-cli</literal> package, following upstream’s
2341− repository split. If you are using the
2342− <literal>pomerium-cli</literal> command, you should now
2343− install the <literal>pomerium-cli</literal> package.
2344− </para>
2345− </listitem>
23461142 <listitem>
23471143 <para>
23481144 The option
@@ -2363,108 +1159,6 @@
23631159 <literal>tmux</literal>.
23641160 </para>
23651161 </listitem>
2366− <listitem>
2367− <para>
2368− The polkit service, available at
2369− <literal>security.polkit.enable</literal>, is now disabled by
2370− default. It will automatically be enabled through services and
2371− desktop environments as needed.
2372− </para>
2373− </listitem>
2374− <listitem>
2375− <para>
2376− xfsprogs was update to version 5.15, which enables inobtcount
2377− and bigtime by default on filesystem creation. Support for
2378− these features was added in kernel 5.10 and deemed stable in
2379− kernel 5.15. If you want to be able to mount XFS filesystems
2380− created with this release of xfsprogs on kernel releases older
2381− than 5.10, you need to format them with
2382− <literal>mkfs.xfs -m bigtime=0 -m inobtcount=0</literal>.
2383− </para>
2384− </listitem>
2385− <listitem>
2386− <para>
2387− <literal>services.xserver.desktopManager.xfce</literal> now
2388− includes Xfce’s screen locker,
2389− <literal>xfce4-screensaver</literal> that is enabled by
2390− default. You can disable it by setting
2391− <literal>false</literal> to
2392− <link linkend="opt-services.xserver.desktopManager.xfce.enableScreensaver">services.xserver.desktopManager.xfce.enableScreensaver</link>.
2393− </para>
2394− </listitem>
2395− <listitem>
2396− <para>
2397− The <literal>hadoop</literal> package has added support for
2398− <literal>aarch64-linux</literal> and
2399− <literal>aarch64-darwin</literal> as of 3.3.1
2400− (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>).
2401− </para>
2402− </listitem>
2403− <listitem>
2404− <para>
2405− The <literal>R</literal> package now builds again on
2406− <literal>aarch64-darwin</literal>
2407− (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>).
2408− </para>
2409− </listitem>
2410− <listitem>
2411− <para>
2412− The <literal>nss</literal> package was split into
2413− <literal>nss_esr</literal> and <literal>nss_latest</literal>,
2414− with <literal>nss</literal> being an alias for
2415− <literal>nss_esr</literal>. This was done to ease maintenance
2416− of <literal>nss</literal> and dependent high-profile packages
2417− like <literal>firefox</literal>.
2418− </para>
2419− </listitem>
2420− <listitem>
2421− <para>
2422− The Nextcloud module now supports to create a Mysql database
2423− automatically with
2424− <literal>services.nextcloud.database.createLocally</literal>
2425− enabled.
2426− </para>
2427− </listitem>
2428− <listitem>
2429− <para>
2430− The <literal>spark3</literal> package has been updated from
2431− 3.1.2 to 3.2.1
2432− (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/160075">#160075</link>):
2433− </para>
2434− <itemizedlist spacing="compact">
2435− <listitem>
2436− <para>
2437− Testing has been enabled for
2438− <literal>aarch64-linux</literal> in addition to
2439− <literal>x86_64-linux</literal>.
2440− </para>
2441− </listitem>
2442− <listitem>
2443− <para>
2444− The <literal>spark3</literal> package is now usable on
2445− <literal>aarch64-darwin</literal> as a result of
2446− <link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>
2447− and
2448− <link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>.
2449− </para>
2450− </listitem>
2451− </itemizedlist>
2452− </listitem>
2453− <listitem>
2454− <para>
2455− The <literal>programs.nncp</literal> options were added for
2456− generating host-global NNCP configuration.
2457− </para>
2458− </listitem>
2459− <listitem>
2460− <para>
2461− The option <literal>services.snapserver.openFirewall</literal>
2462− will no longer default to <literal>true</literal> starting
2463− with NixOS 22.11. Enable it explicitly if you need to control
2464− Snapserver remotely or connect streamig clients from other
2465− hosts.
2466− </para>
2467− </listitem>
24681162 </itemizedlist>
24691163 </section>
24701164</section>
nixos/doc/manual/installation/installation.xml−1
@@ -14,5 +14,4 @@
1414 <xi:include href="../from_md/installation/installing.chapter.xml" />
1515 <xi:include href="../from_md/installation/changing-config.chapter.xml" />
1616 <xi:include href="../from_md/installation/upgrading.chapter.xml" />
17− <xi:include href="../from_md/installation/building-nixos.chapter.xml" />
1817</part>
nixos/doc/manual/installation/installing-usb.section.md+1−1
@@ -18,7 +18,7 @@ $ diskutil list
1818[..]
1919$ diskutil unmountDisk diskN
2020Unmount of all volumes on diskN was successful
21−$ sudo dd if=nix.iso of=/dev/rdiskN bs=1M
21+$ sudo dd if=nix.iso of=/dev/rdiskN
2222```
2323
2424Using the \'raw\' `rdiskN` device instead of `diskN` completes in
nixos/doc/manual/installation/installing.chapter.md+5−5
@@ -296,11 +296,6 @@ Use the following commands:
296296 specify on which disk the GRUB boot loader is to be installed.
297297 Without it, NixOS cannot boot.
298298
299− : If there are other operating systems running on the machine before
300− installing NixOS, the [](#opt-boot.loader.grub.useOSProber)
301− option can be set to `true` to automatically add them to the grub
302− menu.
303−
304299 UEFI systems
305300
306301 : You *must* set the option [](#opt-boot.loader.systemd-boot.enable)
@@ -312,6 +307,11 @@ Use the following commands:
312307 [`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable)
313308 as well.
314309
310+ If there are other operating systems running on the machine before
311+ installing NixOS, the [](#opt-boot.loader.grub.useOSProber)
312+ option can be set to `true` to automatically add them to the grub
313+ menu.
314+
315315 If you need to configure networking for your machine the
316316 configuration options are described in [](#sec-networking). In
317317 particular, while wifi is supported on the installation image, it is
nixos/doc/manual/man-nixos-rebuild.xml−26
@@ -91,10 +91,6 @@
9191 <option>--flake</option> <replaceable>flake-uri</replaceable>
9292 </arg>
9393
94− <arg>
95− <option>--no-flake</option>
96− </arg>
97−
9894 <arg>
9995 <option>--override-input</option> <replaceable>input-name</replaceable> <replaceable>flake-uri</replaceable>
10096 </arg>
@@ -548,14 +544,6 @@
548544 (<replaceable>user@host</replaceable>). You can also set ssh options by
549545 defining the <envar>NIX_SSHOPTS</envar> environment variable.
550546 </para>
551−
552− <para>
553− Note that <command>nixos-rebuild</command> honors the
554− <literal>nixpkgs.crossSystem</literal> setting of the given configuration
555− but disregards the true architecture of the target host. Hence the
556− <literal>nixpkgs.crossSystem</literal> setting has to match the target
557− platform or else activation will fail.
558− </para>
559547 </listitem>
560548 </varlistentry>
561549
@@ -606,20 +594,6 @@
606594 </listitem>
607595 </varlistentry>
608596
609− <varlistentry>
610− <term>
611− <option>--no-flake</option>
612− </term>
613− <listitem>
614− <para>
615− Do not imply <option>--flake</option> if
616− <filename>/etc/nixos/flake.nix</filename> exists. With this
617− option, it is possible to build non-flake NixOS configurations
618− even if the current NixOS systems uses flakes.
619− </para>
620− </listitem>
621− </varlistentry>
622−
623597 </variablelist>
624598
625599 <para>
nixos/doc/manual/man-pages.xml+2−7
@@ -3,15 +3,10 @@
33 xmlns:xi="http://www.w3.org/2001/XInclude">
44 <title>NixOS Reference Pages</title>
55 <info>
6− <author>
7− <personname><firstname>Eelco</firstname><surname>Dolstra</surname></personname>
6+ <author><personname><firstname>Eelco</firstname><surname>Dolstra</surname></personname>
87 <contrib>Author</contrib>
98 </author>
10− <author>
11− <personname><othername>The Nixpkgs/NixOS contributors</othername></personname>
12− <contrib>Author</contrib>
13− </author>
14− <copyright><year>2007-2022</year><holder>Eelco Dolstra and the Nixpkgs/NixOS contributors</holder>
9+ <copyright><year>2007-2020</year><holder>Eelco Dolstra</holder>
1510 </copyright>
1611 </info>
1712 <xi:include href="man-configuration.xml" />
nixos/doc/manual/md-to-db.sh+1−1
@@ -1,5 +1,5 @@
11#! /usr/bin/env nix-shell
2−#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/tarball/21.11 -i bash -p pandoc
2+#! nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p pandoc
33
44# This script is temporarily needed while we transition the manual to
55# CommonMark. It converts the .md files in the regular manual folder
nixos/doc/manual/release-notes/rl-1803.section.md−2
@@ -282,5 +282,3 @@ When upgrading from a previous release, please be aware of the following incompa
282282- The NixOS test driver supports user services declared by `systemd.user.services`. The methods `waitForUnit`, `getUnitInfo`, `startJob` and `stopJob` provide an optional `$user` argument for that purpose.
283283
284284- Enabling bash completion on NixOS, `programs.bash.enableCompletion`, will now also enable completion for the Nix command line tools by installing the [nix-bash-completions](https://github.com/hedning/nix-bash-completions) package.
285−
286−- The vim/kakoune plugin updater now reads from a CSV file: check `pkgs/applications/editors/vim/plugins/vim-plugin-names` out to see the new format
nixos/doc/manual/release-notes/rl-2111.section.md−7
@@ -13,13 +13,6 @@ In addition to numerous new and upgraded packages, this release has the followin
1313 [Fedora](https://fedoraproject.org/wiki/Changes/iptables-nft-default).
1414 This means, `ip[6]tables`, `arptables` and `ebtables` commands will actually
1515 show rules from some specific tables in the `nf_tables` kernel subsystem.
16− In case you're migrating from an older release without rebooting, there might
17− be cases where you end up with iptable rules configured both in the legacy
18− `iptables` kernel backend, as well as in the `nf_tables` backend.
19− This can lead to confusing firewall behaviour. An `iptables-save` after
20− switching will complain about "iptables-legacy tables present".
21− It's probably best to reboot after the upgrade, or manually removing all
22− legacy iptables rules (via the `iptables-legacy` package).
2316
2417- systemd got an `nftables` backend, and configures (networkd) rules in their
2518 own `io.systemd.*` tables. Check `nft list ruleset` to see these rules, not
nixos/doc/manual/release-notes/rl-2205.section.md+7−509
@@ -6,32 +6,11 @@ In addition to numerous new and upgraded packages, this release has the followin
66
77## Highlights {#sec-release-22.05-highlights}
88
9−- The `firefox` browser on `x86_64-linux` is now making use of
10− profile-guided optimization resulting in a much more responsive
11− browsing experience.
12−
139- `security.acme.defaults` has been added to simplify configuring
1410 settings for many certificates at once. This also opens up the
1511 the option to use DNS-01 validation when using `enableACME` on
1612 web server virtual hosts (e.g. `services.nginx.virtualHosts.*.enableACME`).
1713
18−- GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell.
19−
20−- `stdenv.mkDerivation` now supports a self-referencing `finalAttrs:` parameter
21− containing the final `mkDerivation` arguments including overrides.
22− `drv.overrideAttrs` now supports two parameters `finalAttrs: previousAttrs:`.
23− This allows packaging configuration to be overridden in a consistent manner by
24− providing an alternative to `rec {}` syntax.
25−
26− Additionally, `passthru` can now reference `finalAttrs.finalPackage` containing
27− the final package, including attributes such as the output paths and
28− `overrideAttrs`.
29−
30− New language integrations can be simplified by overriding a "prototype"
31− package containing the language-specific logic. This removes the need for a
32− extra layer of overriding for the "generic builder" arguments, thus removing a
33− usability problem and source of error.
34−
3514- PHP 8.1 is now available
3615
3716- Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html).
@@ -40,21 +19,6 @@ In addition to numerous new and upgraded packages, this release has the followin
4019
4120- systemd services can now set [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services) instead of `reloadIfChanged` for a more granular distinction between reloads and restarts.
4221
43−- Systemd has been upgraded to the version 250.
44−
45−- Pulseaudio has been upgraded to version 15.0 and now optionally [supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters) like aptX or LDAC, with codec switching support being available in `pavucontrol`. This feature is disabled by default but can be enabled by using `hardware.pulseaudio.package = pkgs.pulseaudioFull;`.
46− Existing 3rd party modules that provided similar functionality, like `pulseaudio-modules-bt` or `pulseaudio-hsphfpd` are deprecated and have been removed.
47−
48−- The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks.
49−
50−- [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details.
51−
52−- Module authors can use `mkRenamedOptionModuleWith` to automate the deprecation cycle without annoying out-of-tree module authors and their users.
53−
54−- The default GHC version has been updated from 8.10.7 to 9.0.2. `pkgs.haskellPackages` and `pkgs.ghc` will now use this version by default.
55−
56−- The GNOME and Plasma installation CDs now use `pkgs.calamares` and `pkgs.calamares-nixos-extensions` to allow users to easily install and set up NixOS with a GUI.
57−
5822## New Services {#sec-release-22.05-new-services}
5923
6024- [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).
@@ -63,18 +27,14 @@ In addition to numerous new and upgraded packages, this release has the followin
6327
6428- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable).
6529
66−- [nethoscope](https://github.com/vvilhonen/nethoscope), listen to your network traffic. Available as [programs.nethoscope](#opt-programs.nethoscope.enable).
67−
6830- [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable).
6931
7032- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS).
7133
72−- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VRRP and others). Available as [services.frr](#opt-services.frr.babel.enable)
34+- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.frr.babel.enable)
7335
7436- [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable).
7537
76−- [snowflake-proxy](https://snowflake.torproject.org/), a system to defeat internet censorship. Available as [services.snowflake-proxy](options.html#opt-services.snowflake-proxy.enable).
77−
7838- [ergochat](https://ergo.chat), a modern IRC with IRCv3 features. Available as [services.ergochat](options.html#opt-services.ergochat.enable).
7939
8040- [PowerDNS-Admin](https://github.com/ngoduykhanh/PowerDNS-Admin), a web interface for the PowerDNS server. Available at [services.powerdns-admin](options.html#opt-services.powerdns-admin.enable).
@@ -89,14 +49,8 @@ In addition to numerous new and upgraded packages, this release has the followin
8949
9050- [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](options.html#opt-programs.k4-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device.
9151
92−- [mozillavpn](https://github.com/mozilla-mobile/mozilla-vpn-client), the client for the [Mozilla VPN](https://vpn.mozilla.org/) service. Available as [services.mozillavpn](options.html#opt-services.mozillavpn).
93−
9452- [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable).
9553
96−- [prometheus-pve-exporter](https://github.com/prometheus-pve/prometheus-pve-exporter), a tool that exposes information from the Proxmox VE API for use by Prometheus. Available as [services.prometheus.exporters.pve](options.html#opt-services.prometheus.exporters.pve).
97−
98−- [netbox](https://github.com/netbox-community/netbox), infrastructure resource modeling (IRM) tool. Available as [services.netbox](options.html#opt-services.netbox.enable).
99−
10054- [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable).
10155
10256- [agate](https://github.com/mbrubeck/agate), a very simple server for the Gemini hypertext protocol. Available as [services.agate](options.html#opt-services.agate.enable).
@@ -112,29 +66,17 @@ In addition to numerous new and upgraded packages, this release has the followin
11266
11367- [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable).
11468
115−- [systembus-notify](https://github.com/rfjakob/systembus-notify), allow system level notifications to reach the users. Available as [services.systembus-notify](opt-services.systembus-notify.enable). Please keep in mind that this service should only be enabled on machines with fully trusted users, as any local user is able to DoS user sessions by spamming notifications.
116−
11769- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative
11870 spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable).
11971
120−- [nbd](https://nbd.sourceforge.io/), a Network Block Device server. Available as [services.nbd](options.html#opt-services.nbd.server.enable).
121−
122−- [nix-ld](https://github.com/Mic92/nix-ld), Run unpatched dynamic binaries on NixOS. Available as [programs.nix-ld](options.html#opt-programs.nix-ld.enable).
123−
12472- [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable).
12573
12674- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable).
12775
12876- [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable)
12977
130−- [create_ap](https://github.com/lakinduakash/linux-wifi-hotspot), a module for creating wifi hotspots using the program linux-wifi-hotspot. Available as [services.create_ap](options.html#opt-services.create_ap.enable).
131−
13278- [blocky](https://0xerr0r.github.io/blocky/), fast and lightweight DNS proxy as ad-blocker for local network with many features.
13379
134−- [pacemaker](https://clusterlabs.org/pacemaker/) cluster resource manager
135−
136−- [nifi](https://nifi.apache.org), an easy to use, powerful, and reliable system to process and distribute data. Available as [services.nifi](options.html#opt-services.nifi.enable).
137−
13880<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
13981
14082## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
@@ -171,90 +113,10 @@ In addition to numerous new and upgraded packages, this release has the followin
171113 org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
172114 `pkgs.emacsPackages.nongnuPackages` where the new versions will release.
173115
174−- The configuration and state directories used by `nixos-containers` have been
175− moved from `/etc/containers` and `/var/lib/containers` to
176− `/etc/nixos-containers` and `/var/lib/nixos-containers`.
177−
178− If you are changing `system.stateVersion` to `"22.05"` manually on an existing
179− system you are responsible for migrating these directories yourself.
180−
181− This is to improve compatibility with `libcontainer` based software such as Podman and Skopeo
182− which assumes they have ownership over `/etc/containers`.
183−
184−- For new installations `virtualisation.oci-containers.backend` is now set to `podman` by default.
185− If you still want to use Docker on systems where `system.stateVersion` is set to to `"22.05"` set `virtualisation.oci-containers.backend = "docker";`.Old systems with older `stateVersion`s stay with "docker".
186−
187−- `security.klogd` was removed. Logging of kernel messages is handled
188− by systemd since Linux 3.5.
189−
190−- `pkgs.ssmtp` has been dropped due to the program being unmaintained.
191− `pkgs.msmtp` can be used instead as a substitute `sendmail` implementation.
192− The corresponding options `services.ssmtp.*` have been removed as well.
193− `programs.msmtp.*` can be used instead for an equivalent setup. For example:
194−
195− ```nix
196− {
197− # Original ssmtp configuration:
198− services.ssmtp = {
199− enable = true;
200− useTLS = true;
201− useSTARTTLS = true;
202− hostName = "smtp.example:587";
203− authUser = "someone";
204− authPassFile = "/secrets/password.txt";
205− };
206−
207− # Equivalent msmtp configuration:
208− programs.msmtp = {
209− enable = true;
210− accounts.default = {
211− tls = true;
212− tls_starttls = true;
213− auth = true;
214− host = "smtp.example";
215− port = 587;
216− user = "someone";
217− passwordeval = "cat /secrets/password.txt";
218− };
219− };
220− }
221− ```
222−
223116- `services.kubernetes.addons.dashboard` was removed due to it being an outdated version.
224117
225118- `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading.
226119
227−- In the PowerDNS Recursor module (`services.pdns-recursor`), default values of several IP address-related NixOS options have been updated to match the default upstream behavior.
228− In particular, Recursor by default will:
229− - listen on (and allows connections from) both IPv4 and IPv6 addresses
230− (`services.pdns-recursor.dns.address`, `services.pdns-recursor.dns.allowFrom`);
231− - allow only local connections to the REST API server (`services.pdns-recursor.api.allowFrom`).
232−
233−- In the ncdns module, the default value of `services.ncdns.address` has been changed to the IPv6 loopback address (`::1`).
234−
235−- `openssh` has been update to 8.9p1, changing the FIDO security key middleware interface.
236−
237−- `git` no longer hardcodes the path to openssh' ssh binary to reduce the amount of rebuilds. If you are using git with ssh remotes and do not have a ssh binary in your enviroment consider adding `openssh` to it or switching to `gitFull`.
238−
239−- `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`.
240− This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration.
241− The previous behavior may be retained by explicitly setting `systemd.enableUnifiedCgroupHierarchy = false` in your configuration.
242−
243−- `fonts.fonts` no longer includes ancient bitmap fonts when both `config.services.xserver.enable` and `config.nixpkgs.config.allowUnfree` are enabled.
244− If you still want these fonts, use:
245−
246− ```nix
247− {
248− fonts.fonts = [
249− pkgs.xorg.fontbhlucidatypewriter100dpi
250− pkgs.xorg.fontbhlucidatypewriter75dpi
251− pkgs.xorg.fontbh100dpi
252− ];
253− }
254− ```
255−
256−- `services.prometheus.alertManagerTimeout` has been removed as it has been deprecated upstream and has no effect.
257−
258120- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
259121 The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
260122 The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
@@ -262,193 +124,8 @@ In addition to numerous new and upgraded packages, this release has the followin
262124
263125- The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2.
264126
265−- `services.ipfs.extraFlags` is now escaped with `utils.escapeSystemdExecArgs`. If you rely on systemd interpolating `extraFlags` in the service `ExecStart`, this will no longer work.
266−
267−- `hbase` version 0.98.24 has been removed. The package now defaults to version 2.4.11. Versions 1.7.1 and 3.0.0-alpha-2 are also available.
268−
269−- `services.paperless-ng` was renamed to `services.paperless`. Accordingly, the `paperless-ng-manage` script (located in `dataDir`) was renamed to `paperless-manage`. `services.paperless` now uses `paperless-ngx`.
270−
271−- The `matrix-synapse` service (`services.matrix-synapse`) has been converted to use the `settings` option defined in RFC42.
272− This means that options that are part of your `homeserver.yaml` configuration, and that were specified at the top-level of the
273− module (`services.matrix-synapse`) now need to be moved into `services.matrix-synapse.settings`. And while not all options you
274− may use are defined in there, they are still supported, because you can set arbitrary values in this freeform type.
275−
276− The `listeners.*.bind_address` option was renamed to `bind_addresses` in order to match the upstream `homeserver.yaml` option
277− name. It is now also a list of strings instead of a string.
278−
279− An example to make the required migration clearer:
280−
281− Before:
282− ```nix
283− {
284− services.matrix-synapse = {
285− enable = true;
286−
287− server_name = "example.com";
288− public_baseurl = "https://example.com:8448";
289−
290− enable_registration = false;
291− registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut";
292− macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l";
293−
294− tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
295− tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
296−
297− listeners = [ {
298− port = 8448;
299− bind_address = "";
300− type = "http";
301− tls = true;
302− resources = [ {
303− names = [ "client" ];
304− compress = true;
305− } {
306− names = [ "federation" ];
307− compress = false;
308− } ];
309− } ];
310−
311− };
312− }
313− ```
314−
315− After:
316− ```nix
317− {
318− services.matrix-synapse = {
319− enable = true;
320−
321− # this attribute set holds all values that go into your homeserver.yaml configuration
322− # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for
323− # possible values.
324− settings = {
325− server_name = "example.com";
326− public_baseurl = "https://example.com:8448";
327−
328− enable_registration = false;
329− # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead
330−
331− tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
332− tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
333−
334− listeners = [ {
335− port = 8448;
336− bind_addresses = [
337− "::"
338− "0.0.0.0"
339− ];
340− type = "http";
341− tls = true;
342− resources = [ {
343− names = [ "client" ];
344− compress = true;
345− } {
346− names = [ "federation" ];
347− compress = false;
348− } ];
349− } ];
350− };
351−
352− extraConfigFiles = [
353− /run/keys/matrix-synapse/secrets.yaml
354− ];
355− };
356− }
357− ```
358−
359− The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`.
360−
361− Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. For the same reason, the default
362− `media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new
363− location if the `stateVersion` is updated.
364−
365− As of Synapse 1.58.0, the old groups/communities feature has been disabled by default. It will be completely removed with Synapse 1.61.0.
366−
367−- The Keycloak package (`pkgs.keycloak`) has been switched from the
368− Wildfly version, which will soon be deprecated, to the Quarkus based
369− version. The Keycloak service (`services.keycloak`) has been updated
370− to accommodate the change and now differs from the previous version
371− in a few ways:
372−
373− - `services.keycloak.extraConfig` has been removed in favor of the
374− new [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)
375− [`services.keycloak.settings`](#opt-services.keycloak.settings)
376− option. The available options correspond directly to parameters in
377− `conf/keycloak.conf`. Some of the most important parameters are
378− documented as suboptions, the rest can be found in the [All
379− configuration section of the Keycloak Server Installation and
380− Configuration
381− Guide](https://www.keycloak.org/server/all-config). While the new
382− configuration is much simpler and cleaner than the old JBoss CLI
383− one, this unfortunately mean that there's no straightforward way
384− to convert an old configuration to the new format and some
385− settings may not even be available anymore.
386−
387− - `services.keycloak.frontendUrl` was removed and the frontend URL
388− is now configured through the `hostname` family of settings in
389− [`services.keycloak.settings`](#opt-services.keycloak.settings)
390− instead. See the [Hostname section of the Keycloak Server
391− Installation and Configuration
392− Guide](https://www.keycloak.org/server/hostname) for more
393− details. Additionally, `/auth` was removed from the default
394− context path and needs to be added back in
395− [`services.keycloak.settings.http-relative-path`](#opt-services.keycloak.settings.http-relative-path)
396− if you want to keep compatibility with your current clients.
397−
398− - `services.keycloak.bindAddress`,
399− `services.keycloak.forceBackendUrlToFrontendUrl`,
400− `services.keycloak.httpPort` and `services.keycloak.httpsPort`
401− have been removed in favor of their equivalent options in
402− [`services.keycloak.settings`](#opt-services.keycloak.settings). `httpPort`
403− and `httpsPort` have additionally had their types changed from
404− `str` to `port`.
405−
406− The new names are as follows:
407− - `bindAddress`: [`services.keycloak.settings.http-host`](#opt-services.keycloak.settings.http-host)
408− - `forceBackendUrlToFrontendUrl`: [`services.keycloak.settings.hostname-strict-backchannel`](#opt-services.keycloak.settings.hostname-strict-backchannel)
409− - `httpPort`: [`services.keycloak.settings.http-port`](#opt-services.keycloak.settings.http-port)
410− - `httpsPort`: [`services.keycloak.settings.https-port`](#opt-services.keycloak.settings.https-port)
411−
412− For example, when using a reverse proxy the migration could look
413− like this:
414−
415− Before:
416− ```nix
417− services.keycloak = {
418− enable = true;
419− httpPort = "8080";
420− frontendUrl = "https://keycloak.example.com/auth";
421− database.passwordFile = "/run/keys/db_password";
422− extraConfig = {
423− "subsystem=undertow"."server=default-server"."http-listener=default".proxy-address-forwarding = true;
424− };
425− };
426− ```
427−
428− After:
429− ```nix
430− services.keycloak = {
431− enable = true;
432− settings = {
433− http-port = 8080;
434− hostname = "keycloak.example.com";
435− http-relative-path = "/auth";
436− proxy = "edge";
437− };
438− database.passwordFile = "/run/keys/db_password";
439− };
440− ```
441−
442127- The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs.
443128
444−- Services in the `hadoop` module previously set `openFirewall` to true by default.
445− This has now been changed to false. Node definitions for multi-node clusters would need
446− `openFirewall = true;` to be added to to hadoop services when upgrading from NixOS 21.11.
447−
448−- `services.hadoop.yarn.nodemanager` now uses cgroup-based CPU limit enforcement by default.
449− Additionally, the option `useCGroups` was added to nodemanagers as an easy way to switch
450− back to the old behavior.
451−
452129- The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.
453130
454131- `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2.
@@ -461,10 +138,6 @@ In addition to numerous new and upgraded packages, this release has the followin
461138
462139- The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`.
463140
464−- `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings.
465−
466−- `services.telepathy` will no longer be enabled by default for GNOME desktops, one should enable it in their configs if using Empathy or Polari.
467−
468141- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
469142
470143- Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected.
@@ -480,10 +153,6 @@ In addition to numerous new and upgraded packages, this release has the followin
480153
481154- `services.miniflux.adminCredentialFiles` is now required, instead of defaulting to `admin` and `password`.
482155
483−- The `taskserver` module no longer implicitly opens ports in the firewall
484− configuration. This is now controlled through the option
485− `services.taskserver.openFirewall`.
486−
487156- The `autorestic` package has been upgraded from 1.3.0 to 1.5.0 which introduces breaking changes in config file, check [their migration guide](https://autorestic.vercel.app/migration/1.4_1.5) for more details.
488157
489158- For `pkgs.python3.pkgs.ipython`, its direct dependency `pkgs.python3.pkgs.matplotlib-inline`
@@ -509,53 +178,21 @@ In addition to numerous new and upgraded packages, this release has the followin
509178
510179- `pkgs.docbookrx` was removed since it's unmaintained
511180
512−- `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code
513−
514−- The `vim.customize` function produced by `vimUtils.makeCustomizable` now has a slightly different interface:
515− * The wrapper now includes everything in the given Vim derivation if `name` is `"vim"` (the default). This makes the `wrapManual` argument obsolete, but this behavior can be overriden by setting the `standalone` argument.
516− * All the executables present in the given derivation (or, in `standalone` mode, only the `*vim` ones) are wrapped. This makes the `wrapGui` argument obsolete.
517− * The `vimExecutableName` and `gvimExecutableName` arguments were replaced by a single `executableName` argument in which the shell variable `$exe` can be used to refer to the wrapped executable's name.
518−
519− See the comments in `pkgs/applications/editors/vim/plugins/vim-utils.nix` for more details.
520−
521− `vimUtils.vimWithRC` was removed. You should instead use `customize` on a Vim derivation, which now accepts `vimrcFile` and `gvimrcFile` arguments.
522−
523181- `tilp2` was removed together with its module
524182
525−- The F-PROT antivirus (`fprot` package) and its service module were removed because it
526− reached [end-of-life](https://kb.cyren.com/av-support/index.php?/Knowledgebase/Article/View/434/0/end-of-sale--end-of-life-for-f-prot-and-csam).
527−
528183- `bird1` and its modules `services.bird` as well as `services.bird6` have been removed. Upgrade to `services.bird2`.
529184
530185- The options `networking.interfaces.<name>.ipv4.routes` and `networking.interfaces.<name>.ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`.
531186
532−- The `miller` package has been upgraded from 5.10.3 to [6.2.0](https://github.com/johnkerl/miller/releases/tag/v6.2.0). See [What's new in Miller 6](https://miller.readthedocs.io/en/latest/new-in-miller-6).
533−
534187- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.
535188
536189- `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn.<name>.execConfig.PrivateUsers = false`
537190
538−- `systemd-shutdown` is now properly linked on shutdown to unmount all filesystems and device mapper devices cleanly. This can be disabled using `systemd.shutdownRamfs.enable`.
539−
540−- The Tor SOCKS proxy is now actually disabled if `services.tor.client.enable` is set to `false` (the default). If you are using this functionality but didn't change the setting or set it to `false`, you now need to set it to `true`.
541−
542−- `services.github-runner` has been hardened. Notably address families and
543− system calls have been restricted, which may adversely affect some kinds of
544− testing, e.g. using `AF_BLUETOOTH` to test bluetooth devices.
545−
546191- The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under
547192`$out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version>` (which mkProvider does).
548193
549194 This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly.
550195
551−- The `dendrite` package has been upgraded from 0.5.1 to
552− [0.6.5](https://github.com/matrix-org/dendrite/releases/tag/v0.6.5). Instances
553− configured with split sqlite databases, which has been the default
554− in NixOS, require merging of the federation sender and signing key
555− databases. See upstream [release
556− notes](https://github.com/matrix-org/dendrite/releases/tag/v0.6.0)
557− on version 0.6.0 for details on database changes.
558−
559196- The existing `pkgs.opentelemetry-collector` has been moved to
560197 `pkgs.opentelemetry-collector-contrib` to match the actual source being the
561198 "contrib" edition. `pkgs.opentelemetry-collector` is now the actual core
@@ -563,11 +200,8 @@ In addition to numerous new and upgraded packages, this release has the followin
563200 you should change the package you refer to. If you don't need them update your
564201 commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary.
565202
566−- `services.zookeeper` has a new option `jre` for specifying the JRE to start
567− zookeeper with. It defaults to the JRE that `pkgs.zookeeper` was wrapped with,
568− instead of `pkgs.jre`. This changes the JRE to `pkgs.jdk11_headless` by default.
569−
570−- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed.
203+- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`.
204+ If you still need pgadmin3, use `pkgs.pgadmin3`.
571205
572206- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
573207 and `pkgs.noto-fonts-cjk-serif` because they each have different release
@@ -575,30 +209,6 @@ In addition to numerous new and upgraded packages, this release has the followin
575209 `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and
576210 doesn't include serif fonts.
577211
578−- `pkgs.epgstation` has been upgraded from v1 to v2, resulting in incompatible
579− changes in the database scheme and configuration format.
580−
581−- Some top-level settings under [services.epgstation](#opt-services.epgstation.enable)
582− is now deprecated because it was redudant due to the same options being
583− present in [services.epgstation.settings](#opt-services.epgstation.settings).
584−
585−- The option `services.epgstation.basicAuth` was removed because basic
586− authentication support was dropped by upstream.
587−
588−- The option [services.epgstation.database.passwordFile](#opt-services.epgstation.database.passwordFile)
589− no longer has a default value. Make sure to set this option explicitly before
590− upgrading. Change the database password if necessary.
591−
592−- The [services.epgstation.settings](#opt-services.epgstation.settings)
593− option now expects options for `config.yml` in EPGStation v2.
594−
595−- Existing data for the [services.epgstation](#opt-services.epgstation.enable)
596− module would have to be backed up prior to the upgrade. To back up exising
597− data to `/tmp/epgstation.bak`, run
598− `sudo -u epgstation epgstation run backup /tmp/epgstation.bak`.
599− To import that data after to the upgrade, run
600− `sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak`
601−
602212- `switch-to-configuration` (the script that is run when running `nixos-rebuild switch` for example) has been reworked
603213 * The interface that allows activation scripts to restart units has been streamlined. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units.
604214 * Preferring to reload instead of restarting can still be achieved using `/run/nixos/activation-reload-list`.
@@ -637,15 +247,6 @@ In addition to numerous new and upgraded packages, this release has the followin
637247
638248 See the `vscode` package for a more detailed example.
639249
640−- Existing `resholve*` functions have been renamed and nested under `pkgs.resholve`. Update uses to:
641− - `resholvePackage` -> `resholve.mkDerivation`
642− - `resholveScript` -> `resholve.writeScript`
643− - `resholveScriptBin` -> `resholve.writeScriptBin`
644−
645−- `pkgs.cosmopolitan` no longer provides the `cosmoc` command. It has been moved to `pkgs.cosmoc`.
646−
647−- `pkgs.graalvmXX-ce` packages no longer provide support for Python/Ruby/WASM, instead focusing only in Java and Native Image Support. If you need to add support back, please see the `pkgs.graalvmCEPackages.mkGraal` function to create your own customized version of GraalVM with support for what you need.
648−
649250<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
650251
651252## Other Notable Changes {#sec-release-22.05-notable-changes}
@@ -677,20 +278,11 @@ In addition to numerous new and upgraded packages, this release has the followin
677278 Similarly [virtualisation.vmVariantWithBootloader](#opt-virtualisation.vmVariantWithBootLoader) was added.
678279
679280- The configuration portion of the `nix-daemon` module has been reworked and exposed as [nix.settings](options.html#opt-nix-settings):
680− * Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) and will be deprecated when NixOS 21.11 reaches end of life.
281+ * Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) but may be deprecated in the future.
681282 * [nix.buildMachines.publicHostKey](options.html#opt-nix.buildMachines.publicHostKey) has been added.
682283
683284- The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added.
684285
685−- Some improvements have been made to the `hadoop` module:
686− - A `gatewayRole` option has been added, for deploying hadoop cluster configuration files to a node that does not have any active services
687− - Support for older versions of hadoop have been added to the module
688− - Overriding and extending site XML files has been made easier
689−
690−- The auto-upgrade service now accepts persistent (default: true) parameter.
691− By default auto-upgrade will now run immediately if it would have been triggered at least
692− once during the time when the timer was inactive.
693−
694286- If you are using Wayland you can choose to use the Ozone Wayland support
695287 in Chrome and several Electron apps by setting the environment variable
696288 `NIXOS_OZONE_WL=1` (for example via
@@ -699,29 +291,14 @@ In addition to numerous new and upgraded packages, this release has the followin
699291 still under heavy development and behavior is not always flawless.
700292 Furthermore, not all Electron apps use the latest Electron versions.
701293
702−- A new option group `systemd.network.wait-online` was added, with options to configure `systemd-networkd-wait-online.service`:
703− - `anyInterface` allows specifying that the network should be considered online when *at least one* interface is online (useful on laptops)
704− - `timeout` defines how long to wait for the network to come online
705− - `extraArgs` for everything else
706−
707294- The `influxdb2` package was split into `influxdb2-server` and
708295 `influxdb2-cli`, matching the split that took place upstream. A
709296 combined `influxdb2` package is still provided in this release for
710297 backwards compatibilty, but will be removed at a later date.
711298
712−- The `unifi` package was switched from `unifi6` to `unifi7`.
713− Direct downgrades from Unifi 7 to Unifi 6 are not possible and require restoring from a backup made by Unifi 6.
714−
715−- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string.
716−
717−- The `asterisk` and `asterisk-stable` packages were switched from `asterisk_18` to the newly-packaged `asterisk_19`. Asterisk 13 and 17 have been removed as they have reached their end of life.
718−
719299- The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
720300 Configurations using this default will print a warning when rebuilt.
721301
722−- The `services.unifi-video.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
723− Configurations using this default will print a warning when rebuilt.
724−
725302- `security.acme` certificates will now correctly check for CA
726303 revokation before reaching their minimum age.
727304
@@ -740,61 +317,26 @@ In addition to numerous new and upgraded packages, this release has the followin
740317 e.g. Wayland.
741318
742319- [programs.ssh.knownHosts](#opt-programs.ssh.knownHosts) has gained an `extraHostNames`
743− option to augment `hostNames`. It is now possible to use the attribute name of a `knownHosts`
744− entry as the primary host name and specify secondary host names using `extraHostNames` without
745− having to duplicate the primary host name.
320+ option to replace `hostNames`. `hostNames` is deprecated, but still available for now.
746321
747322- The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.
748323
749−- The option
750− [services.xserver.desktopManager.runXdgAutostartIfNone](#opt-services.xserver.desktopManager.runXdgAutostartIfNone)
751− was added in order to automatically run XDG autostart files for sessions without a desktop manager.
752− This replaces helpers like the `dex` package.
753−
754−- When setting [i18n.inputMethod.enabled](#opt-i18n.inputMethod.enabled) to `fcitx5`,
755− it no longer creates corresponding systemd user services.
756− It now relies on XDG autostart files to start and work properly in your desktop sessions.
757− If you are using only a window manager without a desktop manager, you need to enable
758− `services.xserver.desktopManager.runXdgAutostartIfNone` or using the `dex` package to make `fcitx5` work.
759−
760−- A new module was added for the Envoy reverse proxy, providing the options `services.envoy.enable` and `services.envoy.settings`.
761−
762324- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
763325
764−- The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd.
326+- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
765327
766328- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.
767329
768−- ORY Kratos was updated to version 0.9.0-alpha.3, which introduces some breaking changes:
769− - All endpoints at the Admin API are now exposed at `/admin/`. For example, endpoint `https://kratos:4434/identities` is now exposed at `https://kratos:4434/admin/identities`
770− - Configuration key `selfservice.whitelisted_return_urls` has been renamed to `allowed_return_urls`
771− - The `password_identifier` form field of the password login strategy has been renamed to `identifier` to make compatibility with passwordless flows possible.
772− - Instead of having a global `default_schema_url` which developers used to update their schema, you now need to define the `default_schema_id` which must reference schema ID in your config.
773− - Calling `/self-service/recovery` without flow ID or with an invalid flow ID while authenticated will now respond with an error instead of redirecting to the default page.
774− - If you are relying on the SQLite images, update your Docker Pull commands as follows:
775− - `docker pull oryd/kratos:{version}`
776− - Additionally, all passwords now have to be at least 8 characters long.
777− - For more details, see:
778− - [Release Notes for v0.8.1-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1)
779− - [Release Notes for v0.8.2-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1)
780− - [Release Notes for v0.9.0-alpha-1](https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.1)
781− - [Release Notes for v0.9.0-alpha-3](https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.3)
782−
783−
784330- `fetchFromSourcehut` now allows fetching repositories recursively
785331 using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
786332 is set to `true`.
787333
788−- A module for declarative configuration of openconnect VPN profiles was added under `networking.openconnect`.
789−
790334- The `element-desktop` package now has an `useKeytar` option (defaults to `true`),
791335 which allows disabling `keytar` and in turn `libsecret` usage
792336 (which binds to native credential managers / keychain libraries).
793337
794338- The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`.
795339
796−- The option `services.xserver.videoDriver = [ "nvidia" ];` will now also install [nvidia VA-API drivers](https://github.com/elFarto/nvidia-vaapi-driver) by default.
797−
798340- The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`.
799341
800342- It is now possible to specify wordlists to include as handy to access environment variables using the `config.environment.wordlist` configuration options.
@@ -811,35 +353,18 @@ In addition to numerous new and upgraded packages, this release has the followin
811353- `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins.
812354 Plugins are automatically repackaged using autoPatchelf.
813355
814−- [services.logrotate.enable](#opt-services.logrotate.enable) now defaults to true if any rotate path has
356+- `services.logrotate.enable` now defaults to true if any rotate path has
815357 been defined, and some paths have been added by default.
816−- The logrotate module also has been updated to freeform syntax: [services.logrotate.paths](#opt-services.logrotate.paths)
817− and [services.logrotate.extraConfig](#opt-services.logrotate.extraConfig) will work, but issue deprecation
818− warnings and [services.logrotate.settings](#opt-services.logrotate.settings) should now be used instead.
819−
820−- `security.pam.ussh` has been added, which allows authorizing PAM sessions based on SSH _certificates_ held within an SSH agent, using [pam-ussh](https://github.com/uber/pam-ussh).
821−
822−- The `vscode-extensions.ionide.ionide-fsharp` package has been updated to 6.0.0 and now requires .NET 6.0.
823358
824359- The `zrepl` package has been updated from 0.4.0 to 0.5:
825360
826361 - The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume.
827362 - A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver.
828363
829−- The `polybar` package has been updated from 3.5.7 to 3.6.2. See [the changelog](https://github.com/polybar/polybar/releases/tag/3.6.0) for more details.
830− - Breaking changes include changes to escaping rules in configuration values, changes in behavior when encountering invalid tag names, and changes to inter-process-messaging (IPC).
831−
832364- Renamed option `services.openssh.challengeResponseAuthentication` to `services.openssh.kbdInteractiveAuthentication`.
833365 Reason is that the old name has been deprecated upstream.
834366 Using the old option name will still work, but produce a warning.
835367
836−- `services.autorandr` now allows for adding hooks and profiles declaratively.
837−
838−- The `pomerium-cli` command has been moved out of the `pomerium` package into
839− the `pomerium-cli` package, following upstream's repository split. If you are
840− using the `pomerium-cli` command, you should now install the `pomerium-cli`
841− package.
842−
843368- The option
844369 [services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock)
845370 was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager
@@ -848,31 +373,4 @@ In addition to numerous new and upgraded packages, this release has the followin
848373
849374- `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`.
850375
851−- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
852−
853−- xfsprogs was update to version 5.15, which enables inobtcount and bigtime by default on filesystem creation. Support for these features was added in kernel 5.10 and deemed stable in kernel 5.15.
854− If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than 5.10, you need to format them with `mkfs.xfs -m bigtime=0 -m inobtcount=0`.
855−
856−- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver` that is enabled by default. You can disable it by setting `false` to [services.xserver.desktopManager.xfce.enableScreensaver](#opt-services.xserver.desktopManager.xfce.enableScreensaver).
857−
858−- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
859−
860−- The `R` package now builds again on `aarch64-darwin` ([#158992](https://github.com/NixOS/nixpkgs/pull/158992)).
861−
862−- The `nss` package was split into `nss_esr` and `nss_latest`, with `nss` being an alias for `nss_esr`. This was done to ease maintenance of `nss` and dependent high-profile packages like `firefox`.
863−
864−- The Nextcloud module now supports to create a Mysql database automatically
865− with `services.nextcloud.database.createLocally` enabled.
866−
867−- The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)):
868−
869− - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`.
870− - The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992).
871−
872−- The `programs.nncp` options were added for generating host-global NNCP configuration.
873−
874−- The option `services.snapserver.openFirewall` will no longer default to
875− `true` starting with NixOS 22.11. Enable it explicitly if you need to control
876− Snapserver remotely or connect streamig clients from other hosts.
877−
878376<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
nixos/lib/make-disk-image.nix−1
@@ -170,7 +170,6 @@ let format' = format; in let
170170 config.system.build.nixos-install
171171 config.system.build.nixos-enter
172172 nix
173− systemdMinimal
174173 ] ++ stdenv.initialPath);
175174
176175 # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
nixos/lib/make-options-doc/mergeJSON.py+2−11
@@ -48,9 +48,7 @@ overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r')))
4848
4949# fix up declaration paths in lazy options, since we don't eval them from a full nixpkgs dir
5050for (k, v) in options.items():
51− # The _module options are not declared in nixos/modules
52− if v.value['loc'][0] != "_module":
53− v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}', v.value['declarations']))
51+ v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}', v.value['declarations']))
5452
5553# merge both descriptions
5654for (k, v) in overrides.items():
@@ -68,21 +66,14 @@ for (k, v) in overrides.items():
6866 elif ov is not None or cur.get(ok, None) is None:
6967 cur[ok] = ov
7068
71−severity = "error" if warningsAreErrors else "warning"
72−
7369# check that every option has a description
7470hasWarnings = False
7571for (k, v) in options.items():
7672 if v.value.get('description', None) is None:
73+ severity = "error" if warningsAreErrors else "warning"
7774 hasWarnings = True
7875 print(f"\x1b[1;31m{severity}: option {v.name} has no description\x1b[0m", file=sys.stderr)
7976 v.value['description'] = "This option has no description."
80− if v.value.get('type', "unspecified") == "unspecified":
81− hasWarnings = True
82− print(
83− f"\x1b[1;31m{severity}: option {v.name} has no type. Please specify a valid type, see " +
84− "https://nixos.org/manual/nixos/stable/index.html#sec-option-types\x1b[0m", file=sys.stderr)
85−
8677if hasWarnings and warningsAreErrors:
8778 print(
8879 "\x1b[1;31m" +
nixos/lib/make-single-disk-zfs-image.nixdeleted−322
@@ -1,322 +0,0 @@
1−# Note: This is a private API, internal to NixOS. Its interface is subject
2−# to change without notice.
3−#
4−# The result of this builder is a single disk image, partitioned like this:
5−#
6−# * partition #1: a very small, 1MiB partition to leave room for Grub.
7−#
8−# * partition #2: boot, a partition formatted with FAT to be used for /boot.
9−# FAT is chosen to support EFI.
10−#
11−# * partition #3: nixos, a partition dedicated to a zpool.
12−#
13−# This single-disk approach does not satisfy ZFS's requirements for autoexpand,
14−# however automation can expand it anyway. For example, with
15−# `services.zfs.expandOnBoot`.
16−{ lib
17−, pkgs
18−, # The NixOS configuration to be installed onto the disk image.
19− config
20−
21−, # size of the FAT partition, in megabytes.
22− bootSize ? 1024
23−
24−, # The size of the root partition, in megabytes.
25− rootSize ? 2048
26−
27−, # The name of the ZFS pool
28− rootPoolName ? "tank"
29−
30−, # zpool properties
31− rootPoolProperties ? {
32− autoexpand = "on";
33− }
34−, # pool-wide filesystem properties
35− rootPoolFilesystemProperties ? {
36− acltype = "posixacl";
37− atime = "off";
38− compression = "on";
39− mountpoint = "legacy";
40− xattr = "sa";
41− }
42−
43−, # datasets, with per-attribute options:
44− # mount: (optional) mount point in the VM
45− # properties: (optional) ZFS properties on the dataset, like filesystemProperties
46− # Notes:
47− # 1. datasets will be created from shorter to longer names as a simple topo-sort
48− # 2. you should define a root's dataset's mount for `/`
49− datasets ? { }
50−
51−, # The files and directories to be placed in the target file system.
52− # This is a list of attribute sets {source, target} where `source'
53− # is the file system object (regular file or directory) to be
54− # grafted in the file system at path `target'.
55− contents ? [ ]
56−
57−, # The initial NixOS configuration file to be copied to
58− # /etc/nixos/configuration.nix. This configuration will be embedded
59− # inside a configuration which includes the described ZFS fileSystems.
60− configFile ? null
61−
62−, # Shell code executed after the VM has finished.
63− postVM ? ""
64−
65−, name ? "nixos-disk-image"
66−
67−, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw.
68− format ? "raw"
69−
70−, # Include a copy of Nixpkgs in the disk image
71− includeChannel ? true
72−}:
73−let
74− formatOpt = if format == "qcow2-compressed" then "qcow2" else format;
75−
76− compress = lib.optionalString (format == "qcow2-compressed") "-c";
77−
78− filenameSuffix = "." + {
79− qcow2 = "qcow2";
80− vdi = "vdi";
81− vpc = "vhd";
82− raw = "img";
83− }.${formatOpt} or formatOpt;
84− rootFilename = "nixos.root${filenameSuffix}";
85−
86− # FIXME: merge with channel.nix / make-channel.nix.
87− channelSources =
88− let
89− nixpkgs = lib.cleanSource pkgs.path;
90− in
91− pkgs.runCommand "nixos-${config.system.nixos.version}" { } ''
92− mkdir -p $out
93− cp -prd ${nixpkgs.outPath} $out/nixos
94− chmod -R u+w $out/nixos
95− if [ ! -e $out/nixos/nixpkgs ]; then
96− ln -s . $out/nixos/nixpkgs
97− fi
98− rm -rf $out/nixos/.git
99− echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix
100− '';
101−
102− closureInfo = pkgs.closureInfo {
103− rootPaths = [ config.system.build.toplevel ]
104− ++ (lib.optional includeChannel channelSources);
105− };
106−
107− modulesTree = pkgs.aggregateModules
108− (with config.boot.kernelPackages; [ kernel zfs ]);
109−
110− tools = lib.makeBinPath (
111− with pkgs; [
112− config.system.build.nixos-enter
113− config.system.build.nixos-install
114− dosfstools
115− e2fsprogs
116− gptfdisk
117− nix
118− parted
119− utillinux
120− zfs
121− ]
122− );
123−
124− hasDefinedMount = disk: ((disk.mount or null) != null);
125−
126− stringifyProperties = prefix: properties: lib.concatStringsSep " \\\n" (
127− lib.mapAttrsToList
128− (
129− property: value: "${prefix} ${lib.escapeShellArg property}=${lib.escapeShellArg value}"
130− )
131− properties
132− );
133−
134− featuresToProperties = features:
135− lib.listToAttrs
136− (builtins.map
137− (feature: {
138− name = "feature@${feature}";
139− value = "enabled";
140− })
141− features);
142−
143− createDatasets =
144− let
145− datasetlist = lib.mapAttrsToList lib.nameValuePair datasets;
146− sorted = lib.sort (left: right: (lib.stringLength left.name) < (lib.stringLength right.name)) datasetlist;
147− cmd = { name, value }:
148− let
149− properties = stringifyProperties "-o" (value.properties or { });
150− in
151− "zfs create -p ${properties} ${name}";
152− in
153− lib.concatMapStringsSep "\n" cmd sorted;
154−
155− mountDatasets =
156− let
157− datasetlist = lib.mapAttrsToList lib.nameValuePair datasets;
158− mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist;
159− sorted = lib.sort (left: right: (lib.stringLength left.value.mount) < (lib.stringLength right.value.mount)) mounts;
160− cmd = { name, value }:
161− ''
162− mkdir -p /mnt${lib.escapeShellArg value.mount}
163− mount -t zfs ${name} /mnt${lib.escapeShellArg value.mount}
164− '';
165− in
166− lib.concatMapStringsSep "\n" cmd sorted;
167−
168− unmountDatasets =
169− let
170− datasetlist = lib.mapAttrsToList lib.nameValuePair datasets;
171− mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist;
172− sorted = lib.sort (left: right: (lib.stringLength left.value.mount) > (lib.stringLength right.value.mount)) mounts;
173− cmd = { name, value }:
174− ''
175− umount /mnt${lib.escapeShellArg value.mount}
176− '';
177− in
178− lib.concatMapStringsSep "\n" cmd sorted;
179−
180−
181− fileSystemsCfgFile =
182− let
183− mountable = lib.filterAttrs (_: value: hasDefinedMount value) datasets;
184− in
185− pkgs.runCommand "filesystem-config.nix"
186− {
187− buildInputs = with pkgs; [ jq nixpkgs-fmt ];
188− filesystems = builtins.toJSON {
189− fileSystems = lib.mapAttrs'
190− (
191− dataset: attrs:
192− {
193− name = attrs.mount;
194− value = {
195− fsType = "zfs";
196− device = "${dataset}";
197− };
198− }
199− )
200− mountable;
201− };
202− passAsFile = [ "filesystems" ];
203− } ''
204− (
205− echo "builtins.fromJSON '''"
206− jq . < "$filesystemsPath"
207− echo "'''"
208− ) > $out
209−
210− nixpkgs-fmt $out
211− '';
212−
213− mergedConfig =
214− if configFile == null
215− then fileSystemsCfgFile
216− else
217− pkgs.runCommand "configuration.nix"
218− {
219− buildInputs = with pkgs; [ nixpkgs-fmt ];
220− }
221− ''
222− (
223− echo '{ imports = ['
224− printf "(%s)\n" "$(cat ${fileSystemsCfgFile})";
225− printf "(%s)\n" "$(cat ${configFile})";
226− echo ']; }'
227− ) > $out
228−
229− nixpkgs-fmt $out
230− '';
231−
232− image = (
233− pkgs.vmTools.override {
234− rootModules =
235− [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++
236− (pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");
237− kernel = modulesTree;
238− }
239− ).runInLinuxVM (
240− pkgs.runCommand name
241− {
242− memSize = 1024;
243− QEMU_OPTS = "-drive file=$rootDiskImage,if=virtio,cache=unsafe,werror=report";
244− preVM = ''
245− PATH=$PATH:${pkgs.qemu_kvm}/bin
246− mkdir $out
247−
248− rootDiskImage=root.raw
249− qemu-img create -f raw $rootDiskImage ${toString (bootSize + rootSize)}M
250− '';
251−
252− postVM = ''
253− ${if formatOpt == "raw" then ''
254− mv $rootDiskImage $out/${rootFilename}
255− '' else ''
256− ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename}
257− ''}
258− rootDiskImage=$out/${rootFilename}
259− set -x
260− ${postVM}
261− '';
262− } ''
263− export PATH=${tools}:$PATH
264− set -x
265−
266− cp -sv /dev/vda /dev/sda
267− cp -sv /dev/vda /dev/xvda
268−
269− parted --script /dev/vda -- \
270− mklabel gpt \
271− mkpart no-fs 1MiB 2MiB \
272− set 1 bios_grub on \
273− align-check optimal 1 \
274− mkpart primary fat32 2MiB ${toString bootSize}MiB \
275− align-check optimal 2 \
276− mkpart primary fat32 ${toString bootSize}MiB -1MiB \
277− align-check optimal 3 \
278− print
279−
280− sfdisk --dump /dev/vda
281−
282−
283− zpool create \
284− ${stringifyProperties " -o" rootPoolProperties} \
285− ${stringifyProperties " -O" rootPoolFilesystemProperties} \
286− ${rootPoolName} /dev/vda3
287− parted --script /dev/vda -- print
288−
289− ${createDatasets}
290− ${mountDatasets}
291−
292− mkdir -p /mnt/boot
293− mkfs.vfat -n ESP /dev/vda2
294− mount /dev/vda2 /mnt/boot
295−
296− mount
297−
298− # Install a configuration.nix
299− mkdir -p /mnt/etc/nixos
300− # `cat` so it is mutable on the fs
301− cat ${mergedConfig} > /mnt/etc/nixos/configuration.nix
302−
303− export NIX_STATE_DIR=$TMPDIR/state
304− nix-store --load-db < ${closureInfo}/registration
305−
306− nixos-install \
307− --root /mnt \
308− --no-root-passwd \
309− --system ${config.system.build.toplevel} \
310− --substituters "" \
311− ${lib.optionalString includeChannel ''--channel ${channelSources}''}
312−
313− df -h
314−
315− umount /mnt/boot
316− ${unmountDatasets}
317−
318− zpool export ${rootPoolName}
319− ''
320− );
321−in
322−image
nixos/lib/make-multi-disk-zfs-image.nix → nixos/lib/make-zfs-image.nixrenamed
The content is the same.
nixos/lib/qemu-common.nix+2−2
@@ -23,8 +23,8 @@ rec {
2323
2424 qemuBinary = qemuPkg: {
2525 x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
26− armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -machine virt,accel=kvm:tcg -cpu max";
27− aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max";
26+ armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
27+ aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
2828 powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
2929 powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
3030 x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max";
nixos/lib/systemd-lib.nix+12−200
@@ -5,7 +5,6 @@ with lib;
55let
66 cfg = config.systemd;
77 lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir";
8− systemd = cfg.package;
98in rec {
109
1110 shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);
@@ -23,9 +22,8 @@ in rec {
2322 inherit (unit) text;
2423 }
2524 ''
26− name=${shellEscape name}
27− mkdir -p "$out/$(dirname "$name")"
28− echo -n "$text" > "$out/$name"
25+ mkdir -p $out
26+ echo -n "$text" > $out/${shellEscape name}
2927 ''
3028 else
3129 pkgs.runCommand "unit-${mkPathSafeName name}-disabled"
@@ -33,9 +31,8 @@ in rec {
3331 allowSubstitutes = false;
3432 }
3533 ''
36− name=${shellEscape name}
37− mkdir -p "$out/$(dirname "$name")"
38− ln -s /dev/null "$out/$name"
34+ mkdir -p $out
35+ ln -s /dev/null $out/${shellEscape name}
3936 '';
4037
4138 boolValues = [true false "yes" "no"];
@@ -122,15 +119,10 @@ in rec {
122119 (if isList value then value else [value]))
123120 as));
124121
125− generateUnits = { allowCollisions ? true, type, units, upstreamUnits, upstreamWants, packages ? cfg.packages, package ? cfg.package }:
126− let
127− typeDir = ({
128− system = "system";
129− initrd = "system";
130− user = "user";
131− nspawn = "nspawn";
132− }).${type};
133− in pkgs.runCommand "${type}-units"
122+ generateUnits = generateUnits' true;
123+
124+ generateUnits' = allowCollisions: type: units: upstreamUnits: upstreamWants:
125+ pkgs.runCommand "${type}-units"
134126 { preferLocalBuild = true;
135127 allowSubstitutes = false;
136128 } ''
@@ -138,7 +130,7 @@ in rec {
138130
139131 # Copy the upstream systemd units we're interested in.
140132 for i in ${toString upstreamUnits}; do
141− fn=${package}/example/systemd/${typeDir}/$i
133+ fn=${cfg.package}/example/systemd/${type}/$i
142134 if ! [ -e $fn ]; then echo "missing $fn"; false; fi
143135 if [ -L $fn ]; then
144136 target="$(readlink "$fn")"
@@ -155,7 +147,7 @@ in rec {
155147 # Copy .wants links, but only those that point to units that
156148 # we're interested in.
157149 for i in ${toString upstreamWants}; do
158− fn=${package}/example/systemd/${typeDir}/$i
150+ fn=${cfg.package}/example/systemd/${type}/$i
159151 if ! [ -e $fn ]; then echo "missing $fn"; false; fi
160152 x=$out/$(basename $fn)
161153 mkdir $x
@@ -167,14 +159,14 @@ in rec {
167159 done
168160
169161 # Symlink all units provided listed in systemd.packages.
170− packages="${toString packages}"
162+ packages="${toString cfg.packages}"
171163
172164 # Filter duplicate directories
173165 declare -A unique_packages
174166 for k in $packages ; do unique_packages[$k]=1 ; done
175167
176168 for i in ''${!unique_packages[@]}; do
177− for fn in $i/etc/systemd/${typeDir}/* $i/lib/systemd/${typeDir}/*; do
169+ for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
178170 if ! [[ "$fn" =~ .wants$ ]]; then
179171 if [[ -d "$fn" ]]; then
180172 targetDir="$out/$(basename "$fn")"
@@ -243,184 +235,4 @@ in rec {
243235 ''}
244236 ''; # */
245237
246− makeJobScript = name: text:
247− let
248− scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name);
249− out = (pkgs.writeShellScriptBin scriptName ''
250− set -e
251− ${text}
252− '').overrideAttrs (_: {
253− # The derivation name is different from the script file name
254− # to keep the script file name short to avoid cluttering logs.
255− name = "unit-script-${scriptName}";
256− });
257− in "${out}/bin/${scriptName}";
258−
259− unitConfig = { config, options, ... }: {
260− config = {
261− unitConfig =
262− optionalAttrs (config.requires != [])
263− { Requires = toString config.requires; }
264− // optionalAttrs (config.wants != [])
265− { Wants = toString config.wants; }
266− // optionalAttrs (config.after != [])
267− { After = toString config.after; }
268− // optionalAttrs (config.before != [])
269− { Before = toString config.before; }
270− // optionalAttrs (config.bindsTo != [])
271− { BindsTo = toString config.bindsTo; }
272− // optionalAttrs (config.partOf != [])
273− { PartOf = toString config.partOf; }
274− // optionalAttrs (config.conflicts != [])
275− { Conflicts = toString config.conflicts; }
276− // optionalAttrs (config.requisite != [])
277− { Requisite = toString config.requisite; }
278− // optionalAttrs (config ? restartTriggers && config.restartTriggers != [])
279− { X-Restart-Triggers = toString config.restartTriggers; }
280− // optionalAttrs (config ? reloadTriggers && config.reloadTriggers != [])
281− { X-Reload-Triggers = toString config.reloadTriggers; }
282− // optionalAttrs (config.description != "") {
283− Description = config.description; }
284− // optionalAttrs (config.documentation != []) {
285− Documentation = toString config.documentation; }
286− // optionalAttrs (config.onFailure != []) {
287− OnFailure = toString config.onFailure; }
288− // optionalAttrs (options.startLimitIntervalSec.isDefined) {
289− StartLimitIntervalSec = toString config.startLimitIntervalSec;
290− } // optionalAttrs (options.startLimitBurst.isDefined) {
291− StartLimitBurst = toString config.startLimitBurst;
292− };
293− };
294− };
295−
296− serviceConfig = { config, ... }: {
297− config.environment.PATH = mkIf (config.path != []) "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}";
298− };
299−
300− stage2ServiceConfig = {
301− imports = [ serviceConfig ];
302− # Default path for systemd services. Should be quite minimal.
303− config.path = mkAfter [
304− pkgs.coreutils
305− pkgs.findutils
306− pkgs.gnugrep
307− pkgs.gnused
308− systemd
309− ];
310− };
311−
312− stage1ServiceConfig = serviceConfig;
313−
314− mountConfig = { config, ... }: {
315− config = {
316− mountConfig =
317− { What = config.what;
318− Where = config.where;
319− } // optionalAttrs (config.type != "") {
320− Type = config.type;
321− } // optionalAttrs (config.options != "") {
322− Options = config.options;
323− };
324− };
325− };
326−
327− automountConfig = { config, ... }: {
328− config = {
329− automountConfig =
330− { Where = config.where;
331− };
332− };
333− };
334−
335− commonUnitText = def: ''
336− [Unit]
337− ${attrsToSection def.unitConfig}
338− '';
339−
340− targetToUnit = name: def:
341− { inherit (def) aliases wantedBy requiredBy enable;
342− text =
343− ''
344− [Unit]
345− ${attrsToSection def.unitConfig}
346− '';
347− };
348−
349− serviceToUnit = name: def:
350− { inherit (def) aliases wantedBy requiredBy enable;
351− text = commonUnitText def +
352− ''
353− [Service]
354− ${let env = cfg.globalEnvironment // def.environment;
355− in concatMapStrings (n:
356− let s = optionalString (env.${n} != null)
357− "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";
358− # systemd max line length is now 1MiB
359− # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af
360− in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
361− ${if def ? reloadIfChanged && def.reloadIfChanged then ''
362− X-ReloadIfChanged=true
363− '' else if (def ? restartIfChanged && !def.restartIfChanged) then ''
364− X-RestartIfChanged=false
365− '' else ""}
366− ${optionalString (def ? stopIfChanged && !def.stopIfChanged) "X-StopIfChanged=false"}
367− ${attrsToSection def.serviceConfig}
368− '';
369− };
370−
371− socketToUnit = name: def:
372− { inherit (def) aliases wantedBy requiredBy enable;
373− text = commonUnitText def +
374− ''
375− [Socket]
376− ${attrsToSection def.socketConfig}
377− ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)}
378− ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)}
379− '';
380− };
381−
382− timerToUnit = name: def:
383− { inherit (def) aliases wantedBy requiredBy enable;
384− text = commonUnitText def +
385− ''
386− [Timer]
387− ${attrsToSection def.timerConfig}
388− '';
389− };
390−
391− pathToUnit = name: def:
392− { inherit (def) aliases wantedBy requiredBy enable;
393− text = commonUnitText def +
394− ''
395− [Path]
396− ${attrsToSection def.pathConfig}
397− '';
398− };
399−
400− mountToUnit = name: def:
401− { inherit (def) aliases wantedBy requiredBy enable;
402− text = commonUnitText def +
403− ''
404− [Mount]
405− ${attrsToSection def.mountConfig}
406− '';
407− };
408−
409− automountToUnit = name: def:
410− { inherit (def) aliases wantedBy requiredBy enable;
411− text = commonUnitText def +
412− ''
413− [Automount]
414− ${attrsToSection def.automountConfig}
415− '';
416− };
417−
418− sliceToUnit = name: def:
419− { inherit (def) aliases wantedBy requiredBy enable;
420− text = commonUnitText def +
421− ''
422− [Slice]
423− ${attrsToSection def.sliceConfig}
424− '';
425− };
426238}
nixos/lib/systemd-types.nixdeleted−69
@@ -1,69 +0,0 @@
1−{ lib, systemdUtils, pkgs }:
2−
3−with systemdUtils.lib;
4−with systemdUtils.unitOptions;
5−with lib;
6−
7−rec {
8− units = with types;
9− attrsOf (submodule ({ name, config, ... }: {
10− options = concreteUnitOptions;
11− config = { unit = mkDefault (systemdUtils.lib.makeUnit name config); };
12− }));
13−
14− services = with types; attrsOf (submodule [ stage2ServiceOptions unitConfig stage2ServiceConfig ]);
15− initrdServices = with types; attrsOf (submodule [ stage1ServiceOptions unitConfig stage1ServiceConfig ]);
16−
17− targets = with types; attrsOf (submodule [ stage2CommonUnitOptions unitConfig ]);
18− initrdTargets = with types; attrsOf (submodule [ stage1CommonUnitOptions unitConfig ]);
19−
20− sockets = with types; attrsOf (submodule [ stage2SocketOptions unitConfig ]);
21− initrdSockets = with types; attrsOf (submodule [ stage1SocketOptions unitConfig ]);
22−
23− timers = with types; attrsOf (submodule [ stage2TimerOptions unitConfig ]);
24− initrdTimers = with types; attrsOf (submodule [ stage1TimerOptions unitConfig ]);
25−
26− paths = with types; attrsOf (submodule [ stage2PathOptions unitConfig ]);
27− initrdPaths = with types; attrsOf (submodule [ stage1PathOptions unitConfig ]);
28−
29− slices = with types; attrsOf (submodule [ stage2SliceOptions unitConfig ]);
30− initrdSlices = with types; attrsOf (submodule [ stage1SliceOptions unitConfig ]);
31−
32− mounts = with types; listOf (submodule [ stage2MountOptions unitConfig mountConfig ]);
33− initrdMounts = with types; listOf (submodule [ stage1MountOptions unitConfig mountConfig ]);
34−
35− automounts = with types; listOf (submodule [ stage2AutomountOptions unitConfig automountConfig ]);
36− initrdAutomounts = with types; attrsOf (submodule [ stage1AutomountOptions unitConfig automountConfig ]);
37−
38− initrdContents = types.attrsOf (types.submodule ({ config, options, name, ... }: {
39− options = {
40− enable = mkEnableOption "copying of this file and symlinking it" // { default = true; };
41−
42− target = mkOption {
43− type = types.path;
44− description = ''
45− Path of the symlink.
46− '';
47− default = name;
48− };
49−
50− text = mkOption {
51− default = null;
52− type = types.nullOr types.lines;
53− description = "Text of the file.";
54− };
55−
56− source = mkOption {
57− type = types.path;
58− description = "Path of the source file.";
59− };
60− };
61−
62− config = {
63− source = mkIf (config.text != null) (
64− let name' = "initrd-" + baseNameOf name;
65− in mkDerivedConfig options.text (pkgs.writeText name')
66− );
67− };
68− }));
69−}
nixos/lib/systemd-unit-options.nix+401−560
@@ -94,618 +94,459 @@ in rec {
9494
9595 };
9696
97− commonUnitOptions = {
98− options = sharedOptions // {
99−
100− description = mkOption {
101− default = "";
102− type = types.singleLineStr;
103− description = "Description of this unit used in systemd messages and progress indicators.";
104− };
105−
106− documentation = mkOption {
107− default = [];
108− type = types.listOf types.str;
109− description = "A list of URIs referencing documentation for this unit or its configuration.";
110− };
111−
112− requires = mkOption {
113− default = [];
114− type = types.listOf unitNameType;
115− description = ''
116− Start the specified units when this unit is started, and stop
117− this unit when the specified units are stopped or fail.
118− '';
119− };
120−
121− wants = mkOption {
122− default = [];
123− type = types.listOf unitNameType;
124− description = ''
125− Start the specified units when this unit is started.
126− '';
127− };
128−
129− after = mkOption {
130− default = [];
131− type = types.listOf unitNameType;
132− description = ''
133− If the specified units are started at the same time as
134− this unit, delay this unit until they have started.
135− '';
136− };
137−
138− before = mkOption {
139− default = [];
140− type = types.listOf unitNameType;
141− description = ''
142− If the specified units are started at the same time as
143− this unit, delay them until this unit has started.
144− '';
145− };
146−
147− bindsTo = mkOption {
148− default = [];
149− type = types.listOf unitNameType;
150− description = ''
151− Like ‘requires’, but in addition, if the specified units
152− unexpectedly disappear, this unit will be stopped as well.
153− '';
154− };
155−
156− partOf = mkOption {
157− default = [];
158− type = types.listOf unitNameType;
159− description = ''
160− If the specified units are stopped or restarted, then this
161− unit is stopped or restarted as well.
162− '';
163− };
164−
165− conflicts = mkOption {
166− default = [];
167− type = types.listOf unitNameType;
168− description = ''
169− If the specified units are started, then this unit is stopped
170− and vice versa.
171− '';
172− };
173−
174− requisite = mkOption {
175− default = [];
176− type = types.listOf unitNameType;
177− description = ''
178− Similar to requires. However if the units listed are not started,
179− they will not be started and the transaction will fail.
180− '';
181− };
182−
183− unitConfig = mkOption {
184− default = {};
185− example = { RequiresMountsFor = "/data"; };
186− type = types.attrsOf unitOption;
187− description = ''
188− Each attribute in this set specifies an option in the
189− <literal>[Unit]</literal> section of the unit. See
190− <citerefentry><refentrytitle>systemd.unit</refentrytitle>
191− <manvolnum>5</manvolnum></citerefentry> for details.
192− '';
193− };
194−
195− onFailure = mkOption {
196− default = [];
197− type = types.listOf unitNameType;
198− description = ''
199− A list of one or more units that are activated when
200− this unit enters the "failed" state.
201− '';
202− };
203−
204− startLimitBurst = mkOption {
205− type = types.int;
206− description = ''
207− Configure unit start rate limiting. Units which are started
208− more than startLimitBurst times within an interval time
209− interval are not permitted to start any more.
210− '';
211− };
212−
213− startLimitIntervalSec = mkOption {
214− type = types.int;
215− description = ''
216− Configure unit start rate limiting. Units which are started
217− more than startLimitBurst times within an interval time
218− interval are not permitted to start any more.
219− '';
220− };
97+ commonUnitOptions = sharedOptions // {
22198
99+ description = mkOption {
100+ default = "";
101+ type = types.singleLineStr;
102+ description = "Description of this unit used in systemd messages and progress indicators.";
222103 };
223− };
224104
225− stage2CommonUnitOptions = {
226− imports = [
227− commonUnitOptions
228− ];
229−
230− options = {
231− restartTriggers = mkOption {
232− default = [];
233− type = types.listOf types.unspecified;
234− description = ''
235− An arbitrary list of items such as derivations. If any item
236− in the list changes between reconfigurations, the service will
237− be restarted.
238− '';
239− };
240−
241− reloadTriggers = mkOption {
242− default = [];
243− type = types.listOf unitOption;
244− description = ''
245− An arbitrary list of items such as derivations. If any item
246− in the list changes between reconfigurations, the service will
247− be reloaded. If anything but a reload trigger changes in the
248− unit file, the unit will be restarted instead.
249− '';
250− };
105+ documentation = mkOption {
106+ default = [];
107+ type = types.listOf types.str;
108+ description = "A list of URIs referencing documentation for this unit or its configuration.";
251109 };
252− };
253− stage1CommonUnitOptions = commonUnitOptions;
254−
255− serviceOptions = { name, config, ... }: {
256− options = {
257−
258− environment = mkOption {
259− default = {};
260− type = with types; attrsOf (nullOr (oneOf [ str path package ]));
261− example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
262− description = "Environment variables passed to the service's processes.";
263− };
264−
265− path = mkOption {
266− default = [];
267− type = with types; listOf (oneOf [ package str ]);
268− description = ''
269− Packages added to the service's <envar>PATH</envar>
270− environment variable. Both the <filename>bin</filename>
271− and <filename>sbin</filename> subdirectories of each
272− package are added.
273− '';
274− };
275−
276− serviceConfig = mkOption {
277− default = {};
278− example =
279− { RestartSec = 5;
280− };
281− type = types.addCheck (types.attrsOf unitOption) checkService;
282− description = ''
283− Each attribute in this set specifies an option in the
284− <literal>[Service]</literal> section of the unit. See
285− <citerefentry><refentrytitle>systemd.service</refentrytitle>
286− <manvolnum>5</manvolnum></citerefentry> for details.
287− '';
288− };
289−
290− script = mkOption {
291− type = types.lines;
292− default = "";
293− description = "Shell commands executed as the service's main process.";
294− };
295−
296− scriptArgs = mkOption {
297− type = types.str;
298− default = "";
299− description = "Arguments passed to the main process script.";
300− };
301−
302− preStart = mkOption {
303− type = types.lines;
304− default = "";
305− description = ''
306− Shell commands executed before the service's main process
307− is started.
308− '';
309− };
310−
311− postStart = mkOption {
312− type = types.lines;
313− default = "";
314− description = ''
315− Shell commands executed after the service's main process
316− is started.
317− '';
318− };
319−
320− reload = mkOption {
321− type = types.lines;
322− default = "";
323− description = ''
324− Shell commands executed when the service's main process
325− is reloaded.
326− '';
327− };
328−
329− preStop = mkOption {
330− type = types.lines;
331− default = "";
332− description = ''
333− Shell commands executed to stop the service.
334− '';
335− };
336−
337− postStop = mkOption {
338− type = types.lines;
339− default = "";
340− description = ''
341− Shell commands executed after the service's main process
342− has exited.
343− '';
344− };
345−
346− jobScripts = mkOption {
347− type = with types; coercedTo path singleton (listOf path);
348− internal = true;
349− description = "A list of all job script derivations of this unit.";
350− default = [];
351− };
352−
353− };
354−
355− config = mkMerge [
356− (mkIf (config.preStart != "") rec {
357− jobScripts = makeJobScript "${name}-pre-start" config.preStart;
358− serviceConfig.ExecStartPre = [ jobScripts ];
359− })
360− (mkIf (config.script != "") rec {
361− jobScripts = makeJobScript "${name}-start" config.script;
362− serviceConfig.ExecStart = jobScripts + " " + config.scriptArgs;
363− })
364− (mkIf (config.postStart != "") rec {
365− jobScripts = (makeJobScript "${name}-post-start" config.postStart);
366− serviceConfig.ExecStartPost = [ jobScripts ];
367− })
368− (mkIf (config.reload != "") rec {
369− jobScripts = makeJobScript "${name}-reload" config.reload;
370− serviceConfig.ExecReload = jobScripts;
371− })
372− (mkIf (config.preStop != "") rec {
373− jobScripts = makeJobScript "${name}-pre-stop" config.preStop;
374− serviceConfig.ExecStop = jobScripts;
375− })
376− (mkIf (config.postStop != "") rec {
377− jobScripts = makeJobScript "${name}-post-stop" config.postStop;
378− serviceConfig.ExecStopPost = jobScripts;
379− })
380− ];
381110
382− };
111+ requires = mkOption {
112+ default = [];
113+ type = types.listOf unitNameType;
114+ description = ''
115+ Start the specified units when this unit is started, and stop
116+ this unit when the specified units are stopped or fail.
117+ '';
118+ };
383119
384− stage2ServiceOptions = {
385− imports = [
386− stage2CommonUnitOptions
387− serviceOptions
388− ];
389−
390− options = {
391− restartIfChanged = mkOption {
392− type = types.bool;
393− default = true;
394− description = ''
395− Whether the service should be restarted during a NixOS
396− configuration switch if its definition has changed.
397− '';
398− };
399−
400− reloadIfChanged = mkOption {
401− type = types.bool;
402− default = false;
403− description = ''
404− Whether the service should be reloaded during a NixOS
405− configuration switch if its definition has changed. If
406− enabled, the value of <option>restartIfChanged</option> is
407− ignored.
408−
409− This option should not be used anymore in favor of
410− <option>reloadTriggers</option> which allows more granular
411− control of when a service is reloaded and when a service
412− is restarted.
413− '';
414− };
415−
416− stopIfChanged = mkOption {
417− type = types.bool;
418− default = true;
419− description = ''
420− If set, a changed unit is restarted by calling
421− <command>systemctl stop</command> in the old configuration,
422− then <command>systemctl start</command> in the new one.
423− Otherwise, it is restarted in a single step using
424− <command>systemctl restart</command> in the new configuration.
425− The latter is less correct because it runs the
426− <literal>ExecStop</literal> commands from the new
427− configuration.
428− '';
429− };
430−
431− startAt = mkOption {
432− type = with types; either str (listOf str);
433− default = [];
434− example = "Sun 14:00:00";
435− description = ''
436− Automatically start this unit at the given date/time, which
437− must be in the format described in
438− <citerefentry><refentrytitle>systemd.time</refentrytitle>
439− <manvolnum>7</manvolnum></citerefentry>. This is equivalent
440− to adding a corresponding timer unit with
441− <option>OnCalendar</option> set to the value given here.
442− '';
443− apply = v: if isList v then v else [ v ];
444− };
120+ wants = mkOption {
121+ default = [];
122+ type = types.listOf unitNameType;
123+ description = ''
124+ Start the specified units when this unit is started.
125+ '';
445126 };
446− };
447127
448− stage1ServiceOptions = {
449− imports = [
450− stage1CommonUnitOptions
451− serviceOptions
452− ];
453− };
128+ after = mkOption {
129+ default = [];
130+ type = types.listOf unitNameType;
131+ description = ''
132+ If the specified units are started at the same time as
133+ this unit, delay this unit until they have started.
134+ '';
135+ };
454136
137+ before = mkOption {
138+ default = [];
139+ type = types.listOf unitNameType;
140+ description = ''
141+ If the specified units are started at the same time as
142+ this unit, delay them until this unit has started.
143+ '';
144+ };
455145
456− socketOptions = {
457− options = {
458−
459− listenStreams = mkOption {
460− default = [];
461− type = types.listOf types.str;
462− example = [ "0.0.0.0:993" "/run/my-socket" ];
463− description = ''
464− For each item in this list, a <literal>ListenStream</literal>
465− option in the <literal>[Socket]</literal> section will be created.
466− '';
467− };
468−
469− listenDatagrams = mkOption {
470− default = [];
471− type = types.listOf types.str;
472− example = [ "0.0.0.0:993" "/run/my-socket" ];
473− description = ''
474− For each item in this list, a <literal>ListenDatagram</literal>
475− option in the <literal>[Socket]</literal> section will be created.
476− '';
477− };
478−
479− socketConfig = mkOption {
480− default = {};
481− example = { ListenStream = "/run/my-socket"; };
482− type = types.attrsOf unitOption;
483− description = ''
484− Each attribute in this set specifies an option in the
485− <literal>[Socket]</literal> section of the unit. See
486− <citerefentry><refentrytitle>systemd.socket</refentrytitle>
487− <manvolnum>5</manvolnum></citerefentry> for details.
488− '';
489− };
146+ bindsTo = mkOption {
147+ default = [];
148+ type = types.listOf unitNameType;
149+ description = ''
150+ Like ‘requires’, but in addition, if the specified units
151+ unexpectedly disappear, this unit will be stopped as well.
152+ '';
490153 };
491154
492− };
155+ partOf = mkOption {
156+ default = [];
157+ type = types.listOf unitNameType;
158+ description = ''
159+ If the specified units are stopped or restarted, then this
160+ unit is stopped or restarted as well.
161+ '';
162+ };
493163
494− stage2SocketOptions = {
495− imports = [
496− stage2CommonUnitOptions
497− socketOptions
498− ];
499− };
164+ conflicts = mkOption {
165+ default = [];
166+ type = types.listOf unitNameType;
167+ description = ''
168+ If the specified units are started, then this unit is stopped
169+ and vice versa.
170+ '';
171+ };
500172
501− stage1SocketOptions = {
502− imports = [
503− stage1CommonUnitOptions
504− socketOptions
505− ];
506− };
173+ requisite = mkOption {
174+ default = [];
175+ type = types.listOf unitNameType;
176+ description = ''
177+ Similar to requires. However if the units listed are not started,
178+ they will not be started and the transaction will fail.
179+ '';
180+ };
507181
182+ unitConfig = mkOption {
183+ default = {};
184+ example = { RequiresMountsFor = "/data"; };
185+ type = types.attrsOf unitOption;
186+ description = ''
187+ Each attribute in this set specifies an option in the
188+ <literal>[Unit]</literal> section of the unit. See
189+ <citerefentry><refentrytitle>systemd.unit</refentrytitle>
190+ <manvolnum>5</manvolnum></citerefentry> for details.
191+ '';
192+ };
508193
509− timerOptions = {
510− options = {
194+ restartTriggers = mkOption {
195+ default = [];
196+ type = types.listOf types.unspecified;
197+ description = ''
198+ An arbitrary list of items such as derivations. If any item
199+ in the list changes between reconfigurations, the service will
200+ be restarted.
201+ '';
202+ };
511203
512− timerConfig = mkOption {
513− default = {};
514− example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; };
515− type = types.attrsOf unitOption;
516− description = ''
517− Each attribute in this set specifies an option in the
518− <literal>[Timer]</literal> section of the unit. See
519− <citerefentry><refentrytitle>systemd.timer</refentrytitle>
520− <manvolnum>5</manvolnum></citerefentry> and
521− <citerefentry><refentrytitle>systemd.time</refentrytitle>
522− <manvolnum>7</manvolnum></citerefentry> for details.
523− '';
524− };
204+ reloadTriggers = mkOption {
205+ default = [];
206+ type = types.listOf unitOption;
207+ description = ''
208+ An arbitrary list of items such as derivations. If any item
209+ in the list changes between reconfigurations, the service will
210+ be reloaded. If anything but a reload trigger changes in the
211+ unit file, the unit will be restarted instead.
212+ '';
213+ };
525214
215+ onFailure = mkOption {
216+ default = [];
217+ type = types.listOf unitNameType;
218+ description = ''
219+ A list of one or more units that are activated when
220+ this unit enters the "failed" state.
221+ '';
526222 };
527− };
528223
529− stage2TimerOptions = {
530− imports = [
531− stage2CommonUnitOptions
532− timerOptions
533− ];
534− };
224+ startLimitBurst = mkOption {
225+ type = types.int;
226+ description = ''
227+ Configure unit start rate limiting. Units which are started
228+ more than startLimitBurst times within an interval time
229+ interval are not permitted to start any more.
230+ '';
231+ };
232+
233+ startLimitIntervalSec = mkOption {
234+ type = types.int;
235+ description = ''
236+ Configure unit start rate limiting. Units which are started
237+ more than startLimitBurst times within an interval time
238+ interval are not permitted to start any more.
239+ '';
240+ };
535241
536− stage1TimerOptions = {
537− imports = [
538− stage1CommonUnitOptions
539− timerOptions
540− ];
541242 };
542243
543244
544− pathOptions = {
545− options = {
245+ serviceOptions = commonUnitOptions // {
546246
547− pathConfig = mkOption {
548− default = {};
549− example = { PathChanged = "/some/path"; Unit = "changedpath.service"; };
550− type = types.attrsOf unitOption;
551− description = ''
552− Each attribute in this set specifies an option in the
553− <literal>[Path]</literal> section of the unit. See
554− <citerefentry><refentrytitle>systemd.path</refentrytitle>
555− <manvolnum>5</manvolnum></citerefentry> for details.
556− '';
557− };
247+ environment = mkOption {
248+ default = {};
249+ type = with types; attrsOf (nullOr (oneOf [ str path package ]));
250+ example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
251+ description = "Environment variables passed to the service's processes.";
252+ };
558253
254+ path = mkOption {
255+ default = [];
256+ type = with types; listOf (oneOf [ package str ]);
257+ description = ''
258+ Packages added to the service's <envar>PATH</envar>
259+ environment variable. Both the <filename>bin</filename>
260+ and <filename>sbin</filename> subdirectories of each
261+ package are added.
262+ '';
559263 };
560− };
561264
562− stage2PathOptions = {
563− imports = [
564− stage2CommonUnitOptions
565− pathOptions
566− ];
567− };
265+ serviceConfig = mkOption {
266+ default = {};
267+ example =
268+ { RestartSec = 5;
269+ };
270+ type = types.addCheck (types.attrsOf unitOption) checkService;
271+ description = ''
272+ Each attribute in this set specifies an option in the
273+ <literal>[Service]</literal> section of the unit. See
274+ <citerefentry><refentrytitle>systemd.service</refentrytitle>
275+ <manvolnum>5</manvolnum></citerefentry> for details.
276+ '';
277+ };
568278
569− stage1PathOptions = {
570− imports = [
571− stage1CommonUnitOptions
572− pathOptions
573− ];
574− };
279+ script = mkOption {
280+ type = types.lines;
281+ default = "";
282+ description = "Shell commands executed as the service's main process.";
283+ };
575284
285+ scriptArgs = mkOption {
286+ type = types.str;
287+ default = "";
288+ description = "Arguments passed to the main process script.";
289+ };
576290
577− mountOptions = {
578− options = {
579−
580− what = mkOption {
581− example = "/dev/sda1";
582− type = types.str;
583− description = "Absolute path of device node, file or other resource. (Mandatory)";
584− };
585−
586− where = mkOption {
587− example = "/mnt";
588− type = types.str;
589− description = ''
590− Absolute path of a directory of the mount point.
591− Will be created if it doesn't exist. (Mandatory)
592− '';
593− };
594−
595− type = mkOption {
596− default = "";
597− example = "ext4";
598− type = types.str;
599− description = "File system type.";
600− };
601−
602− options = mkOption {
603− default = "";
604− example = "noatime";
605− type = types.commas;
606− description = "Options used to mount the file system.";
607− };
608−
609− mountConfig = mkOption {
610− default = {};
611− example = { DirectoryMode = "0775"; };
612− type = types.attrsOf unitOption;
613− description = ''
614− Each attribute in this set specifies an option in the
615− <literal>[Mount]</literal> section of the unit. See
616− <citerefentry><refentrytitle>systemd.mount</refentrytitle>
617− <manvolnum>5</manvolnum></citerefentry> for details.
618− '';
619− };
291+ preStart = mkOption {
292+ type = types.lines;
293+ default = "";
294+ description = ''
295+ Shell commands executed before the service's main process
296+ is started.
297+ '';
298+ };
620299
300+ postStart = mkOption {
301+ type = types.lines;
302+ default = "";
303+ description = ''
304+ Shell commands executed after the service's main process
305+ is started.
306+ '';
621307 };
622− };
623308
624− stage2MountOptions = {
625− imports = [
626− stage2CommonUnitOptions
627− mountOptions
628− ];
629− };
309+ reload = mkOption {
310+ type = types.lines;
311+ default = "";
312+ description = ''
313+ Shell commands executed when the service's main process
314+ is reloaded.
315+ '';
316+ };
317+
318+ preStop = mkOption {
319+ type = types.lines;
320+ default = "";
321+ description = ''
322+ Shell commands executed to stop the service.
323+ '';
324+ };
325+
326+ postStop = mkOption {
327+ type = types.lines;
328+ default = "";
329+ description = ''
330+ Shell commands executed after the service's main process
331+ has exited.
332+ '';
333+ };
334+
335+ restartIfChanged = mkOption {
336+ type = types.bool;
337+ default = true;
338+ description = ''
339+ Whether the service should be restarted during a NixOS
340+ configuration switch if its definition has changed.
341+ '';
342+ };
343+
344+ reloadIfChanged = mkOption {
345+ type = types.bool;
346+ default = false;
347+ description = ''
348+ Whether the service should be reloaded during a NixOS
349+ configuration switch if its definition has changed. If
350+ enabled, the value of <option>restartIfChanged</option> is
351+ ignored.
352+
353+ This option should not be used anymore in favor of
354+ <option>reloadTriggers</option> which allows more granular
355+ control of when a service is reloaded and when a service
356+ is restarted.
357+ '';
358+ };
359+
360+ stopIfChanged = mkOption {
361+ type = types.bool;
362+ default = true;
363+ description = ''
364+ If set, a changed unit is restarted by calling
365+ <command>systemctl stop</command> in the old configuration,
366+ then <command>systemctl start</command> in the new one.
367+ Otherwise, it is restarted in a single step using
368+ <command>systemctl restart</command> in the new configuration.
369+ The latter is less correct because it runs the
370+ <literal>ExecStop</literal> commands from the new
371+ configuration.
372+ '';
373+ };
374+
375+ startAt = mkOption {
376+ type = with types; either str (listOf str);
377+ default = [];
378+ example = "Sun 14:00:00";
379+ description = ''
380+ Automatically start this unit at the given date/time, which
381+ must be in the format described in
382+ <citerefentry><refentrytitle>systemd.time</refentrytitle>
383+ <manvolnum>7</manvolnum></citerefentry>. This is equivalent
384+ to adding a corresponding timer unit with
385+ <option>OnCalendar</option> set to the value given here.
386+ '';
387+ apply = v: if isList v then v else [ v ];
388+ };
630389
631− stage1MountOptions = {
632− imports = [
633− stage1CommonUnitOptions
634− mountOptions
635− ];
636390 };
637391
638− automountOptions = {
639− options = {
640−
641− where = mkOption {
642− example = "/mnt";
643− type = types.str;
644− description = ''
645− Absolute path of a directory of the mount point.
646− Will be created if it doesn't exist. (Mandatory)
647− '';
648− };
649−
650− automountConfig = mkOption {
651− default = {};
652− example = { DirectoryMode = "0775"; };
653− type = types.attrsOf unitOption;
654− description = ''
655− Each attribute in this set specifies an option in the
656− <literal>[Automount]</literal> section of the unit. See
657− <citerefentry><refentrytitle>systemd.automount</refentrytitle>
658− <manvolnum>5</manvolnum></citerefentry> for details.
659− '';
660− };
661392
393+ socketOptions = commonUnitOptions // {
394+
395+ listenStreams = mkOption {
396+ default = [];
397+ type = types.listOf types.str;
398+ example = [ "0.0.0.0:993" "/run/my-socket" ];
399+ description = ''
400+ For each item in this list, a <literal>ListenStream</literal>
401+ option in the <literal>[Socket]</literal> section will be created.
402+ '';
403+ };
404+
405+ listenDatagrams = mkOption {
406+ default = [];
407+ type = types.listOf types.str;
408+ example = [ "0.0.0.0:993" "/run/my-socket" ];
409+ description = ''
410+ For each item in this list, a <literal>ListenDatagram</literal>
411+ option in the <literal>[Socket]</literal> section will be created.
412+ '';
662413 };
414+
415+ socketConfig = mkOption {
416+ default = {};
417+ example = { ListenStream = "/run/my-socket"; };
418+ type = types.attrsOf unitOption;
419+ description = ''
420+ Each attribute in this set specifies an option in the
421+ <literal>[Socket]</literal> section of the unit. See
422+ <citerefentry><refentrytitle>systemd.socket</refentrytitle>
423+ <manvolnum>5</manvolnum></citerefentry> for details.
424+ '';
425+ };
426+
663427 };
664428
665− stage2AutomountOptions = {
666− imports = [
667− stage2CommonUnitOptions
668− automountOptions
669− ];
429+
430+ timerOptions = commonUnitOptions // {
431+
432+ timerConfig = mkOption {
433+ default = {};
434+ example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; };
435+ type = types.attrsOf unitOption;
436+ description = ''
437+ Each attribute in this set specifies an option in the
438+ <literal>[Timer]</literal> section of the unit. See
439+ <citerefentry><refentrytitle>systemd.timer</refentrytitle>
440+ <manvolnum>5</manvolnum></citerefentry> and
441+ <citerefentry><refentrytitle>systemd.time</refentrytitle>
442+ <manvolnum>7</manvolnum></citerefentry> for details.
443+ '';
444+ };
445+
670446 };
671447
672− stage1AutomountOptions = {
673− imports = [
674− stage1CommonUnitOptions
675− automountOptions
676− ];
448+
449+ pathOptions = commonUnitOptions // {
450+
451+ pathConfig = mkOption {
452+ default = {};
453+ example = { PathChanged = "/some/path"; Unit = "changedpath.service"; };
454+ type = types.attrsOf unitOption;
455+ description = ''
456+ Each attribute in this set specifies an option in the
457+ <literal>[Path]</literal> section of the unit. See
458+ <citerefentry><refentrytitle>systemd.path</refentrytitle>
459+ <manvolnum>5</manvolnum></citerefentry> for details.
460+ '';
461+ };
462+
677463 };
678464
679− sliceOptions = {
680− options = {
681465
682− sliceConfig = mkOption {
683− default = {};
684− example = { MemoryMax = "2G"; };
685− type = types.attrsOf unitOption;
686− description = ''
687− Each attribute in this set specifies an option in the
688− <literal>[Slice]</literal> section of the unit. See
689− <citerefentry><refentrytitle>systemd.slice</refentrytitle>
690− <manvolnum>5</manvolnum></citerefentry> for details.
691− '';
692− };
466+ mountOptions = commonUnitOptions // {
467+
468+ what = mkOption {
469+ example = "/dev/sda1";
470+ type = types.str;
471+ description = "Absolute path of device node, file or other resource. (Mandatory)";
472+ };
473+
474+ where = mkOption {
475+ example = "/mnt";
476+ type = types.str;
477+ description = ''
478+ Absolute path of a directory of the mount point.
479+ Will be created if it doesn't exist. (Mandatory)
480+ '';
481+ };
482+
483+ type = mkOption {
484+ default = "";
485+ example = "ext4";
486+ type = types.str;
487+ description = "File system type.";
488+ };
489+
490+ options = mkOption {
491+ default = "";
492+ example = "noatime";
493+ type = types.commas;
494+ description = "Options used to mount the file system.";
495+ };
693496
497+ mountConfig = mkOption {
498+ default = {};
499+ example = { DirectoryMode = "0775"; };
500+ type = types.attrsOf unitOption;
501+ description = ''
502+ Each attribute in this set specifies an option in the
503+ <literal>[Mount]</literal> section of the unit. See
504+ <citerefentry><refentrytitle>systemd.mount</refentrytitle>
505+ <manvolnum>5</manvolnum></citerefentry> for details.
506+ '';
694507 };
695508 };
696509
697− stage2SliceOptions = {
698− imports = [
699− stage2CommonUnitOptions
700− sliceOptions
701− ];
510+ automountOptions = commonUnitOptions // {
511+
512+ where = mkOption {
513+ example = "/mnt";
514+ type = types.str;
515+ description = ''
516+ Absolute path of a directory of the mount point.
517+ Will be created if it doesn't exist. (Mandatory)
518+ '';
519+ };
520+
521+ automountConfig = mkOption {
522+ default = {};
523+ example = { DirectoryMode = "0775"; };
524+ type = types.attrsOf unitOption;
525+ description = ''
526+ Each attribute in this set specifies an option in the
527+ <literal>[Automount]</literal> section of the unit. See
528+ <citerefentry><refentrytitle>systemd.automount</refentrytitle>
529+ <manvolnum>5</manvolnum></citerefentry> for details.
530+ '';
531+ };
702532 };
703533
704− stage1SliceOptions = {
705− imports = [
706− stage1CommonUnitOptions
707− sliceOptions
708− ];
534+ targetOptions = commonUnitOptions;
535+
536+ sliceOptions = commonUnitOptions // {
537+
538+ sliceConfig = mkOption {
539+ default = {};
540+ example = { MemoryMax = "2G"; };
541+ type = types.attrsOf unitOption;
542+ description = ''
543+ Each attribute in this set specifies an option in the
544+ <literal>[Slice]</literal> section of the unit. See
545+ <citerefentry><refentrytitle>systemd.slice</refentrytitle>
546+ <manvolnum>5</manvolnum></citerefentry> for details.
547+ '';
548+ };
549+
709550 };
710551
711552}
nixos/lib/test-driver/test_driver/driver.py+1−2
@@ -55,7 +55,6 @@ class Driver:
5555 tmp_dir = get_tmp_dir()
5656
5757 with rootlog.nested("start all VLans"):
58− vlans = list(set(vlans))
5958 self.vlans = [VLan(nr, tmp_dir) for nr in vlans]
6059
6160 def cmd(scripts: List[str]) -> Iterator[NixStartScript]:
@@ -86,7 +85,7 @@ class Driver:
8685
8786 def subtest(self, name: str) -> Iterator[None]:
8887 """Group logs under a given test name"""
89− with rootlog.nested("subtest: " + name):
88+ with rootlog.nested(name):
9089 try:
9190 yield
9291 return True
nixos/lib/test-driver/test_driver/logger.py+2−6
@@ -1,4 +1,4 @@
1−from colorama import Style, Fore
1+from colorama import Style
22from contextlib import contextmanager
33from typing import Any, Dict, Iterator
44from queue import Queue, Empty
@@ -81,11 +81,7 @@ class Logger:
8181
8282 @contextmanager
8383 def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
84− self._eprint(
85− self.maybe_prefix(
86− Style.BRIGHT + Fore.GREEN + message + Style.RESET_ALL, attributes
87− )
88− )
84+ self._eprint(self.maybe_prefix(message, attributes))
8985
9086 self.xml.startElement("nest", attrs={})
9187 self.xml.startElement("head", attributes)
nixos/lib/test-driver/test_driver/machine.py+3−38
@@ -198,7 +198,7 @@ class StartCommand:
198198 ) -> subprocess.Popen:
199199 return subprocess.Popen(
200200 self.cmd(monitor_socket_path, shell_socket_path),
201− stdin=subprocess.PIPE,
201+ stdin=subprocess.DEVNULL,
202202 stdout=subprocess.PIPE,
203203 stderr=subprocess.STDOUT,
204204 shell=True,
@@ -526,17 +526,10 @@ class Machine:
526526 self.run_callbacks()
527527 self.connect()
528528
529− # Always run command with shell opts
530− command = f"set -euo pipefail; {command}"
531−
532− timeout_str = ""
533529 if timeout is not None:
534− timeout_str = f"timeout {timeout}"
535−
536− out_command = (
537− f"{timeout_str} sh -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
538− )
530+ command = "timeout {} sh -c {}".format(timeout, shlex.quote(command))
539531
532+ out_command = f"( set -euo pipefail; {command} ) | (base64 --wrap 0; echo)\n"
540533 assert self.shell
541534 self.shell.send(out_command.encode())
542535
@@ -565,28 +558,6 @@ class Machine:
565558 pass_fds=[self.shell.fileno()],
566559 )
567560
568− def console_interact(self) -> None:
569− """Allows you to interact with QEMU's stdin
570−
571− The shell can be exited with Ctrl+D. Note that Ctrl+C is not allowed to be used.
572− QEMU's stdout is read line-wise.
573−
574− Should only be used during test development, not in the production test."""
575− self.log("Terminal is ready (there is no prompt):")
576−
577− assert self.process
578− assert self.process.stdin
579−
580− while True:
581− try:
582− char = sys.stdin.buffer.read(1)
583− except KeyboardInterrupt:
584− break
585− if char == b"": # ctrl+d
586− self.log("Closing connection to the console")
587− break
588− self.send_console(char.decode())
589−
590561 def succeed(self, *commands: str, timeout: Optional[int] = None) -> str:
591562 """Execute each command and check that it succeeds."""
592563 output = ""
@@ -863,12 +834,6 @@ class Machine:
863834 self.send_monitor_command("sendkey {}".format(key))
864835 time.sleep(0.01)
865836
866− def send_console(self, chars: str) -> None:
867− assert self.process
868− assert self.process.stdin
869− self.process.stdin.write(chars.encode())
870− self.process.stdin.flush()
871−
872837 def start(self) -> None:
873838 if self.booted:
874839 return
nixos/lib/testing-python.nix+16−15
@@ -146,28 +146,26 @@ rec {
146146
147147 # Make a full-blown test
148148 makeTest =
149− { machine ? null
150− , nodes ? {}
151− , testScript
149+ { testScript
152150 , enableOCR ? false
153151 , name ? "unnamed"
154152 # Skip linting (mainly intended for faster dev cycles)
155153 , skipLint ? false
156154 , passthru ? {}
157− , meta ? {}
158155 , # For meta.position
159156 pos ? # position used in error messages and for meta.position
160− (if meta.description or null != null
161− then builtins.unsafeGetAttrPos "description" meta
157+ (if t.meta.description or null != null
158+ then builtins.unsafeGetAttrPos "description" t.meta
162159 else builtins.unsafeGetAttrPos "testScript" t)
160+ , ...
163161 } @ t:
164162 let
165− mkNodes = qemu_pkg:
163+ nodes = qemu_pkg:
166164 let
167165 testScript' =
168166 # Call the test script with the computed nodes.
169167 if lib.isFunction testScript
170− then testScript { nodes = mkNodes qemu_pkg; }
168+ then testScript { nodes = nodes qemu_pkg; }
171169 else testScript;
172170
173171 build-vms = import ./build-vms.nix {
@@ -206,31 +204,34 @@ rec {
206204 )];
207205 };
208206 in
209− lib.warnIf (t?machine) "In test `${name}': The `machine' attribute in NixOS tests (pkgs.nixosTest / make-test-pyton.nix / testing-python.nix / makeTest) is deprecated. Please use the equivalent `nodes.machine'."
210207 build-vms.buildVirtualNetwork (
211− nodes // lib.optionalAttrs (machine != null) { inherit machine; }
208+ t.nodes or (if t ? machine then { machine = t.machine; } else { })
212209 );
213210
214211 driver = setupDriverForTest {
215212 inherit testScript enableOCR skipLint passthru;
216213 testName = name;
217214 qemu_pkg = pkgs.qemu_test;
218− nodes = mkNodes pkgs.qemu_test;
215+ nodes = nodes pkgs.qemu_test;
219216 };
220217 driverInteractive = setupDriverForTest {
221218 inherit testScript enableOCR skipLint passthru;
222219 testName = name;
223220 qemu_pkg = pkgs.qemu;
224− nodes = mkNodes pkgs.qemu;
221+ nodes = nodes pkgs.qemu;
225222 interactive = true;
226223 };
227224
228− test = lib.addMetaAttrs meta (runTests { inherit driver pos driverInteractive; });
225+ test =
226+ let
227+ passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
228+ meta = (drv.meta or { }) // t.meta;
229+ };
230+ in passMeta (runTests { inherit driver pos driverInteractive; });
229231
230232 in
231233 test // {
232− inherit test driver driverInteractive;
233− inherit (driver) nodes;
234+ inherit test driver driverInteractive nodes;
234235 };
235236
236237 abortForFunction = functionName: abort ''The ${functionName} function was
nixos/lib/utils.nix−37
@@ -45,26 +45,6 @@ rec {
4545 replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"]
4646 (removePrefix "/" s);
4747
48− # Quotes an argument for use in Exec* service lines.
49− # systemd accepts "-quoted strings with escape sequences, toJSON produces
50− # a subset of these.
51− # Additionally we escape % to disallow expansion of % specifiers. Any lone ;
52− # in the input will be turned it ";" and thus lose its special meaning.
53− # Every $ is escaped to $$, this makes it unnecessary to disable environment
54− # substitution for the directive.
55− escapeSystemdExecArg = arg:
56− let
57− s = if builtins.isPath arg then "${arg}"
58− else if builtins.isString arg then arg
59− else if builtins.isInt arg || builtins.isFloat arg then toString arg
60− else throw "escapeSystemdExecArg only allows strings, paths and numbers";
61− in
62− replaceChars [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s);
63−
64− # Quotes a list of arguments into a single string for use in a Exec*
65− # line.
66− escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg;
67−
6848 # Returns a system path for a given shell package
6949 toShellPath = shell:
7050 if types.shellPackage.check shell then
@@ -194,25 +174,8 @@ rec {
194174 (( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit
195175 '';
196176
197− /* Remove packages of packagesToRemove from packages, based on their names.
198− Relies on package names and has quadratic complexity so use with caution!
199−
200− Type:
201− removePackagesByName :: [package] -> [package] -> [package]
202−
203− Example:
204− removePackagesByName [ nautilus file-roller ] [ file-roller totem ]
205− => [ nautilus ]
206− */
207− removePackagesByName = packages: packagesToRemove:
208− let
209− namesToRemove = map lib.getName packagesToRemove;
210− in
211− lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages;
212−
213177 systemdUtils = {
214178 lib = import ./systemd-lib.nix { inherit lib config pkgs; };
215179 unitOptions = import ./systemd-unit-options.nix { inherit lib systemdUtils; };
216− types = import ./systemd-types.nix { inherit lib systemdUtils pkgs; };
217180 };
218181}
nixos/maintainers/scripts/ec2/amazon-image.nix+1−1
@@ -73,7 +73,7 @@ in {
7373 }
7474 '';
7575
76− zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix {
76+ zfsBuilder = import ../../../lib/make-zfs-image.nix {
7777 inherit lib config configFile;
7878 inherit (cfg) contents format name;
7979 pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
nixos/maintainers/scripts/lxd/lxd-image.nix+1−1
@@ -27,7 +27,7 @@ with lib;
2727 networking.useDHCP = false;
2828 networking.interfaces.eth0.useDHCP = true;
2929
30− # As this is intended as a standalone image, undo some of the minimal profile stuff
30+ # As this is intended as a stadalone image, undo some of the minimal profile stuff
3131 documentation.enable = true;
3232 documentation.nixos.enable = true;
3333 environment.noXlibs = false;
nixos/maintainers/scripts/openstack/openstack-image-zfs.nixdeleted−101
@@ -1,101 +0,0 @@
1−# nix-build '<nixpkgs/nixos>' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }"
2−
3−{ config, lib, pkgs, ... }:
4−let
5− inherit (lib) mkOption types;
6− copyChannel = true;
7− cfg = config.openstackImage;
8− imageBootMode = if config.openstack.efi then "uefi" else "legacy-bios";
9−in
10−{
11− imports = [
12− ../../../modules/virtualisation/openstack-config.nix
13− ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
14−
15−
16− options.openstackImage = {
17− name = mkOption {
18− type = types.str;
19− description = "The name of the generated derivation";
20− default = "nixos-openstack-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
21− };
22−
23− sizeMB = mkOption {
24− type = types.int;
25− default = 8192;
26− description = "The size in MB of the image";
27− };
28−
29− format = mkOption {
30− type = types.enum [ "raw" "qcow2" ];
31− default = "qcow2";
32− description = "The image format to output";
33− };
34− };
35−
36− config = {
37− documentation.enable = copyChannel;
38− openstack = {
39− efi = true;
40− zfs = {
41− enable = true;
42− datasets = {
43− "tank/system/root".mount = "/";
44− "tank/system/var".mount = "/var";
45− "tank/local/nix".mount = "/nix";
46− "tank/user/home".mount = "/home";
47− };
48− };
49− };
50−
51− system.build.openstackImage = import ../../../lib/make-single-disk-zfs-image.nix {
52− inherit lib config;
53− inherit (cfg) contents format name;
54− pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
55−
56− configFile = pkgs.writeText "configuration.nix"
57− ''
58− { modulesPath, ... }: {
59− imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ];
60− openstack.zfs.enable = true;
61− }
62− '';
63−
64− includeChannel = copyChannel;
65−
66− bootSize = 1000;
67−
68− rootSize = cfg.sizeMB;
69− rootPoolProperties = {
70− ashift = 12;
71− autoexpand = "on";
72− };
73−
74− datasets = config.openstack.zfs.datasets;
75−
76− postVM = ''
77− extension=''${rootDiskImage##*.}
78− friendlyName=$out/${cfg.name}
79− rootDisk="$friendlyName.root.$extension"
80− mv "$rootDiskImage" "$rootDisk"
81−
82− mkdir -p $out/nix-support
83− echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products
84−
85− ${pkgs.jq}/bin/jq -n \
86− --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
87− --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
88− --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
89− --arg boot_mode "${imageBootMode}" \
90− --arg root "$rootDisk" \
91− '{}
92− | .label = $system_label
93− | .boot_mode = $boot_mode
94− | .system = $system
95− | .disks.root.logical_bytes = $root_logical_bytes
96− | .disks.root.file = $root
97− ' > $out/nix-support/image-info.json
98− '';
99− };
100− };
101−}
nixos/maintainers/scripts/openstack/openstack-image.nix+8−9
@@ -1,18 +1,17 @@
11# nix-build '<nixpkgs/nixos>' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }"
22
33{ config, lib, pkgs, ... }:
4−let
5− copyChannel = true;
6−in
7−{
8− imports = [
9− ../../../modules/virtualisation/openstack-config.nix
10− ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
114
12− documentation.enable = copyChannel;
5+with lib;
6+
7+{
8+ imports =
9+ [ ../../../modules/installer/cd-dvd/channel.nix
10+ ../../../modules/virtualisation/openstack-config.nix
11+ ];
1312
1413 system.build.openstackImage = import ../../../lib/make-disk-image.nix {
15− inherit lib config copyChannel;
14+ inherit lib config;
1615 additionalSpace = "1024M";
1716 pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
1817 format = "qcow2";
nixos/modules/config/console.nix+9−23
@@ -12,7 +12,7 @@ let
1212
1313 optimizedKeymap = pkgs.runCommand "keymap" {
1414 nativeBuildInputs = [ pkgs.buildPackages.kbd ];
15− LOADKEYS_KEYMAP_PATH = "${consoleEnv pkgs.kbd}/share/keymaps/**";
15+ LOADKEYS_KEYMAP_PATH = "${consoleEnv}/share/keymaps/**";
1616 preferLocalBuild = true;
1717 } ''
1818 loadkeys -b ${optionalString isUnicode "-u"} "${cfg.keyMap}" > $out
@@ -24,9 +24,9 @@ let
2424 FONT=${cfg.font}
2525 '';
2626
27− consoleEnv = kbd: pkgs.buildEnv {
27+ consoleEnv = pkgs.buildEnv {
2828 name = "console-env";
29− paths = [ kbd ] ++ cfg.packages;
29+ paths = [ pkgs.kbd ] ++ cfg.packages;
3030 pathsToLink = [
3131 "/share/consolefonts"
3232 "/share/consoletrans"
@@ -136,9 +136,9 @@ in
136136 # virtual consoles.
137137 environment.etc."vconsole.conf".source = vconsoleConf;
138138 # Provide kbd with additional packages.
139− environment.etc.kbd.source = "${consoleEnv pkgs.kbd}/share";
139+ environment.etc.kbd.source = "${consoleEnv}/share";
140140
141− boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore ''
141+ boot.initrd.preLVMCommands = mkBefore ''
142142 kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console
143143 printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console
144144 loadkmap < ${optimizedKeymap}
@@ -146,26 +146,12 @@ in
146146 ${optionalString cfg.earlySetup ''
147147 setfont -C /dev/console $extraUtils/share/consolefonts/font.psf
148148 ''}
149− '');
150−
151− boot.initrd.systemd.contents = {
152− "/etc/vconsole.conf".source = vconsoleConf;
153− # Add everything if we want full console setup...
154− "/etc/kbd" = lib.mkIf cfg.earlySetup { source = "${consoleEnv config.boot.initrd.systemd.package.kbd}/share"; };
155− # ...but only the keymaps if we don't
156− "/etc/kbd/keymaps" = lib.mkIf (!cfg.earlySetup) { source = "${consoleEnv config.boot.initrd.systemd.package.kbd}/share/keymaps"; };
157− };
158− boot.initrd.systemd.storePaths = [
159− "${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup"
160− "${config.boot.initrd.systemd.package.kbd}/bin/setfont"
161− "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys"
162− "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # keyboard layouts are compressed
163− ];
149+ '';
164150
165151 systemd.services.reload-systemd-vconsole-setup =
166152 { description = "Reset console on configuration changes";
167153 wantedBy = [ "multi-user.target" ];
168− restartTriggers = [ vconsoleConf (consoleEnv pkgs.kbd) ];
154+ restartTriggers = [ vconsoleConf consoleEnv ];
169155 reloadIfChanged = true;
170156 serviceConfig =
171157 { RemainAfterExit = true;
@@ -183,13 +169,13 @@ in
183169 ];
184170 })
185171
186− (mkIf (cfg.earlySetup && !config.boot.initrd.systemd.enable) {
172+ (mkIf cfg.earlySetup {
187173 boot.initrd.extraUtilsCommands = ''
188174 mkdir -p $out/share/consolefonts
189175 ${if substring 0 1 cfg.font == "/" then ''
190176 font="${cfg.font}"
191177 '' else ''
192− font="$(echo ${consoleEnv pkgs.kbd}/share/consolefonts/${cfg.font}.*)"
178+ font="$(echo ${consoleEnv}/share/consolefonts/${cfg.font}.*)"
193179 ''}
194180 if [[ $font == *.gz ]]; then
195181 gzip -cd $font > $out/share/consolefonts/font.psf
nixos/modules/config/fonts/fonts.nix+5
@@ -39,6 +39,11 @@ let
3939 defaultXFonts =
4040 [ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)
4141 pkgs.xorg.fontmiscmisc
42+ ] ++ optionals (config.nixpkgs.config.allowUnfree or false)
43+ [ # these are unfree, and will make usage with xserver fail
44+ pkgs.xorg.fontbhlucidatypewriter100dpi
45+ pkgs.xorg.fontbhlucidatypewriter75dpi
46+ pkgs.xorg.fontbh100dpi
4247 ];
4348
4449in
nixos/modules/config/nsswitch.nix+4−7
@@ -95,14 +95,11 @@ with lib;
9595 config = {
9696 assertions = [
9797 {
98+ # Prevent users from disabling nscd, with nssModules being set.
99+ # If disabling nscd is really necessary, it's still possible to opt out
100+ # by forcing config.system.nssModules to [].
98101 assertion = config.system.nssModules.path != "" -> config.services.nscd.enable;
99− message = ''
100− Loading NSS modules from system.nssModules (${config.system.nssModules.path}),
101− requires services.nscd.enable being set to true.
102−
103− If disabling nscd is really necessary, it is possible to disable loading NSS modules
104− by setting `system.nssModules = lib.mkForce [];` in your configuration.nix.
105− '';
102+ message = "Loading NSS modules from system.nssModules (${config.system.nssModules.path}), requires services.nscd.enable being set to true.";
106103 }
107104 ];
108105
nixos/modules/config/resolvconf.nix+4−2
@@ -47,8 +47,8 @@ in
4747
4848 enable = mkOption {
4949 type = types.bool;
50− default = !(config.environment.etc ? "resolv.conf");
51− defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")'';
50+ default = false;
51+ internal = true;
5252 description = ''
5353 DNS configuration is managed by resolvconf.
5454 '';
@@ -110,6 +110,8 @@ in
110110
111111 config = mkMerge [
112112 {
113+ networking.resolvconf.enable = !(config.environment.etc ? "resolv.conf");
114+
113115 environment.etc."resolvconf.conf".text =
114116 if !cfg.enable then
115117 # Force-stop any attempts to use resolvconf
nixos/modules/config/terminfo.nix+1−25
@@ -1,33 +1,9 @@
11# This module manages the terminfo database
22# and its integration in the system.
3−{ config, lib, pkgs, ... }:
4−
5−with lib;
6−
3+{ config, ... }:
74{
8−
9− options.environment.enableAllTerminfo = with lib; mkOption {
10− default = false;
11− type = types.bool;
12− description = ''
13− Whether to install all terminfo outputs
14− '';
15− };
16−
175 config = {
186
19− # can be generated with: filter (drv: (builtins.tryEval (drv ? terminfo)).value) (attrValues pkgs)
20− environment.systemPackages = mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs; [
21− alacritty
22− foot
23− kitty
24− mtm
25− rxvt-unicode-unwrapped
26− rxvt-unicode-unwrapped-emoji
27− termite
28− wezterm
29− ]));
30−
317 environment.pathsToLink = [
328 "/share/terminfo"
339 ];
nixos/modules/hardware/all-firmware.nix+3−8
@@ -27,8 +27,7 @@ in {
2727 };
2828
2929 hardware.enableRedistributableFirmware = mkOption {
30− default = config.hardware.enableAllFirmware;
31− defaultText = lib.literalExpression "config.hardware.enableAllFirmware";
30+ default = false;
3231 type = types.bool;
3332 description = ''
3433 Turn on this option if you want to enable all the firmware with a license allowing redistribution.
@@ -72,7 +71,7 @@ in {
7271 })
7372 (mkIf cfg.enableAllFirmware {
7473 assertions = [{
75− assertion = !cfg.enableAllFirmware || config.nixpkgs.config.allowUnfree;
74+ assertion = !cfg.enableAllFirmware || (config.nixpkgs.config.allowUnfree or false);
7675 message = ''
7776 the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files.
7877 This requires nixpkgs.config.allowUnfree to be true.
@@ -84,11 +83,7 @@ in {
8483 b43Firmware_5_1_138
8584 b43Firmware_6_30_163_46
8685 b43FirmwareCutter
87− xow_dongle-firmware
88− ] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
89− facetimehd-calibration
90− facetimehd-firmware
91− ];
86+ ] ++ optional pkgs.stdenv.hostPlatform.isx86 facetimehd-firmware;
9287 })
9388 (mkIf cfg.wirelessRegulatoryDatabase {
9489 hardware.firmware = [ pkgs.wireless-regdb ];
nixos/modules/hardware/raid/hpsa.nix+1−4
@@ -8,10 +8,7 @@ let
88 version = "2.40-13.0";
99
1010 src = pkgs.fetchurl {
11− urls = [
12− "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb"
13− "http://apt.netangels.net/pool/main/h/hpssacli/${pname}-${version}_amd64.deb"
14− ];
11+ url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb";
1512 sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
1613 };
1714
nixos/modules/hardware/video/amdgpu-pro.nix+1−2
@@ -51,10 +51,9 @@ in
5151 (isYes "KALLSYMS_ALL")
5252 ];
5353
54− boot.initrd.extraUdevRulesCommands = mkIf (!config.boot.initrd.systemd.enable) ''
54+ boot.initrd.extraUdevRulesCommands = ''
5555 cp -v ${package}/etc/udev/rules.d/*.rules $out/
5656 '';
57− boot.initrd.services.udev.packages = [ package ];
5857
5958 environment.systemPackages =
6059 [ package.vulkan ] ++
nixos/modules/hardware/video/nvidia.nix+14−26
@@ -24,7 +24,6 @@ let
2424 primeEnabled = syncCfg.enable || offloadCfg.enable;
2525 nvidiaPersistencedEnabled = cfg.nvidiaPersistenced;
2626 nvidiaSettings = cfg.nvidiaSettings;
27− busIDType = types.strMatching "([[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9])?";
2827in
2928
3029{
@@ -69,7 +68,7 @@ in
6968 };
7069
7170 hardware.nvidia.prime.nvidiaBusId = mkOption {
72− type = busIDType;
71+ type = types.str;
7372 default = "";
7473 example = "PCI:1:0:0";
7574 description = ''
@@ -79,7 +78,7 @@ in
7978 };
8079
8180 hardware.nvidia.prime.intelBusId = mkOption {
82− type = busIDType;
81+ type = types.str;
8382 default = "";
8483 example = "PCI:0:2:0";
8584 description = ''
@@ -89,7 +88,7 @@ in
8988 };
9089
9190 hardware.nvidia.prime.amdgpuBusId = mkOption {
92− type = busIDType;
91+ type = types.str;
9392 default = "";
9493 example = "PCI:4:0:0";
9594 description = ''
@@ -245,7 +244,7 @@ in
245244 modules = optional (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ];
246245 deviceSection = ''
247246 BusID "${igpuBusId}"
248− ${optionalString (syncCfg.enable && igpuDriver != "amdgpu") ''Option "AccelMethod" "none"''}
247+ ${optionalString syncCfg.enable ''Option "AccelMethod" "none"''}
249248 '';
250249 } ++ singleton {
251250 name = "nvidia";
@@ -270,15 +269,9 @@ in
270269 Option "AllowNVIDIAGPUScreens"
271270 '';
272271
273− services.xserver.displayManager.setupCommands = let
274− sinkGpuProviderName = if igpuDriver == "amdgpu" then
275− # find the name of the provider if amdgpu
276− "`${pkgs.xorg.xrandr}/bin/xrandr --listproviders | ${pkgs.gnugrep}/bin/grep -i AMD | ${pkgs.gnused}/bin/sed -n 's/^.*name://p'`"
277− else
278− igpuDriver;
279− in optionalString syncCfg.enable ''
272+ services.xserver.displayManager.setupCommands = optionalString syncCfg.enable ''
280273 # Added by nvidia configuration module for Optimus/PRIME.
281− ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource "${sinkGpuProviderName}" NVIDIA-0
274+ ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource ${igpuDriver} NVIDIA-0
282275 ${pkgs.xorg.xrandr}/bin/xrandr --auto
283276 '';
284277
@@ -290,14 +283,10 @@ in
290283 environment.etc."egl/egl_external_platform.d".source =
291284 "/run/opengl-driver/share/egl/egl_external_platform.d/";
292285
293− hardware.opengl.extraPackages = [
294− nvidia_x11.out
295− pkgs.nvidia-vaapi-driver
296− ];
297− hardware.opengl.extraPackages32 = [
298− nvidia_x11.lib32
299− pkgs.pkgsi686Linux.nvidia-vaapi-driver
300− ];
286+ hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out;
287+ hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32;
288+ hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out;
289+ hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32;
301290
302291 environment.systemPackages = [ nvidia_x11.bin ]
303292 ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ]
@@ -361,12 +350,11 @@ in
361350 services.udev.extraRules =
362351 ''
363352 # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
364− KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'"
365− KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c 195 254'"
366− KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", PROGRAM="${pkgs.gnugrep}/bin/grep 'Device Minor:' /proc/driver/nvidia/gpus/%b/information", \
367− RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%c{3} c 195 %c{3}"
353+ KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'"
354+ KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'"
355+ KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'"
368356 KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
369− KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
357+ KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
370358 '' + optionalString cfg.powerManagement.finegrained ''
371359 # Remove NVIDIA USB xHCI Host Controller devices, if present
372360 ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1"
nixos/modules/hardware/video/webcam/facetimehd.nix+6−14
@@ -14,28 +14,20 @@ in
1414
1515 options.hardware.facetimehd.enable = mkEnableOption "facetimehd kernel module";
1616
17− options.hardware.facetimehd.withCalibration = mkOption {
18− default = false;
19− example = true;
20− type = types.bool;
21− description = ''
22− Whether to include sensor calibration files for facetimehd.
23− This makes colors look much better but is experimental, see
24− <link xlink:href="https://github.com/patjak/facetimehd/wiki/Extracting-the-sensor-calibration-files"/>
25− for details.
26− '';
27− };
28−
2917 config = mkIf cfg.enable {
3018
19+ assertions = singleton {
20+ assertion = versionAtLeast kernelPackages.kernel.version "3.19";
21+ message = "facetimehd is not supported for kernels older than 3.19";
22+ };
23+
3124 boot.kernelModules = [ "facetimehd" ];
3225
3326 boot.blacklistedKernelModules = [ "bdc_pci" ];
3427
3528 boot.extraModulePackages = [ kernelPackages.facetimehd ];
3629
37− hardware.firmware = [ pkgs.facetimehd-firmware ]
38− ++ optional cfg.withCalibration pkgs.facetimehd-calibration;
30+ hardware.firmware = [ pkgs.facetimehd-firmware ];
3931
4032 # unload module during suspend/hibernate as it crashes the whole system
4133 powerManagement.powerDownCommands = ''
nixos/modules/hardware/xone.nixdeleted−23
@@ -1,23 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−let
5− cfg = config.hardware.xone;
6−in
7−{
8− options.hardware.xone = {
9− enable = mkEnableOption "the xone driver for Xbox One and Xbobx Series X|S accessories";
10− };
11−
12− config = mkIf cfg.enable {
13− boot = {
14− blacklistedKernelModules = [ "xpad" "mt76x2u" ];
15− extraModulePackages = with config.boot.kernelPackages; [ xone ];
16− };
17− hardware.firmware = [ pkgs.xow_dongle-firmware ];
18− };
19−
20− meta = {
21− maintainers = with maintainers; [ rhysmdnz ];
22− };
23−}
nixos/modules/i18n/input-method/fcitx5.nix+11−20
@@ -5,9 +5,7 @@ with lib;
55let
66 im = config.i18n.inputMethod;
77 cfg = im.fcitx5;
8− addons = cfg.addons ++ optional cfg.enableRimeData pkgs.rime-data;
9− fcitx5Package = pkgs.fcitx5-with-addons.override { inherit addons; };
10− whetherRimeDataDir = any (p: p.pname == "fcitx5-rime") cfg.addons;
8+ fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
119in {
1210 options = {
1311 i18n.inputMethod.fcitx5 = {
@@ -19,29 +17,22 @@ in {
1917 Enabled Fcitx5 addons.
2018 '';
2119 };
22−
23− enableRimeData = mkEnableOption "default rime-data with fcitx5-rime";
2420 };
2521 };
2622
2723 config = mkIf (im.enabled == "fcitx5") {
2824 i18n.inputMethod.package = fcitx5Package;
2925
30− environment = mkMerge [{
31− variables = {
32− GTK_IM_MODULE = "fcitx";
33− QT_IM_MODULE = "fcitx";
34− XMODIFIERS = "@im=fcitx";
35− };
36− }
37− (mkIf whetherRimeDataDir {
38− pathsToLink = [
39− "/share/rime-data"
40− ];
26+ environment.variables = {
27+ GTK_IM_MODULE = "fcitx";
28+ QT_IM_MODULE = "fcitx";
29+ XMODIFIERS = "@im=fcitx";
30+ };
4131
42− variables = {
43− NIX_RIME_DATA_DIR = "/run/current-system/sw/share/rime-data";
44− };
45− })];
32+ systemd.user.services.fcitx5-daemon = {
33+ enable = true;
34+ script = "${fcitx5Package}/bin/fcitx5";
35+ wantedBy = [ "graphical-session.target" ];
36+ };
4637 };
4738}
nixos/modules/installer/cd-dvd/channel.nix+1−2
@@ -39,8 +39,7 @@ in
3939 echo "unpacking the NixOS/Nixpkgs sources..."
4040 mkdir -p /nix/var/nix/profiles/per-user/root
4141 ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \
42− -i ${channelSources} --quiet --option build-use-substitutes false \
43− ${optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root
42+ -i ${channelSources} --quiet --option build-use-substitutes false
4443 mkdir -m 0700 -p /root/.nix-defexpr
4544 ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
4645 mkdir -m 0755 -p /var/lib/nixos
nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix+8−14
@@ -35,28 +35,22 @@ with lib;
3535 # Enable sound in graphical iso's.
3636 hardware.pulseaudio.enable = true;
3737
38− # Spice guest additions
39− services.spice-vdagentd.enable = true;
40−
41− # Enable plymouth
42− boot.plymouth.enable = true;
43−
44− environment.defaultPackages = with pkgs; [
38+ environment.systemPackages = [
4539 # Include gparted for partitioning disks.
46− gparted
40+ pkgs.gparted
4741
4842 # Include some editors.
49− vim
50− nano
43+ pkgs.vim
44+ pkgs.bvi # binary editor
45+ pkgs.joe
5146
5247 # Include some version control tools.
53− git
54− rsync
48+ pkgs.git
5549
5650 # Firefox for reading the manual.
57− firefox
51+ pkgs.firefox
5852
59− glxinfo
53+ pkgs.glxinfo
6054 ];
6155
6256}
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nixdeleted−59
@@ -1,59 +0,0 @@
1−# This module defines a NixOS installation CD that contains GNOME.
2−
3−{ pkgs, ... }:
4−
5−{
6− imports = [ ./installation-cd-graphical-calamares.nix ];
7−
8− isoImage.edition = "gnome";
9−
10− services.xserver.desktopManager.gnome = {
11− # Add Firefox and other tools useful for installation to the launcher
12− favoriteAppsOverride = ''
13− [org.gnome.shell]
14− favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop', 'io.calamares.calamares.desktop' ]
15− '';
16−
17− # Override GNOME defaults to disable GNOME tour and disable suspend
18− extraGSettingsOverrides = ''
19− [org.gnome.shell]
20− welcome-dialog-last-shown-version='9999999999'
21−
22− [org.gnome.settings-daemon.plugins.power]
23− sleep-inactive-ac-type='nothing'
24− sleep-inactive-battery-type='nothing'
25− '';
26−
27− extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ];
28−
29− enable = true;
30− };
31−
32− # Theme calamares with GNOME theme
33− qt5 = {
34− enable = true;
35− platformTheme = "gnome";
36− };
37−
38− # Fix scaling for calamares on wayland
39− environment.variables = {
40− QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";
41− };
42−
43− services.xserver.displayManager = {
44− gdm = {
45− enable = true;
46− # autoSuspend makes the machine automatically suspend after inactivity.
47− # It's possible someone could/try to ssh'd into the machine and obviously
48− # have issues because it's inactive.
49− # See:
50− # * https://github.com/NixOS/nixpkgs/pull/63790
51− # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22
52− autoSuspend = false;
53− };
54− autoLogin = {
55− enable = true;
56− user = "nixos";
57− };
58− };
59−}
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nixdeleted−49
@@ -1,49 +0,0 @@
1−# This module defines a NixOS installation CD that contains X11 and
2−# Plasma 5.
3−
4−{ pkgs, ... }:
5−
6−{
7− imports = [ ./installation-cd-graphical-calamares.nix ];
8−
9− isoImage.edition = "plasma5";
10−
11− services.xserver = {
12− desktopManager.plasma5 = {
13− enable = true;
14− };
15−
16− # Automatically login as nixos.
17− displayManager = {
18− sddm.enable = true;
19− autoLogin = {
20− enable = true;
21− user = "nixos";
22− };
23− };
24− };
25−
26− environment.systemPackages = with pkgs; [
27− # Graphical text editor
28− kate
29− ];
30−
31− system.activationScripts.installerDesktop = let
32−
33− # Comes from documentation.nix when xserver and nixos.enable are true.
34− manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";
35−
36− homeDir = "/home/nixos/";
37− desktopDir = homeDir + "Desktop/";
38−
39− in ''
40− mkdir -p ${desktopDir}
41− chown nixos ${homeDir} ${desktopDir}
42−
43− ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
44− ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
45− ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
46− ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${desktopDir + "io.calamares.calamares.desktop"}
47− '';
48−
49−}
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nixdeleted−20
@@ -1,20 +0,0 @@
1−# This module adds the calamares installer to the basic graphical NixOS
2−# installation CD.
3−
4−{ pkgs, ... }:
5−let
6− calamares-nixos-autostart = pkgs.makeAutostartItem { name = "io.calamares.calamares"; package = pkgs.calamares-nixos; };
7−in
8−{
9− imports = [ ./installation-cd-graphical-base.nix ];
10−
11− environment.systemPackages = with pkgs; [
12− # Calamares for graphical installation
13− libsForQt5.kpmcore
14− calamares-nixos
15− calamares-nixos-autostart
16− calamares-nixos-extensions
17− # Needed for calamares QML module packagechooserq
18− libsForQt5.full
19− ];
20−}
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix+3−1
@@ -1,6 +1,8 @@
11# This module defines a NixOS installation CD that contains GNOME.
22
3−{ ... }:
3+{ lib, ... }:
4+
5+with lib;
46
57{
68 imports = [ ./installation-cd-graphical-base.nix ];
nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix+3−1
@@ -1,7 +1,9 @@
11# This module defines a NixOS installation CD that contains X11 and
22# Plasma 5.
33
4−{ pkgs, ... }:
4+{ config, lib, pkgs, ... }:
5+
6+with lib;
57
68{
79 imports = [ ./installation-cd-graphical-base.nix ];
nixos/modules/installer/cd-dvd/iso-image.nix+22−33
@@ -91,9 +91,29 @@ let
9191 SERIAL 0 115200
9292 TIMEOUT ${builtins.toString syslinuxTimeout}
9393 UI vesamenu.c32
94+ MENU TITLE NixOS
9495 MENU BACKGROUND /isolinux/background.png
95−
96− ${config.isoImage.syslinuxTheme}
96+ MENU RESOLUTION 800 600
97+ MENU CLEAR
98+ MENU ROWS 6
99+ MENU CMDLINEROW -4
100+ MENU TIMEOUTROW -3
101+ MENU TABMSGROW -2
102+ MENU HELPMSGROW -1
103+ MENU HELPMSGENDROW -1
104+ MENU MARGIN 0
105+
106+ # FG:AARRGGBB BG:AARRGGBB shadow
107+ MENU COLOR BORDER 30;44 #00000000 #00000000 none
108+ MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none
109+ MENU COLOR TABMSG 31;40 #80000000 #00000000 none
110+ MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none
111+ MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none
112+ MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none
113+ MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none
114+ MENU COLOR TITLE 1;36;44 #00000000 #00000000 none
115+ MENU COLOR UNSEL 37;44 #FF000000 #00000000 none
116+ MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std
97117
98118 DEFAULT boot
99119
@@ -581,37 +601,6 @@ in
581601 '';
582602 };
583603
584− isoImage.syslinuxTheme = mkOption {
585− default = ''
586− MENU TITLE NixOS
587− MENU RESOLUTION 800 600
588− MENU CLEAR
589− MENU ROWS 6
590− MENU CMDLINEROW -4
591− MENU TIMEOUTROW -3
592− MENU TABMSGROW -2
593− MENU HELPMSGROW -1
594− MENU HELPMSGENDROW -1
595− MENU MARGIN 0
596−
597− # FG:AARRGGBB BG:AARRGGBB shadow
598− MENU COLOR BORDER 30;44 #00000000 #00000000 none
599− MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none
600− MENU COLOR TABMSG 31;40 #80000000 #00000000 none
601− MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none
602− MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none
603− MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none
604− MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none
605− MENU COLOR TITLE 1;36;44 #00000000 #00000000 none
606− MENU COLOR UNSEL 37;44 #FF000000 #00000000 none
607− MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std
608− '';
609− type = types.str;
610− description = ''
611− The syslinux theme used for BIOS boot.
612− '';
613− };
614−
615604 isoImage.appendToMenuLabel = mkOption {
616605 default = " Installer";
617606 example = " Live System";
nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix+3−3
@@ -87,19 +87,19 @@ in
8787 boot.initrd.availableKernelModules =
8888 [ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ];
8989
90− boot.postBootCommands = lib.mkIf (!boot.initrd.systemd.enable)
90+ boot.postBootCommands =
9191 ''
9292 mkdir -p /mnt
9393
9494 cp ${dummyConfiguration} /etc/nixos/configuration.nix
9595 '';
9696
97− boot.initrd.extraUtilsCommands = lib.mkIf (!boot.initrd.systemd.enable)
97+ boot.initrd.extraUtilsCommands =
9898 ''
9999 copy_bin_and_libs ${pkgs.util-linux}/sbin/hwclock
100100 '';
101101
102− boot.initrd.postDeviceCommands = lib.mkIf (!boot.initrd.systemd.enable)
102+ boot.initrd.postDeviceCommands =
103103 ''
104104 hwclock -s
105105 '';
nixos/modules/installer/kexec/kexec-boot.nixdeleted−51
@@ -1,51 +0,0 @@
1−# This module exposes a config.system.build.kexecBoot attribute,
2−# which returns a directory with kernel, initrd and a shell script
3−# running the necessary kexec commands.
4−
5−# It's meant to be scp'ed to a machine with working ssh and kexec binary
6−# installed.
7−
8−# This is useful for (cloud) providers where you can't boot a custom image, but
9−# get some Debian or Ubuntu installation.
10−
11−{ pkgs
12−, modulesPath
13−, config
14−, ...
15−}:
16−{
17− imports = [
18− (modulesPath + "/installer/netboot/netboot-minimal.nix")
19− ];
20−
21− config = {
22− system.build.kexecBoot =
23− let
24− kexecScript = pkgs.writeScript "kexec-boot" ''
25− #!/usr/bin/env bash
26− if ! kexec -v >/dev/null 2>&1; then
27− echo "kexec not found: please install kexec-tools" 2>&1
28− exit 1
29− fi
30− SCRIPT_DIR=$( cd -- "$( dirname -- "''${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
31− kexec --load ''${SCRIPT_DIR}/bzImage \
32− --initrd=''${SCRIPT_DIR}/initrd.gz \
33− --command-line "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}"
34− kexec -e
35− ''; in
36− pkgs.linkFarm "kexec-tree" [
37− {
38− name = "initrd.gz";
39− path = "${config.system.build.netbootRamdisk}/initrd";
40− }
41− {
42− name = "bzImage";
43− path = "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}";
44− }
45− {
46− name = "kexec-boot";
47− path = kexecScript;
48− }
49− ];
50− };
51−}
nixos/modules/installer/sd-card/sd-image-aarch64.nix−9
@@ -39,12 +39,6 @@
3939 # Supported in newer board revisions
4040 arm_boost=1
4141
42− [cm4]
43− # Enable host mode on the 2711 built-in XHCI USB controller.
44− # This line should be removed if the legacy DWC2 controller is required
45− # (e.g. for USB device mode) or if USB support is not required.
46− otg_mode=1
47−
4842 [all]
4943 # Boot in 64-bit mode.
5044 arm_64bit=1
@@ -71,9 +65,6 @@
7165 cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin
7266 cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin
7367 cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/
74− cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-400.dtb firmware/
75− cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4.dtb firmware/
76− cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4s.dtb firmware/
7768 '';
7869 populateRootCommands = ''
7970 mkdir -p ./files/boot
nixos/modules/installer/tools/nix-fallback-paths.nix+5−5
@@ -1,7 +1,7 @@
11{
2− x86_64-linux = "/nix/store/yx36yzxpw1hn4fz8iyf1rfyd56jg3yf4-nix-2.8.0";
3− i686-linux = "/nix/store/c0hg806zvwg800qbszzj8ff4a224kjgf-nix-2.8.0";
4− aarch64-linux = "/nix/store/wic2832ll53q392r2wks4xr2nrk7p8p5-nix-2.8.0";
5− x86_64-darwin = "/nix/store/5yqdvnkmkrhl36xh0qy31pymdphjimdd-nix-2.8.0";
6− aarch64-darwin = "/nix/store/izc9592szrnpv8n86hr88bhpyc9g6b4s-nix-2.8.0";
2+ x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0";
3+ i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0";
4+ aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0";
5+ x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0";
6+ aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0";
77}
nixos/modules/installer/tools/nixos-enter.sh+11−11
@@ -63,32 +63,32 @@ mount --rbind /sys "$mountPoint/sys"
6363
6464# modified from https://github.com/archlinux/arch-install-scripts/blob/bb04ab435a5a89cd5e5ee821783477bc80db797f/arch-chroot.in#L26-L52
6565chroot_add_resolv_conf() {
66− local chrootDir="$1" resolvConf="$1/etc/resolv.conf"
66+ local chrootdir=$1 resolv_conf=$1/etc/resolv.conf
6767
6868 [[ -e /etc/resolv.conf ]] || return 0
6969
7070 # Handle resolv.conf as a symlink to somewhere else.
71− if [[ -L "$resolvConf" ]]; then
71+ if [[ -L $chrootdir/etc/resolv.conf ]]; then
7272 # readlink(1) should always give us *something* since we know at this point
7373 # it's a symlink. For simplicity, ignore the case of nested symlinks.
74− # We also ignore the possibility of `../`s escaping the root.
75− resolvConf="$(readlink "$resolvConf")"
76− if [[ "$resolvConf" = /* ]]; then
77− resolvConf="$chrootDir$resolvConf"
74+ # We also ignore the possibility if `../`s escaping the root.
75+ resolv_conf=$(readlink "$chrootdir/etc/resolv.conf")
76+ if [[ $resolv_conf = /* ]]; then
77+ resolv_conf=$chrootdir$resolv_conf
7878 else
79− resolvConf="$chrootDir/etc/$resolvConf"
79+ resolv_conf=$chrootdir/etc/$resolv_conf
8080 fi
8181 fi
8282
8383 # ensure file exists to bind mount over
84− if [[ ! -f "$resolvConf" ]]; then
85− install -Dm644 /dev/null "$resolvConf" || return 1
84+ if [[ ! -f $resolv_conf ]]; then
85+ install -Dm644 /dev/null "$resolv_conf" || return 1
8686 fi
8787
88− mount --bind /etc/resolv.conf "$resolvConf"
88+ mount --bind /etc/resolv.conf "$resolv_conf"
8989}
9090
91−chroot_add_resolv_conf "$mountPoint" || echo "$0: failed to set up resolv.conf" >&2
91+chroot_add_resolv_conf "$mountPoint" || print "ERROR: failed to set up resolv.conf"
9292
9393(
9494 # If silent, write both stdout and stderr of activation script to /dev/null
nixos/modules/installer/tools/nixos-generate-config.pl+1−8
@@ -51,9 +51,7 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
5151 $n++;
5252 $rootDir = $ARGV[$n];
5353 die "$0: ‘--root’ requires an argument\n" unless defined $rootDir;
54− die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/";
5554 $rootDir =~ s/\/*$//; # remove trailing slashes
56− $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
5755 }
5856 elsif ($arg eq "--force") {
5957 $force = 1;
@@ -618,12 +616,7 @@ EOF
618616if ($showHardwareConfig) {
619617 print STDOUT $hwConfig;
620618} else {
621− if ($outDir eq "/etc/nixos") {
622− $outDir = "$rootDir$outDir";
623− } else {
624− $outDir = File::Spec->rel2abs($outDir);
625− $outDir =~ s/\/*$//; # remove trailing slashes
626− }
619+ $outDir = "$rootDir$outDir";
627620
628621 my $fn = "$outDir/hardware-configuration.nix";
629622 print STDERR "writing $fn...\n";
nixos/modules/installer/tools/tools.nix+1−6
@@ -117,7 +117,7 @@ in
117117 '';
118118 };
119119
120− config = lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) {
120+ config = lib.mkIf (!config.system.disableInstallerTools) {
121121
122122 system.nixos-generate-config.configuration = mkDefault ''
123123 # Edit this configuration file to define what should be installed on
@@ -206,11 +206,6 @@ in
206206 # Or disable the firewall altogether.
207207 # networking.firewall.enable = false;
208208
209− # Copy the NixOS configuration file and link it from the resulting system
210− # (/run/current-system/configuration.nix). This is useful in case you
211− # accidentally delete configuration.nix.
212− # system.copySystemConfiguration = true;
213−
214209 # This value determines the NixOS release from which the default
215210 # settings for stateful data, like file locations and database versions
216211 # on your system were taken. It‘s perfectly fine and recommended to leave
nixos/modules/misc/documentation.nix+1−2
@@ -64,8 +64,7 @@ let
6464 filter =
6565 builtins.filterSource
6666 (n: t:
67− cleanSourceFilter n t
68− && (t == "directory" -> baseNameOf n != "tests")
67+ (t == "directory" -> baseNameOf n != "tests")
6968 && (t == "file" -> hasSuffix ".nix" n)
7069 );
7170 in
nixos/modules/misc/ids.nix+2−2
@@ -89,7 +89,7 @@ in
8989 prayer = 49;
9090 mpd = 50;
9191 clamav = 51;
92− #fprot = 52; # unused
92+ fprot = 52;
9393 # bind = 53; #dynamically allocated as of 2021-09-03
9494 wwwrun = 54;
9595 #adm = 55; # unused
@@ -412,7 +412,7 @@ in
412412 prayer = 49;
413413 mpd = 50;
414414 clamav = 51;
415− #fprot = 52; # unused
415+ fprot = 52;
416416 #bind = 53; # unused
417417 wwwrun = 54;
418418 adm = 55;
nixos/modules/misc/locate.nix+2−6
@@ -27,7 +27,7 @@ in
2727
2828 locate = mkOption {
2929 type = package;
30− default = pkgs.findutils.locate;
30+ default = pkgs.findutils;
3131 defaultText = literalExpression "pkgs.findutils";
3232 example = literalExpression "pkgs.mlocate";
3333 description = ''
@@ -183,11 +183,7 @@ in
183183
184184 pruneNames = mkOption {
185185 type = listOf str;
186− default = lib.optionals (!isFindutils) [ ".bzr" ".cache" ".git" ".hg" ".svn" ];
187− defaultText = literalDocBook ''
188− <literal>[ ".bzr" ".cache" ".git" ".hg" ".svn" ]</literal>, if
189− supported by the locate implementation (i.e. mlocate or plocate).
190− '';
186+ default = [ ".bzr" ".cache" ".git" ".hg" ".svn" ];
191187 description = ''
192188 Directory components which should exclude paths containing them from indexing
193189 '';
nixos/modules/misc/version.nix+18−47
@@ -1,41 +1,12 @@
11{ config, lib, options, pkgs, ... }:
22
3+with lib;
4+
35let
46 cfg = config.system.nixos;
57 opt = options.system.nixos;
6−
7− inherit (lib)
8− concatStringsSep mapAttrsToList toLower
9− literalExpression mkRenamedOptionModule mkDefault mkOption trivial types;
10−
11− needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s;
12− escapeIfNeccessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"'';
13− attrsToText = attrs:
14− concatStringsSep "\n" (
15− mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs
16− );
17−
18− osReleaseContents = {
19− NAME = "NixOS";
20− ID = "nixos";
21− VERSION = "${cfg.release} (${cfg.codeName})";
22− VERSION_CODENAME = toLower cfg.codeName;
23− VERSION_ID = cfg.release;
24− BUILD_ID = cfg.version;
25− PRETTY_NAME = "NixOS ${cfg.release} (${cfg.codeName})";
26− LOGO = "nix-snowflake";
27− HOME_URL = "https://nixos.org/";
28− DOCUMENTATION_URL = "https://nixos.org/learn.html";
29− SUPPORT_URL = "https://nixos.org/community.html";
30− BUG_REPORT_URL = "https://github.com/NixOS/nixpkgs/issues";
31− };
32−
33− initrdReleaseContents = osReleaseContents // {
34− PRETTY_NAME = "${osReleaseContents.PRETTY_NAME} (Initrd)";
35− };
36− initrdRelease = pkgs.writeText "initrd-release" (attrsToText initrdReleaseContents);
37−
388in
9+
3910{
4011 imports = [
4112 (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ])
@@ -130,22 +101,22 @@ in
130101 # Generate /etc/os-release. See
131102 # https://www.freedesktop.org/software/systemd/man/os-release.html for the
132103 # format.
133− environment.etc = {
134− "lsb-release".text = attrsToText {
135− LSB_VERSION = "${cfg.release} (${cfg.codeName})";
136− DISTRIB_ID = "nixos";
137− DISTRIB_RELEASE = cfg.release;
138− DISTRIB_CODENAME = toLower cfg.codeName;
139− DISTRIB_DESCRIPTION = "NixOS ${cfg.release} (${cfg.codeName})";
140− };
141−
142− "os-release".text = attrsToText osReleaseContents;
143− };
104+ environment.etc.os-release.text =
105+ ''
106+ NAME=NixOS
107+ ID=nixos
108+ VERSION="${cfg.release} (${cfg.codeName})"
109+ VERSION_CODENAME=${toLower cfg.codeName}
110+ VERSION_ID="${cfg.release}"
111+ BUILD_ID="${cfg.version}"
112+ PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})"
113+ LOGO="nix-snowflake"
114+ HOME_URL="https://nixos.org/"
115+ DOCUMENTATION_URL="https://nixos.org/learn.html"
116+ SUPPORT_URL="https://nixos.org/community.html"
117+ BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
118+ '';
144119
145− boot.initrd.systemd.contents = {
146− "/etc/os-release".source = initrdRelease;
147− "/etc/initrd-release".source = initrdRelease;
148− };
149120 };
150121
151122 # uses version info nixpkgs, which requires a full nixpkgs path
nixos/modules/module-list.nix+7−40
@@ -91,7 +91,6 @@
9191 ./hardware/video/switcheroo-control.nix
9292 ./hardware/video/uvcvideo/default.nix
9393 ./hardware/video/webcam/facetimehd.nix
94− ./hardware/xone.nix
9594 ./hardware/xpadneo.nix
9695 ./i18n/input-method/default.nix
9796 ./i18n/input-method/fcitx.nix
@@ -118,8 +117,6 @@
118117 ./misc/version.nix
119118 ./misc/wordlist.nix
120119 ./misc/nixops-autoluks.nix
121− ./programs/_1password.nix
122− ./programs/_1password-gui.nix
123120 ./programs/adb.nix
124121 ./programs/appgate-sdp.nix
125122 ./programs/atop.nix
@@ -171,8 +168,6 @@
171168 ./programs/iotop.nix
172169 ./programs/java.nix
173170 ./programs/k40-whisperer.nix
174− ./programs/kclock.nix
175− ./programs/k3b.nix
176171 ./programs/kdeconnect.nix
177172 ./programs/kbdlight.nix
178173 ./programs/less.nix
@@ -183,12 +178,8 @@
183178 ./programs/msmtp.nix
184179 ./programs/mtr.nix
185180 ./programs/nano.nix
186− ./programs/nbd.nix
187− ./programs/nix-ld.nix
188181 ./programs/neovim.nix
189− ./programs/nethoscope.nix
190182 ./programs/nm-applet.nix
191− ./programs/nncp.nix
192183 ./programs/npm.nix
193184 ./programs/noisetorch.nix
194185 ./programs/oblogout.nix
@@ -206,6 +197,7 @@
206197 ./programs/spacefm.nix
207198 ./programs/singularity.nix
208199 ./programs/ssh.nix
200+ ./programs/ssmtp.nix
209201 ./programs/sysdig.nix
210202 ./programs/systemtap.nix
211203 ./programs/starship.nix
@@ -307,7 +299,6 @@
307299 ./services/backup/znapzend.nix
308300 ./services/blockchain/ethereum/geth.nix
309301 ./services/backup/zrepl.nix
310− ./services/cluster/corosync/default.nix
311302 ./services/cluster/hadoop/default.nix
312303 ./services/cluster/k3s/default.nix
313304 ./services/cluster/kubernetes/addons/dns.nix
@@ -320,7 +311,6 @@
320311 ./services/cluster/kubernetes/pki.nix
321312 ./services/cluster/kubernetes/proxy.nix
322313 ./services/cluster/kubernetes/scheduler.nix
323− ./services/cluster/pacemaker/default.nix
324314 ./services/cluster/spark/default.nix
325315 ./services/computing/boinc/client.nix
326316 ./services/computing/foldingathome/client.nix
@@ -410,7 +400,6 @@
410400 ./services/display-managers/greetd.nix
411401 ./services/editors/emacs.nix
412402 ./services/editors/infinoted.nix
413− ./services/editors/haste.nix
414403 ./services/finance/odoo.nix
415404 ./services/games/asf.nix
416405 ./services/games/crossfire-server.nix
@@ -460,13 +449,11 @@
460449 ./services/hardware/udisks2.nix
461450 ./services/hardware/upower.nix
462451 ./services/hardware/usbmuxd.nix
463− ./services/hardware/usbrelayd.nix
464452 ./services/hardware/thermald.nix
465453 ./services/hardware/undervolt.nix
466454 ./services/hardware/vdr.nix
467455 ./services/hardware/xow.nix
468456 ./services/home-automation/home-assistant.nix
469− ./services/home-automation/zigbee2mqtt.nix
470457 ./services/logging/SystemdJournal2Gelf.nix
471458 ./services/logging/awstats.nix
472459 ./services/logging/filebeat.nix
@@ -511,7 +498,6 @@
511498 ./services/mail/roundcube.nix
512499 ./services/mail/sympa.nix
513500 ./services/mail/nullmailer.nix
514− ./services/matrix/matrix-synapse.nix
515501 ./services/matrix/mjolnir.nix
516502 ./services/matrix/pantalaimon.nix
517503 ./services/misc/ananicy.nix
@@ -578,6 +564,7 @@
578564 ./services/misc/matrix-appservice-discord.nix
579565 ./services/misc/matrix-appservice-irc.nix
580566 ./services/misc/matrix-conduit.nix
567+ ./services/misc/matrix-synapse.nix
581568 ./services/misc/mautrix-facebook.nix
582569 ./services/misc/mautrix-telegram.nix
583570 ./services/misc/mbpfan.nix
@@ -599,7 +586,7 @@
599586 ./services/misc/osrm.nix
600587 ./services/misc/owncast.nix
601588 ./services/misc/packagekit.nix
602− ./services/misc/paperless.nix
589+ ./services/misc/paperless-ng.nix
603590 ./services/misc/parsoid.nix
604591 ./services/misc/plex.nix
605592 ./services/misc/plikd.nix
@@ -638,6 +625,7 @@
638625 ./services/misc/weechat.nix
639626 ./services/misc/xmr-stak.nix
640627 ./services/misc/xmrig.nix
628+ ./services/misc/zigbee2mqtt.nix
641629 ./services/misc/zoneminder.nix
642630 ./services/misc/zookeeper.nix
643631 ./services/monitoring/alerta.nix
@@ -663,7 +651,6 @@
663651 ./services/monitoring/longview.nix
664652 ./services/monitoring/mackerel-agent.nix
665653 ./services/monitoring/metricbeat.nix
666− ./services/monitoring/mimir.nix
667654 ./services/monitoring/monit.nix
668655 ./services/monitoring/munin.nix
669656 ./services/monitoring/nagios.nix
@@ -737,14 +724,12 @@
737724 ./services/networking/blocky.nix
738725 ./services/networking/charybdis.nix
739726 ./services/networking/cjdns.nix
740− ./services/networking/cloudflare-dyndns.nix
741727 ./services/networking/cntlm.nix
742728 ./services/networking/connman.nix
743729 ./services/networking/consul.nix
744730 ./services/networking/coredns.nix
745731 ./services/networking/corerad.nix
746732 ./services/networking/coturn.nix
747− ./services/networking/create_ap.nix
748733 ./services/networking/croc.nix
749734 ./services/networking/dante.nix
750735 ./services/networking/ddclient.nix
@@ -759,7 +744,6 @@
759744 ./services/networking/ncdns.nix
760745 ./services/networking/nomad.nix
761746 ./services/networking/ejabberd.nix
762− ./services/networking/envoy.nix
763747 ./services/networking/epmd.nix
764748 ./services/networking/ergo.nix
765749 ./services/networking/ergochat.nix
@@ -787,7 +771,6 @@
787771 ./services/networking/headscale.nix
788772 ./services/networking/hostapd.nix
789773 ./services/networking/htpdate.nix
790− ./services/networking/https-dns-proxy.nix
791774 ./services/networking/hylafax/default.nix
792775 ./services/networking/i2pd.nix
793776 ./services/networking/i2p.nix
@@ -822,7 +805,6 @@
822805 ./services/networking/mosquitto.nix
823806 ./services/networking/monero.nix
824807 ./services/networking/morty.nix
825− ./services/networking/mozillavpn.nix
826808 ./services/networking/miredo.nix
827809 ./services/networking/mstpd.nix
828810 ./services/networking/mtprotoproxy.nix
@@ -835,7 +817,6 @@
835817 ./services/networking/nar-serve.nix
836818 ./services/networking/nat.nix
837819 ./services/networking/nats.nix
838− ./services/networking/nbd.nix
839820 ./services/networking/ndppd.nix
840821 ./services/networking/nebula.nix
841822 ./services/networking/networkmanager.nix
@@ -858,7 +839,7 @@
858839 ./services/networking/ofono.nix
859840 ./services/networking/oidentd.nix
860841 ./services/networking/onedrive.nix
861− ./services/networking/openconnect.nix
842+ ./services/networking/openfire.nix
862843 ./services/networking/openvpn.nix
863844 ./services/networking/ostinato.nix
864845 ./services/networking/owamp.nix
@@ -895,7 +876,6 @@
895876 ./services/networking/shorewall6.nix
896877 ./services/networking/shout.nix
897878 ./services/networking/sniproxy.nix
898− ./services/networking/snowflake-proxy.nix
899879 ./services/networking/smartdns.nix
900880 ./services/networking/smokeping.nix
901881 ./services/networking/softether.nix
@@ -970,6 +950,7 @@
970950 ./services/security/clamav.nix
971951 ./services/security/fail2ban.nix
972952 ./services/security/fprintd.nix
953+ ./services/security/fprot.nix
973954 ./services/security/haka.nix
974955 ./services/security/haveged.nix
975956 ./services/security/hockeypuck.nix
@@ -985,7 +966,6 @@
985966 ./services/security/shibboleth-sp.nix
986967 ./services/security/sks.nix
987968 ./services/security/sshguard.nix
988− ./services/security/sslmate-agent.nix
989969 ./services/security/step-ca.nix
990970 ./services/security/tor.nix
991971 ./services/security/torify.nix
@@ -1003,7 +983,6 @@
1003983 ./services/system/nscd.nix
1004984 ./services/system/saslauthd.nix
1005985 ./services/system/self-deploy.nix
1006− ./services/system/systembus-notify.nix
1007986 ./services/system/uptimed.nix
1008987 ./services/torrent/deluge.nix
1009988 ./services/torrent/flexget.nix
@@ -1057,10 +1036,8 @@
10571036 ./services/web-apps/mediawiki.nix
10581037 ./services/web-apps/miniflux.nix
10591038 ./services/web-apps/moodle.nix
1060− ./services/web-apps/netbox.nix
10611039 ./services/web-apps/nextcloud.nix
10621040 ./services/web-apps/nexus.nix
1063− ./services/web-apps/nifi.nix
10641041 ./services/web-apps/node-red.nix
10651042 ./services/web-apps/pict-rs.nix
10661043 ./services/web-apps/peertube.nix
@@ -1184,15 +1161,7 @@
11841161 ./system/boot/stage-1.nix
11851162 ./system/boot/stage-2.nix
11861163 ./system/boot/systemd.nix
1187− ./system/boot/systemd/coredump.nix
1188− ./system/boot/systemd/initrd-secrets.nix
1189− ./system/boot/systemd/initrd.nix
1190− ./system/boot/systemd/journald.nix
1191− ./system/boot/systemd/logind.nix
1192− ./system/boot/systemd/nspawn.nix
1193− ./system/boot/systemd/shutdown.nix
1194− ./system/boot/systemd/tmpfiles.nix
1195− ./system/boot/systemd/user.nix
1164+ ./system/boot/systemd-nspawn.nix
11961165 ./system/boot/timesyncd.nix
11971166 ./system/boot/tmp.nix
11981167 ./system/etc/etc-activation.nix
@@ -1246,7 +1215,6 @@
12461215 ./virtualisation/amazon-options.nix
12471216 ./virtualisation/hyperv-guest.nix
12481217 ./virtualisation/kvmgt.nix
1249− ./virtualisation/openstack-options.nix
12501218 ./virtualisation/openvswitch.nix
12511219 ./virtualisation/parallels-guest.nix
12521220 ./virtualisation/podman/default.nix
@@ -1256,7 +1224,6 @@
12561224 ./virtualisation/virtualbox-guest.nix
12571225 ./virtualisation/virtualbox-host.nix
12581226 ./virtualisation/vmware-guest.nix
1259− ./virtualisation/vmware-host.nix
12601227 ./virtualisation/waydroid.nix
12611228 ./virtualisation/xen-dom0.nix
12621229 ./virtualisation/xe-guest-utilities.nix
nixos/modules/profiles/all-hardware.nix−3
@@ -40,9 +40,6 @@ in
4040 # SD cards.
4141 "sdhci_pci"
4242
43− # NVMe drives
44− "nvme"
45−
4643 # Firewire support. Not tested.
4744 "ohci1394" "sbp2"
4845
nixos/modules/profiles/installation-device.nix−4
@@ -99,10 +99,6 @@ with lib;
9999 stdenvNoCC # for runCommand
100100 busybox
101101 jq # for closureInfo
102− # For boot.initrd.systemd
103− makeInitrdNGTool
104− systemdStage1
105− systemdStage1Network
106102 ];
107103
108104 # Show all debug messages from the kernel but don't log refused packets
nixos/modules/profiles/qemu-guest.nix+2−2
@@ -1,13 +1,13 @@
11# Common configuration for virtual machines running under QEMU (using
22# virtio).
33
4−{ config, lib, ... }:
4+{ ... }:
55
66{
77 boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
88 boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ];
99
10− boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
10+ boot.initrd.postDeviceCommands =
1111 ''
1212 # Set the system time from the hardware clock to work around a
1313 # bug in qemu-kvm > 1.5.2 (where the VM clock is initialised
nixos/modules/programs/_1password-gui.nixdeleted−68
@@ -1,68 +0,0 @@
1−{ config, pkgs, lib, ... }:
2−
3−with lib;
4−
5−let
6−
7− cfg = config.programs._1password-gui;
8−
9−in
10−{
11− options = {
12− programs._1password-gui = {
13− enable = mkEnableOption "the 1Password GUI application";
14−
15− gid = mkOption {
16− type = types.addCheck types.int (x: x >= 1000);
17− example = literalExpression "5000";
18− description = ''
19− The gid to assign to the onepassword group, which is needed for browser integration.
20− It must be 1000 or greater.
21− '';
22− };
23−
24− polkitPolicyOwners = mkOption {
25− type = types.listOf types.str;
26− default = [ ];
27− example = literalExpression ''["user1" "user2" "user3"]'';
28− description = ''
29− A list of users who should be able to integrate 1Password with polkit-based authentication mechanisms.
30− '';
31− };
32−
33− package = mkPackageOption pkgs "1Password GUI" {
34− default = [ "_1password-gui" ];
35− };
36− };
37− };
38−
39− config =
40− let
41− package = cfg.package.override {
42− polkitPolicyOwners = cfg.polkitPolicyOwners;
43− };
44− in
45− mkIf cfg.enable {
46− environment.systemPackages = [ package ];
47− users.groups.onepassword.gid = cfg.gid;
48−
49− security.wrappers = {
50− "1Password-BrowserSupport" = {
51− source = "${package}/share/1password/1Password-BrowserSupport";
52− owner = "root";
53− group = "onepassword";
54− setuid = false;
55− setgid = true;
56− };
57−
58− "1Password-KeyringHelper" = {
59− source = "${package}/share/1password/1Password-KeyringHelper";
60− owner = "root";
61− group = "onepassword";
62− setuid = true;
63− setgid = true;
64− };
65− };
66−
67− };
68−}
nixos/modules/programs/_1password.nixdeleted−44
@@ -1,44 +0,0 @@
1−{ config, pkgs, lib, ... }:
2−
3−with lib;
4−
5−let
6−
7− cfg = config.programs._1password;
8−
9−in
10−{
11− options = {
12− programs._1password = {
13− enable = mkEnableOption "the 1Password CLI tool";
14−
15− gid = mkOption {
16− type = types.addCheck types.int (x: x >= 1000);
17− example = literalExpression "5001";
18− description = ''
19− The gid to assign to the onepassword-cli group, which is needed for integration with the 1Password GUI.
20− It must be 1000 or greater.
21− '';
22− };
23−
24− package = mkPackageOption pkgs "1Password CLI" {
25− default = [ "_1password" ];
26− };
27− };
28− };
29−
30− config = mkIf cfg.enable {
31− environment.systemPackages = [ cfg.package ];
32− users.groups.onepassword-cli.gid = cfg.gid;
33−
34− security.wrappers = {
35− "op" = {
36− source = "${cfg.package}/bin/op";
37− owner = "root";
38− group = "onepassword-cli";
39− setuid = false;
40− setgid = true;
41− };
42− };
43− };
44−}
nixos/modules/programs/adb.nix+2−1
@@ -23,7 +23,8 @@ with lib;
2323 ###### implementation
2424 config = mkIf config.programs.adb.enable {
2525 services.udev.packages = [ pkgs.android-udev-rules ];
26− environment.systemPackages = [ pkgs.android-tools ];
26+ # Give platform-tools lower priority so mke2fs+friends are taken from other packages first
27+ environment.systemPackages = [ (lowPrio pkgs.androidenv.androidPkgs_9_0.platform-tools) ];
2728 users.groups.adbusers = {};
2829 };
2930}
nixos/modules/programs/captive-browser.nix+1−19
@@ -1,12 +1,8 @@
11{ config, lib, pkgs, ... }:
22
3+with lib;
34let
45 cfg = config.programs.captive-browser;
5−
6− inherit (lib)
7− concatStringsSep escapeShellArgs optionalString
8− literalExpression mkEnableOption mkIf mkOption mkOptionDefault types;
9−
106 browserDefault = chromium: concatStringsSep " " [
117 ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"''
128 ''${chromium}/bin/chromium''
@@ -19,15 +15,6 @@ let
1915 ''-no-default-browser-check''
2016 ''http://cache.nixos.org/''
2117 ];
22−
23− desktopItem = pkgs.makeDesktopItem {
24− name = "captive-browser";
25− desktopName = "Captive Portal Browser";
26− exec = "/run/wrappers/bin/captive-browser";
27− icon = "nix-snowflake";
28− categories = [ "Network" ];
29− };
30−
3118in
3219{
3320 ###### interface
@@ -97,11 +84,6 @@ in
9784 ###### implementation
9885
9986 config = mkIf cfg.enable {
100− environment.systemPackages = [
101− (pkgs.runCommandNoCC "captive-browser-desktop-item" { } ''
102− install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop
103− '')
104− ];
10587
10688 programs.captive-browser.dhcp-dns =
10789 let
nixos/modules/programs/chromium.nix−3
@@ -108,8 +108,5 @@ in
108108 # for google-chrome https://www.chromium.org/administrators/linux-quick-start
109109 environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile;
110110 environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
111− # for brave
112− environment.etc."brave/policies/managed/default.json".text = builtins.toJSON defaultProfile;
113− environment.etc."brave/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
114111 };
115112}
nixos/modules/programs/environment.nix+1−3
@@ -40,15 +40,13 @@ in
4040 KDEDIRS = [ "" ];
4141 QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
4242 QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
43− GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ];
43+ GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
4444 XDG_CONFIG_DIRS = [ "/etc/xdg" ];
4545 XDG_DATA_DIRS = [ "/share" ];
4646 MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ];
4747 LIBEXEC_PATH = [ "/lib/libexec" ];
4848 };
4949
50− environment.pathsToLink = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ];
51−
5250 environment.extraInit =
5351 ''
5452 unset ASPELL_CONF
nixos/modules/programs/firejail.nix+2−2
@@ -17,8 +17,8 @@ let
1717 then value
1818 else { executable = value; profile = null; extraArgs = []; };
1919 args = lib.escapeShellArgs (
20− opts.extraArgs
21− ++ (optional (opts.profile != null) "--profile=${toString opts.profile}")
20+ (optional (opts.profile != null) "--profile=${toString opts.profile}")
21+ ++ opts.extraArgs
2222 );
2323 in
2424 ''
nixos/modules/programs/k3b.nixdeleted−52
@@ -1,52 +0,0 @@
1−{ config, pkgs, lib, ... }:
2−
3−with lib;
4−
5−{
6− # interface
7− options.programs.k3b = {
8− enable = mkOption {
9− type = types.bool;
10− default = false;
11− description = ''
12− Whether to enable k3b, the KDE disk burning application.
13−
14− Additionally to installing <package>k3b</package> enabling this will
15− add <literal>setuid</literal> wrappers in <literal>/run/wrappers/bin</literal>
16− for both <package>cdrdao</package> and <package>cdrecord</package>. On first
17− run you must manually configure the path of <package>cdrdae</package> and
18− <package>cdrecord</package> to correspond to the appropriate paths under
19− <literal>/run/wrappers/bin</literal> in the "Setup External Programs" menu.
20− '';
21− };
22− };
23−
24− # implementation
25− config = mkIf config.programs.k3b.enable {
26−
27− environment.systemPackages = with pkgs; [
28− k3b
29− dvdplusrwtools
30− cdrdao
31− cdrkit
32− ];
33−
34− security.wrappers = {
35− cdrdao = {
36− setuid = true;
37− owner = "root";
38− group = "cdrom";
39− permissions = "u+wrx,g+x";
40− source = "${pkgs.cdrdao}/bin/cdrdao";
41− };
42− cdrecord = {
43− setuid = true;
44− owner = "root";
45− group = "cdrom";
46− permissions = "u+wrx,g+x";
47− source = "${pkgs.cdrkit}/bin/cdrecord";
48− };
49− };
50−
51− };
52−}
nixos/modules/programs/kclock.nixdeleted−13
@@ -1,13 +0,0 @@
1−{ lib, pkgs, config, ... }:
2−with lib;
3−let
4− cfg = config.programs.kclock;
5− kclockPkg = pkgs.libsForQt5.kclock;
6−in {
7− options.programs.kclock = { enable = mkEnableOption "Enable KClock"; };
8−
9− config = mkIf cfg.enable {
10− services.dbus.packages = [ kclockPkg ];
11− environment.systemPackages = [ kclockPkg ];
12− };
13−}
nixos/modules/programs/mininet.nix+2−2
@@ -23,8 +23,8 @@ let
2323 ln -s ${pyEnv}/bin/mn $out/bin/mn
2424
2525 # mn errors out without a telnet binary
26− # pkgs.inetutils brings an undesired ifconfig into PATH see #43105
27− ln -s ${pkgs.inetutils}/bin/telnet $out/bin/telnet
26+ # pkgs.telnet brings an undesired ifconfig into PATH see #43105
27+ ln -s ${pkgs.telnet}/bin/telnet $out/bin/telnet
2828 '';
2929in
3030{
nixos/modules/programs/nbd.nixdeleted−19
@@ -1,19 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−
5−let
6− cfg = config.programs.nbd;
7−in
8−{
9− options = {
10− programs.nbd = {
11− enable = mkEnableOption "Network Block Device (nbd) support";
12− };
13− };
14−
15− config = mkIf cfg.enable {
16− environment.systemPackages = with pkgs; [ nbd ];
17− boot.kernelModules = [ "nbd" ];
18− };
19−}
nixos/modules/programs/nethoscope.nixdeleted−30
@@ -1,30 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−
5−let cfg = config.programs.nethoscope;
6−in
7−{
8− meta.maintainers = with maintainers; [ _0x4A6F ];
9−
10− options = {
11− programs.nethoscope = {
12− enable = mkOption {
13− type = types.bool;
14− default = false;
15− description = ''
16− Whether to add nethoscope to the global environment and configure a
17− setcap wrapper for it.
18− '';
19− };
20− };
21− };
22−
23− config = mkIf cfg.enable {
24− environment.systemPackages = with pkgs; [ nethoscope ];
25− security.wrappers.nethoscope = {
26− source = "${pkgs.nethoscope}/bin/nethoscope";
27− capabilities = "cap_net_raw,cap_net_admin=eip";
28− };
29− };
30−}
nixos/modules/programs/nix-ld.nixdeleted−12
@@ -1,12 +0,0 @@
1−{ pkgs, lib, config, ... }:
2−{
3− meta.maintainers = [ lib.maintainers.mic92 ];
4− options = {
5− programs.nix-ld.enable = lib.mkEnableOption ''nix-ld, Documentation: <link xlink:href="https://github.com/Mic92/nix-ld"/>'';
6− };
7− config = lib.mkIf config.programs.nix-ld.enable {
8− systemd.tmpfiles.rules = [
9− "L+ ${pkgs.nix-ld.ldPath} - - - - ${pkgs.nix-ld}/libexec/nix-ld"
10− ];
11− };
12−}
nixos/modules/programs/nncp.nixdeleted−101
@@ -1,101 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−let
5− nncpCfgFile = "/run/nncp.hjson";
6− programCfg = config.programs.nncp;
7− settingsFormat = pkgs.formats.json { };
8− jsonCfgFile = settingsFormat.generate "nncp.json" programCfg.settings;
9− pkg = programCfg.package;
10−in {
11− options.programs.nncp = {
12−
13− enable =
14− mkEnableOption "NNCP (Node to Node copy) utilities and configuration";
15−
16− group = mkOption {
17− type = types.str;
18− default = "uucp";
19− description = ''
20− The group under which NNCP files shall be owned.
21− Any member of this group may access the secret keys
22− of this NNCP node.
23− '';
24− };
25−
26− package = mkOption {
27− type = types.package;
28− default = pkgs.nncp;
29− defaultText = literalExpression "pkgs.nncp";
30− description = "The NNCP package to use system-wide.";
31− };
32−
33− secrets = mkOption {
34− type = with types; listOf str;
35− example = [ "/run/keys/nncp.hjson" ];
36− description = ''
37− A list of paths to NNCP configuration files that should not be
38− in the Nix store. These files are layered on top of the values at
39− <xref linkend="opt-programs.nncp.settings"/>.
40− '';
41− };
42−
43− settings = mkOption {
44− type = settingsFormat.type;
45− description = ''
46− NNCP configuration, see
47− <link xlink:href="http://www.nncpgo.org/Configuration.html"/>.
48− At runtime these settings will be overlayed by the contents of
49− <xref linkend="opt-programs.nncp.secrets"/> into the file
50− <literal>${nncpCfgFile}</literal>. Node keypairs go in
51− <literal>secrets</literal>, do not specify them in
52− <literal>settings</literal> as they will be leaked into
53− <literal>/nix/store</literal>!
54− '';
55− default = { };
56− };
57−
58− };
59−
60− config = mkIf programCfg.enable {
61−
62− environment = {
63− systemPackages = [ pkg ];
64− etc."nncp.hjson".source = nncpCfgFile;
65− };
66−
67− programs.nncp.settings = {
68− spool = mkDefault "/var/spool/nncp";
69− log = mkDefault "/var/spool/nncp/log";
70− };
71−
72− systemd.tmpfiles.rules = [
73− "d ${programCfg.settings.spool} 0770 root ${programCfg.group}"
74− "f ${programCfg.settings.log} 0770 root ${programCfg.group}"
75− ];
76−
77− systemd.services.nncp-config = {
78− path = [ pkg ];
79− description = "Generate NNCP configuration";
80− wantedBy = [ "basic.target" ];
81− serviceConfig.Type = "oneshot";
82− script = ''
83− umask u=rw
84− nncpCfgDir=$(mktemp --directory nncp.XXX)
85− for f in ${jsonCfgFile} ${toString config.programs.nncp.secrets}; do
86− tmpdir=$(mktemp --directory nncp.XXX)
87− nncp-cfgdir -cfg $f -dump $tmpdir
88− find $tmpdir -size 1c -delete
89− cp -a $tmpdir/* $nncpCfgDir/
90− rm -rf $tmpdir
91− done
92− nncp-cfgdir -load $nncpCfgDir > ${nncpCfgFile}
93− rm -rf $nncpCfgDir
94− chgrp ${programCfg.group} ${nncpCfgFile}
95− chmod g+r ${nncpCfgFile}
96− '';
97− };
98− };
99−
100− meta.maintainers = with lib.maintainers; [ ehmry ];
101−}
nixos/modules/programs/ssh.nix+7−18
@@ -157,13 +157,9 @@ in
157157 default = [ name ] ++ config.extraHostNames;
158158 defaultText = literalExpression "[ ${name} ] ++ config.${options.extraHostNames}";
159159 description = ''
160+ DEPRECATED, please use <literal>extraHostNames</literal>.
160161 A list of host names and/or IP numbers used for accessing
161− the host's ssh service. This list includes the name of the
162− containing <literal>knownHosts</literal> attribute by default
163− for convenience. If you wish to configure multiple host keys
164− for the same host use multiple <literal>knownHosts</literal>
165− entries with different attribute names and the same
166− <literal>hostNames</literal> list.
162+ the host's ssh service.
167163 '';
168164 };
169165 extraHostNames = mkOption {
@@ -171,8 +167,7 @@ in
171167 default = [];
172168 description = ''
173169 A list of additional host names and/or IP numbers used for
174− accessing the host's ssh service. This list is ignored if
175− <literal>hostNames</literal> is set explicitly.
170+ accessing the host's ssh service.
176171 '';
177172 };
178173 publicKey = mkOption {
@@ -203,12 +198,7 @@ in
203198 };
204199 }));
205200 description = ''
206− The set of system-wide known SSH hosts. To make simple setups more
207− convenient the name of an attribute in this set is used as a host name
208− for the entry. This behaviour can be disabled by setting
209− <literal>hostNames</literal> explicitly. You can use
210− <literal>extraHostNames</literal> to add additional host names without
211− disabling this default.
201+ The set of system-wide known SSH hosts.
212202 '';
213203 example = literalExpression ''
214204 {
@@ -217,10 +207,6 @@ in
217207 publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
218208 };
219209 "myhost2.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILIRuJ8p1Fi+m6WkHV0KWnRfpM1WxoW8XAS+XvsSKsTK";
220− "myhost2.net/dsa" = {
221− hostNames = [ "myhost2.net" ];
222− publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
223− };
224210 }
225211 '';
226212 };
@@ -293,6 +279,9 @@ in
293279 message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
294280 });
295281
282+ warnings = mapAttrsToList (name: _: ''programs.ssh.knownHosts.${name}.hostNames is deprecated, use programs.ssh.knownHosts.${name}.extraHostNames'')
283+ (filterAttrs (name: {hostNames, extraHostNames, ...}: hostNames != [ name ] ++ extraHostNames) cfg.knownHosts);
284+
296285 # SSH configuration. Slight duplication of the sshd_config
297286 # generation in the sshd service.
298287 environment.etc."ssh/ssh_config".text =
nixos/modules/programs/ssmtp.nixnew file+190
@@ -0,0 +1,190 @@
1+# Configuration for `ssmtp', a trivial mail transfer agent that can
2+# replace sendmail/postfix on simple systems. It delivers email
3+# directly to an SMTP server defined in its configuration file, without
4+# queueing mail locally.
5+
6+{ config, lib, pkgs, ... }:
7+
8+with lib;
9+
10+let
11+ cfg = config.services.ssmtp;
12+
13+in
14+{
15+
16+ imports = [
17+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "directDelivery" ] [ "services" "ssmtp" "enable" ])
18+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "hostName" ] [ "services" "ssmtp" "hostName" ])
19+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "domain" ] [ "services" "ssmtp" "domain" ])
20+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "root" ] [ "services" "ssmtp" "root" ])
21+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "useTLS" ] [ "services" "ssmtp" "useTLS" ])
22+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "useSTARTTLS" ] [ "services" "ssmtp" "useSTARTTLS" ])
23+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "authUser" ] [ "services" "ssmtp" "authUser" ])
24+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPassFile" ] [ "services" "ssmtp" "authPassFile" ])
25+ (mkRenamedOptionModule [ "networking" "defaultMailServer" "setSendmail" ] [ "services" "ssmtp" "setSendmail" ])
26+
27+ (mkRemovedOptionModule [ "networking" "defaultMailServer" "authPass" ] "authPass has been removed since it leaks the clear-text password into the world-readable store. Use authPassFile instead and make sure it's not a store path")
28+ (mkRemovedOptionModule [ "services" "ssmtp" "authPass" ] "authPass has been removed since it leaks the clear-text password into the world-readable store. Use authPassFile instead and make sure it's not a store path")
29+ ];
30+
31+ options = {
32+
33+ services.ssmtp = {
34+
35+ enable = mkOption {
36+ type = types.bool;
37+ default = false;
38+ description = ''
39+ Use the trivial Mail Transfer Agent (MTA)
40+ <command>ssmtp</command> package to allow programs to send
41+ e-mail. If you don't want to run a “real” MTA like
42+ <command>sendmail</command> or <command>postfix</command> on
43+ your machine, set this option to <literal>true</literal>, and
44+ set the option
45+ <option>services.ssmtp.hostName</option> to the
46+ host name of your preferred mail server.
47+ '';
48+ };
49+
50+ settings = mkOption {
51+ type = with types; attrsOf (oneOf [ bool str ]);
52+ default = {};
53+ description = ''
54+ <citerefentry><refentrytitle>ssmtp</refentrytitle><manvolnum>5</manvolnum></citerefentry> configuration. Refer
55+ to <link xlink:href="https://linux.die.net/man/5/ssmtp.conf"/> for details on supported values.
56+ '';
57+ example = literalExpression ''
58+ {
59+ Debug = true;
60+ FromLineOverride = false;
61+ }
62+ '';
63+ };
64+
65+ hostName = mkOption {
66+ type = types.str;
67+ example = "mail.example.org";
68+ description = ''
69+ The host name of the default mail server to use to deliver
70+ e-mail. Can also contain a port number (ex: mail.example.org:587),
71+ defaults to port 25 if no port is given.
72+ '';
73+ };
74+
75+ root = mkOption {
76+ type = types.str;
77+ default = "";
78+ example = "root@example.org";
79+ description = ''
80+ The e-mail to which mail for users with UID < 1000 is forwarded.
81+ '';
82+ };
83+
84+ domain = mkOption {
85+ type = types.str;
86+ default = "";
87+ example = "example.org";
88+ description = ''
89+ The domain from which mail will appear to be sent.
90+ '';
91+ };
92+
93+ useTLS = mkOption {
94+ type = types.bool;
95+ default = false;
96+ description = ''
97+ Whether TLS should be used to connect to the default mail
98+ server.
99+ '';
100+ };
101+
102+ useSTARTTLS = mkOption {
103+ type = types.bool;
104+ default = false;
105+ description = ''
106+ Whether the STARTTLS should be used to connect to the default
107+ mail server. (This is needed for TLS-capable mail servers
108+ running on the default SMTP port 25.)
109+ '';
110+ };
111+
112+ authUser = mkOption {
113+ type = types.str;
114+ default = "";
115+ example = "foo@example.org";
116+ description = ''
117+ Username used for SMTP auth. Leave blank to disable.
118+ '';
119+ };
120+
121+ authPassFile = mkOption {
122+ type = types.nullOr types.str;
123+ default = null;
124+ example = "/run/keys/ssmtp-authpass";
125+ description = ''
126+ Path to a file that contains the password used for SMTP auth. The file
127+ should not contain a trailing newline, if the password does not contain one
128+ (e.g. use <command>echo -n "password" > file</command>).
129+ This file should be readable by the users that need to execute ssmtp.
130+ '';
131+ };
132+
133+ setSendmail = mkOption {
134+ type = types.bool;
135+ default = true;
136+ description = "Whether to set the system sendmail to ssmtp's.";
137+ };
138+
139+ };
140+
141+ };
142+
143+
144+ config = mkIf cfg.enable {
145+
146+ assertions = [
147+ {
148+ assertion = cfg.useSTARTTLS -> cfg.useTLS;
149+ message = "services.ssmtp.useSTARTTLS has no effect without services.ssmtp.useTLS";
150+ }
151+ ];
152+
153+ services.ssmtp.settings = mkMerge [
154+ ({
155+ MailHub = cfg.hostName;
156+ FromLineOverride = mkDefault true;
157+ UseTLS = cfg.useTLS;
158+ UseSTARTTLS = cfg.useSTARTTLS;
159+ })
160+ (mkIf (cfg.root != "") { root = cfg.root; })
161+ (mkIf (cfg.domain != "") { rewriteDomain = cfg.domain; })
162+ (mkIf (cfg.authUser != "") { AuthUser = cfg.authUser; })
163+ (mkIf (cfg.authPassFile != null) { AuthPassFile = cfg.authPassFile; })
164+ ];
165+
166+ # careful here: ssmtp REQUIRES all config lines to end with a newline char!
167+ environment.etc."ssmtp/ssmtp.conf".text = with generators; toKeyValue {
168+ mkKeyValue = mkKeyValueDefault {
169+ mkValueString = value:
170+ if value == true then "YES"
171+ else if value == false then "NO"
172+ else mkValueStringDefault {} value
173+ ;
174+ } "=";
175+ } cfg.settings;
176+
177+ environment.systemPackages = [pkgs.ssmtp];
178+
179+ services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail {
180+ program = "sendmail";
181+ source = "${pkgs.ssmtp}/bin/sendmail";
182+ setuid = false;
183+ setgid = false;
184+ owner = "root";
185+ group = "root";
186+ };
187+
188+ };
189+
190+}
nixos/modules/programs/sway.nix−1
@@ -134,7 +134,6 @@ in {
134134 '';
135135 };
136136 };
137− security.polkit.enable = true;
138137 security.pam.services.swaylock = {};
139138 hardware.opengl.enable = mkDefault true;
140139 fonts.enableDefaultFonts = mkDefault true;
nixos/modules/programs/thefuck.nix+6−7
@@ -6,12 +6,9 @@ let
66 prg = config.programs;
77 cfg = prg.thefuck;
88
9− bashAndZshInitScript = ''
9+ initScript = ''
1010 eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
1111 '';
12− fishInitScript = ''
13− ${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias} | source
14− '';
1512in
1613 {
1714 options = {
@@ -33,8 +30,10 @@ in
3330 config = mkIf cfg.enable {
3431 environment.systemPackages = with pkgs; [ thefuck ];
3532
36− programs.bash.interactiveShellInit = bashAndZshInitScript;
37− programs.zsh.interactiveShellInit = mkIf prg.zsh.enable bashAndZshInitScript;
38− programs.fish.interactiveShellInit = mkIf prg.fish.enable fishInitScript;
33+ programs.bash.interactiveShellInit = initScript;
34+ programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
35+ programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
36+ ${pkgs.thefuck}/bin/thefuck --alias | source
37+ '';
3938 };
4039 }
nixos/modules/programs/zsh/zsh-autosuggestions.nix+10−11
@@ -22,18 +22,17 @@ in
2222 };
2323
2424 strategy = mkOption {
25− type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]);
26− default = [ "history" ];
25+ type = types.enum [ "history" "match_prev_cmd" ];
26+ default = "history";
2727 description = ''
28− `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated.
29− The strategies in the array are tried successively until a suggestion is found.
30− There are currently three built-in strategies to choose from:
28+ Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions.
29+ There are currently two to choose from:
3130
32− - `history`: Chooses the most recent match from history.
33− - `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module)
34− - `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches
35− the most recently executed command. Note that this strategy won't work as expected with ZSH options that
36− don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
31+ * history: Chooses the most recent match.
32+ * match_prev_cmd: Chooses the most recent match whose preceding history item matches
33+ the most recently executed command (more info). Note that this strategy won't work as
34+ expected with ZSH options that don't preserve the history order such as
35+ HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST.
3736 '';
3837 };
3938
@@ -63,7 +62,7 @@ in
6362 source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
6463
6564 export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
66− export ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.strategy})
65+ export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}")
6766 ${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"}
6867
6968 ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
nixos/modules/rename.nix−7
@@ -50,7 +50,6 @@ with lib;
5050 (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
5151 (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed")
5252 (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
53− (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.")
5453 (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
5554 (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.")
5655 (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.")
@@ -69,11 +68,6 @@ with lib;
6968 '')
7069 (mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs")
7170 (mkRemovedOptionModule [ "services" "seeks" ] "")
72− (mkRemovedOptionModule [ "services" "ssmtp" ] ''
73− The ssmtp package and the corresponding module have been removed due to
74− the program being unmaintained. The options `programs.msmtp.*` can be
75− used instead.
76− '')
7771 (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.")
7872 (mkRemovedOptionModule [ "services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces.<name>.wakeOnLan")
7973 (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.")
@@ -96,7 +90,6 @@ with lib;
9690 (mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.")
9791 (mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.")
9892 (mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.")
99− (mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.")
10093
10194 # Do NOT add any option renames here, see top of the file
10295 ];
nixos/modules/security/pam.nix+4−114
@@ -61,19 +61,6 @@ let
6161 '';
6262 };
6363
64− usshAuth = mkOption {
65− default = false;
66− type = types.bool;
67− description = ''
68− If set, users with an SSH certificate containing an authorized principal
69− in their SSH agent are able to log in. Specific options are controlled
70− using the <option>security.pam.ussh</option> options.
71−
72− Note that the <option>security.pam.ussh.enable</option> must also be
73− set for this option to take effect.
74− '';
75− };
76−
7764 yubicoAuth = mkOption {
7865 default = config.security.pam.yubico.enable;
7966 defaultText = literalExpression "config.security.pam.yubico.enable";
@@ -488,11 +475,8 @@ let
488475 optionalString cfg.usbAuth ''
489476 auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so
490477 '' +
491− (let ussh = config.security.pam.ussh; in optionalString (config.security.pam.ussh.enable && cfg.usshAuth) ''
492− auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"}
493− '') +
494478 (let oath = config.security.pam.oath; in optionalString cfg.oathAuth ''
495− auth requisite ${pkgs.oath-toolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}
479+ auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}
496480 '') +
497481 (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ''
498482 auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}
@@ -534,7 +518,7 @@ let
534518 auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"}
535519 '' +
536520 optionalString cfg.googleAuthenticator.enable ''
537− auth required ${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so no_increment_hotp
521+ auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp
538522 '' +
539523 optionalString cfg.duoSecurity.enable ''
540524 auth required ${pkgs.duo-unix}/lib/security/pam_duo.so
@@ -610,7 +594,6 @@ let
610594 session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so
611595 '' +
612596 optionalString cfg.pamMount ''
613− session [success=1 default=ignore] ${pkgs.pam}/lib/security/pam_succeed_if.so service = systemd-user quiet
614597 session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive
615598 '' +
616599 optionalString use_ldap ''
@@ -943,96 +926,6 @@ in
943926 };
944927 };
945928
946− security.pam.ussh = {
947− enable = mkOption {
948− default = false;
949− type = types.bool;
950− description = ''
951− Enables Uber's USSH PAM (<literal>pam-ussh</literal>) module.
952−
953− This is similar to <literal>pam-ssh-agent</literal>, except that
954− the presence of a CA-signed SSH key with a valid principal is checked
955− instead.
956−
957− Note that this module must both be enabled using this option and on a
958− per-PAM-service level as well (using <literal>usshAuth</literal>).
959−
960− More information can be found <link
961− xlink:href="https://github.com/uber/pam-ussh">here</link>.
962− '';
963− };
964−
965− caFile = mkOption {
966− default = null;
967− type = with types; nullOr path;
968− description = ''
969− By default <literal>pam-ussh</literal> reads the trusted user CA keys
970− from <filename>/etc/ssh/trusted_user_ca</filename>.
971−
972− This should be set the same as your <literal>TrustedUserCAKeys</literal>
973− option for sshd.
974− '';
975− };
976−
977− authorizedPrincipals = mkOption {
978− default = null;
979− type = with types; nullOr commas;
980− description = ''
981− Comma-separated list of authorized principals to permit; if the user
982− presents a certificate with one of these principals, then they will be
983− authorized.
984−
985− Note that <literal>pam-ussh</literal> also requires that the certificate
986− contain a principal matching the user's username. The principals from
987− this list are in addition to those principals.
988−
989− Mutually exclusive with <literal>authorizedPrincipalsFile</literal>.
990− '';
991− };
992−
993− authorizedPrincipalsFile = mkOption {
994− default = null;
995− type = with types; nullOr path;
996− description = ''
997− Path to a list of principals; if the user presents a certificate with
998− one of these principals, then they will be authorized.
999−
1000− Note that <literal>pam-ussh</literal> also requires that the certificate
1001− contain a principal matching the user's username. The principals from
1002− this file are in addition to those principals.
1003−
1004− Mutually exclusive with <literal>authorizedPrincipals</literal>.
1005− '';
1006− };
1007−
1008− group = mkOption {
1009− default = null;
1010− type = with types; nullOr str;
1011− description = ''
1012− If set, then the authenticating user must be a member of this group
1013− to use this module.
1014− '';
1015− };
1016−
1017− control = mkOption {
1018− default = "sufficient";
1019− type = types.enum [ "required" "requisite" "sufficient" "optional" ];
1020− description = ''
1021− This option sets pam "control".
1022− If you want to have multi factor authentication, use "required".
1023− If you want to use the SSH certificate instead of the regular password,
1024− use "sufficient".
1025−
1026− Read
1027− <citerefentry>
1028− <refentrytitle>pam.conf</refentrytitle>
1029− <manvolnum>5</manvolnum>
1030− </citerefentry>
1031− for better understanding of this option.
1032− '';
1033− };
1034− };
1035−
1036929 security.pam.yubico = {
1037930 enable = mkOption {
1038931 default = false;
@@ -1131,7 +1024,7 @@ in
11311024 ++ optional config.services.sssd.enable pkgs.sssd
11321025 ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
11331026 ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
1134− ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ]
1027+ ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]
11351028 ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]
11361029 ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];
11371030
@@ -1217,11 +1110,8 @@ in
12171110 optionalString (isEnabled (cfg: cfg.usbAuth)) ''
12181111 mr ${pkgs.pam_usb}/lib/security/pam_usb.so,
12191112 '' +
1220− optionalString (isEnabled (cfg: cfg.usshAuth)) ''
1221− mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so,
1222− '' +
12231113 optionalString (isEnabled (cfg: cfg.oathAuth)) ''
1224− "mr ${pkgs.oath-toolkit}/lib/security/pam_oath.so,
1114+ "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so,
12251115 '' +
12261116 optionalString (isEnabled (cfg: cfg.yubicoAuth)) ''
12271117 mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,
nixos/modules/security/pam_mount.nix+6−78
@@ -5,14 +5,6 @@ with lib;
55let
66 cfg = config.security.pam.mount;
77
8− oflRequired = cfg.logoutHup || cfg.logoutTerm || cfg.logoutKill;
9−
10− fake_ofl = pkgs.writeShellScriptBin "fake_ofl" ''
11− SIGNAL=$1
12− MNTPT=$2
13− ${pkgs.lsof}/bin/lsof | ${pkgs.gnugrep}/bin/grep $MNTPT | ${pkgs.gawk}/bin/awk '{print $2}' | ${pkgs.findutils}/bin/xargs ${pkgs.util-linux}/bin/kill -$SIGNAL
14− '';
15−
168 anyPamMount = any (attrByPath ["pamMount"] false) (attrValues config.security.pam.services);
179in
1810
@@ -59,71 +51,6 @@ in
5951 You can define volume-specific options in the volume definitions.
6052 '';
6153 };
62−
63− debugLevel = mkOption {
64− type = types.int;
65− default = 0;
66− example = 1;
67− description = ''
68− Sets the Debug-Level. 0 disables debugging, 1 enables pam_mount tracing,
69− and 2 additionally enables tracing in mount.crypt. The default is 0.
70− For more information, visit <link
71− xlink:href="http://pam-mount.sourceforge.net/pam_mount.conf.5.html" />.
72− '';
73− };
74−
75− logoutWait = mkOption {
76− type = types.int;
77− default = 0;
78− description = ''
79− Amount of microseconds to wait until killing remaining processes after
80− final logout.
81− For more information, visit <link
82− xlink:href="http://pam-mount.sourceforge.net/pam_mount.conf.5.html" />.
83− '';
84− };
85−
86− logoutHup = mkOption {
87− type = types.bool;
88− default = false;
89− description = ''
90− Kill remaining processes after logout by sending a SIGHUP.
91− '';
92− };
93−
94− logoutTerm = mkOption {
95− type = types.bool;
96− default = false;
97− description = ''
98− Kill remaining processes after logout by sending a SIGTERM.
99− '';
100− };
101−
102− logoutKill = mkOption {
103− type = types.bool;
104− default = false;
105− description = ''
106− Kill remaining processes after logout by sending a SIGKILL.
107− '';
108− };
109−
110− createMountPoints = mkOption {
111− type = types.bool;
112− default = true;
113− description = ''
114− Create mountpoints for volumes if they do not exist.
115− '';
116− };
117−
118− removeCreatedMountPoints = mkOption {
119− type = types.bool;
120− default = true;
121− description = ''
122− Remove mountpoints created by pam_mount after logout. This
123− only affects mountpoints that have been created by pam_mount
124− in the same session.
125− '';
126− };
12754 };
12855
12956 };
@@ -150,20 +77,21 @@ in
15077 <!DOCTYPE pam_mount SYSTEM "pam_mount.conf.xml.dtd">
15178 <!-- auto generated from Nixos: modules/config/users-groups.nix -->
15279 <pam_mount>
153− <debug enable="${toString cfg.debugLevel}" />
80+ <debug enable="0" />
81+
15482 <!-- if activated, requires ofl from hxtools to be present -->
155− <logout wait="${toString cfg.logoutWait}" hup="${if cfg.logoutHup then "yes" else "no"}" term="${if cfg.logoutTerm then "yes" else "no"}" kill="${if cfg.logoutKill then "yes" else "no"}" />
83+ <logout wait="0" hup="no" term="no" kill="no" />
15684 <!-- set PATH variable for pam_mount module -->
15785 <path>${makeBinPath ([ pkgs.util-linux ] ++ cfg.additionalSearchPaths)}</path>
15886 <!-- create mount point if not present -->
159− <mkmountpoint enable="${if cfg.createMountPoints then "1" else "0"}" remove="${if cfg.removeCreatedMountPoints then "true" else "false"}" />
87+ <mkmountpoint enable="1" remove="true" />
88+
16089 <!-- specify the binaries to be called -->
16190 <fusemount>${pkgs.fuse}/bin/mount.fuse %(VOLUME) %(MNTPT) -o ${concatStringsSep "," (cfg.fuseMountOptions ++ [ "%(OPTIONS)" ])}</fusemount>
162− <fuseumount>${pkgs.fuse}/bin/fusermount -u %(MNTPT)</fuseumount>
16391 <cryptmount>${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT)</cryptmount>
16492 <cryptumount>${pkgs.pam_mount}/bin/umount.crypt %(MNTPT)</cryptumount>
16593 <pmvarrun>${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION)</pmvarrun>
166− ${optionalString oflRequired "<ofl>${fake_ofl}/bin/fake_ofl %(SIGNAL) %(MNTPT)</ofl>"}
94+
16795 ${concatStrings (map userVolumeEntry (attrValues extraUserVolumes))}
16896 ${concatStringsSep "\n" cfg.extraVolumes}
16997 </pam_mount>
nixos/modules/security/polkit.nix+5−1
@@ -12,7 +12,11 @@ in
1212
1313 options = {
1414
15− security.polkit.enable = mkEnableOption "polkit";
15+ security.polkit.enable = mkOption {
16+ type = types.bool;
17+ default = true;
18+ description = "Whether to enable PolKit.";
19+ };
1620
1721 security.polkit.extraConfig = mkOption {
1822 type = types.lines;
nixos/modules/security/sudo.nix+1−1
@@ -245,7 +245,7 @@ in
245245
246246 environment.systemPackages = [ sudo ];
247247
248− security.pam.services.sudo = { sshAgentAuth = true; usshAuth = true; };
248+ security.pam.services.sudo = { sshAgentAuth = true; };
249249
250250 environment.etc.sudoers =
251251 { source =
nixos/modules/security/systemd-confinement.nix+2−2
@@ -175,8 +175,8 @@ in {
175175 serviceName = "${name}.service";
176176 excludedPath = rootPaths;
177177 } ''
178− mkdir -p "$out/lib/systemd/system/$serviceName.d"
179− serviceFile="$out/lib/systemd/system/$serviceName.d/confinement.conf"
178+ mkdir -p "$out/lib/systemd/system"
179+ serviceFile="$out/lib/systemd/system/$serviceName"
180180
181181 echo '[Service]' > "$serviceFile"
182182
nixos/modules/services/audio/snapserver.nix+7−15
@@ -1,4 +1,4 @@
1−{ config, options, lib, pkgs, ... }:
1+{ config, lib, pkgs, ... }:
22
33with lib;
44
@@ -101,8 +101,6 @@ in {
101101
102102 openFirewall = mkOption {
103103 type = types.bool;
104− # Make the behavior consistent with other services. Set the default to
105− # false and remove the accompanying warning after NixOS 22.05 is released.
106104 default = true;
107105 description = ''
108106 Whether to automatically open the specified ports in the firewall.
@@ -275,16 +273,10 @@ in {
275273
276274 config = mkIf cfg.enable {
277275
278− warnings =
279− # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85
280− filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then ''
281− services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.
282− '' else "") cfg.streams)
283− # Remove this warning after NixOS 22.05 is released.
284− ++ optional (options.services.snapserver.openFirewall.highestPrio >= (mkOptionDefault null).priority) ''
285− services.snapserver.openFirewall will no longer default to true starting with NixOS 22.11.
286− Enable it explicitly if you need to control Snapserver remotely.
287− '';
276+ # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85
277+ warnings = filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then ''
278+ services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.
279+ '' else "") cfg.streams);
288280
289281 systemd.services.snapserver = {
290282 after = [ "network.target" ];
@@ -312,8 +304,8 @@ in {
312304
313305 networking.firewall.allowedTCPPorts =
314306 optionals cfg.openFirewall [ cfg.port ]
315− ++ optional (cfg.openFirewall && cfg.tcp.enable) cfg.tcp.port
316− ++ optional (cfg.openFirewall && cfg.http.enable) cfg.http.port;
307+ ++ optional cfg.tcp.enable cfg.tcp.port
308+ ++ optional cfg.http.enable cfg.http.port;
317309 };
318310
319311 meta = {
nixos/modules/services/audio/squeezelite.nix+21−17
@@ -1,46 +1,50 @@
11{ config, lib, pkgs, ... }:
22
3−let
4− inherit (lib) mkEnableOption mkIf mkOption optionalString types;
3+with lib;
54
5+let
66 dataDir = "/var/lib/squeezelite";
77 cfg = config.services.squeezelite;
8− pkg = if cfg.pulseAudio then pkgs.squeezelite-pulse else pkgs.squeezelite;
9− bin = "${pkg}/bin/${pkg.pname}";
108
11−in
12−{
9+in {
1310
1411 ###### interface
1512
16− options.services.squeezelite = {
17− enable = mkEnableOption "Squeezelite, a software Squeezebox emulator";
13+ options = {
14+
15+ services.squeezelite= {
1816
19− pulseAudio = mkEnableOption "pulseaudio support";
17+ enable = mkEnableOption "Squeezelite, a software Squeezebox emulator";
18+
19+ extraArguments = mkOption {
20+ default = "";
21+ type = types.str;
22+ description = ''
23+ Additional command line arguments to pass to Squeezelite.
24+ '';
25+ };
2026
21− extraArguments = mkOption {
22− default = "";
23− type = types.str;
24− description = ''
25− Additional command line arguments to pass to Squeezelite.
26− '';
2727 };
28+
2829 };
2930
3031
3132 ###### implementation
3233
3334 config = mkIf cfg.enable {
34− systemd.services.squeezelite = {
35+
36+ systemd.services.squeezelite= {
3537 wantedBy = [ "multi-user.target" ];
3638 after = [ "network.target" "sound.target" ];
3739 description = "Software Squeezebox emulator";
3840 serviceConfig = {
3941 DynamicUser = true;
40− ExecStart = "${bin} -N ${dataDir}/player-name ${cfg.extraArguments}";
42+ ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${dataDir}/player-name ${cfg.extraArguments}";
4143 StateDirectory = builtins.baseNameOf dataDir;
4244 SupplementaryGroups = "audio";
4345 };
4446 };
47+
4548 };
49+
4650}
nixos/modules/services/backup/zrepl.nix−3
@@ -38,9 +38,6 @@ in
3838 environment.etc."zrepl/zrepl.yml".source = configFile;
3939
4040 systemd.packages = [ pkgs.zrepl ];
41−
42− # Note that pkgs.zrepl copies and adapts the upstream systemd unit, and
43− # the fields defined here only override certain fields from that unit.
4441 systemd.services.zrepl = {
4542 requires = [ "local-fs.target" ];
4643 wantedBy = [ "zfs.target" ];
nixos/modules/services/cluster/corosync/default.nixdeleted−112
@@ -1,112 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−let
5− cfg = config.services.corosync;
6−in
7−{
8− # interface
9− options.services.corosync = {
10− enable = mkEnableOption "corosync";
11−
12− package = mkOption {
13− type = types.package;
14− default = pkgs.corosync;
15− defaultText = literalExpression "pkgs.corosync";
16− description = "Package that should be used for corosync.";
17− };
18−
19− clusterName = mkOption {
20− type = types.str;
21− default = "nixcluster";
22− description = "Name of the corosync cluster.";
23− };
24−
25− extraOptions = mkOption {
26− type = with types; listOf str;
27− default = [];
28− description = "Additional options with which to start corosync.";
29− };
30−
31− nodelist = mkOption {
32− description = "Corosync nodelist: all cluster members.";
33− default = [];
34− type = with types; listOf (submodule {
35− options = {
36− nodeid = mkOption {
37− type = int;
38− description = "Node ID number";
39− };
40− name = mkOption {
41− type = str;
42− description = "Node name";
43− };
44− ring_addrs = mkOption {
45− type = listOf str;
46− description = "List of addresses, one for each ring.";
47− };
48− };
49− });
50− };
51− };
52−
53− # implementation
54− config = mkIf cfg.enable {
55− environment.systemPackages = [ cfg.package ];
56−
57− environment.etc."corosync/corosync.conf".text = ''
58− totem {
59− version: 2
60− secauth: on
61− cluster_name: ${cfg.clusterName}
62− transport: knet
63− }
64−
65− nodelist {
66− ${concatMapStrings ({ nodeid, name, ring_addrs }: ''
67− node {
68− nodeid: ${toString nodeid}
69− name: ${name}
70− ${concatStrings (imap0 (i: addr: ''
71− ring${toString i}_addr: ${addr}
72− '') ring_addrs)}
73− }
74− '') cfg.nodelist}
75− }
76−
77− quorum {
78− # only corosync_votequorum is supported
79− provider: corosync_votequorum
80− wait_for_all: 0
81− ${optionalString (builtins.length cfg.nodelist < 3) ''
82− two_node: 1
83− ''}
84− }
85−
86− logging {
87− to_syslog: yes
88− }
89− '';
90−
91− environment.etc."corosync/uidgid.d/root".text = ''
92− # allow pacemaker connection by root
93− uidgid {
94− uid: 0
95− gid: 0
96− }
97− '';
98−
99− systemd.packages = [ cfg.package ];
100− systemd.services.corosync = {
101− wantedBy = [ "multi-user.target" ];
102− serviceConfig = {
103− StateDirectory = "corosync";
104− StateDirectoryMode = "0700";
105− };
106− };
107−
108− environment.etc."sysconfig/corosync".text = lib.optionalString (cfg.extraOptions != []) ''
109− COROSYNC_OPTIONS="${lib.escapeShellArgs cfg.extraOptions}"
110− '';
111− };
112−}
nixos/modules/services/cluster/hadoop/conf.nix+11−11
@@ -1,6 +1,6 @@
11{ cfg, pkgs, lib }:
22let
3− propertyXml = name: value: lib.optionalString (value != null) ''
3+ propertyXml = name: value: ''
44 <property>
55 <name>${name}</name>
66 <value>${builtins.toString value}</value>
@@ -29,16 +29,16 @@ let
2929 export HADOOP_LOG_DIR=/tmp/hadoop/$USER
3030 '';
3131in
32−pkgs.runCommand "hadoop-conf" {} (with cfg; ''
32+pkgs.runCommand "hadoop-conf" {} ''
3333 mkdir -p $out/
34− cp ${siteXml "core-site.xml" (coreSite // coreSiteInternal)}/* $out/
35− cp ${siteXml "hdfs-site.xml" (hdfsSiteDefault // hdfsSite // hdfsSiteInternal)}/* $out/
36− cp ${siteXml "mapred-site.xml" (mapredSiteDefault // mapredSite)}/* $out/
37− cp ${siteXml "yarn-site.xml" (yarnSiteDefault // yarnSite // yarnSiteInternal)}/* $out/
38− cp ${siteXml "httpfs-site.xml" httpfsSite}/* $out/
39− cp ${cfgFile "container-executor.cfg" containerExecutorCfg}/* $out/
34+ cp ${siteXml "core-site.xml" cfg.coreSite}/* $out/
35+ cp ${siteXml "hdfs-site.xml" cfg.hdfsSite}/* $out/
36+ cp ${siteXml "mapred-site.xml" cfg.mapredSite}/* $out/
37+ cp ${siteXml "yarn-site.xml" cfg.yarnSite}/* $out/
38+ cp ${siteXml "httpfs-site.xml" cfg.httpfsSite}/* $out/
39+ cp ${cfgFile "container-executor.cfg" cfg.containerExecutorCfg}/* $out/
4040 cp ${pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions}/* $out/
4141 cp ${pkgs.writeTextDir "hadoop-env.sh" hadoopEnv}/* $out/
42− cp ${log4jProperties} $out/log4j.properties
43− ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") extraConfDirs}
44−'')
42+ cp ${cfg.log4jProperties} $out/log4j.properties
43+ ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") cfg.extraConfDirs}
44+''
nixos/modules/services/cluster/hadoop/default.nix+25−72
@@ -21,50 +21,24 @@ with lib;
2121 <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/core-default.xml"/>
2222 '';
2323 };
24− coreSiteInternal = mkOption {
25− default = {};
26− type = types.attrsOf types.anything;
27− internal = true;
28− description = ''
29− Internal option to add configs to core-site.xml based on module options
30− '';
31− };
3224
33− hdfsSiteDefault = mkOption {
25+ hdfsSite = mkOption {
3426 default = {
3527 "dfs.namenode.rpc-bind-host" = "0.0.0.0";
36− "dfs.namenode.http-address" = "0.0.0.0:9870";
37− "dfs.namenode.servicerpc-bind-host" = "0.0.0.0";
38− "dfs.namenode.http-bind-host" = "0.0.0.0";
3928 };
4029 type = types.attrsOf types.anything;
41− description = ''
42− Default options for hdfs-site.xml
43− '';
44− };
45− hdfsSite = mkOption {
46− default = {};
47− type = types.attrsOf types.anything;
4830 example = literalExpression ''
4931 {
5032 "dfs.nameservices" = "namenode1";
5133 }
5234 '';
5335 description = ''
54− Additional options and overrides for hdfs-site.xml
36+ Hadoop hdfs-site.xml definition
5537 <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/>
5638 '';
5739 };
58− hdfsSiteInternal = mkOption {
59− default = {};
60− type = types.attrsOf types.anything;
61− internal = true;
62− description = ''
63− Internal option to add configs to hdfs-site.xml based on module options
64− '';
65− };
6640
67− mapredSiteDefault = mkOption {
41+ mapredSite = mkOption {
6842 default = {
6943 "mapreduce.framework.name" = "yarn";
7044 "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}";
@@ -80,25 +54,18 @@ with lib;
8054 }
8155 '';
8256 type = types.attrsOf types.anything;
83− description = ''
84− Default options for mapred-site.xml
85− '';
86− };
87− mapredSite = mkOption {
88− default = {};
89− type = types.attrsOf types.anything;
9057 example = literalExpression ''
91− {
58+ options.services.hadoop.mapredSite.default // {
9259 "mapreduce.map.java.opts" = "-Xmx900m -XX:+UseParallelGC";
9360 }
9461 '';
9562 description = ''
96− Additional options and overrides for mapred-site.xml
63+ Hadoop mapred-site.xml definition
9764 <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml"/>
9865 '';
9966 };
10067
101− yarnSiteDefault = mkOption {
68+ yarnSite = mkOption {
10269 default = {
10370 "yarn.nodemanager.admin-env" = "PATH=$PATH";
10471 "yarn.nodemanager.aux-services" = "mapreduce_shuffle";
@@ -110,34 +77,19 @@ with lib;
11077 "yarn.nodemanager.linux-container-executor.path" = "/run/wrappers/yarn-nodemanager/bin/container-executor";
11178 "yarn.nodemanager.log-dirs" = "/var/log/hadoop/yarn/nodemanager";
11279 "yarn.resourcemanager.bind-host" = "0.0.0.0";
113− "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler";
80+ "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler";
11481 };
11582 type = types.attrsOf types.anything;
116− description = ''
117− Default options for yarn-site.xml
118− '';
119− };
120− yarnSite = mkOption {
121− default = {};
122− type = types.attrsOf types.anything;
12383 example = literalExpression ''
124− {
84+ options.services.hadoop.yarnSite.default // {
12585 "yarn.resourcemanager.hostname" = "''${config.networking.hostName}";
12686 }
12787 '';
12888 description = ''
129− Additional options and overrides for yarn-site.xml
89+ Hadoop yarn-site.xml definition
13090 <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-common/yarn-default.xml"/>
13191 '';
13292 };
133− yarnSiteInternal = mkOption {
134− default = {};
135− type = types.attrsOf types.anything;
136− internal = true;
137− description = ''
138− Internal option to add configs to yarn-site.xml based on module options
139− '';
140− };
14193
14294 httpfsSite = mkOption {
14395 default = { };
@@ -171,7 +123,6 @@ with lib;
171123 "yarn.nodemanager.linux-container-executor.group"="hadoop";
172124 "min.user.id"=1000;
173125 "feature.terminal.enabled"=1;
174− "feature.mount-cgroup.enabled" = 1;
175126 };
176127 type = types.attrsOf types.anything;
177128 example = literalExpression ''
@@ -197,8 +148,6 @@ with lib;
197148 description = "Directories containing additional config files to be added to HADOOP_CONF_DIR";
198149 };
199150
200− gatewayRole.enable = mkEnableOption "gateway role for deploying hadoop configs";
201−
202151 package = mkOption {
203152 type = types.package;
204153 default = pkgs.hadoop;
@@ -208,16 +157,20 @@ with lib;
208157 };
209158
210159
211− config = mkIf cfg.gatewayRole.enable {
212− users.groups.hadoop = {
213− gid = config.ids.gids.hadoop;
214− };
215− environment = {
216− systemPackages = [ cfg.package ];
217− etc."hadoop-conf".source = let
218− hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";
219− in "${hadoopConf}";
220− variables.HADOOP_CONF_DIR = "/etc/hadoop-conf/";
221− };
222− };
160+ config = mkMerge [
161+ (mkIf (builtins.hasAttr "yarn" config.users.users ||
162+ builtins.hasAttr "hdfs" config.users.users ||
163+ builtins.hasAttr "httpfs" config.users.users) {
164+ users.groups.hadoop = {
165+ gid = config.ids.gids.hadoop;
166+ };
167+ environment = {
168+ systemPackages = [ cfg.package ];
169+ etc."hadoop-conf".source = let
170+ hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";
171+ in "${hadoopConf}";
172+ };
173+ })
174+
175+ ];
223176}
nixos/modules/services/cluster/hadoop/hdfs.nix+147−148
@@ -1,191 +1,191 @@
1−{ config, lib, pkgs, ... }:
1+{ config, lib, pkgs, ...}:
22with lib;
33let
44 cfg = config.services.hadoop;
5−
6− # Config files for hadoop services
75 hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";
8−
9− # Generator for HDFS service options
10− hadoopServiceOption = { serviceName, firewallOption ? true, extraOpts ? null }: {
11− enable = mkEnableOption serviceName;
12− restartIfChanged = mkOption {
13− type = types.bool;
14− description = ''
15− Automatically restart the service on config change.
16− This can be set to false to defer restarts on clusters running critical applications.
17− Please consider the security implications of inadvertently running an older version,
18− and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option.
19− '';
20− default = false;
21− };
22− extraFlags = mkOption{
23− type = with types; listOf str;
24− default = [];
25− description = "Extra command line flags to pass to ${serviceName}";
26− example = [
27− "-Dcom.sun.management.jmxremote"
28− "-Dcom.sun.management.jmxremote.port=8010"
29− ];
30− };
31− extraEnv = mkOption{
32− type = with types; attrsOf str;
33− default = {};
34− description = "Extra environment variables for ${serviceName}";
35− };
36− } // (optionalAttrs firewallOption {
37− openFirewall = mkOption {
38− type = types.bool;
39− default = false;
40− description = "Open firewall ports for ${serviceName}.";
41− };
42− }) // (optionalAttrs (extraOpts != null) extraOpts);
43−
44− # Generator for HDFS service configs
45− hadoopServiceConfig =
46− { name
47− , serviceOptions ? cfg.hdfs."${toLower name}"
48− , description ? "Hadoop HDFS ${name}"
49− , User ? "hdfs"
50− , allowedTCPPorts ? [ ]
51− , preStart ? ""
52− , environment ? { }
53− , extraConfig ? { }
54− }: (
55−
56− mkIf serviceOptions.enable ( mkMerge [{
57− systemd.services."hdfs-${toLower name}" = {
58− inherit description preStart;
59− environment = environment // serviceOptions.extraEnv;
60− wantedBy = [ "multi-user.target" ];
61− inherit (serviceOptions) restartIfChanged;
62− serviceConfig = {
63− inherit User;
64− SyslogIdentifier = "hdfs-${toLower name}";
65− ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} ${toLower name} ${escapeShellArgs serviceOptions.extraFlags}";
66− Restart = "always";
67− };
68− };
69−
70− services.hadoop.gatewayRole.enable = true;
71−
72− networking.firewall.allowedTCPPorts = mkIf
73− ((builtins.hasAttr "openFirewall" serviceOptions) && serviceOptions.openFirewall)
74− allowedTCPPorts;
75− } extraConfig])
76− );
77−
6+ restartIfChanged = mkOption {
7+ type = types.bool;
8+ description = ''
9+ Automatically restart the service on config change.
10+ This can be set to false to defer restarts on clusters running critical applications.
11+ Please consider the security implications of inadvertently running an older version,
12+ and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option.
13+ '';
14+ default = false;
15+ };
7816in
7917{
8018 options.services.hadoop.hdfs = {
81−
82− namenode = hadoopServiceOption { serviceName = "HDFS NameNode"; } // {
19+ namenode = {
20+ enable = mkEnableOption "Whether to run the HDFS NameNode";
8321 formatOnInit = mkOption {
8422 type = types.bool;
8523 default = false;
8624 description = ''
87− Format HDFS namenode on first start. This is useful for quickly spinning up
88− ephemeral HDFS clusters with a single namenode.
89− For HA clusters, initialization involves multiple steps across multiple nodes.
90− Follow this guide to initialize an HA cluster manually:
91− <link xlink:href="https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html"/>
25+ Format HDFS namenode on first start. This is useful for quickly spinning up ephemeral HDFS clusters with a single namenode.
26+ For HA clusters, initialization involves multiple steps across multiple nodes. Follow [this guide](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html)
27+ to initialize an HA cluster manually.
28+ '';
29+ };
30+ inherit restartIfChanged;
31+ openFirewall = mkOption {
32+ type = types.bool;
33+ default = true;
34+ description = ''
35+ Open firewall ports for namenode
9236 '';
9337 };
9438 };
95−
96− datanode = hadoopServiceOption { serviceName = "HDFS DataNode"; } // {
97− dataDirs = mkOption {
98− default = null;
99− description = "Tier and path definitions for datanode storage.";
100− type = with types; nullOr (listOf (submodule {
101− options = {
102− type = mkOption {
103− type = enum [ "SSD" "DISK" "ARCHIVE" "RAM_DISK" ];
104− description = ''
105− Storage types ([SSD]/[DISK]/[ARCHIVE]/[RAM_DISK]) for HDFS storage policies.
106− '';
107− };
108− path = mkOption {
109− type = path;
110− example = [ "/var/lib/hadoop/hdfs/dn" ];
111− description = "Determines where on the local filesystem a data node should store its blocks.";
112− };
113− };
114− }));
39+ datanode = {
40+ enable = mkEnableOption "Whether to run the HDFS DataNode";
41+ inherit restartIfChanged;
42+ openFirewall = mkOption {
43+ type = types.bool;
44+ default = true;
45+ description = ''
46+ Open firewall ports for datanode
47+ '';
11548 };
11649 };
117−
118− journalnode = hadoopServiceOption { serviceName = "HDFS JournalNode"; };
119−
120− zkfc = hadoopServiceOption {
121− serviceName = "HDFS ZooKeeper failover controller";
122− firewallOption = false;
50+ journalnode = {
51+ enable = mkEnableOption "Whether to run the HDFS JournalNode";
52+ inherit restartIfChanged;
53+ openFirewall = mkOption {
54+ type = types.bool;
55+ default = true;
56+ description = ''
57+ Open firewall ports for journalnode
58+ '';
59+ };
12360 };
124−
125− httpfs = hadoopServiceOption { serviceName = "HDFS JournalNode"; } // {
61+ zkfc = {
62+ enable = mkEnableOption "Whether to run the HDFS ZooKeeper failover controller";
63+ inherit restartIfChanged;
64+ };
65+ httpfs = {
66+ enable = mkEnableOption "Whether to run the HDFS HTTPfs server";
12667 tempPath = mkOption {
12768 type = types.path;
12869 default = "/tmp/hadoop/httpfs";
129− description = "HTTPFS_TEMP path used by HTTPFS";
70+ description = ''
71+ HTTPFS_TEMP path used by HTTPFS
72+ '';
73+ };
74+ inherit restartIfChanged;
75+ openFirewall = mkOption {
76+ type = types.bool;
77+ default = true;
78+ description = ''
79+ Open firewall ports for HTTPFS
80+ '';
13081 };
13182 };
132−
13383 };
13484
13585 config = mkMerge [
136− (hadoopServiceConfig {
137− name = "NameNode";
138− allowedTCPPorts = [
86+ (mkIf cfg.hdfs.namenode.enable {
87+ systemd.services.hdfs-namenode = {
88+ description = "Hadoop HDFS NameNode";
89+ wantedBy = [ "multi-user.target" ];
90+ inherit (cfg.hdfs.namenode) restartIfChanged;
91+
92+ preStart = (mkIf cfg.hdfs.namenode.formatOnInit ''
93+ ${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true
94+ '');
95+
96+ serviceConfig = {
97+ User = "hdfs";
98+ SyslogIdentifier = "hdfs-namenode";
99+ ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode";
100+ Restart = "always";
101+ };
102+ };
103+
104+ networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.namenode.openFirewall [
139105 9870 # namenode.http-address
140106 8020 # namenode.rpc-address
141− 8022 # namenode.servicerpc-address
142− 8019 # dfs.ha.zkfc.port
143− ];
144− preStart = (mkIf cfg.hdfs.namenode.formatOnInit
145− "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true"
146− );
107+ 8022 # namenode. servicerpc-address
108+ ]);
147109 })
110+ (mkIf cfg.hdfs.datanode.enable {
111+ systemd.services.hdfs-datanode = {
112+ description = "Hadoop HDFS DataNode";
113+ wantedBy = [ "multi-user.target" ];
114+ inherit (cfg.hdfs.datanode) restartIfChanged;
115+
116+ serviceConfig = {
117+ User = "hdfs";
118+ SyslogIdentifier = "hdfs-datanode";
119+ ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} datanode";
120+ Restart = "always";
121+ };
122+ };
148123
149− (hadoopServiceConfig {
150− name = "DataNode";
151− # port numbers for datanode changed between hadoop 2 and 3
152− allowedTCPPorts = if versionAtLeast cfg.package.version "3" then [
124+ networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.datanode.openFirewall [
153125 9864 # datanode.http.address
154126 9866 # datanode.address
155127 9867 # datanode.ipc.address
156− ] else [
157− 50075 # datanode.http.address
158− 50010 # datanode.address
159− 50020 # datanode.ipc.address
160− ];
161− extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = let d = cfg.hdfs.datanode.dataDirs; in
162− if (d!= null) then (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs) else d;
128+ ]);
163129 })
130+ (mkIf cfg.hdfs.journalnode.enable {
131+ systemd.services.hdfs-journalnode = {
132+ description = "Hadoop HDFS JournalNode";
133+ wantedBy = [ "multi-user.target" ];
134+ inherit (cfg.hdfs.journalnode) restartIfChanged;
135+
136+ serviceConfig = {
137+ User = "hdfs";
138+ SyslogIdentifier = "hdfs-journalnode";
139+ ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} journalnode";
140+ Restart = "always";
141+ };
142+ };
164143
165− (hadoopServiceConfig {
166− name = "JournalNode";
167− allowedTCPPorts = [
144+ networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.journalnode.openFirewall [
168145 8480 # dfs.journalnode.http-address
169146 8485 # dfs.journalnode.rpc-address
170− ];
147+ ]);
171148 })
172−
173− (hadoopServiceConfig {
174− name = "zkfc";
175− description = "Hadoop HDFS ZooKeeper failover controller";
149+ (mkIf cfg.hdfs.zkfc.enable {
150+ systemd.services.hdfs-zkfc = {
151+ description = "Hadoop HDFS ZooKeeper failover controller";
152+ wantedBy = [ "multi-user.target" ];
153+ inherit (cfg.hdfs.zkfc) restartIfChanged;
154+
155+ serviceConfig = {
156+ User = "hdfs";
157+ SyslogIdentifier = "hdfs-zkfc";
158+ ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} zkfc";
159+ Restart = "always";
160+ };
161+ };
176162 })
163+ (mkIf cfg.hdfs.httpfs.enable {
164+ systemd.services.hdfs-httpfs = {
165+ description = "Hadoop httpfs";
166+ wantedBy = [ "multi-user.target" ];
167+ inherit (cfg.hdfs.httpfs) restartIfChanged;
168+
169+ environment.HTTPFS_TEMP = cfg.hdfs.httpfs.tempPath;
177170
178− (hadoopServiceConfig {
179− name = "HTTPFS";
180− environment.HTTPFS_TEMP = cfg.hdfs.httpfs.tempPath;
181− preStart = "mkdir -p $HTTPFS_TEMP";
182− User = "httpfs";
183− allowedTCPPorts = [
171+ preStart = ''
172+ mkdir -p $HTTPFS_TEMP
173+ '';
174+
175+ serviceConfig = {
176+ User = "httpfs";
177+ SyslogIdentifier = "hdfs-httpfs";
178+ ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} httpfs";
179+ Restart = "always";
180+ };
181+ };
182+ networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.httpfs.openFirewall [
184183 14000 # httpfs.http.port
185− ];
184+ ]);
186185 })
187−
188− (mkIf cfg.gatewayRole.enable {
186+ (mkIf (
187+ cfg.hdfs.namenode.enable || cfg.hdfs.datanode.enable || cfg.hdfs.journalnode.enable || cfg.hdfs.zkfc.enable
188+ ) {
189189 users.users.hdfs = {
190190 description = "Hadoop HDFS user";
191191 group = "hadoop";
@@ -199,6 +199,5 @@ in
199199 isSystemUser = true;
200200 };
201201 })
202−
203202 ];
204203}
nixos/modules/services/cluster/hadoop/yarn.nix+13−85
@@ -13,77 +13,23 @@ let
1313 '';
1414 default = false;
1515 };
16− extraFlags = mkOption{
17− type = with types; listOf str;
18− default = [];
19− description = "Extra command line flags to pass to the service";
20− example = [
21− "-Dcom.sun.management.jmxremote"
22− "-Dcom.sun.management.jmxremote.port=8010"
23− ];
24− };
25− extraEnv = mkOption{
26− type = with types; attrsOf str;
27− default = {};
28− description = "Extra environment variables";
29− };
3016in
3117{
3218 options.services.hadoop.yarn = {
3319 resourcemanager = {
34− enable = mkEnableOption "Hadoop YARN ResourceManager";
35− inherit restartIfChanged extraFlags extraEnv;
36−
20+ enable = mkEnableOption "Whether to run the Hadoop YARN ResourceManager";
21+ inherit restartIfChanged;
3722 openFirewall = mkOption {
3823 type = types.bool;
39− default = false;
24+ default = true;
4025 description = ''
4126 Open firewall ports for resourcemanager
4227 '';
4328 };
4429 };
4530 nodemanager = {
46− enable = mkEnableOption "Hadoop YARN NodeManager";
47− inherit restartIfChanged extraFlags extraEnv;
48−
49− resource = {
50− cpuVCores = mkOption {
51− description = "Number of vcores that can be allocated for containers.";
52− type = with types; nullOr ints.positive;
53− default = null;
54− };
55− maximumAllocationVCores = mkOption {
56− description = "The maximum virtual CPU cores any container can be allocated.";
57− type = with types; nullOr ints.positive;
58− default = null;
59− };
60− memoryMB = mkOption {
61− description = "Amount of physical memory, in MB, that can be allocated for containers.";
62− type = with types; nullOr ints.positive;
63− default = null;
64− };
65− maximumAllocationMB = mkOption {
66− description = "The maximum physical memory any container can be allocated.";
67− type = with types; nullOr ints.positive;
68− default = null;
69− };
70− };
71−
72− useCGroups = mkOption {
73− type = types.bool;
74− default = true;
75− description = ''
76− Use cgroups to enforce resource limits on containers
77− '';
78− };
79−
80− localDir = mkOption {
81− description = "List of directories to store localized files in.";
82− type = with types; nullOr (listOf path);
83− example = [ "/var/lib/hadoop/yarn/nm" ];
84− default = null;
85− };
86−
31+ enable = mkEnableOption "Whether to run the Hadoop YARN NodeManager";
32+ inherit restartIfChanged;
8733 addBinBash = mkOption {
8834 type = types.bool;
8935 default = true;
@@ -93,7 +39,7 @@ in
9339 };
9440 openFirewall = mkOption {
9541 type = types.bool;
96− default = false;
42+ default = true;
9743 description = ''
9844 Open firewall ports for nodemanager.
9945 Because containers can listen on any ephemeral port, TCP ports 1024–65535 will be opened.
@@ -103,7 +49,10 @@ in
10349 };
10450
10551 config = mkMerge [
106− (mkIf cfg.gatewayRole.enable {
52+ (mkIf (
53+ cfg.yarn.resourcemanager.enable || cfg.yarn.nodemanager.enable
54+ ) {
55+
10756 users.users.yarn = {
10857 description = "Hadoop YARN user";
10958 group = "hadoop";
@@ -116,19 +65,15 @@ in
11665 description = "Hadoop YARN ResourceManager";
11766 wantedBy = [ "multi-user.target" ];
11867 inherit (cfg.yarn.resourcemanager) restartIfChanged;
119− environment = cfg.yarn.resourcemanager.extraEnv;
12068
12169 serviceConfig = {
12270 User = "yarn";
12371 SyslogIdentifier = "yarn-resourcemanager";
12472 ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " +
125− " resourcemanager ${escapeShellArgs cfg.yarn.resourcemanager.extraFlags}";
73+ " resourcemanager";
12674 Restart = "always";
12775 };
12876 };
129−
130− services.hadoop.gatewayRole.enable = true;
131−
13277 networking.firewall.allowedTCPPorts = (mkIf cfg.yarn.resourcemanager.openFirewall [
13378 8088 # resourcemanager.webapp.address
13479 8030 # resourcemanager.scheduler.address
@@ -149,7 +94,6 @@ in
14994 description = "Hadoop YARN NodeManager";
15095 wantedBy = [ "multi-user.target" ];
15196 inherit (cfg.yarn.nodemanager) restartIfChanged;
152− environment = cfg.yarn.nodemanager.extraEnv;
15397
15498 preStart = ''
15599 # create log dir
@@ -157,9 +101,8 @@ in
157101 chown yarn:hadoop /var/log/hadoop/yarn/nodemanager
158102
159103 # set up setuid container executor binary
160− umount /run/wrappers/yarn-nodemanager/cgroup/cpu || true
161104 rm -rf /run/wrappers/yarn-nodemanager/ || true
162− mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop,cgroup/cpu}
105+ mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop}
163106 cp ${cfg.package}/lib/${cfg.package.untarDir}/bin/container-executor /run/wrappers/yarn-nodemanager/bin/
164107 chgrp hadoop /run/wrappers/yarn-nodemanager/bin/container-executor
165108 chmod 6050 /run/wrappers/yarn-nodemanager/bin/container-executor
@@ -171,26 +114,11 @@ in
171114 SyslogIdentifier = "yarn-nodemanager";
172115 PermissionsStartOnly = true;
173116 ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " +
174− " nodemanager ${escapeShellArgs cfg.yarn.nodemanager.extraFlags}";
117+ " nodemanager";
175118 Restart = "always";
176119 };
177120 };
178121
179− services.hadoop.gatewayRole.enable = true;
180−
181− services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; {
182− "yarn.nodemanager.local-dirs" = localDir;
183− "yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores;
184− "yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB;
185− "yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores;
186− "yarn.nodemanager.resource.memory-mb" = resource.memoryMB;
187− } // mkIf useCGroups {
188− "yarn.nodemanager.linux-container-executor.cgroups.hierarchy" = "/hadoop-yarn";
189− "yarn.nodemanager.linux-container-executor.resources-handler.class" = "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler";
190− "yarn.nodemanager.linux-container-executor.cgroups.mount" = "true";
191− "yarn.nodemanager.linux-container-executor.cgroups.mount-path" = "/run/wrappers/yarn-nodemanager/cgroup";
192− };
193−
194122 networking.firewall.allowedTCPPortRanges = [
195123 (mkIf (cfg.yarn.nodemanager.openFirewall) {from = 1024; to = 65535;})
196124 ];
nixos/modules/services/cluster/k3s/default.nix+5−1
@@ -91,6 +91,11 @@ in
9191 virtualisation.docker = mkIf cfg.docker {
9292 enable = mkDefault true;
9393 };
94+
95+ # TODO: disable this once k3s supports cgroupsv2, either by docker
96+ # supporting it, or their bundled containerd
97+ systemd.enableUnifiedCgroupHierarchy = false;
98+
9499 environment.systemPackages = [ config.services.k3s.package ];
95100
96101 systemd.services.k3s = {
@@ -114,7 +119,6 @@ in
114119 [
115120 "${cfg.package}/bin/k3s ${cfg.role}"
116121 ] ++ (optional cfg.docker "--docker")
117− ++ (optional (cfg.docker && config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd")
118122 ++ (optional cfg.disableAgent "--disable-agent")
119123 ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")
120124 ++ (optional (cfg.token != "") "--token ${cfg.token}")
nixos/modules/services/cluster/pacemaker/default.nixdeleted−52
@@ -1,52 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−let
5− cfg = config.services.pacemaker;
6−in
7−{
8− # interface
9− options.services.pacemaker = {
10− enable = mkEnableOption "pacemaker";
11−
12− package = mkOption {
13− type = types.package;
14− default = pkgs.pacemaker;
15− defaultText = literalExpression "pkgs.pacemaker";
16− description = "Package that should be used for pacemaker.";
17− };
18− };
19−
20− # implementation
21− config = mkIf cfg.enable {
22− assertions = [ {
23− assertion = config.services.corosync.enable;
24− message = ''
25− Enabling services.pacemaker requires a services.corosync configuration.
26− '';
27− } ];
28−
29− environment.systemPackages = [ cfg.package ];
30−
31− # required by pacemaker
32− users.users.hacluster = {
33− isSystemUser = true;
34− group = "pacemaker";
35− home = "/var/lib/pacemaker";
36− };
37− users.groups.pacemaker = {};
38−
39− systemd.tmpfiles.rules = [
40− "d /var/log/pacemaker 0700 hacluster pacemaker -"
41− ];
42−
43− systemd.packages = [ cfg.package ];
44− systemd.services.pacemaker = {
45− wantedBy = [ "multi-user.target" ];
46− serviceConfig = {
47− StateDirectory = "pacemaker";
48− StateDirectoryMode = "0700";
49− };
50− };
51− };
52−}
nixos/modules/services/continuous-integration/buildbot/master.nix+2−2
@@ -64,7 +64,7 @@ in {
6464 description = "Factory Steps";
6565 default = [];
6666 example = [
67− "steps.Git(repourl='https://github.com/buildbot/pyflakes.git', mode='incremental')"
67+ "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')"
6868 "steps.ShellCommand(command=['trial', 'pyflakes'])"
6969 ];
7070 };
@@ -74,7 +74,7 @@ in {
7474 description = "List of Change Sources.";
7575 default = [];
7676 example = [
77− "changes.GitPoller('https://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
77+ "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
7878 ];
7979 };
8080
nixos/modules/services/continuous-integration/github-runner.nix−18
@@ -34,14 +34,6 @@ in
3434 Repository to add the runner to.
3535
3636 Changing this option triggers a new runner registration.
37−
38− IMPORTANT: If your token is org-wide (not per repository), you need to
39− provide a github org link, not a single repository, so do it like this
40− <literal>https://github.com/nixos</literal>, not like this
41− <literal>https://github.com/nixos/nixpkgs</literal>.
42− Otherwise, you are going to get a <literal>404 NotFound</literal>
43− from <literal>POST https://api.github.com/actions/runner-registration</literal>
44− in the configure script.
4537 '';
4638 example = "https://github.com/nixos/nixpkgs";
4739 };
@@ -299,16 +291,6 @@ in
299291 RestrictRealtime = true;
300292 RestrictSUIDSGID = true;
301293 UMask = "0066";
302− ProtectProc = "invisible";
303− ProcSubset = "pid";
304− SystemCallFilter = [
305− "~@debug"
306− "~@mount"
307− "~@privileged"
308− "~@cpu-emulation"
309− "~@obsolete"
310− ];
311− RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ];
312294
313295 # Needs network access
314296 PrivateNetwork = false;
nixos/modules/services/continuous-integration/gitlab-runner.nix+2−9
@@ -36,12 +36,12 @@ let
3636
3737 # register new services
3838 ${concatStringsSep "\n" (mapAttrsToList (name: service: ''
39− if echo "$NEW_SERVICES" | grep -xq "${name}"; then
39+ if echo "$NEW_SERVICES" | grep -xq ${name}; then
4040 bash -c ${escapeShellArg (concatStringsSep " \\\n " ([
4141 "set -a && source ${service.registrationConfigFile} &&"
4242 "gitlab-runner register"
4343 "--non-interactive"
44− (if service.description != null then "--description \"${service.description}\"" else "--name '${name}'")
44+ "--name ${name}"
4545 "--executor ${service.executor}"
4646 "--limit ${toString service.limit}"
4747 "--request-concurrency ${toString service.requestConcurrency}"
@@ -365,13 +365,6 @@ in
365365 with <literal>RUNNER_ENV</literal> variable set.
366366 '';
367367 };
368− description = mkOption {
369− type = types.nullOr types.str;
370− default = null;
371− description = ''
372− Name/description of the runner.
373− '';
374− };
375368 executor = mkOption {
376369 type = types.str;
377370 default = "docker";
nixos/modules/services/continuous-integration/jenkins/slave.nix+1−15
@@ -1,4 +1,4 @@
1−{ config, lib, pkgs, ... }:
1+{ config, lib, ... }:
22with lib;
33let
44 cfg = config.services.jenkinsSlave;
@@ -46,15 +46,6 @@ in {
4646 this is the home of the "jenkins" user.
4747 '';
4848 };
49−
50− javaPackage = mkOption {
51− default = pkgs.jdk;
52− defaultText = literalExpression "pkgs.jdk";
53− description = ''
54− Java package to install.
55− '';
56− type = types.package;
57− };
5849 };
5950 };
6051
@@ -73,10 +64,5 @@ in {
7364 uid = config.ids.uids.jenkins;
7465 };
7566 };
76−
77− programs.java = {
78− enable = true;
79− package = cfg.javaPackage;
80− };
8167 };
8268}
nixos/modules/services/databases/cockroachdb.nix+29−37
@@ -1,4 +1,4 @@
1−{ config, lib, pkgs, utils, ... }:
1+{ config, lib, pkgs, ... }:
22
33with lib;
44
@@ -6,44 +6,46 @@ let
66 cfg = config.services.cockroachdb;
77 crdb = cfg.package;
88
9− startupCommand = utils.escapeSystemdExecArgs
10− ([
11− # Basic startup
12− "${crdb}/bin/cockroach"
13− "start"
9+ escape = builtins.replaceStrings ["%"] ["%%"];
10+ ifNotNull = v: s: optionalString (v != null) s;
11+
12+ startupCommand = lib.concatStringsSep " "
13+ [ # Basic startup
14+ "${crdb}/bin/cockroach start"
1415 "--logtostderr"
1516 "--store=/var/lib/cockroachdb"
17+ (ifNotNull cfg.locality "--locality='${cfg.locality}'")
1618
1719 # WebUI settings
18− "--http-addr=${cfg.http.address}:${toString cfg.http.port}"
20+ "--http-addr='${cfg.http.address}:${toString cfg.http.port}'"
1921
2022 # Cluster listen address
21− "--listen-addr=${cfg.listen.address}:${toString cfg.listen.port}"
23+ "--listen-addr='${cfg.listen.address}:${toString cfg.listen.port}'"
24+
25+ # Cluster configuration
26+ (ifNotNull cfg.join "--join=${cfg.join}")
2227
23− # Cache and memory settings.
24− "--cache=${cfg.cache}"
25− "--max-sql-memory=${cfg.maxSqlMemory}"
28+ # Cache and memory settings. Must be escaped.
29+ "--cache='${escape cfg.cache}'"
30+ "--max-sql-memory='${escape cfg.maxSqlMemory}'"
2631
2732 # Certificate/security settings.
2833 (if cfg.insecure then "--insecure" else "--certs-dir=${cfg.certsDir}")
29− ]
30− ++ lib.optional (cfg.join != null) "--join=${cfg.join}"
31− ++ lib.optional (cfg.locality != null) "--locality=${cfg.locality}"
32− ++ cfg.extraArgs);
33−
34− addressOption = descr: defaultPort: {
35− address = mkOption {
36− type = types.str;
37− default = "localhost";
38− description = "Address to bind to for ${descr}";
39− };
34+ ];
35+
36+ addressOption = descr: defaultPort: {
37+ address = mkOption {
38+ type = types.str;
39+ default = "localhost";
40+ description = "Address to bind to for ${descr}";
41+ };
4042
41− port = mkOption {
42− type = types.port;
43− default = defaultPort;
44− description = "Port to bind to for ${descr}";
43+ port = mkOption {
44+ type = types.port;
45+ default = defaultPort;
46+ description = "Port to bind to for ${descr}";
47+ };
4548 };
46− };
4749in
4850
4951{
@@ -157,16 +159,6 @@ in
157159 only contain open source features and open source code).
158160 '';
159161 };
160−
161− extraArgs = mkOption {
162− type = types.listOf types.str;
163− default = [];
164− example = [ "--advertise-addr" "[fe80::f6f2:::]" ];
165− description = ''
166− Extra CLI arguments passed to <command>cockroach start</command>.
167− For the full list of supported argumemnts, check <link xlink:href="https://www.cockroachlabs.com/docs/stable/cockroach-start.html#flags"/>
168− '';
169− };
170162 };
171163 };
172164
nixos/modules/services/databases/couchdb.nix−6
@@ -193,11 +193,6 @@ in {
193193
194194 preStart = ''
195195 touch ${cfg.configFile}
196− if ! test -e ${cfg.databaseDir}/.erlang.cookie; then
197− touch ${cfg.databaseDir}/.erlang.cookie
198− chmod 600 ${cfg.databaseDir}/.erlang.cookie
199− dd if=/dev/random bs=16 count=1 | base64 > ${cfg.databaseDir}/.erlang.cookie
200− fi
201196 '';
202197
203198 environment = {
@@ -209,7 +204,6 @@ in {
209204 ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';
210205 # 5. the vm.args file
211206 COUCHDB_ARGS_FILE=''${cfg.argsFile}'';
212− HOME =''${cfg.databaseDir}'';
213207 };
214208
215209 serviceConfig = {
nixos/modules/services/databases/redis.nix+5−8
@@ -81,9 +81,7 @@ in {
8181 user = mkOption {
8282 type = types.str;
8383 default = redisName name;
84− defaultText = literalExpression ''
85− if name == "" then "redis" else "redis-''${name}"
86− '';
84+ defaultText = "\"redis\" or \"redis-\${name}\" if name != \"\"";
8785 description = "The username and groupname for redis-server.";
8886 };
8987
@@ -107,7 +105,8 @@ in {
107105
108106 bind = mkOption {
109107 type = with types; nullOr str;
110− default = "127.0.0.1";
108+ default = if name == "" then "127.0.0.1" else null;
109+ defaultText = literalExpression ''if name == "" then "127.0.0.1" else null'';
111110 description = ''
112111 The IP interface to bind to.
113112 <literal>null</literal> means "all interfaces".
@@ -118,9 +117,7 @@ in {
118117 unixSocket = mkOption {
119118 type = with types; nullOr path;
120119 default = "/run/${redisName name}/redis.sock";
121− defaultText = literalExpression ''
122− if name == "" then "/run/redis/redis.sock" else "/run/redis-''${name}/redis.sock"
123− '';
120+ defaultText = "\"/run/redis/redis.sock\" or \"/run/redis-\${name}/redis.sock\" if name != \"\"";
124121 description = "The path to the socket to bind to.";
125122 };
126123
@@ -373,7 +370,7 @@ in {
373370 ProtectKernelTunables = true;
374371 ProtectControlGroups = true;
375372 RestrictAddressFamilies =
376− optionals (conf.port != 0) ["AF_INET" "AF_INET6"] ++
373+ optionals (conf.bind != null) ["AF_INET" "AF_INET6"] ++
377374 optional (conf.unixSocket != null) "AF_UNIX";
378375 RestrictNamespaces = true;
379376 LockPersonality = true;
nixos/modules/services/desktops/flatpak.nix−2
@@ -30,8 +30,6 @@ in {
3030
3131 environment.systemPackages = [ pkgs.flatpak ];
3232
33− security.polkit.enable = true;
34−
3533 services.dbus.packages = [ pkgs.flatpak ];
3634
3735 systemd.packages = [ pkgs.flatpak ];
nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json+1−1
@@ -8,7 +8,7 @@
88 },
99 "context.modules": [
1010 {
11− "name": "libpipewire-module-rt",
11+ "name": "libpipewire-module-rtkit",
1212 "args": {},
1313 "flags": [
1414 "ifexists",
nixos/modules/services/desktops/pipewire/daemon/minimal.conf.jsondeleted−118
@@ -1,118 +0,0 @@
1−{
2− "context.properties": {
3− "link.max-buffers": 16,
4− "core.daemon": true,
5− "core.name": "pipewire-0",
6− "settings.check-quantum": true,
7− "settings.check-rate": true,
8− "vm.overrides": {
9− "default.clock.min-quantum": 1024
10− }
11− },
12− "context.spa-libs": {
13− "audio.convert.*": "audioconvert/libspa-audioconvert",
14− "api.alsa.*": "alsa/libspa-alsa",
15− "support.*": "support/libspa-support"
16− },
17− "context.modules": [
18− {
19− "name": "libpipewire-module-rt",
20− "args": {
21− "nice.level": -11
22− },
23− "flags": [
24− "ifexists",
25− "nofail"
26− ]
27− },
28− {
29− "name": "libpipewire-module-protocol-native"
30− },
31− {
32− "name": "libpipewire-module-profiler"
33− },
34− {
35− "name": "libpipewire-module-metadata"
36− },
37− {
38− "name": "libpipewire-module-spa-node-factory"
39− },
40− {
41− "name": "libpipewire-module-client-node"
42− },
43− {
44− "name": "libpipewire-module-access",
45− "args": {}
46− },
47− {
48− "name": "libpipewire-module-adapter"
49− },
50− {
51− "name": "libpipewire-module-link-factory"
52− }
53− ],
54− "context.objects": [
55− {
56− "factory": "metadata",
57− "args": {
58− "metadata.name": "default"
59− }
60− },
61− {
62− "factory": "spa-node-factory",
63− "args": {
64− "factory.name": "support.node.driver",
65− "node.name": "Dummy-Driver",
66− "node.group": "pipewire.dummy",
67− "priority.driver": 20000
68− }
69− },
70− {
71− "factory": "spa-node-factory",
72− "args": {
73− "factory.name": "support.node.driver",
74− "node.name": "Freewheel-Driver",
75− "priority.driver": 19000,
76− "node.group": "pipewire.freewheel",
77− "node.freewheel": true
78− }
79− },
80− {
81− "factory": "adapter",
82− "args": {
83− "factory.name": "api.alsa.pcm.source",
84− "node.name": "system",
85− "node.description": "system",
86− "media.class": "Audio/Source",
87− "api.alsa.path": "hw:0",
88− "node.suspend-on-idle": true,
89− "resample.disable": true,
90− "channelmix.disable": true,
91− "adapter.auto-port-config": {
92− "mode": "dsp",
93− "monitor": false,
94− "position": "unknown"
95− }
96− }
97− },
98− {
99− "factory": "adapter",
100− "args": {
101− "factory.name": "api.alsa.pcm.sink",
102− "node.name": "system",
103− "node.description": "system",
104− "media.class": "Audio/Sink",
105− "api.alsa.path": "hw:0",
106− "node.suspend-on-idle": true,
107− "resample.disable": true,
108− "channelmix.disable": true,
109− "adapter.auto-port-config": {
110− "mode": "dsp",
111− "monitor": false,
112− "position": "unknown"
113− }
114− }
115− }
116− ],
117− "context.exec": []
118−}
nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json+10−68
@@ -6,10 +6,8 @@
66 },
77 "context.modules": [
88 {
9− "name": "libpipewire-module-rt",
10− "args": {
11− "nice.level": -11
12− },
9+ "name": "libpipewire-module-rtkit",
10+ "args": {},
1311 "flags": [
1412 "ifexists",
1513 "nofail"
@@ -29,72 +27,16 @@
2927 },
3028 {
3129 "name": "libpipewire-module-protocol-pulse",
32− "args": {}
33− }
34− ],
35− "context.exec": [
36− {
37− "path": "pactl",
38− "args": "load-module module-always-sink"
39− }
40− ],
41− "stream.properties": {},
42− "pulse.properties": {
43− "server.address": [
44− "unix:native"
45− ],
46− "vm.overrides": {
47− "pulse.min.quantum": "1024/48000"
48− }
49− },
50− "pulse.rules": [
51− {
52− "matches": [
53− {}
54− ],
55− "actions": {
56− "update-props": {}
57− }
58− },
59− {
60− "matches": [
61− {
62− "application.process.binary": "teams"
63− },
64− {
65− "application.process.binary": "skypeforlinux"
66− }
67− ],
68− "actions": {
69− "quirks": [
70− "force-s16-info"
71− ]
72− }
73− },
74− {
75− "matches": [
76− {
77− "application.process.binary": "firefox"
78− }
79− ],
80− "actions": {
81− "quirks": [
82− "remove-capture-dont-move"
83− ]
84− }
85− },
86− {
87− "matches": [
88− {
89− "application.name": "~speech-dispatcher*"
90− }
91− ],
92− "actions": {
93− "update-props": {
94− "pulse.min.req": "1024/48000",
30+ "args": {
31+ "server.address": [
32+ "unix:native"
33+ ],
34+ "vm.overrides": {
9535 "pulse.min.quantum": "1024/48000"
9636 }
9737 }
9838 }
99− ]
39+ ],
40+ "context.exec": [],
41+ "stream.properties": {}
10042}
nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json+2−5
@@ -3,7 +3,6 @@
33 "link.max-buffers": 16,
44 "core.daemon": true,
55 "core.name": "pipewire-0",
6− "default.clock.min-quantum": 16,
76 "vm.overrides": {
87 "default.clock.min-quantum": 1024
98 }
@@ -20,10 +19,8 @@
2019 },
2120 "context.modules": [
2221 {
23− "name": "libpipewire-module-rt",
24− "args": {
25− "nice.level": -11
26− },
22+ "name": "libpipewire-module-rtkit",
23+ "args": {},
2724 "flags": [
2825 "ifexists",
2926 "nofail"
nixos/modules/services/desktops/pipewire/pipewire-media-session.nix+4−9
@@ -58,7 +58,7 @@ in {
5858 Configuration for the media session core. For details see
5959 https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf
6060 '';
61− default = defaults.media-session;
61+ default = {};
6262 };
6363
6464 alsa-monitor = mkOption {
@@ -67,7 +67,7 @@ in {
6767 Configuration for the alsa monitor. For details see
6868 https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf
6969 '';
70− default = defaults.alsa-monitor;
70+ default = {};
7171 };
7272
7373 bluez-monitor = mkOption {
@@ -76,7 +76,7 @@ in {
7676 Configuration for the bluez5 monitor. For details see
7777 https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf
7878 '';
79− default = defaults.bluez-monitor;
79+ default = {};
8080 };
8181
8282 v4l2-monitor = mkOption {
@@ -85,7 +85,7 @@ in {
8585 Configuration for the V4L2 monitor. For details see
8686 https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf
8787 '';
88− default = defaults.v4l2-monitor;
88+ default = {};
8989 };
9090 };
9191 };
@@ -110,11 +110,6 @@ in {
110110 source = json.generate "v4l2-monitor.conf" configs.v4l2-monitor;
111111 };
112112
113− environment.etc."pipewire/media-session.d/with-audio" =
114− mkIf config.services.pipewire.audio.enable {
115− text = "";
116− };
117−
118113 environment.etc."pipewire/media-session.d/with-alsa" =
119114 mkIf config.services.pipewire.alsa.enable {
120115 text = "";
nixos/modules/services/desktops/pipewire/pipewire.nix+3−21
@@ -25,18 +25,15 @@ let
2525 client = lib.importJSON ./daemon/client.conf.json;
2626 client-rt = lib.importJSON ./daemon/client-rt.conf.json;
2727 jack = lib.importJSON ./daemon/jack.conf.json;
28− minimal = lib.importJSON ./daemon/minimal.conf.json;
2928 pipewire = lib.importJSON ./daemon/pipewire.conf.json;
3029 pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json;
3130 };
3231
33− useSessionManager = cfg.wireplumber.enable || cfg.media-session.enable;
34−
3532 configs = {
3633 client = recursiveUpdate defaults.client cfg.config.client;
3734 client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt;
3835 jack = recursiveUpdate defaults.jack cfg.config.jack;
39− pipewire = recursiveUpdate (if useSessionManager then defaults.pipewire else defaults.minimal) cfg.config.pipewire;
36+ pipewire = recursiveUpdate defaults.pipewire cfg.config.pipewire;
4037 pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse;
4138 };
4239in {
@@ -116,16 +113,6 @@ in {
116113 };
117114 };
118115
119− audio = {
120− enable = lib.mkOption {
121− type = lib.types.bool;
122− # this is for backwards compatibility
123− default = cfg.alsa.enable || cfg.jack.enable || cfg.pulse.enable;
124− defaultText = lib.literalExpression "config.services.pipewire.alsa.enable || config.services.pipewire.jack.enable || config.services.pipewire.pulse.enable";
125− description = "Whether to use PipeWire as the primary sound server";
126− };
127− };
128−
129116 alsa = {
130117 enable = mkEnableOption "ALSA support";
131118 support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems";
@@ -162,18 +149,13 @@ in {
162149 config = mkIf cfg.enable {
163150 assertions = [
164151 {
165− assertion = cfg.audio.enable -> !config.hardware.pulseaudio.enable;
166− message = "Using PipeWire as the sound server conflicts with PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false";
152+ assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable;
153+ message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false";
167154 }
168155 {
169156 assertion = cfg.jack.enable -> !config.services.jack.jackd.enable;
170157 message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false";
171158 }
172− {
173− # JACK intentionally not checked, as PW-on-JACK setups are a thing that some people may want
174− assertion = (cfg.alsa.enable || cfg.pulse.enable) -> cfg.audio.enable;
175− message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Set `services.pipewire.audio.enable` to true.";
176− }
177159 ];
178160
179161 environment.systemPackages = [ cfg.package ]
nixos/modules/services/desktops/pipewire/wireplumber.nix+1−11
@@ -1,9 +1,7 @@
11{ config, lib, pkgs, ... }:
22
33let
4− pwCfg = config.services.pipewire;
5− cfg = pwCfg.wireplumber;
6− pwUsedForAudio = pwCfg.audio.enable;
4+ cfg = config.services.pipewire.wireplumber;
75in
86{
97 meta.maintainers = [ lib.maintainers.k900 ];
@@ -35,14 +33,6 @@ in
3533 ];
3634
3735 environment.systemPackages = [ cfg.package ];
38−
39− environment.etc."wireplumber/main.lua.d/80-nixos.lua" = lib.mkIf (!pwUsedForAudio) {
40− text = ''
41− -- Pipewire is not used for audio, so prevent it from grabbing audio devices
42− alsa_monitor.enable = function() end
43− '';
44− };
45−
4636 systemd.packages = [ cfg.package ];
4737
4838 systemd.services.wireplumber.enable = config.services.pipewire.systemWide;
nixos/modules/services/development/jupyter/default.nix−1
@@ -194,7 +194,6 @@ in {
194194 extraGroups = [ cfg.group ];
195195 home = "/var/lib/jupyter";
196196 createHome = true;
197− isSystemUser = true;
198197 useDefaultShell = true; # needed so that the user can start a terminal.
199198 };
200199 })
nixos/modules/services/editors/haste.nixdeleted−86
@@ -1,86 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−
5−let
6− pkg = pkgs.haste-server;
7− cfg = config.services.haste-server;
8−
9− format = pkgs.formats.json {};
10−in
11−{
12− options.services.haste-server = {
13− enable = mkEnableOption "haste-server";
14− openFirewall = mkEnableOption "firewall passthrough for haste-server";
15−
16− settings = mkOption {
17− description = ''
18− Configuration for haste-server.
19− For documentation see <link xlink:href="https://github.com/toptal/haste-server#settings">project readme</link>
20− '';
21− type = format.type;
22− };
23− };
24−
25− config = mkIf (cfg.enable) {
26− networking.firewall.allowedTCPPorts = mkIf (cfg.openFirewall) [ cfg.settings.port ];
27−
28− services.haste-server = {
29− settings = {
30− host = mkDefault "::";
31− port = mkDefault 7777;
32−
33− keyLength = mkDefault 10;
34− maxLength = mkDefault 400000;
35−
36− staticMaxAge = mkDefault 86400;
37− recompressStaticAssets = mkDefault false;
38−
39− logging = mkDefault [
40− {
41− level = "verbose";
42− type = "Console";
43− colorize = true;
44− }
45− ];
46−
47− keyGenerator = mkDefault {
48− type = "phonetic";
49− };
50−
51− rateLimits = {
52− categories = {
53− normal = {
54− totalRequests = mkDefault 500;
55− every = mkDefault 60000;
56− };
57− };
58− };
59−
60− storage = mkDefault {
61− type = "file";
62− };
63−
64− documents = {
65− about = mkDefault "${pkg}/share/haste-server/about.md";
66− };
67− };
68− };
69−
70− systemd.services.haste-server = {
71− wantedBy = [ "multi-user.target" ];
72− requires = [ "network.target" ];
73− after = [ "network.target" ];
74−
75− serviceConfig = {
76− User = "haste-server";
77− DynamicUser = true;
78− StateDirectory = "haste-server";
79− WorkingDirectory = "/var/lib/haste-server";
80− ExecStart = "${pkg}/bin/haste-server ${format.generate "config.json" cfg.settings}";
81− };
82−
83− path = with pkgs; [ pkg coreutils ];
84− };
85− };
86−}
nixos/modules/services/games/factorio.nix−9
@@ -53,14 +53,6 @@ in
5353 '';
5454 };
5555
56− bind = mkOption {
57− type = types.str;
58− default = "0.0.0.0";
59− description = ''
60− The address to which the service should bind.
61− '';
62− };
63−
6456 admins = mkOption {
6557 type = types.listOf types.str;
6658 default = [];
@@ -249,7 +241,6 @@ in
249241 "${cfg.package}/bin/factorio"
250242 "--config=${cfg.configFile}"
251243 "--port=${toString cfg.port}"
252− "--bind=${cfg.bind}"
253244 "--start-server=${mkSavePath cfg.saveName}"
254245 "--server-settings=${serverSettingsFile}"
255246 (optionalString (cfg.mods != []) "--mod-directory=${modDir}")
nixos/modules/services/games/minecraft-server.nix+1−1
@@ -153,7 +153,7 @@ in {
153153 type = types.separatedString " ";
154154 default = "-Xmx2048M -Xms2048M";
155155 # Example options from https://minecraft.gamepedia.com/Tutorials/Server_startup_script
156− example = "-Xms4092M -Xmx4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing "
156+ example = "-Xmx2048M -Xms4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing "
157157 + "-XX:+CMSClassUnloadingEnabled -XX:ParallelGCThreads=2 "
158158 + "-XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10";
159159 description = "JVM options for the Minecraft server.";
nixos/modules/services/hardware/joycond.nix+6−2
@@ -22,9 +22,13 @@ with lib;
2222 };
2323
2424 config = mkIf cfg.enable {
25− environment.systemPackages = [ cfg.package ];
25+ environment.systemPackages = [
26+ kernelPackages.hid-nintendo
27+ cfg.package
28+ ];
2629
27− boot.extraModulePackages = optional (versionOlder kernelPackages.kernel.version "5.16") kernelPackages.hid-nintendo;
30+ boot.extraModulePackages = [ kernelPackages.hid-nintendo ];
31+ boot.kernelModules = [ "hid_nintendo" ];
2832
2933 services.udev.packages = [ cfg.package ];
3034
nixos/modules/services/hardware/udev.nix+23−125
@@ -8,24 +8,6 @@ let
88
99 cfg = config.services.udev;
1010
11− initrdUdevRules = pkgs.runCommand "initrd-udev-rules" {} ''
12− mkdir -p $out/etc/udev/rules.d
13− for f in 60-cdrom_id 60-persistent-storage 75-net-description 80-drivers 80-net-setup-link; do
14− ln -s ${config.boot.initrd.systemd.package}/lib/udev/rules.d/$f.rules $out/etc/udev/rules.d
15− done
16− '';
17−
18−
19− # networkd link files are used early by udev to set up interfaces early.
20− # This must be done in stage 1 to avoid race conditions between udev and
21− # network daemons.
22− # TODO move this into the initrd-network module when it exists
23− initrdLinkUnits = pkgs.runCommand "initrd-link-units" {} ''
24− mkdir -p $out
25− ln -s ${udev}/lib/systemd/network/*.link $out/
26− ${lib.concatMapStringsSep "\n" (file: "ln -s ${file} $out/") (lib.mapAttrsToList (n: v: "${v.unit}/${n}") (lib.filterAttrs (n: _: hasSuffix ".link" n) config.systemd.network.units))}
27− '';
28−
2911 extraUdevRules = pkgs.writeTextFile {
3012 name = "extra-udev-rules";
3113 text = cfg.extraRules;
@@ -41,16 +23,17 @@ let
4123 nixosRules = ''
4224 # Miscellaneous devices.
4325 KERNEL=="kvm", MODE="0666"
26+ KERNEL=="kqemu", MODE="0666"
4427
4528 # Needed for gpm.
4629 SUBSYSTEM=="input", KERNEL=="mice", TAG+="systemd"
4730 '';
4831
4932 # Perform substitutions in all udev rules files.
50− udevRulesFor = { name, udevPackages, udevPath, udev, systemd, binPackages, initrdBin ? null }: pkgs.runCommand name
33+ udevRules = pkgs.runCommand "udev-rules"
5134 { preferLocalBuild = true;
5235 allowSubstitutes = false;
53− packages = unique (map toString udevPackages);
36+ packages = unique (map toString cfg.packages);
5437 }
5538 ''
5639 mkdir -p $out
@@ -78,9 +61,6 @@ let
7861 --replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \
7962 --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \
8063 --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename
81− ${optionalString (initrdBin != null) ''
82− substituteInPlace $i --replace '/run/current-system/systemd' "${removeSuffix "/bin" initrdBin}"
83− ''}
8464 done
8565
8666 echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... "
@@ -105,9 +85,8 @@ let
10585 for i in $import_progs $run_progs; do
10686 # if the path refers to /run/current-system/systemd, replace with config.systemd.package
10787 if [[ $i == /run/current-system/systemd* ]]; then
108− i="${systemd}/''${i#/run/current-system/systemd/}"
88+ i="${config.systemd.package}/''${i#/run/current-system/systemd/}"
10989 fi
110−
11190 if [[ ! -x $i ]]; then
11291 echo "FAIL"
11392 echo "$i is called in udev rules but is not executable or does not exist"
@@ -124,7 +103,7 @@ let
124103 echo "Consider fixing the following udev rules:"
125104 echo "$filesToFixup" | while read localFile; do
126105 remoteFile="origin unknown"
127− for i in ${toString binPackages}; do
106+ for i in ${toString cfg.packages}; do
128107 for j in "$i"/*/udev/rules.d/*; do
129108 [ -e "$out/$(basename "$j")" ] || continue
130109 [ "$(basename "$j")" = "$(basename "$localFile")" ] || continue
@@ -147,7 +126,7 @@ let
147126 ${optionalString (!config.boot.hardwareScan) ''
148127 ln -s /dev/null $out/80-drivers.rules
149128 ''}
150− '';
129+ ''; # */
151130
152131 hwdbBin = pkgs.runCommand "hwdb.bin"
153132 { preferLocalBuild = true;
@@ -223,6 +202,20 @@ in
223202 '';
224203 };
225204
205+ initrdRules = mkOption {
206+ default = "";
207+ example = ''
208+ SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card"
209+ '';
210+ type = types.lines;
211+ description = ''
212+ <command>udev</command> rules to include in the initrd
213+ <emphasis>only</emphasis>. They'll be written into file
214+ <filename>99-local.rules</filename>. Thus they are read and applied
215+ after the essential initrd rules.
216+ '';
217+ };
218+
226219 extraRules = mkOption {
227220 default = "";
228221 example = ''
@@ -290,52 +283,6 @@ in
290283 '';
291284 };
292285
293− boot.initrd.services.udev = {
294−
295− packages = mkOption {
296− type = types.listOf types.path;
297− default = [];
298− visible = false;
299− description = ''
300− <emphasis>This will only be used when systemd is used in stage 1.</emphasis>
301−
302− List of packages containing <command>udev</command> rules that will be copied to stage 1.
303− All files found in
304− <filename><replaceable>pkg</replaceable>/etc/udev/rules.d</filename> and
305− <filename><replaceable>pkg</replaceable>/lib/udev/rules.d</filename>
306− will be included.
307− '';
308− };
309−
310− binPackages = mkOption {
311− type = types.listOf types.path;
312− default = [];
313− visible = false;
314− description = ''
315− <emphasis>This will only be used when systemd is used in stage 1.</emphasis>
316−
317− Packages to search for binaries that are referenced by the udev rules in stage 1.
318− This list always contains /bin of the initrd.
319− '';
320− apply = map getBin;
321− };
322−
323− rules = mkOption {
324− default = "";
325− example = ''
326− SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card"
327− '';
328− type = types.lines;
329− description = ''
330− <command>udev</command> rules to include in the initrd
331− <emphasis>only</emphasis>. They'll be written into file
332− <filename>99-local.rules</filename>. Thus they are read and applied
333− after the essential initrd rules.
334− '';
335− };
336−
337− };
338−
339286 };
340287
341288
@@ -351,61 +298,16 @@ in
351298
352299 boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ];
353300
354− boot.initrd.extraUdevRulesCommands = optionalString (!config.boot.initrd.systemd.enable && config.boot.initrd.services.udev.rules != "")
301+ boot.initrd.extraUdevRulesCommands = optionalString (cfg.initrdRules != "")
355302 ''
356303 cat <<'EOF' > $out/99-local.rules
357− ${config.boot.initrd.services.udev.rules}
304+ ${cfg.initrdRules}
358305 EOF
359306 '';
360307
361− boot.initrd.systemd.additionalUpstreamUnits = [
362− # TODO: "initrd-udevadm-cleanup-db.service" is commented out because of https://github.com/systemd/systemd/issues/12953
363− "systemd-udevd-control.socket"
364− "systemd-udevd-kernel.socket"
365− "systemd-udevd.service"
366− "systemd-udev-settle.service"
367− "systemd-udev-trigger.service"
368− ];
369− boot.initrd.systemd.storePaths = [
370− "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"
371− "${config.boot.initrd.systemd.package}/lib/udev/ata_id"
372− "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"
373− "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"
374− "${config.boot.initrd.systemd.package}/lib/udev/rules.d"
375− ] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages;
376−
377− # Generate the udev rules for the initrd
378− boot.initrd.systemd.contents = {
379− "/etc/udev/rules.d".source = udevRulesFor {
380− name = "initrd-udev-rules";
381− initrdBin = config.boot.initrd.systemd.contents."/bin".source;
382− udevPackages = config.boot.initrd.services.udev.packages;
383− udevPath = config.boot.initrd.systemd.contents."/bin".source;
384− udev = config.boot.initrd.systemd.package;
385− systemd = config.boot.initrd.systemd.package;
386− binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ];
387− };
388− "/etc/systemd/network".source = initrdLinkUnits;
389− };
390− # Insert initrd rules
391− boot.initrd.services.udev.packages = [
392− initrdUdevRules
393− (mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {
394− name = "initrd-udev-rules";
395− destination = "/etc/udev/rules.d/99-local.rules";
396− text = config.boot.initrd.services.udev.rules;
397− }))
398− ];
399−
400308 environment.etc =
401309 {
402− "udev/rules.d".source = udevRulesFor {
403− name = "udev-rules";
404− udevPackages = cfg.packages;
405− systemd = config.systemd.package;
406− binPackages = cfg.packages;
407− inherit udevPath udev;
408− };
310+ "udev/rules.d".source = udevRules;
409311 "udev/hwdb.bin".source = hwdbBin;
410312 };
411313
@@ -436,8 +338,4 @@ in
436338 };
437339
438340 };
439−
440− imports = [
441− (mkRenamedOptionModule [ "services" "udev" "initrdRules" ] [ "boot" "initrd" "services" "udev" "rules" ])
442− ];
443341}
nixos/modules/services/hardware/udisks2.nix−41
@@ -4,13 +4,6 @@
44
55with lib;
66
7−let
8− settingsFormat = pkgs.formats.ini {
9− listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {});
10− };
11− configFiles = mapAttrs (name: value: (settingsFormat.generate name value)) (mapAttrs' (name: value: nameValuePair name value ) config.services.udisks2.settings);
12−in
13−
147{
158
169 ###### interface
@@ -28,36 +21,6 @@ in
2821 '';
2922 };
3023
31− settings = mkOption rec {
32− type = types.attrsOf settingsFormat.type;
33− apply = recursiveUpdate default;
34− default = {
35− "udisks2.conf" = {
36− udisks2 = {
37− modules = [ "*" ];
38− modules_load_preference = "ondemand";
39− };
40− defaults = {
41− encryption = "luks2";
42− };
43− };
44− };
45− example = literalExpression ''
46− {
47− "WDC-WD10EZEX-60M2NA0-WD-WCC3F3SJ0698.conf" = {
48− ATA = {
49− StandbyTimeout = 50;
50− };
51− };
52− };
53− '';
54− description = ''
55− Options passed to udisksd.
56− See <link xlink:href="http://manpages.ubuntu.com/manpages/latest/en/man5/udisks2.conf.5.html">here</link> and
57− drive configuration in <link xlink:href="http://manpages.ubuntu.com/manpages/latest/en/man8/udisks.8.html">here</link> for supported options.
58− '';
59− };
60−
6124 };
6225
6326 };
@@ -69,10 +32,6 @@ in
6932
7033 environment.systemPackages = [ pkgs.udisks2 ];
7134
72− environment.etc = mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles;
73−
74− security.polkit.enable = true;
75−
7635 services.dbus.packages = [ pkgs.udisks2 ];
7736
7837 systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ];
nixos/modules/services/hardware/usbrelayd.nixdeleted−44
@@ -1,44 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−with lib;
3−let
4− cfg = config.services.usbrelayd;
5−in
6−{
7− options.services.usbrelayd = with types; {
8− enable = mkEnableOption "USB Relay MQTT daemon";
9−
10− broker = mkOption {
11− type = str;
12− description = "Hostname or IP address of your MQTT Broker.";
13− default = "127.0.0.1";
14− example = [
15− "mqtt"
16− "192.168.1.1"
17− ];
18− };
19−
20− clientName = mkOption {
21− type = str;
22− description = "Name, your client connects as.";
23− default = "MyUSBRelay";
24− };
25− };
26−
27− config = mkIf cfg.enable {
28−
29− # TODO: Rename to .conf in upcomming release
30− environment.etc."usbrelayd.ini".text = ''
31− [MQTT]
32− BROKER = ${cfg.broker}
33− CLIENTNAME = ${cfg.clientName}
34− '';
35−
36− services.udev.packages = [ pkgs.usbrelayd ];
37− systemd.packages = [ pkgs.usbrelayd ];
38− users.users.usbrelay = {
39− isSystemUser = true;
40− group = "usbrelay";
41− };
42− users.groups.usbrelay = { };
43− };
44−}
nixos/modules/services/logging/graylog.nix+1−1
@@ -132,7 +132,7 @@ in
132132 description = "Graylog server daemon user";
133133 };
134134 };
135− users.groups = mkIf (cfg.user == "graylog") { graylog = {}; };
135+ users.groups = mkIf (cfg.user == "graylog") {};
136136
137137 systemd.tmpfiles.rules = [
138138 "d '${cfg.messageJournalDir}' - ${cfg.user} - - -"
nixos/modules/services/logging/klogd.nix+35−6
@@ -1,9 +1,38 @@
1−{ lib, ... }:
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
24
35{
4− imports = [
5− (lib.mkRemovedOptionModule [ "security" "klogd" "enable" ] ''
6− Logging of kernel messages is now handled by systemd.
7− '')
8− ];
6+ ###### interface
7+
8+ options = {
9+
10+ services.klogd.enable = mkOption {
11+ type = types.bool;
12+ default = versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5";
13+ defaultText = literalExpression ''versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5"'';
14+ description = ''
15+ Whether to enable klogd, the kernel log message processing
16+ daemon. Since systemd handles logging of kernel messages on
17+ Linux 3.5 and later, this is only useful if you're running an
18+ older kernel.
19+ '';
20+ };
21+
22+ };
23+
24+
25+ ###### implementation
26+
27+ config = mkIf config.services.klogd.enable {
28+ systemd.services.klogd = {
29+ description = "Kernel Log Daemon";
30+ wantedBy = [ "multi-user.target" ];
31+ path = [ pkgs.sysklogd ];
32+ unitConfig.ConditionVirtualization = "!systemd-nspawn";
33+ script =
34+ "klogd -c 1 -2 -n " +
35+ "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
36+ };
37+ };
938}
nixos/modules/services/logging/logrotate.nix+27−251
@@ -5,10 +5,7 @@ with lib;
55let
66 cfg = config.services.logrotate;
77
8− # deprecated legacy compat settings
9− # these options will be removed before 22.11 in the following PR:
10− # https://github.com/NixOS/nixpkgs/pull/164169
11− pathOpts = { name, ... }: {
8+ pathOpts = { name, ... }: {
129 options = {
1310 enable = mkOption {
1411 type = types.bool;
@@ -89,113 +86,23 @@ let
8986 config.name = name;
9087 };
9188
92− generateLine = n: v:
93− if builtins.elem n [ "files" "priority" "enable" "global" ] || v == null then null
94− else if builtins.elem n [ "extraConfig" "frequency" ] then "${v}\n"
95− else if builtins.elem n [ "firstaction" "lastaction" "prerotate" "postrotate" "preremove" ]
96− then "${n}\n ${v}\n endscript\n"
97− else if isInt v then "${n} ${toString v}\n"
98− else if v == true then "${n}\n"
99− else if v == false then "no${n}\n"
100− else "${n} ${v}\n";
101− generateSection = indent: settings: concatStringsSep (fixedWidthString indent " " "") (
102− filter (x: x != null) (mapAttrsToList generateLine settings)
89+ mkConf = pathOpts: ''
90+ # generated by NixOS using the `services.logrotate.paths.${pathOpts.name}` attribute set
91+ ${concatMapStringsSep " " (path: ''"${path}"'') (toList pathOpts.path)} {
92+ ${optionalString (pathOpts.user != null || pathOpts.group != null) "su ${pathOpts.user} ${pathOpts.group}"}
93+ ${pathOpts.frequency}
94+ rotate ${toString pathOpts.keep}
95+ ${pathOpts.extraConfig}
96+ }
97+ '';
98+
99+ paths = sortProperties (attrValues (filterAttrs (_: pathOpts: pathOpts.enable) cfg.paths));
100+ configFile = pkgs.writeText "logrotate.conf" (
101+ concatStringsSep "\n" (
102+ [ "missingok" "notifempty" cfg.extraConfig ] ++ (map mkConf paths)
103+ )
103104 );
104105
105− # generateSection includes a final newline hence weird closing brace
106− mkConf = settings:
107− if settings.global or false then generateSection 0 settings
108− else ''
109− ${concatMapStringsSep "\n" (files: ''"${files}"'') (toList settings.files)} {
110− ${generateSection 2 settings}}
111− '';
112−
113− # below two mapPaths are compat functions
114− mapPathOptToSetting = n: v:
115− if n == "keep" then nameValuePair "rotate" v
116− else if n == "path" then nameValuePair "files" v
117− else nameValuePair n v;
118−
119− mapPathsToSettings = path: pathOpts:
120− nameValuePair path (
121− filterAttrs (n: v: ! builtins.elem n [ "user" "group" "name" ] && v != "") (
122− (mapAttrs' mapPathOptToSetting pathOpts) //
123− {
124− su =
125− if pathOpts.user != null
126− then "${pathOpts.user} ${pathOpts.group}"
127− else null;
128− }
129− )
130− );
131−
132− settings = sortProperties (attrValues (filterAttrs (_: settings: settings.enable) (
133− foldAttrs recursiveUpdate { } [
134− {
135− header = {
136− enable = true;
137− missingok = true;
138− notifempty = true;
139− frequency = "weekly";
140− rotate = 4;
141− };
142− # compat section
143− extraConfig = {
144− enable = (cfg.extraConfig != "");
145− global = true;
146− extraConfig = cfg.extraConfig;
147− priority = 101;
148− };
149− }
150− (mapAttrs' mapPathsToSettings cfg.paths)
151− cfg.settings
152− { header = { global = true; priority = 100; }; }
153− ]
154− )));
155− configFile = pkgs.writeTextFile {
156− name = "logrotate.conf";
157− text = concatStringsSep "\n" (
158− map mkConf settings
159− );
160− checkPhase = optionalString cfg.checkConfig ''
161− # logrotate --debug also checks that users specified in config
162− # file exist, but we only have sandboxed users here so brown these
163− # out. according to man page that means su, create and createolddir.
164− # files required to exist also won't be present, so missingok is forced.
165− user=$(${pkgs.buildPackages.coreutils}/bin/id -un)
166− group=$(${pkgs.buildPackages.coreutils}/bin/id -gn)
167− sed -e "s/\bsu\s.*/su $user $group/" \
168− -e "s/\b\(create\s\+[0-9]*\s*\|createolddir\s\+[0-9]*\s\+\).*/\1$user $group/" \
169− -e "1imissingok" -e "s/\bnomissingok\b//" \
170− $out > /tmp/logrotate.conf
171− # Since this makes for very verbose builds only show real error.
172− # There is no way to control log level, but logrotate hardcodes
173− # 'error:' at common log level, so we can use grep, taking care
174− # to keep error codes
175− set -o pipefail
176− if ! ${pkgs.buildPackages.logrotate}/sbin/logrotate --debug /tmp/logrotate.conf 2>&1 \
177− | ( ! grep "error:" ) > /tmp/logrotate-error; then
178− echo "Logrotate configuration check failed."
179− echo "The failing configuration (after adjustments to pass tests in sandbox) was:"
180− printf "%s\n" "-------"
181− cat /tmp/logrotate.conf
182− printf "%s\n" "-------"
183− echo "The error reported by logrotate was as follow:"
184− printf "%s\n" "-------"
185− cat /tmp/logrotate-error
186− printf "%s\n" "-------"
187− echo "You can disable this check with services.logrotate.checkConfig = false,"
188− echo "but if you think it should work please report this failure along with"
189− echo "the config file being tested!"
190− false
191− fi
192− '';
193− };
194−
195− mailOption =
196− if foldr (n: a: a || n ? mail) false (attrValues cfg.settings)
197− then "--mail=${pkgs.mailutils}/bin/mail"
198− else "";
199106in
200107{
201108 imports = [
@@ -205,121 +112,17 @@ in
205112 options = {
206113 services.logrotate = {
207114 enable = mkEnableOption "the logrotate systemd service" // {
208− default = foldr (n: a: a || n.enable) false (attrValues cfg.settings);
209− defaultText = literalExpression "cfg.settings != {}";
210− };
211−
212− settings = mkOption {
213− default = { };
214− description = ''
215− logrotate freeform settings: each attribute here will define its own section,
216− ordered by priority, which can either define files to rotate with their settings
217− or settings common to all further files settings.
218− Refer to <link xlink:href="https://linux.die.net/man/8/logrotate"/> for details.
219− '';
220− type = types.attrsOf (types.submodule ({ name, ... }: {
221− freeformType = with types; attrsOf (nullOr (oneOf [ int bool str ]));
222−
223− options = {
224− enable = mkEnableOption "setting individual kill switch" // {
225− default = true;
226− };
227−
228− global = mkOption {
229− type = types.bool;
230− default = false;
231− description = ''
232− Whether this setting is a global option or not: set to have these
233− settings apply to all files settings with a higher priority.
234− '';
235− };
236− files = mkOption {
237− type = with types; either str (listOf str);
238− default = name;
239− defaultText = ''
240− The attrset name if not specified
241− '';
242− description = ''
243− Single or list of files for which rules are defined.
244− The files are quoted with double-quotes in logrotate configuration,
245− so globs and spaces are supported.
246− Note this setting is ignored if globals is true.
247− '';
248− };
249−
250− frequency = mkOption {
251− type = types.nullOr types.str;
252− default = null;
253− description = ''
254− How often to rotate the logs. Defaults to previously set global setting,
255− which itself defauts to weekly.
256− '';
257− };
258−
259− priority = mkOption {
260− type = types.int;
261− default = 1000;
262− description = ''
263− Order of this logrotate block in relation to the others. The semantics are
264− the same as with `lib.mkOrder`. Smaller values are inserted first.
265− '';
266− };
267− };
268−
269− }));
270− };
271−
272− configFile = mkOption {
273− type = types.path;
274− default = configFile;
275− defaultText = ''
276− A configuration file automatically generated by NixOS.
277− '';
278− description = ''
279− Override the configuration file used by MySQL. By default,
280− NixOS generates one automatically from <xref linkend="opt-services.logrotate.settings"/>.
281− '';
282− example = literalExpression ''
283− pkgs.writeText "logrotate.conf" '''
284− missingok
285− "/var/log/*.log" {
286− rotate 4
287− weekly
288− }
289− ''';
290− '';
115+ default = foldr (n: a: a || n.enable) false (attrValues cfg.paths);
116+ defaultText = literalExpression "cfg.paths != {}";
291117 };
292118
293− checkConfig = mkOption {
294− type = types.bool;
295− default = true;
296− description = ''
297− Whether the config should be checked at build time.
298−
299− Some options are not checkable at build time because of the build sandbox:
300− for example, the test does not know about existing files and system users are
301− not known.
302− These limitations mean we must adjust the file for tests (missingok is forced
303− and users are replaced by dummy users), so tests are complemented by a
304− logrotate-checkconf service that is enabled by default.
305− This extra check can be disabled by disabling it at the systemd level with the
306− <option>services.systemd.services.logrotate-checkconf.enable</option> option.
307−
308− Conversely there are still things that might make this check fail incorrectly
309− (e.g. a file path where we don't have access to intermediate directories):
310− in this case you can disable the failing check with this option.
311− '';
312− };
313−
314− # deprecated legacy compat settings
315119 paths = mkOption {
316120 type = with types; attrsOf (submodule pathOpts);
317− default = { };
121+ default = {};
318122 description = ''
319123 Attribute set of paths to rotate. The order each block appears in the generated configuration file
320124 can be controlled by the <link linkend="opt-services.logrotate.paths._name_.priority">priority</link> option
321125 using the same semantics as `lib.mkOrder`. Smaller values have a greater priority.
322− This setting has been deprecated in favor of <link linkend="opt-services.logrotate.settings">logrotate settings</link>.
323126 '';
324127 example = literalExpression ''
325128 {
@@ -348,37 +151,19 @@ in
348151 description = ''
349152 Extra contents to append to the logrotate configuration file. Refer to
350153 <link xlink:href="https://linux.die.net/man/8/logrotate"/> for details.
351− This setting has been deprecated in favor of
352− <link linkend="opt-services.logrotate.settings">logrotate settings</link>.
353154 '';
354155 };
355156 };
356157 };
357158
358159 config = mkIf cfg.enable {
359− assertions =
360− mapAttrsToList
361− (name: pathOpts:
362− {
363− assertion = (pathOpts.user != null) == (pathOpts.group != null);
364− message = ''
365− If either of `services.logrotate.paths.${name}.user` or `services.logrotate.paths.${name}.group` are specified then *both* must be specified.
366− '';
367− })
368− cfg.paths;
369−
370− warnings =
371− (mapAttrsToList
372− (name: pathOpts: ''
373− Using config.services.logrotate.paths.${name} is deprecated and will become unsupported in a future release.
374− Please use services.logrotate.settings instead.
375− '')
376− cfg.paths
377− ) ++
378− (optional (cfg.extraConfig != "") ''
379− Using config.services.logrotate.extraConfig is deprecated and will become unsupported in a future release.
380− Please use services.logrotate.settings with globals=true instead.
381− '');
160+ assertions = mapAttrsToList (name: pathOpts:
161+ { assertion = (pathOpts.user != null) == (pathOpts.group != null);
162+ message = ''
163+ If either of `services.logrotate.paths.${name}.user` or `services.logrotate.paths.${name}.group` are specified then *both* must be specified.
164+ '';
165+ }
166+ ) cfg.paths;
382167
383168 systemd.services.logrotate = {
384169 description = "Logrotate Service";
@@ -387,16 +172,7 @@ in
387172 serviceConfig = {
388173 Restart = "no";
389174 User = "root";
390− ExecStart = "${pkgs.logrotate}/sbin/logrotate ${mailOption} ${cfg.configFile}";
391− };
392− };
393− systemd.services.logrotate-checkconf = {
394− description = "Logrotate configuration check";
395− wantedBy = [ "multi-user.target" ];
396− serviceConfig = {
397− Type = "oneshot";
398− RemainAfterExit = true;
399− ExecStart = "${pkgs.logrotate}/sbin/logrotate --debug ${cfg.configFile}";
175+ ExecStart = "${pkgs.logrotate}/sbin/logrotate ${configFile}";
400176 };
401177 };
402178 };
nixos/modules/services/mail/mailman.nix+7−14
@@ -192,6 +192,7 @@ in {
192192 log_dir = "/var/log/mailman";
193193 lock_dir = "$var_dir/lock";
194194 etc_dir = "/etc";
195+ ext_dir = "$etc_dir/mailman.d";
195196 pid_file = "/run/mailman/master.pid";
196197 };
197198
@@ -224,14 +225,7 @@ in {
224225 See <https://mailman.readthedocs.io/en/latest/src/mailman/docs/mta.html>.
225226 '';
226227 };
227− in [
228− { assertion = cfg.webHosts != [];
229− message = ''
230− services.mailman.serve.enable requires there to be at least one entry
231− in services.mailman.webHosts.
232− '';
233− }
234− ] ++ (lib.optionals cfg.enablePostfix [
228+ in (lib.optionals cfg.enablePostfix [
235229 { assertion = postfix.enable;
236230 message = ''
237231 Mailman's default NixOS configuration requires Postfix to be enabled.
@@ -281,14 +275,15 @@ in {
281275 globals().update(json.load(f))
282276 '';
283277
284− services.nginx = mkIf (cfg.serve.enable && cfg.webHosts != []) {
278+ services.nginx = mkIf cfg.serve.enable {
285279 enable = mkDefault true;
286− virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
280+ virtualHosts."${lib.head cfg.webHosts}" = {
281+ serverAliases = cfg.webHosts;
287282 locations = {
288283 "/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
289284 "/static/".alias = webSettings.STATIC_ROOT + "/";
290285 };
291− });
286+ };
292287 };
293288
294289 environment.systemPackages = [ (pkgs.buildEnv {
@@ -318,9 +313,7 @@ in {
318313 systemd.services = {
319314 mailman = {
320315 description = "GNU Mailman Master Process";
321− before = lib.optional cfg.enablePostfix "postfix.service";
322− after = [ "network.target" ]
323− ++ lib.optional cfg.enablePostfix "postfix-setup.service";
316+ after = [ "network.target" ];
324317 restartTriggers = [ config.environment.etc."mailman.cfg".source ];
325318 wantedBy = [ "multi-user.target" ];
326319 serviceConfig = {
nixos/modules/services/mail/postfix.nix+17−22
@@ -723,10 +723,23 @@ in
723723 { ${setgidGroup}.gid = config.ids.gids.postdrop;
724724 };
725725
726− systemd.services.postfix-setup =
727− { description = "Setup for Postfix mail server";
728− serviceConfig.Type = "oneshot";
729− script = ''
726+ systemd.services.postfix =
727+ { description = "Postfix mail server";
728+
729+ wantedBy = [ "multi-user.target" ];
730+ after = [ "network.target" ];
731+ path = [ pkgs.postfix ];
732+
733+ serviceConfig = {
734+ Type = "forking";
735+ Restart = "always";
736+ PIDFile = "/var/lib/postfix/queue/pid/master.pid";
737+ ExecStart = "${pkgs.postfix}/bin/postfix start";
738+ ExecStop = "${pkgs.postfix}/bin/postfix stop";
739+ ExecReload = "${pkgs.postfix}/bin/postfix reload";
740+ };
741+
742+ preStart = ''
730743 # Backwards compatibility
731744 if [ ! -d /var/lib/postfix ] && [ -d /var/postfix ]; then
732745 mkdir -p /var/lib
@@ -764,24 +777,6 @@ in
764777 '';
765778 };
766779
767− systemd.services.postfix =
768− { description = "Postfix mail server";
769−
770− wantedBy = [ "multi-user.target" ];
771− after = [ "network.target" "postfix-setup.service" ];
772− requires = [ "postfix-setup.service" ];
773− path = [ pkgs.postfix ];
774−
775− serviceConfig = {
776− Type = "forking";
777− Restart = "always";
778− PIDFile = "/var/lib/postfix/queue/pid/master.pid";
779− ExecStart = "${pkgs.postfix}/bin/postfix start";
780− ExecStop = "${pkgs.postfix}/bin/postfix stop";
781− ExecReload = "${pkgs.postfix}/bin/postfix reload";
782− };
783− };
784−
785780 services.postfix.config = (mapAttrs (_: v: mkDefault v) {
786781 compatibility_level = pkgs.postfix.version;
787782 mail_owner = cfg.user;
nixos/modules/services/matrix/matrix-synapse.nixdeleted−773
@@ -1,773 +0,0 @@
1−{ config, lib, options, pkgs, ... }:
2−
3−with lib;
4−
5−let
6− cfg = config.services.matrix-synapse;
7− format = pkgs.formats.yaml {};
8−
9− # remove null values from the final configuration
10− finalSettings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings;
11− configFile = format.generate "homeserver.yaml" finalSettings;
12− logConfigFile = format.generate "log_config.yaml" cfg.logConfig;
13−
14− pluginsEnv = cfg.package.python.buildEnv.override {
15− extraLibs = cfg.plugins;
16− };
17−
18− usePostgresql = cfg.settings.database.name == "psycopg2";
19− hasLocalPostgresDB = let args = cfg.settings.database.args; in
20− usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ]));
21−
22− registerNewMatrixUser =
23− let
24− isIpv6 = x: lib.length (lib.splitString ":" x) > 1;
25− listener =
26− lib.findFirst (
27− listener: lib.any (
28− resource: lib.any (
29− name: name == "client"
30− ) resource.names
31− ) listener.resources
32− ) (lib.last cfg.settings.listeners) cfg.settings.listeners;
33− # FIXME: Handle cases with missing client listener properly,
34− # don't rely on lib.last, this will not work.
35−
36− # add a tail, so that without any bind_addresses we still have a useable address
37− bindAddress = head (listener.bind_addresses ++ [ "127.0.0.1" ]);
38− listenerProtocol = if listener.tls
39− then "https"
40− else "http";
41− in
42− pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" ''
43− exec ${cfg.package}/bin/register_new_matrix_user \
44− $@ \
45− ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \
46− "${listenerProtocol}://${
47− if (isIpv6 bindAddress) then
48− "[${bindAddress}]"
49− else
50− "${bindAddress}"
51− }:${builtins.toString listener.port}/"
52− '';
53−in {
54−
55− imports = [
56−
57− (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] ''
58− The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0
59− as the behavior is now obsolete.
60− '')
61− (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] ''
62− Database configuration must be done manually. An exemplary setup is demonstrated in
63− <nixpkgs/nixos/tests/matrix-synapse.nix>
64− '')
65− (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
66− (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] ''
67− You may add additional event types via
68− `services.matrix-synapse.room_prejoin_state.additional_event_types` and
69− disable the default events via
70− `services.matrix-synapse.room_prejoin_state.disable_default_event_types`.
71− '')
72−
73− # options that don't exist in synapse anymore
74− (mkRemovedOptionModule [ "services" "matrix-synapse" "bind_host" ] "Use listener settings instead." )
75− (mkRemovedOptionModule [ "services" "matrix-synapse" "bind_port" ] "Use listener settings instead." )
76− (mkRemovedOptionModule [ "services" "matrix-synapse" "expire_access_tokens" ] "" )
77− (mkRemovedOptionModule [ "services" "matrix-synapse" "no_tls" ] "It is no longer supported by synapse." )
78− (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_dh_param_path" ] "It was removed from synapse." )
79− (mkRemovedOptionModule [ "services" "matrix-synapse" "unsecure_port" ] "Use settings.listeners instead." )
80− (mkRemovedOptionModule [ "services" "matrix-synapse" "user_creation_max_duration" ] "It is no longer supported by synapse." )
81− (mkRemovedOptionModule [ "services" "matrix-synapse" "verbose" ] "Use a log config instead." )
82−
83− # options that were moved into rfc42 style settigns
84− (mkRemovedOptionModule [ "services" "matrix-synapse" "app_service_config_files" ] "Use settings.app_service_config_files instead" )
85− (mkRemovedOptionModule [ "services" "matrix-synapse" "database_args" ] "Use settings.database.args instead" )
86− (mkRemovedOptionModule [ "services" "matrix-synapse" "database_name" ] "Use settings.database.args.database instead" )
87− (mkRemovedOptionModule [ "services" "matrix-synapse" "database_type" ] "Use settings.database.name instead" )
88− (mkRemovedOptionModule [ "services" "matrix-synapse" "database_user" ] "Use settings.database.args.user instead" )
89− (mkRemovedOptionModule [ "services" "matrix-synapse" "dynamic_thumbnails" ] "Use settings.dynamic_thumbnails instead" )
90− (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_metrics" ] "Use settings.enable_metrics instead" )
91− (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_registration" ] "Use settings.enable_registration instead" )
92− (mkRemovedOptionModule [ "services" "matrix-synapse" "extraConfig" ] "Use settings instead." )
93− (mkRemovedOptionModule [ "services" "matrix-synapse" "listeners" ] "Use settings.listeners instead" )
94− (mkRemovedOptionModule [ "services" "matrix-synapse" "logConfig" ] "Use settings.log_config instead" )
95− (mkRemovedOptionModule [ "services" "matrix-synapse" "max_image_pixels" ] "Use settings.max_image_pixels instead" )
96− (mkRemovedOptionModule [ "services" "matrix-synapse" "max_upload_size" ] "Use settings.max_upload_size instead" )
97− (mkRemovedOptionModule [ "services" "matrix-synapse" "presence" "enabled" ] "Use settings.presence.enabled instead" )
98− (mkRemovedOptionModule [ "services" "matrix-synapse" "public_baseurl" ] "Use settings.public_baseurl instead" )
99− (mkRemovedOptionModule [ "services" "matrix-synapse" "report_stats" ] "Use settings.report_stats instead" )
100− (mkRemovedOptionModule [ "services" "matrix-synapse" "server_name" ] "Use settings.server_name instead" )
101− (mkRemovedOptionModule [ "services" "matrix-synapse" "servers" ] "Use settings.trusted_key_servers instead." )
102− (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_certificate_path" ] "Use settings.tls_certificate_path instead" )
103− (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_private_key_path" ] "Use settings.tls_private_key_path instead" )
104− (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_shared_secret" ] "Use settings.turn_shared_secret instead" )
105− (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_uris" ] "Use settings.turn_uris instead" )
106− (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_user_lifetime" ] "Use settings.turn_user_lifetime instead" )
107− (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_enabled" ] "Use settings.url_preview_enabled instead" )
108− (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_ip_range_blacklist" ] "Use settings.url_preview_ip_range_blacklist instead" )
109− (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_ip_range_whitelist" ] "Use settings.url_preview_ip_range_whitelist instead" )
110− (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_url_blacklist" ] "Use settings.url_preview_url_blacklist instead" )
111−
112− # options that are too specific to mention them explicitly in settings
113− (mkRemovedOptionModule [ "services" "matrix-synapse" "account_threepid_delegates" "email" ] "Use settings.account_threepid_delegates.email instead" )
114− (mkRemovedOptionModule [ "services" "matrix-synapse" "account_threepid_delegates" "msisdn" ] "Use settings.account_threepid_delegates.msisdn instead" )
115− (mkRemovedOptionModule [ "services" "matrix-synapse" "allow_guest_access" ] "Use settings.allow_guest_access instead" )
116− (mkRemovedOptionModule [ "services" "matrix-synapse" "bcrypt_rounds" ] "Use settings.bcrypt_rounds instead" )
117− (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_registration_captcha" ] "Use settings.enable_registration_captcha instead" )
118− (mkRemovedOptionModule [ "services" "matrix-synapse" "event_cache_size" ] "Use settings.event_cache_size instead" )
119− (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_concurrent" ] "Use settings.rc_federation.concurrent instead" )
120− (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_reject_limit" ] "Use settings.rc_federation.reject_limit instead" )
121− (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_sleep_delay" ] "Use settings.rc_federation.sleep_delay instead" )
122− (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_sleep_limit" ] "Use settings.rc_federation.sleep_limit instead" )
123− (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_window_size" ] "Use settings.rc_federation.window_size instead" )
124− (mkRemovedOptionModule [ "services" "matrix-synapse" "key_refresh_interval" ] "Use settings.key_refresh_interval instead" )
125− (mkRemovedOptionModule [ "services" "matrix-synapse" "rc_messages_burst_count" ] "Use settings.rc_messages.burst_count instead" )
126− (mkRemovedOptionModule [ "services" "matrix-synapse" "rc_messages_per_second" ] "Use settings.rc_messages.per_second instead" )
127− (mkRemovedOptionModule [ "services" "matrix-synapse" "recaptcha_private_key" ] "Use settings.recaptcha_private_key instead" )
128− (mkRemovedOptionModule [ "services" "matrix-synapse" "recaptcha_public_key" ] "Use settings.recaptcha_public_key instead" )
129− (mkRemovedOptionModule [ "services" "matrix-synapse" "redaction_retention_period" ] "Use settings.redaction_retention_period instead" )
130− (mkRemovedOptionModule [ "services" "matrix-synapse" "room_prejoin_state" "additional_event_types" ] "Use settings.room_prejoin_state.additional_event_types instead" )
131− (mkRemovedOptionModule [ "services" "matrix-synapse" "room_prejoin_state" "disable_default_event_types" ] "Use settings.room_prejoin-state.disable_default_event_types instead" )
132−
133− # Options that should be passed via extraConfigFiles, so they are not persisted into the nix store
134− (mkRemovedOptionModule [ "services" "matrix-synapse" "macaroon_secret_key" ] "Pass this value via extraConfigFiles instead" )
135− (mkRemovedOptionModule [ "services" "matrix-synapse" "registration_shared_secret" ] "Pass this value via extraConfigFiles instead" )
136−
137− ];
138−
139− options = {
140− services.matrix-synapse = {
141− enable = mkEnableOption "matrix.org synapse";
142−
143− configFile = mkOption {
144− type = types.path;
145− readOnly = true;
146− description = ''
147− Path to the configuration file on the target system. Useful to configure e.g. workers
148− that also need this.
149− '';
150− };
151−
152− package = mkOption {
153− type = types.package;
154− default = pkgs.matrix-synapse;
155− defaultText = literalExpression "pkgs.matrix-synapse";
156− description = ''
157− Overridable attribute of the matrix synapse server package to use.
158− '';
159− };
160−
161− plugins = mkOption {
162− type = types.listOf types.package;
163− default = [ ];
164− example = literalExpression ''
165− with config.services.matrix-synapse.package.plugins; [
166− matrix-synapse-ldap3
167− matrix-synapse-pam
168− ];
169− '';
170− description = ''
171− List of additional Matrix plugins to make available.
172− '';
173− };
174−
175− withJemalloc = mkOption {
176− type = types.bool;
177− default = false;
178− description = ''
179− Whether to preload jemalloc to reduce memory fragmentation and overall usage.
180− '';
181− };
182−
183− dataDir = mkOption {
184− type = types.str;
185− default = "/var/lib/matrix-synapse";
186− description = ''
187− The directory where matrix-synapse stores its stateful data such as
188− certificates, media and uploads.
189− '';
190− };
191−
192− settings = mkOption {
193− default = {};
194− description = ''
195− The primary synapse configuration. See the
196− <link xlink:href="https://github.com/matrix-org/synapse/blob/v${cfg.package.version}/docs/sample_config.yaml">sample configuration</link>
197− for possible values.
198−
199− Secrets should be passed in by using the <literal>extraConfigFiles</literal> option.
200− '';
201− type = with types; submodule {
202− freeformType = format.type;
203− options = {
204− # This is a reduced set of popular options and defaults
205− # Do not add every available option here, they can be specified
206− # by the user at their own discretion. This is a freeform type!
207−
208− server_name = mkOption {
209− type = types.str;
210− example = "example.com";
211− default = config.networking.hostName;
212− defaultText = literalExpression "config.networking.hostName";
213− description = ''
214− The domain name of the server, with optional explicit port.
215− This is used by remote servers to look up the server address.
216− This is also the last part of your UserID.
217−
218− The server_name cannot be changed later so it is important to configure this correctly before you start Synapse.
219− '';
220− };
221−
222− enable_registration = mkOption {
223− type = types.bool;
224− default = false;
225− description = ''
226− Enable registration for new users.
227− '';
228− };
229−
230− registration_shared_secret = mkOption {
231− type = types.nullOr types.str;
232− default = null;
233− description = ''
234− If set, allows registration by anyone who also has the shared
235− secret, even if registration is otherwise disabled.
236−
237− Secrets should be passed in via <literal>extraConfigFiles</literal>!
238− '';
239− };
240−
241− macaroon_secret_key = mkOption {
242− type = types.nullOr types.str;
243− default = null;
244− description = ''
245− Secret key for authentication tokens. If none is specified,
246− the registration_shared_secret is used, if one is given; otherwise,
247− a secret key is derived from the signing key.
248−
249− Secrets should be passed in via <literal>extraConfigFiles</literal>!
250− '';
251− };
252−
253− enable_metrics = mkOption {
254− type = types.bool;
255− default = false;
256− description = ''
257− Enable collection and rendering of performance metrics
258− '';
259− };
260−
261− report_stats = mkOption {
262− type = types.bool;
263− default = false;
264− description = ''
265− Whether or not to report anonymized homeserver usage statistics.
266− '';
267− };
268−
269− signing_key_path = mkOption {
270− type = types.path;
271− default = "${cfg.dataDir}/homeserver.signing.key";
272− description = ''
273− Path to the signing key to sign messages with.
274− '';
275− };
276−
277− pid_file = mkOption {
278− type = types.path;
279− default = "/run/matrix-synapse.pid";
280− readOnly = true;
281− description = ''
282− The file to store the PID in.
283− '';
284− };
285−
286− log_config = mkOption {
287− type = types.path;
288− default = ./matrix-synapse-log_config.yaml;
289− description = ''
290− The file that holds the logging configuration.
291− '';
292− };
293−
294− media_store_path = mkOption {
295− type = types.path;
296− default = if lib.versionAtLeast config.system.stateVersion "22.05"
297− then "${cfg.dataDir}/media_store"
298− else "${cfg.dataDir}/media";
299− description = ''
300− Directory where uploaded images and attachments are stored.
301− '';
302− };
303−
304− public_baseurl = mkOption {
305− type = types.nullOr types.str;
306− default = null;
307− example = "https://example.com:8448/";
308− description = ''
309− The public-facing base URL for the client API (not including _matrix/...)
310− '';
311− };
312−
313− tls_certificate_path = mkOption {
314− type = types.nullOr types.str;
315− default = null;
316− example = "/var/lib/acme/example.com/fullchain.pem";
317− description = ''
318− PEM encoded X509 certificate for TLS.
319− You can replace the self-signed certificate that synapse
320− autogenerates on launch with your own SSL certificate + key pair
321− if you like. Any required intermediary certificates can be
322− appended after the primary certificate in hierarchical order.
323− '';
324− };
325−
326− tls_private_key_path = mkOption {
327− type = types.nullOr types.str;
328− default = null;
329− example = "/var/lib/acme/example.com/key.pem";
330− description = ''
331− PEM encoded private key for TLS. Specify null if synapse is not
332− speaking TLS directly.
333− '';
334− };
335−
336− presence.enabled = mkOption {
337− type = types.bool;
338− default = true;
339− example = false;
340− description = ''
341− Whether to enable presence tracking.
342−
343− Presence tracking allows users to see the state (e.g online/offline)
344− of other local and remote users.
345− '';
346− };
347−
348− listeners = mkOption {
349− type = types.listOf (types.submodule {
350− options = {
351− port = mkOption {
352− type = types.port;
353− example = 8448;
354− description = ''
355− The port to listen for HTTP(S) requests on.
356− '';
357− };
358−
359− bind_addresses = mkOption {
360− type = types.listOf types.str;
361− default = [
362− "::1"
363− "127.0.0.1"
364− ];
365− example = literalExpression ''
366− [
367− "::"
368− "0.0.0.0"
369− ]
370− '';
371− description = ''
372− IP addresses to bind the listener to.
373− '';
374− };
375−
376− type = mkOption {
377− type = types.enum [
378− "http"
379− "manhole"
380− "metrics"
381− "replication"
382− ];
383− default = "http";
384− example = "metrics";
385− description = ''
386− The type of the listener, usually http.
387− '';
388− };
389−
390− tls = mkOption {
391− type = types.bool;
392− default = true;
393− example = false;
394− description = ''
395− Whether to enable TLS on the listener socket.
396− '';
397− };
398−
399− x_forwarded = mkOption {
400− type = types.bool;
401− default = false;
402− example = true;
403− description = ''
404− Use the X-Forwarded-For (XFF) header as the client IP and not the
405− actual client IP.
406− '';
407− };
408−
409− resources = mkOption {
410− type = types.listOf (types.submodule {
411− options = {
412− names = mkOption {
413− type = types.listOf (types.enum [
414− "client"
415− "consent"
416− "federation"
417− "keys"
418− "media"
419− "metrics"
420− "openid"
421− "replication"
422− "static"
423− ]);
424− description = ''
425− List of resources to host on this listener.
426− '';
427− example = [
428− "client"
429− ];
430− };
431− compress = mkOption {
432− type = types.bool;
433− description = ''
434− Should synapse compress HTTP responses to clients that support it?
435− This should be disabled if running synapse behind a load balancer
436− that can do automatic compression.
437− '';
438− };
439− };
440− });
441− description = ''
442− List of HTTP resources to serve on this listener.
443− '';
444− };
445− };
446− });
447− default = [ {
448− port = 8008;
449− bind_addresses = [ "127.0.0.1" ];
450− type = "http";
451− tls = false;
452− x_forwarded = true;
453− resources = [ {
454− names = [ "client" ];
455− compress = true;
456− } {
457− names = [ "federation" ];
458− compress = false;
459− } ];
460− } ];
461− description = ''
462− List of ports that Synapse should listen on, their purpose and their configuration.
463− '';
464− };
465−
466− database.name = mkOption {
467− type = types.enum [
468− "sqlite3"
469− "psycopg2"
470− ];
471− default = if versionAtLeast config.system.stateVersion "18.03"
472− then "psycopg2"
473− else "sqlite3";
474− defaultText = literalExpression ''
475− if versionAtLeast config.system.stateVersion "18.03"
476− then "psycopg2"
477− else "sqlite3"
478− '';
479− description = ''
480− The database engine name. Can be sqlite3 or psycopg2.
481− '';
482− };
483−
484− database.args.database = mkOption {
485− type = types.str;
486− default = {
487− sqlite3 = "${cfg.dataDir}/homeserver.db";
488− psycopg2 = "matrix-synapse";
489− }.${cfg.settings.database.name};
490− defaultText = literalExpression ''
491− {
492− sqlite3 = "''${${options.services.matrix-synapse.dataDir}}/homeserver.db";
493− psycopg2 = "matrix-synapse";
494− }.''${${options.services.matrix-synapse.settings}.database.name};
495− '';
496− description = ''
497− Name of the database when using the psycopg2 backend,
498− path to the database location when using sqlite3.
499− '';
500− };
501−
502− database.args.user = mkOption {
503− type = types.nullOr types.str;
504− default = {
505− sqlite3 = null;
506− psycopg2 = "matrix-synapse";
507− }.${cfg.settings.database.name};
508− description = ''
509− Username to connect with psycopg2, set to null
510− when using sqlite3.
511− '';
512− };
513−
514− url_preview_enabled = mkOption {
515− type = types.bool;
516− default = true;
517− example = false;
518− description = ''
519− Is the preview URL API enabled? If enabled, you *must* specify an
520− explicit url_preview_ip_range_blacklist of IPs that the spider is
521− denied from accessing.
522− '';
523− };
524−
525− url_preview_ip_range_blacklist = mkOption {
526− type = types.listOf types.str;
527− default = [
528− "10.0.0.0/8"
529− "100.64.0.0/10"
530− "127.0.0.0/8"
531− "169.254.0.0/16"
532− "172.16.0.0/12"
533− "192.0.0.0/24"
534− "192.0.2.0/24"
535− "192.168.0.0/16"
536− "192.88.99.0/24"
537− "198.18.0.0/15"
538− "198.51.100.0/24"
539− "2001:db8::/32"
540− "203.0.113.0/24"
541− "224.0.0.0/4"
542− "::1/128"
543− "fc00::/7"
544− "fe80::/10"
545− "fec0::/10"
546− "ff00::/8"
547− ];
548− description = ''
549− List of IP address CIDR ranges that the URL preview spider is denied
550− from accessing.
551− '';
552− };
553−
554− url_preview_ip_range_whitelist = mkOption {
555− type = types.listOf types.str;
556− default = [];
557− description = ''
558− List of IP address CIDR ranges that the URL preview spider is allowed
559− to access even if they are specified in url_preview_ip_range_blacklist.
560− '';
561− };
562−
563− url_preview_url_blacklist = mkOption {
564− type = types.listOf types.str;
565− default = [];
566− description = ''
567− Optional list of URL matches that the URL preview spider is
568− denied from accessing.
569− '';
570− };
571−
572− max_upload_size = mkOption {
573− type = types.str;
574− default = "50M";
575− example = "100M";
576− description = ''
577− The largest allowed upload size in bytes
578− '';
579− };
580−
581− max_image_pixels = mkOption {
582− type = types.str;
583− default = "32M";
584− example = "64M";
585− description = ''
586− Maximum number of pixels that will be thumbnailed
587− '';
588− };
589−
590− dynamic_thumbnails = mkOption {
591− type = types.bool;
592− default = false;
593− example = true;
594− description = ''
595− Whether to generate new thumbnails on the fly to precisely match
596− the resolution requested by the client. If true then whenever
597− a new resolution is requested by the client the server will
598− generate a new thumbnail. If false the server will pick a thumbnail
599− from a precalculated list.
600− '';
601− };
602−
603− turn_uris = mkOption {
604− type = types.listOf types.str;
605− default = [];
606− example = [
607− "turn:turn.example.com:3487?transport=udp"
608− "turn:turn.example.com:3487?transport=tcp"
609− "turns:turn.example.com:5349?transport=udp"
610− "turns:turn.example.com:5349?transport=tcp"
611− ];
612− description = ''
613− The public URIs of the TURN server to give to clients
614− '';
615− };
616− turn_shared_secret = mkOption {
617− type = types.str;
618− default = "";
619− example = literalExpression ''
620− config.services.coturn.static-auth-secret
621− '';
622− description = ''
623− The shared secret used to compute passwords for the TURN server.
624−
625− Secrets should be passed in via <literal>extraConfigFiles</literal>!
626− '';
627− };
628−
629− trusted_key_servers = mkOption {
630− type = types.listOf (types.submodule {
631− options = {
632− server_name = mkOption {
633− type = types.str;
634− example = "matrix.org";
635− description = ''
636− Hostname of the trusted server.
637− '';
638− };
639−
640− verify_keys = mkOption {
641− type = types.nullOr (types.attrsOf types.str);
642− default = null;
643− example = literalExpression ''
644− {
645− "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw";
646− }
647− '';
648− description = ''
649− Attribute set from key id to base64 encoded public key.
650−
651− If specified synapse will check that the response is signed
652− by at least one of the given keys.
653− '';
654− };
655− };
656− });
657− default = [ {
658− server_name = "matrix.org";
659− verify_keys = {
660− "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw";
661− };
662− } ];
663− description = ''
664− The trusted servers to download signing keys from.
665− '';
666− };
667−
668− app_service_config_files = mkOption {
669− type = types.listOf types.path;
670− default = [ ];
671− description = ''
672− A list of application service config file to use
673− '';
674− };
675−
676− };
677− };
678− };
679−
680− extraConfigFiles = mkOption {
681− type = types.listOf types.path;
682− default = [];
683− description = ''
684− Extra config files to include.
685−
686− The configuration files will be included based on the command line
687− argument --config-path. This allows to configure secrets without
688− having to go through the Nix store, e.g. based on deployment keys if
689− NixOps is in use.
690− '';
691− };
692− };
693− };
694−
695− config = mkIf cfg.enable {
696− assertions = [
697− { assertion = hasLocalPostgresDB -> config.services.postgresql.enable;
698− message = ''
699− Cannot deploy matrix-synapse with a configuration for a local postgresql database
700− and a missing postgresql service. Since 20.03 it's mandatory to manually configure the
701− database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for
702− further reference).
703−
704− If you
705− - try to deploy a fresh synapse, you need to configure the database yourself. An example
706− for this can be found in <nixpkgs/nixos/tests/matrix-synapse.nix>
707− - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true`
708− to your configuration.
709−
710− For further information about this update, please read the release-notes of 20.03 carefully.
711− '';
712− }
713− ];
714−
715− services.matrix-synapse.configFile = configFile;
716−
717− users.users.matrix-synapse = {
718− group = "matrix-synapse";
719− home = cfg.dataDir;
720− createHome = true;
721− shell = "${pkgs.bash}/bin/bash";
722− uid = config.ids.uids.matrix-synapse;
723− };
724−
725− users.groups.matrix-synapse = {
726− gid = config.ids.gids.matrix-synapse;
727− };
728−
729− systemd.services.matrix-synapse = {
730− description = "Synapse Matrix homeserver";
731− after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service";
732− wantedBy = [ "multi-user.target" ];
733− preStart = ''
734− ${cfg.package}/bin/synapse_homeserver \
735− --config-path ${configFile} \
736− --keys-directory ${cfg.dataDir} \
737− --generate-keys
738− '';
739− environment = {
740− PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];
741− } // optionalAttrs (cfg.withJemalloc) {
742− LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
743− };
744− serviceConfig = {
745− Type = "notify";
746− User = "matrix-synapse";
747− Group = "matrix-synapse";
748− WorkingDirectory = cfg.dataDir;
749− ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" ''
750− chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key
751− chmod 0600 ${cfg.dataDir}/homeserver.signing.key
752− '')) ];
753− ExecStart = ''
754− ${cfg.package}/bin/synapse_homeserver \
755− ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
756− --keys-directory ${cfg.dataDir}
757− '';
758− ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
759− Restart = "on-failure";
760− UMask = "0077";
761− };
762− };
763−
764− environment.systemPackages = [ registerNewMatrixUser ];
765− };
766−
767− meta = {
768− buildDocsInSandbox = false;
769− doc = ./matrix-synapse.xml;
770− maintainers = teams.matrix.members;
771− };
772−
773−}
nixos/modules/services/misc/autorandr.nix+2−308
@@ -5,243 +5,6 @@ with lib;
55let
66
77 cfg = config.services.autorandr;
8− hookType = types.lines;
9−
10− matrixOf = n: m: elemType:
11− mkOptionType rec {
12− name = "matrixOf";
13− description =
14− "${toString n}×${toString m} matrix of ${elemType.description}s";
15− check = xss:
16− let listOfSize = l: xs: isList xs && length xs == l;
17− in listOfSize n xss
18− && all (xs: listOfSize m xs && all elemType.check xs) xss;
19− merge = mergeOneOption;
20− getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "*" "*" ]);
21− getSubModules = elemType.getSubModules;
22− substSubModules = mod: matrixOf n m (elemType.substSubModules mod);
23− functor = (defaultFunctor name) // { wrapped = elemType; };
24− };
25−
26− profileModule = types.submodule {
27− options = {
28− fingerprint = mkOption {
29− type = types.attrsOf types.str;
30− description = ''
31− Output name to EDID mapping.
32− Use <code>autorandr --fingerprint</code> to get current setup values.
33− '';
34− default = { };
35− };
36−
37− config = mkOption {
38− type = types.attrsOf configModule;
39− description = "Per output profile configuration.";
40− default = { };
41− };
42−
43− hooks = mkOption {
44− type = hooksModule;
45− description = "Profile hook scripts.";
46− default = { };
47− };
48− };
49− };
50−
51− configModule = types.submodule {
52− options = {
53− enable = mkOption {
54− type = types.bool;
55− description = "Whether to enable the output.";
56− default = true;
57− };
58−
59− crtc = mkOption {
60− type = types.nullOr types.ints.unsigned;
61− description = "Output video display controller.";
62− default = null;
63− example = 0;
64− };
65−
66− primary = mkOption {
67− type = types.bool;
68− description = "Whether output should be marked as primary";
69− default = false;
70− };
71−
72− position = mkOption {
73− type = types.str;
74− description = "Output position";
75− default = "";
76− example = "5760x0";
77− };
78−
79− mode = mkOption {
80− type = types.str;
81− description = "Output resolution.";
82− default = "";
83− example = "3840x2160";
84− };
85−
86− rate = mkOption {
87− type = types.str;
88− description = "Output framerate.";
89− default = "";
90− example = "60.00";
91− };
92−
93− gamma = mkOption {
94− type = types.str;
95− description = "Output gamma configuration.";
96− default = "";
97− example = "1.0:0.909:0.833";
98− };
99−
100− rotate = mkOption {
101− type = types.nullOr (types.enum [ "normal" "left" "right" "inverted" ]);
102− description = "Output rotate configuration.";
103− default = null;
104− example = "left";
105− };
106−
107− transform = mkOption {
108− type = types.nullOr (matrixOf 3 3 types.float);
109− default = null;
110− example = literalExpression ''
111− [
112− [ 0.6 0.0 0.0 ]
113− [ 0.0 0.6 0.0 ]
114− [ 0.0 0.0 1.0 ]
115− ]
116− '';
117− description = ''
118− Refer to
119− <citerefentry>
120− <refentrytitle>xrandr</refentrytitle>
121− <manvolnum>1</manvolnum>
122− </citerefentry>
123− for the documentation of the transform matrix.
124− '';
125− };
126−
127− dpi = mkOption {
128− type = types.nullOr types.ints.positive;
129− description = "Output DPI configuration.";
130− default = null;
131− example = 96;
132− };
133−
134− scale = mkOption {
135− type = types.nullOr (types.submodule {
136− options = {
137− method = mkOption {
138− type = types.enum [ "factor" "pixel" ];
139− description = "Output scaling method.";
140− default = "factor";
141− example = "pixel";
142− };
143−
144− x = mkOption {
145− type = types.either types.float types.ints.positive;
146− description = "Horizontal scaling factor/pixels.";
147− };
148−
149− y = mkOption {
150− type = types.either types.float types.ints.positive;
151− description = "Vertical scaling factor/pixels.";
152− };
153− };
154− });
155− description = ''
156− Output scale configuration.
157− </para><para>
158− Either configure by pixels or a scaling factor. When using pixel method the
159− <citerefentry>
160− <refentrytitle>xrandr</refentrytitle>
161− <manvolnum>1</manvolnum>
162− </citerefentry>
163− option
164− <parameter class="command">--scale-from</parameter>
165− will be used; when using factor method the option
166− <parameter class="command">--scale</parameter>
167− will be used.
168− </para><para>
169− This option is a shortcut version of the transform option and they are mutually
170− exclusive.
171− '';
172− default = null;
173− example = literalExpression ''
174− {
175− x = 1.25;
176− y = 1.25;
177− }
178− '';
179− };
180− };
181− };
182−
183− hooksModule = types.submodule {
184− options = {
185− postswitch = mkOption {
186− type = types.attrsOf hookType;
187− description = "Postswitch hook executed after mode switch.";
188− default = { };
189− };
190−
191− preswitch = mkOption {
192− type = types.attrsOf hookType;
193− description = "Preswitch hook executed before mode switch.";
194− default = { };
195− };
196−
197− predetect = mkOption {
198− type = types.attrsOf hookType;
199− description = ''
200− Predetect hook executed before autorandr attempts to run xrandr.
201− '';
202− default = { };
203− };
204− };
205− };
206−
207− hookToFile = folder: name: hook:
208− nameValuePair "xdg/autorandr/${folder}/${name}" {
209− source = "${pkgs.writeShellScriptBin "hook" hook}/bin/hook";
210− };
211− profileToFiles = name: profile:
212− with profile;
213− mkMerge ([
214− {
215− "xdg/autorandr/${name}/setup".text = concatStringsSep "\n"
216− (mapAttrsToList fingerprintToString fingerprint);
217− "xdg/autorandr/${name}/config".text =
218− concatStringsSep "\n" (mapAttrsToList configToString profile.config);
219− }
220− (mapAttrs' (hookToFile "${name}/postswitch.d") hooks.postswitch)
221− (mapAttrs' (hookToFile "${name}/preswitch.d") hooks.preswitch)
222− (mapAttrs' (hookToFile "${name}/predetect.d") hooks.predetect)
223− ]);
224− fingerprintToString = name: edid: "${name} ${edid}";
225− configToString = name: config:
226− if config.enable then
227− concatStringsSep "\n" ([ "output ${name}" ]
228− ++ optional (config.position != "") "pos ${config.position}"
229− ++ optional (config.crtc != null) "crtc ${toString config.crtc}"
230− ++ optional config.primary "primary"
231− ++ optional (config.dpi != null) "dpi ${toString config.dpi}"
232− ++ optional (config.gamma != "") "gamma ${config.gamma}"
233− ++ optional (config.mode != "") "mode ${config.mode}"
234− ++ optional (config.rate != "") "rate ${config.rate}"
235− ++ optional (config.rotate != null) "rotate ${config.rotate}"
236− ++ optional (config.transform != null) ("transform "
237− + concatMapStringsSep "," toString (flatten config.transform))
238− ++ optional (config.scale != null)
239− ((if config.scale.method == "factor" then "scale" else "scale-from")
240− + " ${toString config.scale.x}x${toString config.scale.y}"))
241− else ''
242− output ${name}
243− off
244− '';
2458
2469in {
24710
@@ -259,67 +22,6 @@ in {
25922 for further reference.
26023 '';
26124 };
262−
263− hooks = mkOption {
264− type = hooksModule;
265− description = "Global hook scripts";
266− default = { };
267− example = ''
268− {
269− postswitch = {
270− "notify-i3" = "''${pkgs.i3}/bin/i3-msg restart";
271− "change-background" = readFile ./change-background.sh;
272− "change-dpi" = '''
273− case "$AUTORANDR_CURRENT_PROFILE" in
274− default)
275− DPI=120
276− ;;
277− home)
278− DPI=192
279− ;;
280− work)
281− DPI=144
282− ;;
283− *)
284− echo "Unknown profle: $AUTORANDR_CURRENT_PROFILE"
285− exit 1
286− esac
287− echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge
288− '''
289− };
290− }
291− '';
292− };
293− profiles = mkOption {
294− type = types.attrsOf profileModule;
295− description = "Autorandr profiles specification.";
296− default = { };
297− example = literalExpression ''
298− {
299− "work" = {
300− fingerprint = {
301− eDP1 = "<EDID>";
302− DP1 = "<EDID>";
303− };
304− config = {
305− eDP1.enable = false;
306− DP1 = {
307− enable = true;
308− crtc = 0;
309− primary = true;
310− position = "0x0";
311− mode = "3840x2160";
312− gamma = "1.0:0.909:0.833";
313− rate = "60.00";
314− rotate = "left";
315− };
316− };
317− hooks.postswitch = readFile ./work-postswitch.sh;
318− };
319− }
320− '';
321− };
322−
32325 };
32426
32527 };
@@ -328,15 +30,7 @@ in {
32830
32931 services.udev.packages = [ pkgs.autorandr ];
33032
331− environment = {
332− systemPackages = [ pkgs.autorandr ];
333− etc = mkMerge ([
334− (mapAttrs' (hookToFile "postswitch.d") cfg.hooks.postswitch)
335− (mapAttrs' (hookToFile "preswitch.d") cfg.hooks.preswitch)
336− (mapAttrs' (hookToFile "predetect.d") cfg.hooks.predetect)
337− (mkMerge (mapAttrsToList profileToFiles cfg.profiles))
338− ]);
339− };
33+ environment.systemPackages = [ pkgs.autorandr ];
34034
34135 systemd.services.autorandr = {
34236 wantedBy = [ "sleep.target" ];
@@ -355,5 +49,5 @@ in {
35549
35650 };
35751
358− meta.maintainers = with maintainers; [ alexnortung ];
52+ meta.maintainers = with maintainers; [ ];
35953}
nixos/modules/services/misc/dendrite.nix+8−100
@@ -110,15 +110,6 @@ in
110110 '';
111111 };
112112 };
113− options.app_service_api.database = {
114− connection_string = lib.mkOption {
115− type = lib.types.str;
116− default = "file:federationapi.db";
117− description = ''
118− Database for the Appservice API.
119− '';
120− };
121− };
122113 options.client_api = {
123114 registration_disabled = lib.mkOption {
124115 type = lib.types.bool;
@@ -129,91 +120,6 @@ in
129120 '';
130121 };
131122 };
132− options.federation_api.database = {
133− connection_string = lib.mkOption {
134− type = lib.types.str;
135− default = "file:federationapi.db";
136− description = ''
137− Database for the Federation API.
138− '';
139− };
140− };
141− options.key_server.database = {
142− connection_string = lib.mkOption {
143− type = lib.types.str;
144− default = "file:keyserver.db";
145− description = ''
146− Database for the Key Server (for end-to-end encryption).
147− '';
148− };
149− };
150− options.media_api = {
151− database = {
152− connection_string = lib.mkOption {
153− type = lib.types.str;
154− default = "file:mediaapi.db";
155− description = ''
156− Database for the Media API.
157− '';
158− };
159− };
160− base_path = lib.mkOption {
161− type = lib.types.str;
162− default = "${workingDir}/media_store";
163− description = ''
164− Storage path for uploaded media.
165− '';
166− };
167− };
168− options.room_server.database = {
169− connection_string = lib.mkOption {
170− type = lib.types.str;
171− default = "file:roomserver.db";
172− description = ''
173− Database for the Room Server.
174− '';
175− };
176− };
177− options.sync_api.database = {
178− connection_string = lib.mkOption {
179− type = lib.types.str;
180− default = "file:syncserver.db";
181− description = ''
182− Database for the Sync API.
183− '';
184− };
185− };
186− options.user_api = {
187− account_database = {
188− connection_string = lib.mkOption {
189− type = lib.types.str;
190− default = "file:userapi_accounts.db";
191− description = ''
192− Database for the User API, accounts.
193− '';
194− };
195− };
196− device_database = {
197− connection_string = lib.mkOption {
198− type = lib.types.str;
199− default = "file:userapi_devices.db";
200− description = ''
201− Database for the User API, devices.
202− '';
203− };
204− };
205− };
206− options.mscs = {
207− database = {
208− connection_string = lib.mkOption {
209− type = lib.types.str;
210− default = "file:mscs.db";
211− description = ''
212− Database for exerimental MSC's.
213− '';
214− };
215− };
216− };
217123 };
218124 default = { };
219125 description = ''
@@ -247,13 +153,15 @@ in
247153 WorkingDirectory = workingDir;
248154 RuntimeDirectory = "dendrite";
249155 RuntimeDirectoryMode = "0700";
250− LimitNOFILE = 65535;
251156 EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
252− ExecStartPre = ''
253− ${pkgs.envsubst}/bin/envsubst \
254− -i ${configurationYaml} \
255− -o /run/dendrite/dendrite.yaml
256− '';
157+ ExecStartPre =
158+ if (cfg.environmentFile != null) then ''
159+ ${pkgs.envsubst}/bin/envsubst \
160+ -i ${configurationYaml} \
161+ -o /run/dendrite/dendrite.yaml
162+ '' else ''
163+ ${pkgs.coreutils}/bin/cp ${configurationYaml} /run/dendrite/dendrite.yaml
164+ '';
257165 ExecStart = lib.strings.concatStringsSep " " ([
258166 "${pkgs.dendrite}/bin/dendrite-monolith-server"
259167 "--config /run/dendrite/dendrite.yaml"
nixos/modules/services/misc/etebase-server.nix+1−1
@@ -166,7 +166,7 @@ in
166166 } ''
167167 makeWrapper ${pythonEnv}/bin/etebase-server \
168168 $out/bin/etebase-server \
169− --chdir ${escapeShellArg cfg.dataDir} \
169+ --run "cd ${cfg.dataDir}" \
170170 --prefix ETEBASE_EASY_CONFIG_PATH : "${configIni}"
171171 '')
172172 ];
nixos/modules/services/misc/ethminer.nix+4−4
@@ -22,7 +22,7 @@ in
2222 };
2323
2424 recheckInterval = mkOption {
25− type = types.ints.unsigned;
25+ type = types.int;
2626 default = 2000;
2727 description = "Interval in milliseconds between farm rechecks.";
2828 };
@@ -70,7 +70,7 @@ in
7070 };
7171
7272 maxPower = mkOption {
73− type = types.ints.unsigned;
73+ type = types.int;
7474 default = 113;
7575 description = "Miner max watt usage.";
7676 };
@@ -85,7 +85,7 @@ in
8585 config = mkIf cfg.enable {
8686
8787 systemd.services.ethminer = {
88− path = optional (cfg.toolkit == "cuda") [ pkgs.cudaPackages.cudatoolkit ];
88+ path = [ pkgs.cudatoolkit ];
8989 description = "ethminer ethereum mining service";
9090 wantedBy = [ "multi-user.target" ];
9191 after = [ "network.target" ];
@@ -97,7 +97,7 @@ in
9797 Restart = "always";
9898 };
9999
100− environment = mkIf (cfg.toolkit == "cuda") {
100+ environment = {
101101 LD_LIBRARY_PATH = "${config.boot.kernelPackages.nvidia_x11}/lib";
102102 };
103103
nixos/modules/services/misc/gitea.nix+16−11
@@ -499,7 +499,6 @@ in
499499 oldLfsJwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret"; # old file for LFS_JWT_SECRET
500500 lfsJwtSecret = "${cfg.stateDir}/custom/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET
501501 internalToken = "${cfg.stateDir}/custom/conf/internal_token";
502− replaceSecretBin = "${pkgs.replace-secret}/bin/replace-secret";
503502 in ''
504503 # copy custom configuration and generate a random secret key if needed
505504 ${optionalString (cfg.useWizard == false) ''
@@ -527,17 +526,23 @@ in
527526 ${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken}
528527 fi
529528
530− chmod u+w '${runConfig}'
531− ${replaceSecretBin} '#secretkey#' '${secretKey}' '${runConfig}'
532− ${replaceSecretBin} '#dbpass#' '${cfg.database.passwordFile}' '${runConfig}'
533− ${replaceSecretBin} '#oauth2jwtsecret#' '${oauth2JwtSecret}' '${runConfig}'
534− ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'
535− ${replaceSecretBin} '#internaltoken#' '${internalToken}' '${runConfig}'
536−
537− ${lib.optionalString (cfg.mailerPasswordFile != null) ''
538− ${replaceSecretBin} '#mailerpass#' '${cfg.mailerPasswordFile}' '${runConfig}'
529+ SECRETKEY="$(head -n1 ${secretKey})"
530+ DBPASS="$(head -n1 ${cfg.database.passwordFile})"
531+ OAUTH2JWTSECRET="$(head -n1 ${oauth2JwtSecret})"
532+ LFSJWTSECRET="$(head -n1 ${lfsJwtSecret})"
533+ INTERNALTOKEN="$(head -n1 ${internalToken})"
534+ ${if (cfg.mailerPasswordFile == null) then ''
535+ MAILERPASSWORD="#mailerpass#"
536+ '' else ''
537+ MAILERPASSWORD="$(head -n1 ${cfg.mailerPasswordFile} || :)"
539538 ''}
540− chmod u-w '${runConfig}'
539+ sed -e "s,#secretkey#,$SECRETKEY,g" \
540+ -e "s,#dbpass#,$DBPASS,g" \
541+ -e "s,#oauth2jwtsecret#,$OAUTH2JWTSECRET,g" \
542+ -e "s,#lfsjwtsecret#,$LFSJWTSECRET,g" \
543+ -e "s,#internaltoken#,$INTERNALTOKEN,g" \
544+ -e "s,#mailerpass#,$MAILERPASSWORD,g" \
545+ -i ${runConfig}
541546 }
542547 (umask 027; gitea_setup)
543548 ''}
nixos/modules/services/misc/gitit.nix+1−1
@@ -10,7 +10,7 @@ let
1010
1111 toYesNo = b: if b then "yes" else "no";
1212
13− gititShared = with cfg.haskellPackages; gitit + "/share/" + ghc.targetPrefix + ghc.haskellCompilerName + "/" + gitit.pname + "-" + gitit.version;
13+ gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.hostPlatform.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version;
1414
1515 gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self));
1616
nixos/modules/services/misc/gitlab.nix+11−9
@@ -179,7 +179,7 @@ let
179179 ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
180180 --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \
181181 --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
182− --chdir '${cfg.packages.gitlab}/share/gitlab'
182+ --run 'cd ${cfg.packages.gitlab}/share/gitlab'
183183 '';
184184 };
185185
@@ -193,7 +193,7 @@ let
193193 makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \
194194 ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
195195 --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \
196− --chdir '${cfg.packages.gitlab}/share/gitlab'
196+ --run 'cd ${cfg.packages.gitlab}/share/gitlab'
197197 '';
198198 };
199199
@@ -848,7 +848,10 @@ in {
848848
849849 extraConfig = mkOption {
850850 type = types.lines;
851− default = "";
851+ default = ''
852+ copytruncate
853+ compress
854+ '';
852855 description = ''
853856 Extra logrotate config options for this path. Refer to
854857 <link xlink:href="https://linux.die.net/man/8/logrotate"/> for details.
@@ -974,14 +977,13 @@ in {
974977 # Enable rotation of log files
975978 services.logrotate = {
976979 enable = cfg.logrotate.enable;
977− settings = {
980+ paths = {
978981 gitlab = {
979− files = "${cfg.statePath}/log/*.log";
980− su = "${cfg.user} ${cfg.group}";
982+ path = "${cfg.statePath}/log/*.log";
983+ user = cfg.user;
984+ group = cfg.group;
981985 frequency = cfg.logrotate.frequency;
982− rotate = cfg.logrotate.keep;
983− copytruncate = true;
984− compress = true;
986+ keep = cfg.logrotate.keep;
985987 extraConfig = cfg.logrotate.extraConfig;
986988 };
987989 };
nixos/modules/services/misc/input-remapper.nix+13−14
@@ -7,24 +7,23 @@ let cfg = config.services.input-remapper; in
77 options = {
88 services.input-remapper = {
99 enable = mkEnableOption "input-remapper, an easy to use tool to change the mapping of your input device buttons.";
10− package = options.mkPackageOption pkgs "input-remapper" { };
11− enableUdevRules = mkEnableOption "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140";
12− serviceWantedBy = mkOption {
13− default = [ "graphical.target" ];
14− example = [ "multi-user.target" ];
15− type = types.listOf types.str;
16− description = "Specifies the WantedBy setting for the input-remapper service.";
10+ package = mkOption {
11+ type = types.package;
12+ default = pkgs.input-remapper;
13+ defaultText = literalExpression "pkgs.input-remapper";
14+ description = ''
15+ The input-remapper package to use.
16+ '';
1717 };
1818 };
1919 };
2020
2121 config = mkIf cfg.enable {
22− services.udev.packages = mkIf cfg.enableUdevRules [ cfg.package ];
23− services.dbus.packages = [ cfg.package ];
24− systemd.packages = [ cfg.package ];
25− environment.systemPackages = [ cfg.package ];
26− systemd.services.input-remapper.wantedBy = cfg.serviceWantedBy;
22+ # FIXME: udev rule hangs sometimes when lots of devices connected, so let's not use it
23+ # config.services.udev.packages = mapper-pkg;
24+ services.dbus.packages = cfg.package;
25+ systemd.packages = cfg.package;
26+ environment.systemPackages = cfg.package;
27+ systemd.services.input-remapper.wantedBy = [ "graphical.target" ];
2728 };
28−
29− meta.maintainers = with lib.maintainers; [ LunNova ];
3029}
nixos/modules/services/misc/jellyfin.nix+3−5
@@ -70,12 +70,10 @@ in
7070 LockPersonality = true;
7171
7272 PrivateTmp = true;
73− # Disabled to allow Jellyfin to access hw accel devices endpoints
74− # PrivateDevices = true;
73+ PrivateDevices = true;
7574 PrivateUsers = true;
7675
77− # Disabled as it does not allow Jellyfin to interface with CUDA devices
78− # ProtectClock = true;
76+ ProtectClock = true;
7977 ProtectControlGroups = true;
8078 ProtectHostname = true;
8179 ProtectKernelLogs = true;
@@ -86,7 +84,7 @@ in
8684
8785 RestrictNamespaces = true;
8886 # AF_NETLINK needed because Jellyfin monitors the network connection
89− RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" "AF_UNIX" ];
87+ RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" ];
9088 RestrictRealtime = true;
9189 RestrictSUIDSGID = true;
9290
nixos/modules/services/matrix/matrix-synapse-log_config.yaml → nixos/modules/services/misc/matrix-synapse-log_config.yamlrenamed
The content is the same.
nixos/modules/services/misc/matrix-synapse.nixnew file+844
@@ -0,0 +1,844 @@
1+{ config, lib, options, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.matrix-synapse;
7+ opt = options.services.matrix-synapse;
8+ pg = config.services.postgresql;
9+ usePostgresql = cfg.database_type == "psycopg2";
10+ logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig;
11+ mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}'';
12+ mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
13+ pluginsEnv = cfg.package.python.buildEnv.override {
14+ extraLibs = cfg.plugins;
15+ };
16+ configFile = pkgs.writeText "homeserver.yaml" ''
17+${optionalString (cfg.tls_certificate_path != null) ''
18+tls_certificate_path: "${cfg.tls_certificate_path}"
19+''}
20+${optionalString (cfg.tls_private_key_path != null) ''
21+tls_private_key_path: "${cfg.tls_private_key_path}"
22+''}
23+${optionalString (cfg.tls_dh_params_path != null) ''
24+tls_dh_params_path: "${cfg.tls_dh_params_path}"
25+''}
26+no_tls: ${boolToString cfg.no_tls}
27+${optionalString (cfg.bind_port != null) ''
28+bind_port: ${toString cfg.bind_port}
29+''}
30+${optionalString (cfg.unsecure_port != null) ''
31+unsecure_port: ${toString cfg.unsecure_port}
32+''}
33+${optionalString (cfg.bind_host != null) ''
34+bind_host: "${cfg.bind_host}"
35+''}
36+server_name: "${cfg.server_name}"
37+pid_file: "/run/matrix-synapse.pid"
38+${optionalString (cfg.public_baseurl != null) ''
39+public_baseurl: "${cfg.public_baseurl}"
40+''}
41+listeners: [${concatStringsSep "," (map mkListener cfg.listeners)}]
42+database: {
43+ name: "${cfg.database_type}",
44+ args: {
45+ ${concatStringsSep ",\n " (
46+ mapAttrsToList (n: v: "\"${n}\": ${builtins.toJSON v}") cfg.database_args
47+ )}
48+ }
49+}
50+event_cache_size: "${cfg.event_cache_size}"
51+verbose: ${cfg.verbose}
52+log_config: "${logConfigFile}"
53+rc_messages_per_second: ${cfg.rc_messages_per_second}
54+rc_message_burst_count: ${cfg.rc_message_burst_count}
55+federation_rc_window_size: ${cfg.federation_rc_window_size}
56+federation_rc_sleep_limit: ${cfg.federation_rc_sleep_limit}
57+federation_rc_sleep_delay: ${cfg.federation_rc_sleep_delay}
58+federation_rc_reject_limit: ${cfg.federation_rc_reject_limit}
59+federation_rc_concurrent: ${cfg.federation_rc_concurrent}
60+media_store_path: "${cfg.dataDir}/media"
61+uploads_path: "${cfg.dataDir}/uploads"
62+max_upload_size: "${cfg.max_upload_size}"
63+max_image_pixels: "${cfg.max_image_pixels}"
64+dynamic_thumbnails: ${boolToString cfg.dynamic_thumbnails}
65+url_preview_enabled: ${boolToString cfg.url_preview_enabled}
66+${optionalString (cfg.url_preview_enabled == true) ''
67+url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist}
68+url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist}
69+url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist}
70+''}
71+recaptcha_private_key: "${cfg.recaptcha_private_key}"
72+recaptcha_public_key: "${cfg.recaptcha_public_key}"
73+enable_registration_captcha: ${boolToString cfg.enable_registration_captcha}
74+turn_uris: ${builtins.toJSON cfg.turn_uris}
75+turn_shared_secret: "${cfg.turn_shared_secret}"
76+enable_registration: ${boolToString cfg.enable_registration}
77+${optionalString (cfg.registration_shared_secret != null) ''
78+registration_shared_secret: "${cfg.registration_shared_secret}"
79+''}
80+recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
81+turn_user_lifetime: "${cfg.turn_user_lifetime}"
82+user_creation_max_duration: ${cfg.user_creation_max_duration}
83+bcrypt_rounds: ${cfg.bcrypt_rounds}
84+allow_guest_access: ${boolToString cfg.allow_guest_access}
85+
86+account_threepid_delegates:
87+ ${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"}
88+ ${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"}
89+
90+room_prejoin_state:
91+ disable_default_event_types: ${boolToString cfg.room_prejoin_state.disable_default_event_types}
92+ additional_event_types: ${builtins.toJSON cfg.room_prejoin_state.additional_event_types}
93+${optionalString (cfg.macaroon_secret_key != null) ''
94+ macaroon_secret_key: "${cfg.macaroon_secret_key}"
95+''}
96+expire_access_token: ${boolToString cfg.expire_access_token}
97+enable_metrics: ${boolToString cfg.enable_metrics}
98+report_stats: ${boolToString cfg.report_stats}
99+signing_key_path: "${cfg.dataDir}/homeserver.signing.key"
100+key_refresh_interval: "${cfg.key_refresh_interval}"
101+perspectives:
102+ servers: {
103+ ${concatStringsSep "},\n" (mapAttrsToList (n: v: ''
104+ "${n}": {
105+ "verify_keys": {
106+ ${concatStringsSep "},\n" (mapAttrsToList (n: v: ''
107+ "${n}": {
108+ "key": "${v}"
109+ }'') v)}
110+ }
111+ '') cfg.servers)}
112+ }
113+ }
114+redaction_retention_period: ${toString cfg.redaction_retention_period}
115+app_service_config_files: ${builtins.toJSON cfg.app_service_config_files}
116+
117+${cfg.extraConfig}
118+'';
119+
120+ hasLocalPostgresDB = let args = cfg.database_args; in
121+ usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ]));
122+
123+ registerNewMatrixUser =
124+ let
125+ isIpv6 = x: lib.length (lib.splitString ":" x) > 1;
126+ listener =
127+ lib.findFirst (
128+ listener: lib.any (
129+ resource: lib.any (
130+ name: name == "client"
131+ ) resource.names
132+ ) listener.resources
133+ ) (lib.last cfg.listeners) cfg.listeners;
134+ in
135+ pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" ''
136+ exec ${cfg.package}/bin/register_new_matrix_user \
137+ $@ \
138+ ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \
139+ "${listener.type}://${
140+ if (isIpv6 listener.bind_address) then
141+ "[${listener.bind_address}]"
142+ else
143+ "${listener.bind_address}"
144+ }:${builtins.toString listener.port}/"
145+ '';
146+in {
147+ options = {
148+ services.matrix-synapse = {
149+ enable = mkEnableOption "matrix.org synapse";
150+ configFile = mkOption {
151+ type = types.str;
152+ readOnly = true;
153+ description = ''
154+ Path to the configuration file on the target system. Useful to configure e.g. workers
155+ that also need this.
156+ '';
157+ };
158+ package = mkOption {
159+ type = types.package;
160+ default = pkgs.matrix-synapse;
161+ defaultText = literalExpression "pkgs.matrix-synapse";
162+ description = ''
163+ Overridable attribute of the matrix synapse server package to use.
164+ '';
165+ };
166+ plugins = mkOption {
167+ type = types.listOf types.package;
168+ default = [ ];
169+ example = literalExpression ''
170+ with config.services.matrix-synapse.package.plugins; [
171+ matrix-synapse-ldap3
172+ matrix-synapse-pam
173+ ];
174+ '';
175+ description = ''
176+ List of additional Matrix plugins to make available.
177+ '';
178+ };
179+ withJemalloc = mkOption {
180+ type = types.bool;
181+ default = false;
182+ description = ''
183+ Whether to preload jemalloc to reduce memory fragmentation and overall usage.
184+ '';
185+ };
186+ no_tls = mkOption {
187+ type = types.bool;
188+ default = false;
189+ description = ''
190+ Don't bind to the https port
191+ '';
192+ };
193+ bind_port = mkOption {
194+ type = types.nullOr types.int;
195+ default = null;
196+ example = 8448;
197+ description = ''
198+ DEPRECATED: Use listeners instead.
199+ The port to listen for HTTPS requests on.
200+ For when matrix traffic is sent directly to synapse.
201+ '';
202+ };
203+ unsecure_port = mkOption {
204+ type = types.nullOr types.int;
205+ default = null;
206+ example = 8008;
207+ description = ''
208+ DEPRECATED: Use listeners instead.
209+ The port to listen for HTTP requests on.
210+ For when matrix traffic passes through loadbalancer that unwraps TLS.
211+ '';
212+ };
213+ bind_host = mkOption {
214+ type = types.nullOr types.str;
215+ default = null;
216+ description = ''
217+ DEPRECATED: Use listeners instead.
218+ Local interface to listen on.
219+ The empty string will cause synapse to listen on all interfaces.
220+ '';
221+ };
222+ tls_certificate_path = mkOption {
223+ type = types.nullOr types.str;
224+ default = null;
225+ example = "/var/lib/matrix-synapse/homeserver.tls.crt";
226+ description = ''
227+ PEM encoded X509 certificate for TLS.
228+ You can replace the self-signed certificate that synapse
229+ autogenerates on launch with your own SSL certificate + key pair
230+ if you like. Any required intermediary certificates can be
231+ appended after the primary certificate in hierarchical order.
232+ '';
233+ };
234+ tls_private_key_path = mkOption {
235+ type = types.nullOr types.str;
236+ default = null;
237+ example = "/var/lib/matrix-synapse/homeserver.tls.key";
238+ description = ''
239+ PEM encoded private key for TLS. Specify null if synapse is not
240+ speaking TLS directly.
241+ '';
242+ };
243+ tls_dh_params_path = mkOption {
244+ type = types.nullOr types.str;
245+ default = null;
246+ example = "/var/lib/matrix-synapse/homeserver.tls.dh";
247+ description = ''
248+ PEM dh parameters for ephemeral keys
249+ '';
250+ };
251+ server_name = mkOption {
252+ type = types.str;
253+ example = "example.com";
254+ default = config.networking.hostName;
255+ defaultText = literalExpression "config.networking.hostName";
256+ description = ''
257+ The domain name of the server, with optional explicit port.
258+ This is used by remote servers to look up the server address.
259+ This is also the last part of your UserID.
260+
261+ The server_name cannot be changed later so it is important to configure this correctly before you start Synapse.
262+ '';
263+ };
264+ public_baseurl = mkOption {
265+ type = types.nullOr types.str;
266+ default = null;
267+ example = "https://example.com:8448/";
268+ description = ''
269+ The public-facing base URL for the client API (not including _matrix/...)
270+ '';
271+ };
272+ listeners = mkOption {
273+ type = types.listOf (types.submodule {
274+ options = {
275+ port = mkOption {
276+ type = types.port;
277+ example = 8448;
278+ description = ''
279+ The port to listen for HTTP(S) requests on.
280+ '';
281+ };
282+ bind_address = mkOption {
283+ type = types.str;
284+ default = "";
285+ example = "203.0.113.42";
286+ description = ''
287+ Local interface to listen on.
288+ The empty string will cause synapse to listen on all interfaces.
289+ '';
290+ };
291+ type = mkOption {
292+ type = types.str;
293+ default = "http";
294+ description = ''
295+ Type of listener.
296+ '';
297+ };
298+ tls = mkOption {
299+ type = types.bool;
300+ default = true;
301+ description = ''
302+ Whether to listen for HTTPS connections rather than HTTP.
303+ '';
304+ };
305+ x_forwarded = mkOption {
306+ type = types.bool;
307+ default = false;
308+ description = ''
309+ Use the X-Forwarded-For (XFF) header as the client IP and not the
310+ actual client IP.
311+ '';
312+ };
313+ resources = mkOption {
314+ type = types.listOf (types.submodule {
315+ options = {
316+ names = mkOption {
317+ type = types.listOf types.str;
318+ description = ''
319+ List of resources to host on this listener.
320+ '';
321+ example = ["client" "federation"];
322+ };
323+ compress = mkOption {
324+ type = types.bool;
325+ description = ''
326+ Should synapse compress HTTP responses to clients that support it?
327+ This should be disabled if running synapse behind a load balancer
328+ that can do automatic compression.
329+ '';
330+ };
331+ };
332+ });
333+ description = ''
334+ List of HTTP resources to serve on this listener.
335+ '';
336+ };
337+ };
338+ });
339+ default = [{
340+ port = 8448;
341+ bind_address = "";
342+ type = "http";
343+ tls = true;
344+ x_forwarded = false;
345+ resources = [
346+ { names = ["client"]; compress = true; }
347+ { names = ["federation"]; compress = false; }
348+ ];
349+ }];
350+ description = ''
351+ List of ports that Synapse should listen on, their purpose and their configuration.
352+ '';
353+ };
354+ verbose = mkOption {
355+ type = types.str;
356+ default = "0";
357+ description = "Logging verbosity level.";
358+ };
359+ rc_messages_per_second = mkOption {
360+ type = types.str;
361+ default = "0.2";
362+ description = "Number of messages a client can send per second";
363+ };
364+ rc_message_burst_count = mkOption {
365+ type = types.str;
366+ default = "10.0";
367+ description = "Number of message a client can send before being throttled";
368+ };
369+ federation_rc_window_size = mkOption {
370+ type = types.str;
371+ default = "1000";
372+ description = "The federation window size in milliseconds";
373+ };
374+ federation_rc_sleep_limit = mkOption {
375+ type = types.str;
376+ default = "10";
377+ description = ''
378+ The number of federation requests from a single server in a window
379+ before the server will delay processing the request.
380+ '';
381+ };
382+ federation_rc_sleep_delay = mkOption {
383+ type = types.str;
384+ default = "500";
385+ description = ''
386+ The duration in milliseconds to delay processing events from
387+ remote servers by if they go over the sleep limit.
388+ '';
389+ };
390+ federation_rc_reject_limit = mkOption {
391+ type = types.str;
392+ default = "50";
393+ description = ''
394+ The maximum number of concurrent federation requests allowed
395+ from a single server
396+ '';
397+ };
398+ federation_rc_concurrent = mkOption {
399+ type = types.str;
400+ default = "3";
401+ description = "The number of federation requests to concurrently process from a single server";
402+ };
403+ database_type = mkOption {
404+ type = types.enum [ "sqlite3" "psycopg2" ];
405+ default = if versionAtLeast config.system.stateVersion "18.03"
406+ then "psycopg2"
407+ else "sqlite3";
408+ defaultText = literalExpression ''
409+ if versionAtLeast config.system.stateVersion "18.03"
410+ then "psycopg2"
411+ else "sqlite3"
412+ '';
413+ description = ''
414+ The database engine name. Can be sqlite or psycopg2.
415+ '';
416+ };
417+ database_name = mkOption {
418+ type = types.str;
419+ default = "matrix-synapse";
420+ description = "Database name.";
421+ };
422+ database_user = mkOption {
423+ type = types.str;
424+ default = "matrix-synapse";
425+ description = "Database user name.";
426+ };
427+ database_args = mkOption {
428+ type = types.attrs;
429+ default = {
430+ sqlite3 = { database = "${cfg.dataDir}/homeserver.db"; };
431+ psycopg2 = {
432+ user = cfg.database_user;
433+ database = cfg.database_name;
434+ };
435+ }.${cfg.database_type};
436+ defaultText = literalDocBook ''
437+ <variablelist>
438+ <varlistentry>
439+ <term>using sqlite3</term>
440+ <listitem>
441+ <programlisting>
442+ { database = "''${config.${opt.dataDir}}/homeserver.db"; }
443+ </programlisting>
444+ </listitem>
445+ </varlistentry>
446+ <varlistentry>
447+ <term>using psycopg2</term>
448+ <listitem>
449+ <programlisting>
450+ psycopg2 = {
451+ user = config.${opt.database_user};
452+ database = config.${opt.database_name};
453+ }
454+ </programlisting>
455+ </listitem>
456+ </varlistentry>
457+ </variablelist>
458+ '';
459+ description = ''
460+ Arguments to pass to the engine.
461+ '';
462+ };
463+ event_cache_size = mkOption {
464+ type = types.str;
465+ default = "10K";
466+ description = "Number of events to cache in memory.";
467+ };
468+ url_preview_enabled = mkOption {
469+ type = types.bool;
470+ default = false;
471+ description = ''
472+ Is the preview URL API enabled? If enabled, you *must* specify an
473+ explicit url_preview_ip_range_blacklist of IPs that the spider is
474+ denied from accessing.
475+ '';
476+ };
477+ url_preview_ip_range_blacklist = mkOption {
478+ type = types.listOf types.str;
479+ default = [
480+ "127.0.0.0/8"
481+ "10.0.0.0/8"
482+ "172.16.0.0/12"
483+ "192.168.0.0/16"
484+ "100.64.0.0/10"
485+ "169.254.0.0/16"
486+ "::1/128"
487+ "fe80::/64"
488+ "fc00::/7"
489+ ];
490+ description = ''
491+ List of IP address CIDR ranges that the URL preview spider is denied
492+ from accessing.
493+ '';
494+ };
495+ url_preview_ip_range_whitelist = mkOption {
496+ type = types.listOf types.str;
497+ default = [];
498+ description = ''
499+ List of IP address CIDR ranges that the URL preview spider is allowed
500+ to access even if they are specified in
501+ url_preview_ip_range_blacklist.
502+ '';
503+ };
504+ url_preview_url_blacklist = mkOption {
505+ type = types.listOf types.str;
506+ default = [];
507+ description = ''
508+ Optional list of URL matches that the URL preview spider is
509+ denied from accessing.
510+ '';
511+ };
512+ recaptcha_private_key = mkOption {
513+ type = types.str;
514+ default = "";
515+ description = ''
516+ This Home Server's ReCAPTCHA private key.
517+ '';
518+ };
519+ recaptcha_public_key = mkOption {
520+ type = types.str;
521+ default = "";
522+ description = ''
523+ This Home Server's ReCAPTCHA public key.
524+ '';
525+ };
526+ enable_registration_captcha = mkOption {
527+ type = types.bool;
528+ default = false;
529+ description = ''
530+ Enables ReCaptcha checks when registering, preventing signup
531+ unless a captcha is answered. Requires a valid ReCaptcha
532+ public/private key.
533+ '';
534+ };
535+ turn_uris = mkOption {
536+ type = types.listOf types.str;
537+ default = [];
538+ description = ''
539+ The public URIs of the TURN server to give to clients
540+ '';
541+ };
542+ turn_shared_secret = mkOption {
543+ type = types.str;
544+ default = "";
545+ description = ''
546+ The shared secret used to compute passwords for the TURN server
547+ '';
548+ };
549+ turn_user_lifetime = mkOption {
550+ type = types.str;
551+ default = "1h";
552+ description = "How long generated TURN credentials last";
553+ };
554+ enable_registration = mkOption {
555+ type = types.bool;
556+ default = false;
557+ description = ''
558+ Enable registration for new users.
559+ '';
560+ };
561+ registration_shared_secret = mkOption {
562+ type = types.nullOr types.str;
563+ default = null;
564+ description = ''
565+ If set, allows registration by anyone who also has the shared
566+ secret, even if registration is otherwise disabled.
567+ '';
568+ };
569+ enable_metrics = mkOption {
570+ type = types.bool;
571+ default = false;
572+ description = ''
573+ Enable collection and rendering of performance metrics
574+ '';
575+ };
576+ report_stats = mkOption {
577+ type = types.bool;
578+ default = false;
579+ description = "";
580+ };
581+ servers = mkOption {
582+ type = types.attrsOf (types.attrsOf types.str);
583+ default = {
584+ "matrix.org" = {
585+ "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw";
586+ };
587+ };
588+ description = ''
589+ The trusted servers to download signing keys from.
590+ '';
591+ };
592+ max_upload_size = mkOption {
593+ type = types.str;
594+ default = "10M";
595+ description = "The largest allowed upload size in bytes";
596+ };
597+ max_image_pixels = mkOption {
598+ type = types.str;
599+ default = "32M";
600+ description = "Maximum number of pixels that will be thumbnailed";
601+ };
602+ dynamic_thumbnails = mkOption {
603+ type = types.bool;
604+ default = false;
605+ description = ''
606+ Whether to generate new thumbnails on the fly to precisely match
607+ the resolution requested by the client. If true then whenever
608+ a new resolution is requested by the client the server will
609+ generate a new thumbnail. If false the server will pick a thumbnail
610+ from a precalculated list.
611+ '';
612+ };
613+ user_creation_max_duration = mkOption {
614+ type = types.str;
615+ default = "1209600000";
616+ description = ''
617+ Sets the expiry for the short term user creation in
618+ milliseconds. The default value is two weeks.
619+ '';
620+ };
621+ bcrypt_rounds = mkOption {
622+ type = types.str;
623+ default = "12";
624+ description = ''
625+ Set the number of bcrypt rounds used to generate password hash.
626+ Larger numbers increase the work factor needed to generate the hash.
627+ '';
628+ };
629+ allow_guest_access = mkOption {
630+ type = types.bool;
631+ default = false;
632+ description = ''
633+ Allows users to register as guests without a password/email/etc, and
634+ participate in rooms hosted on this server which have been made
635+ accessible to anonymous users.
636+ '';
637+ };
638+ account_threepid_delegates.email = mkOption {
639+ type = types.nullOr types.str;
640+ default = null;
641+ description = ''
642+ Delegate email sending to https://example.org
643+ '';
644+ };
645+ account_threepid_delegates.msisdn = mkOption {
646+ type = types.nullOr types.str;
647+ default = null;
648+ description = ''
649+ Delegate SMS sending to this local process (https://localhost:8090)
650+ '';
651+ };
652+ room_prejoin_state.additional_event_types = mkOption {
653+ default = [];
654+ type = types.listOf types.str;
655+ description = ''
656+ Additional events to share with users who received an invite.
657+ '';
658+ };
659+ room_prejoin_state.disable_default_event_types = mkOption {
660+ default = false;
661+ type = types.bool;
662+ description = ''
663+ Whether to disable the default state-event types for users invited to a room.
664+ These are:
665+
666+ <itemizedlist>
667+ <listitem><para>m.room.join_rules</para></listitem>
668+ <listitem><para>m.room.canonical_alias</para></listitem>
669+ <listitem><para>m.room.avatar</para></listitem>
670+ <listitem><para>m.room.encryption</para></listitem>
671+ <listitem><para>m.room.name</para></listitem>
672+ <listitem><para>m.room.create</para></listitem>
673+ </itemizedlist>
674+ '';
675+ };
676+ macaroon_secret_key = mkOption {
677+ type = types.nullOr types.str;
678+ default = null;
679+ description = ''
680+ Secret key for authentication tokens
681+ '';
682+ };
683+ expire_access_token = mkOption {
684+ type = types.bool;
685+ default = false;
686+ description = ''
687+ Whether to enable access token expiration.
688+ '';
689+ };
690+ key_refresh_interval = mkOption {
691+ type = types.str;
692+ default = "1d";
693+ description = ''
694+ How long key response published by this server is valid for.
695+ Used to set the valid_until_ts in /key/v2 APIs.
696+ Determines how quickly servers will query to check which keys
697+ are still valid.
698+ '';
699+ };
700+ app_service_config_files = mkOption {
701+ type = types.listOf types.path;
702+ default = [ ];
703+ description = ''
704+ A list of application service config file to use
705+ '';
706+ };
707+ redaction_retention_period = mkOption {
708+ type = types.int;
709+ default = 7;
710+ description = ''
711+ How long to keep redacted events in unredacted form in the database.
712+ '';
713+ };
714+ extraConfig = mkOption {
715+ type = types.lines;
716+ default = "";
717+ description = ''
718+ Extra config options for matrix-synapse.
719+ '';
720+ };
721+ extraConfigFiles = mkOption {
722+ type = types.listOf types.path;
723+ default = [];
724+ description = ''
725+ Extra config files to include.
726+
727+ The configuration files will be included based on the command line
728+ argument --config-path. This allows to configure secrets without
729+ having to go through the Nix store, e.g. based on deployment keys if
730+ NixOPS is in use.
731+ '';
732+ };
733+ logConfig = mkOption {
734+ type = types.lines;
735+ default = readFile ./matrix-synapse-log_config.yaml;
736+ description = ''
737+ A yaml python logging config file
738+ '';
739+ };
740+ dataDir = mkOption {
741+ type = types.str;
742+ default = "/var/lib/matrix-synapse";
743+ description = ''
744+ The directory where matrix-synapse stores its stateful data such as
745+ certificates, media and uploads.
746+ '';
747+ };
748+ };
749+ };
750+
751+ config = mkIf cfg.enable {
752+ assertions = [
753+ { assertion = hasLocalPostgresDB -> config.services.postgresql.enable;
754+ message = ''
755+ Cannot deploy matrix-synapse with a configuration for a local postgresql database
756+ and a missing postgresql service. Since 20.03 it's mandatory to manually configure the
757+ database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for
758+ further reference).
759+
760+ If you
761+ - try to deploy a fresh synapse, you need to configure the database yourself. An example
762+ for this can be found in <nixpkgs/nixos/tests/matrix-synapse.nix>
763+ - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true`
764+ to your configuration.
765+
766+ For further information about this update, please read the release-notes of 20.03 carefully.
767+ '';
768+ }
769+ ];
770+
771+ services.matrix-synapse.configFile = "${configFile}";
772+
773+ users.users.matrix-synapse = {
774+ group = "matrix-synapse";
775+ home = cfg.dataDir;
776+ createHome = true;
777+ shell = "${pkgs.bash}/bin/bash";
778+ uid = config.ids.uids.matrix-synapse;
779+ };
780+
781+ users.groups.matrix-synapse = {
782+ gid = config.ids.gids.matrix-synapse;
783+ };
784+
785+ systemd.services.matrix-synapse = {
786+ description = "Synapse Matrix homeserver";
787+ after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service";
788+ wantedBy = [ "multi-user.target" ];
789+ preStart = ''
790+ ${cfg.package}/bin/synapse_homeserver \
791+ --config-path ${configFile} \
792+ --keys-directory ${cfg.dataDir} \
793+ --generate-keys
794+ '';
795+ environment = {
796+ PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];
797+ } // optionalAttrs (cfg.withJemalloc) {
798+ LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
799+ };
800+ serviceConfig = {
801+ Type = "notify";
802+ User = "matrix-synapse";
803+ Group = "matrix-synapse";
804+ WorkingDirectory = cfg.dataDir;
805+ ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" ''
806+ chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key
807+ chmod 0600 ${cfg.dataDir}/homeserver.signing.key
808+ '')) ];
809+ ExecStart = ''
810+ ${cfg.package}/bin/synapse_homeserver \
811+ ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
812+ --keys-directory ${cfg.dataDir}
813+ '';
814+ ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
815+ Restart = "on-failure";
816+ UMask = "0077";
817+ };
818+ };
819+
820+ environment.systemPackages = [ registerNewMatrixUser ];
821+ };
822+
823+ imports = [
824+ (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] ''
825+ The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0
826+ as the behavior is now obsolete.
827+ '')
828+ (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] ''
829+ Database configuration must be done manually. An exemplary setup is demonstrated in
830+ <nixpkgs/nixos/tests/matrix-synapse.nix>
831+ '')
832+ (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
833+ (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] ''
834+ You may add additional event types via
835+ `services.matrix-synapse.room_prejoin_state.additional_event_types` and
836+ disable the default events via
837+ `services.matrix-synapse.room_prejoin_state.disable_default_event_types`.
838+ '')
839+ ];
840+
841+ meta.doc = ./matrix-synapse.xml;
842+ meta.maintainers = teams.matrix.members;
843+
844+}
nixos/modules/services/matrix/matrix-synapse.xml → nixos/modules/services/misc/matrix-synapse.xmlrenamed+17−18
@@ -115,21 +115,20 @@ in {
115115 };
116116 services.matrix-synapse = {
117117 <link linkend="opt-services.matrix-synapse.enable">enable</link> = true;
118− <link linkend="opt-services.matrix-synapse.settings.server_name">server_name</link> = config.networking.domain;
119− <link linkend="opt-services.matrix-synapse.settings.listeners">listeners</link> = [
118+ <link linkend="opt-services.matrix-synapse.server_name">server_name</link> = config.networking.domain;
119+ <link linkend="opt-services.matrix-synapse.listeners">listeners</link> = [
120120 {
121− <link linkend="opt-services.matrix-synapse.settings.listeners._.port">port</link> = 8008;
122− <link linkend="opt-services.matrix-synapse.settings.listeners._.bind_addresses">bind_addresses</link> = [ "::1" ];
123− <link linkend="opt-services.matrix-synapse.settings.listeners._.type">type</link> = "http";
124− <link linkend="opt-services.matrix-synapse.settings.listeners._.tls">tls</link> = false;
125− <link linkend="opt-services.matrix-synapse.settings.listeners._.x_forwarded">x_forwarded</link> = true;
126− <link linkend="opt-services.matrix-synapse.settings.listeners._.resources">resources</link> = [ {
127− <link linkend="opt-services.matrix-synapse.settings.listeners._.resources._.names">names</link> = [ "client" ];
128− <link linkend="opt-services.matrix-synapse.settings.listeners._.resources._.compress">compress</link> = true;
129− } {
130− <link linkend="opt-services.matrix-synapse.settings.listeners._.resources._.names">names</link> = [ "federation" ];
131− <link linkend="opt-services.matrix-synapse.settings.listeners._.resources._.compress">compress</link> = false;
132− } ];
121+ <link linkend="opt-services.matrix-synapse.listeners._.port">port</link> = 8008;
122+ <link linkend="opt-services.matrix-synapse.listeners._.bind_address">bind_address</link> = "::1";
123+ <link linkend="opt-services.matrix-synapse.listeners._.type">type</link> = "http";
124+ <link linkend="opt-services.matrix-synapse.listeners._.tls">tls</link> = false;
125+ <link linkend="opt-services.matrix-synapse.listeners._.x_forwarded">x_forwarded</link> = true;
126+ <link linkend="opt-services.matrix-synapse.listeners._.resources">resources</link> = [
127+ {
128+ <link linkend="opt-services.matrix-synapse.listeners._.resources._.names">names</link> = [ "client" "federation" ];
129+ <link linkend="opt-services.matrix-synapse.listeners._.resources._.compress">compress</link> = false;
130+ }
131+ ];
133132 }
134133 ];
135134 };
@@ -152,11 +151,11 @@ in {
152151
153152 <para>
154153 If you want to run a server with public registration by anybody, you can
155− then enable <literal><link linkend="opt-services.matrix-synapse.settings.enable_registration">services.matrix-synapse.settings.enable_registration</link> =
154+ then enable <literal><link linkend="opt-services.matrix-synapse.enable_registration">services.matrix-synapse.enable_registration</link> =
156155 true;</literal>. Otherwise, or you can generate a registration secret with
157156 <command>pwgen -s 64 1</command> and set it with
158− <option><link linkend="opt-services.matrix-synapse.settings.registration_shared_secret">services.matrix-synapse.settings.registration_shared_secret</link></option>.
159− To create a new user or admin, run the following after you have set the secret
157+ <option><link linkend="opt-services.matrix-synapse.registration_shared_secret">services.matrix-synapse.registration_shared_secret</link></option>. To
158+ create a new user or admin, run the following after you have set the secret
160159 and have rebuilt NixOS:
161160<screen>
162161<prompt>$ </prompt>nix run nixpkgs.matrix-synapse
@@ -171,7 +170,7 @@ Success!
171170 <literal>@your-username:example.org</literal>. Note that the registration
172171 secret ends up in the nix store and therefore is world-readable by any user
173172 on your machine, so it makes sense to only temporarily activate the
174− <link linkend="opt-services.matrix-synapse.settings.registration_shared_secret">registration_shared_secret</link>
173+ <link linkend="opt-services.matrix-synapse.registration_shared_secret">registration_shared_secret</link>
175174 option until a better solution for NixOS is in place.
176175 </para>
177176 </section>
nixos/modules/services/misc/moonraker.nix−40
@@ -79,19 +79,6 @@ in {
7979 for supported values.
8080 '';
8181 };
82−
83− allowSystemControl = mkOption {
84− type = types.bool;
85− default = false;
86− description = ''
87− Whether to allow Moonraker to perform system-level operations.
88−
89− Moonraker exposes APIs to perform system-level operations, such as
90− reboot, shutdown, and management of systemd units. See the
91− <link xlink:href="https://moonraker.readthedocs.io/en/latest/web_api/#machine-commands">documentation</link>
92− for details on what clients are able to do.
93− '';
94− };
9582 };
9683 };
9784
@@ -99,13 +86,6 @@ in {
9986 warnings = optional (cfg.settings ? update_manager)
10087 ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.'';
10188
102− assertions = [
103− {
104− assertion = cfg.allowSystemControl -> config.security.polkit.enable;
105− message = "services.moonraker.allowSystemControl requires polkit to be enabled (security.polkit.enable).";
106− }
107− ];
108−
10989 users.users = optionalAttrs (cfg.user == "moonraker") {
11090 moonraker = {
11191 group = cfg.group;
@@ -148,31 +128,11 @@ in {
148128 exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg
149129 '';
150130
151− # Needs `ip` command
152− path = [ pkgs.iproute2 ];
153−
154131 serviceConfig = {
155132 WorkingDirectory = cfg.stateDir;
156133 Group = cfg.group;
157134 User = cfg.user;
158135 };
159136 };
160−
161− security.polkit.extraConfig = lib.optionalString cfg.allowSystemControl ''
162− // nixos/moonraker: Allow Moonraker to perform system-level operations
163− //
164− // This was enabled via services.moonraker.allowSystemControl.
165− polkit.addRule(function(action, subject) {
166− if ((action.id == "org.freedesktop.systemd1.manage-units" ||
167− action.id == "org.freedesktop.login1.power-off" ||
168− action.id == "org.freedesktop.login1.power-off-multiple-sessions" ||
169− action.id == "org.freedesktop.login1.reboot" ||
170− action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
171− action.id.startsWith("org.freedesktop.packagekit.")) &&
172− subject.user == "${cfg.user}") {
173− return polkit.Result.YES;
174− }
175− });
176− '';
177137 };
178138}
nixos/modules/services/misc/nitter.nix+4−11
@@ -49,13 +49,6 @@ in
4949 services.nitter = {
5050 enable = mkEnableOption "If enabled, start Nitter.";
5151
52− package = mkOption {
53− default = pkgs.nitter;
54− type = types.package;
55− defaultText = literalExpression "pkgs.nitter";
56− description = "The nitter derivation to use.";
57− };
58−
5952 server = {
6053 address = mkOption {
6154 type = types.str;
@@ -85,8 +78,8 @@ in
8578
8679 staticDir = mkOption {
8780 type = types.path;
88− default = "${cfg.package}/share/nitter/public";
89− defaultText = literalExpression ''"''${config.services.nitter.package}/share/nitter/public"'';
81+ default = "${pkgs.nitter}/share/nitter/public";
82+ defaultText = literalExpression ''"''${pkgs.nitter}/share/nitter/public"'';
9083 description = "Path to the static files directory.";
9184 };
9285
@@ -313,8 +306,8 @@ in
313306 Environment = [ "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf" ];
314307 # Some parts of Nitter expect `public` folder in working directory,
315308 # see https://github.com/zedeus/nitter/issues/414
316− WorkingDirectory = "${cfg.package}/share/nitter";
317− ExecStart = "${cfg.package}/bin/nitter";
309+ WorkingDirectory = "${pkgs.nitter}/share/nitter";
310+ ExecStart = "${pkgs.nitter}/bin/nitter";
318311 ExecStartPre = "${preStart}";
319312 AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
320313 Restart = "on-failure";
nixos/modules/services/misc/nix-daemon.nix+6−14
@@ -112,11 +112,11 @@ in
112112
113113{
114114 imports = [
115− (mkRenamedOptionModuleWith { sinceRelease = 2003; from = [ "nix" "useChroot" ]; to = [ "nix" "useSandbox" ]; })
116− (mkRenamedOptionModuleWith { sinceRelease = 2003; from = [ "nix" "chrootDirs" ]; to = [ "nix" "sandboxPaths" ]; })
117− (mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" "daemonIONiceLevel" ]; to = [ "nix" "daemonIOSchedPriority" ]; })
115+ (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ])
116+ (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ])
117+ (mkRenamedOptionModule [ "nix" "daemonIONiceLevel" ] [ "nix" "daemonIOSchedPriority" ])
118118 (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.")
119− ] ++ mapAttrsToList (oldConf: newConf: mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" oldConf ]; to = [ "nix" "settings" newConf ]; }) legacyConfMappings;
119+ ] ++ mapAttrsToList (oldConf: newConf: mkRenamedOptionModule [ "nix" oldConf ] [ "nix" "settings" newConf ]) legacyConfMappings;
120120
121121 ###### interface
122122
@@ -409,14 +409,14 @@ in
409409 to = mkOption {
410410 type = referenceAttrs;
411411 example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; };
412− description = "The flake reference <option>from</option> is rewritten to.";
412+ description = "The flake reference <option>from></option> is rewritten to.";
413413 };
414414 flake = mkOption {
415415 type = types.nullOr types.attrs;
416416 default = null;
417417 example = literalExpression "nixpkgs";
418418 description = ''
419− The flake input <option>from</option> is rewritten to.
419+ The flake input <option>from></option> is rewritten to.
420420 '';
421421 };
422422 exact = mkOption {
@@ -708,14 +708,6 @@ in
708708
709709 systemd.packages = [ nixPackage ];
710710
711− # Will only work once https://github.com/NixOS/nix/pull/6285 is merged
712− # systemd.tmpfiles.packages = [ nixPackage ];
713−
714− # Can be dropped for Nix > https://github.com/NixOS/nix/pull/6285
715− systemd.tmpfiles.rules = [
716− "d /nix/var/nix/daemon-socket 0755 root root - -"
717− ];
718−
719711 systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
720712
721713 systemd.services.nix-daemon =
nixos/modules/services/misc/nix-gc.nix+3−9
@@ -39,7 +39,7 @@ in
3939 type = types.str;
4040 example = "45min";
4141 description = ''
42− Add a randomized delay before each garbage collection.
42+ Add a randomized delay before each automatic upgrade.
4343 The delay will be chosen between zero and this value.
4444 This value must be a time span in the format specified by
4545 <citerefentry><refentrytitle>systemd.time</refentrytitle>
@@ -81,14 +81,8 @@ in
8181 ###### implementation
8282
8383 config = {
84− assertions = [
85− {
86− assertion = cfg.automatic -> config.nix.enable;
87− message = ''nix.gc.automatic requires nix.enable'';
88− }
89− ];
90−
91− systemd.services.nix-gc = lib.mkIf config.nix.enable {
84+
85+ systemd.services.nix-gc = {
9286 description = "Nix Garbage Collector";
9387 script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";
9488 startAt = optional cfg.automatic cfg.dates;
nixos/modules/services/misc/nix-optimise.nix+2−8
@@ -37,14 +37,8 @@ in
3737 ###### implementation
3838
3939 config = {
40− assertions = [
41− {
42− assertion = cfg.automatic -> config.nix.enable;
43− message = ''nix.optimise.automatic requires nix.enable'';
44− }
45− ];
46−
47− systemd.services.nix-optimise = lib.mkIf config.nix.enable
40+
41+ systemd.services.nix-optimise =
4842 { description = "Nix Store Optimiser";
4943 # No point this if the nix daemon (and thus the nix store) is outside
5044 unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket";
nixos/modules/services/misc/paperless.nix → nixos/modules/services/misc/paperless-ng.nixrenamed+53−53
@@ -2,13 +2,11 @@
22
33with lib;
44let
5− cfg = config.services.paperless;
5+ cfg = config.services.paperless-ng;
66
77 defaultUser = "paperless";
88
9− # Don't start a redis instance if the user sets a custom redis connection
10− enableRedis = !hasAttr "PAPERLESS_REDIS" cfg.extraConfig;
11− redisServer = config.services.redis.servers.paperless;
9+ hasCustomRedis = hasAttr "PAPERLESS_REDIS" cfg.extraConfig;
1210
1311 env = {
1412 PAPERLESS_DATA_DIR = cfg.dataDir;
@@ -17,15 +15,15 @@ let
1715 GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
1816 } // (
1917 lib.mapAttrs (_: toString) cfg.extraConfig
20− ) // (optionalAttrs enableRedis {
21− PAPERLESS_REDIS = "unix://${redisServer.unixSocket}";
18+ ) // (optionalAttrs (!hasCustomRedis) {
19+ PAPERLESS_REDIS = "unix://${config.services.redis.servers.paperless-ng.unixSocket}";
2220 });
2321
2422 manage = let
2523 setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);
2624 in pkgs.writeShellScript "manage" ''
2725 ${setupEnv}
28− exec ${cfg.package}/bin/paperless-ngx "$@"
26+ exec ${cfg.package}/bin/paperless-ng "$@"
2927 '';
3028
3129 # Secure the services
@@ -38,7 +36,7 @@ let
3836 "-/etc/hosts"
3937 "-/etc/localtime"
4038 "-/run/postgresql"
41− ] ++ (optional enableRedis redisServer.unixSocket);
39+ ] ++ (optional (!hasCustomRedis) config.services.redis.servers.paperless-ng.unixSocket);
4240 BindPaths = [
4341 cfg.consumptionDir
4442 cfg.dataDir
@@ -55,6 +53,7 @@ let
5553 PrivateNetwork = true;
5654 PrivateTmp = true;
5755 PrivateUsers = true;
56+ ProcSubset = "pid";
5857 ProtectClock = true;
5958 # Breaks if the home dir of the user is in /home
6059 # Also does not add much value in combination with the TemporaryFileSystem.
@@ -67,15 +66,11 @@ let
6766 ProtectKernelModules = true;
6867 ProtectKernelTunables = true;
6968 ProtectProc = "invisible";
70− # Don't restrict ProcSubset because django-q requires read access to /proc/stat
71− # to query CPU and memory information.
72− # Note that /proc only contains processes of user `paperless`, so this is safe.
73− # ProcSubset = "pid";
7469 RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
7570 RestrictNamespaces = true;
7671 RestrictRealtime = true;
7772 RestrictSUIDSGID = true;
78− SupplementaryGroups = optional enableRedis redisServer.user;
73+ SupplementaryGroups = optional (!hasCustomRedis) config.services.redis.servers.paperless-ng.user;
7974 SystemCallArchitectures = "native";
8075 SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ];
8176 # Does not work well with the temporary root
@@ -86,22 +81,26 @@ in
8681 meta.maintainers = with maintainers; [ earvstedt Flakebi ];
8782
8883 imports = [
89− (mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ])
84+ (mkRemovedOptionModule [ "services" "paperless"] ''
85+ The paperless module has been removed as the upstream project died.
86+ Users should migrate to the paperless-ng module (services.paperless-ng).
87+ More information can be found in the NixOS 21.11 release notes.
88+ '')
9089 ];
9190
92− options.services.paperless = {
91+ options.services.paperless-ng = {
9392 enable = mkOption {
9493 type = lib.types.bool;
9594 default = false;
9695 description = ''
97− Enable Paperless.
96+ Enable Paperless-ng.
9897
9998 When started, the Paperless database is automatically created if it doesn't
10099 exist and updated if the Paperless package has changed.
101100 Both tasks are achieved by running a Django migration.
102101
103102 A script to manage the Paperless instance (by wrapping Django's manage.py) is linked to
104− <literal>''${dataDir}/paperless-manage</literal>.
103+ <literal>''${dataDir}/paperless-ng-manage</literal>.
105104 '';
106105 };
107106
@@ -134,13 +133,13 @@ in
134133 passwordFile = mkOption {
135134 type = types.nullOr types.path;
136135 default = null;
137− example = "/run/keys/paperless-password";
136+ example = "/run/keys/paperless-ng-password";
138137 description = ''
139138 A file containing the superuser password.
140139
141140 A superuser is required to access the web interface.
142141 If unset, you can create a superuser manually by running
143− <literal>''${dataDir}/paperless-manage createsuperuser</literal>.
142+ <literal>''${dataDir}/paperless-ng-manage createsuperuser</literal>.
144143
145144 The default superuser name is <literal>admin</literal>. To change it, set
146145 option <option>extraConfig.PAPERLESS_ADMIN_USER</option>.
@@ -169,9 +168,9 @@ in
169168 type = types.attrs;
170169 default = {};
171170 description = ''
172− Extra paperless config options.
171+ Extra paperless-ng config options.
173172
174− See <link xlink:href="https://paperless-ngx.readthedocs.io/en/latest/configuration.html">the documentation</link>
173+ See <link xlink:href="https://paperless-ng.readthedocs.io/en/latest/configuration.html">the documentation</link>
175174 for available options.
176175 '';
177176 example = literalExpression ''
@@ -189,14 +188,15 @@ in
189188
190189 package = mkOption {
191190 type = types.package;
192− default = pkgs.paperless-ngx;
193− defaultText = literalExpression "pkgs.paperless-ngx";
191+ default = pkgs.paperless-ng;
192+ defaultText = literalExpression "pkgs.paperless-ng";
194193 description = "The Paperless package to use.";
195194 };
196195 };
197196
198197 config = mkIf cfg.enable {
199− services.redis.servers.paperless.enable = mkIf enableRedis true;
198+ # Enable redis if no special url is set
199+ services.redis.servers.paperless-ng.enable = mkIf (!hasCustomRedis) true;
200200
201201 systemd.tmpfiles.rules = [
202202 "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
@@ -208,28 +208,24 @@ in
208208 )
209209 ];
210210
211− systemd.services.paperless-scheduler = {
212− description = "Paperless scheduler";
211+ systemd.services.paperless-ng-server = {
212+ description = "Paperless document server";
213213 serviceConfig = defaultServiceConfig // {
214214 User = cfg.user;
215− ExecStart = "${cfg.package}/bin/paperless-ngx qcluster";
215+ ExecStart = "${cfg.package}/bin/paperless-ng qcluster";
216216 Restart = "on-failure";
217− # The `mbind` syscall is needed for running the classifier.
218− SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ];
219− # Needs to talk to mail server for automated import rules
220− PrivateNetwork = false;
221217 };
222218 environment = env;
223219 wantedBy = [ "multi-user.target" ];
224− wants = [ "paperless-consumer.service" "paperless-web.service" ];
220+ wants = [ "paperless-ng-consumer.service" "paperless-ng-web.service" ];
225221
226222 preStart = ''
227− ln -sf ${manage} ${cfg.dataDir}/paperless-manage
223+ ln -sf ${manage} ${cfg.dataDir}/paperless-ng-manage
228224
229225 # Auto-migrate on first run or if the package has changed
230226 versionFile="${cfg.dataDir}/src-version"
231227 if [[ $(cat "$versionFile" 2>/dev/null) != ${cfg.package} ]]; then
232− ${cfg.package}/bin/paperless-ngx migrate
228+ ${cfg.package}/bin/paperless-ng migrate
233229 echo ${cfg.package} > "$versionFile"
234230 fi
235231 ''
@@ -240,48 +236,52 @@ in
240236 superuserStateFile="${cfg.dataDir}/superuser-state"
241237
242238 if [[ $(cat "$superuserStateFile" 2>/dev/null) != $superuserState ]]; then
243− ${cfg.package}/bin/paperless-ngx manage_superuser
239+ ${cfg.package}/bin/paperless-ng manage_superuser
244240 echo "$superuserState" > "$superuserStateFile"
245241 fi
246242 '';
247− } // optionalAttrs enableRedis {
248− after = [ "redis-paperless.service" ];
243+ } // optionalAttrs (!hasCustomRedis) {
244+ after = [ "redis-paperless-ng.service" ];
249245 };
250246
251− # Reading the user-provided password file requires root access
252− systemd.services.paperless-copy-password = mkIf (cfg.passwordFile != null) {
253− requiredBy = [ "paperless-scheduler.service" ];
254− before = [ "paperless-scheduler.service" ];
247+ # Password copying can't be implemented as a privileged preStart script
248+ # in 'paperless-ng-server' because 'defaultServiceConfig' limits the filesystem
249+ # paths accessible by the service.
250+ systemd.services.paperless-ng-copy-password = mkIf (cfg.passwordFile != null) {
251+ requiredBy = [ "paperless-ng-server.service" ];
252+ before = [ "paperless-ng-server.service" ];
255253 serviceConfig = {
256254 ExecStart = ''
257255 ${pkgs.coreutils}/bin/install --mode 600 --owner '${cfg.user}' --compare \
258256 '${cfg.passwordFile}' '${cfg.dataDir}/superuser-password'
259257 '';
260258 Type = "oneshot";
259+ # Needs to talk to mail server for automated import rules
260+ PrivateNetwork = false;
261261 };
262262 };
263263
264− systemd.services.paperless-consumer = {
264+ systemd.services.paperless-ng-consumer = {
265265 description = "Paperless document consumer";
266266 serviceConfig = defaultServiceConfig // {
267267 User = cfg.user;
268− ExecStart = "${cfg.package}/bin/paperless-ngx document_consumer";
268+ ExecStart = "${cfg.package}/bin/paperless-ng document_consumer";
269269 Restart = "on-failure";
270270 };
271271 environment = env;
272− # Bind to `paperless-scheduler` so that the consumer never runs
272+ # Bind to `paperless-ng-server` so that the consumer never runs
273273 # during migrations
274− bindsTo = [ "paperless-scheduler.service" ];
275− after = [ "paperless-scheduler.service" ];
274+ bindsTo = [ "paperless-ng-server.service" ];
275+ after = [ "paperless-ng-server.service" ];
276276 };
277277
278− systemd.services.paperless-web = {
278+ systemd.services.paperless-ng-web = {
279279 description = "Paperless web server";
280280 serviceConfig = defaultServiceConfig // {
281281 User = cfg.user;
282282 ExecStart = ''
283283 ${pkgs.python3Packages.gunicorn}/bin/gunicorn \
284− -c ${cfg.package}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application
284+ -c ${cfg.package}/lib/paperless-ng/gunicorn.conf.py paperless.asgi:application
285285 '';
286286 Restart = "on-failure";
287287
@@ -294,15 +294,15 @@ in
294294 };
295295 environment = env // {
296296 PATH = mkForce cfg.package.path;
297− PYTHONPATH = "${cfg.package.pythonPath}:${cfg.package}/lib/paperless-ngx/src";
297+ PYTHONPATH = "${cfg.package.pythonPath}:${cfg.package}/lib/paperless-ng/src";
298298 };
299299 # Allow the web interface to access the private /tmp directory of the server.
300300 # This is required to support uploading files via the web interface.
301− unitConfig.JoinsNamespaceOf = "paperless-scheduler.service";
302− # Bind to `paperless-scheduler` so that the web server never runs
301+ unitConfig.JoinsNamespaceOf = "paperless-ng-server.service";
302+ # Bind to `paperless-ng-server` so that the web server never runs
303303 # during migrations
304− bindsTo = [ "paperless-scheduler.service" ];
305− after = [ "paperless-scheduler.service" ];
304+ bindsTo = [ "paperless-ng-server.service" ];
305+ after = [ "paperless-ng-server.service" ];
306306 };
307307
308308 users = optionalAttrs (cfg.user == defaultUser) {
nixos/modules/services/misc/sourcehut/default.nix+1−1
@@ -1018,7 +1018,7 @@ in
10181018 inherit configIniOfService;
10191019 mainService = mkMerge [ baseService {
10201020 serviceConfig.StateDirectory = [ "sourcehut/gitsrht" "sourcehut/gitsrht/repos" ];
1021− preStart = mkIf (versionOlder config.system.stateVersion "22.05") (mkBefore ''
1021+ preStart = mkIf (!versionAtLeast config.system.stateVersion "22.05") (mkBefore ''
10221022 # Fix Git hooks of repositories pre-dating https://github.com/NixOS/nixpkgs/pull/133984
10231023 (
10241024 set +f
nixos/modules/services/misc/taskserver/default.nix+6−10
@@ -106,7 +106,7 @@ let
106106
107107 certtool = "${pkgs.gnutls.bin}/bin/certtool";
108108
109− nixos-taskserver = with pkgs.python3.pkgs; buildPythonApplication {
109+ nixos-taskserver = with pkgs.python2.pkgs; buildPythonApplication {
110110 name = "nixos-taskserver";
111111
112112 src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''
@@ -277,6 +277,10 @@ in {
277277 example = "::";
278278 description = ''
279279 The address (IPv4, IPv6 or DNS) to listen on.
280+
281+ If the value is something else than <literal>localhost</literal> the
282+ port defined by <option>listenPort</option> is automatically added to
283+ <option>networking.firewall.allowedTCPPorts</option>.
280284 '';
281285 };
282286
@@ -288,14 +292,6 @@ in {
288292 '';
289293 };
290294
291− openFirewall = mkOption {
292− type = types.bool;
293− default = false;
294− description = ''
295− Whether to open the firewall for the specified Taskserver port.
296− '';
297− };
298−
299295 fqdn = mkOption {
300296 type = types.str;
301297 default = "localhost";
@@ -564,7 +560,7 @@ in {
564560 '';
565561 };
566562 })
567− (mkIf (cfg.enable && cfg.openFirewall) {
563+ (mkIf (cfg.enable && cfg.listenHost != "localhost") {
568564 networking.firewall.allowedTCPPorts = [ cfg.listenPort ];
569565 })
570566 ];
nixos/modules/services/misc/taskserver/helper-tool.py+5−5
@@ -90,7 +90,7 @@ def certtool_cmd(*args, **kwargs):
9090 """
9191 return subprocess.check_output(
9292 [CERTTOOL_COMMAND] + list(args),
93− preexec_fn=lambda: os.umask(0o077),
93+ preexec_fn=lambda: os.umask(0077),
9494 stderr=subprocess.STDOUT,
9595 **kwargs
9696 )
@@ -164,7 +164,7 @@ def generate_key(org, user):
164164 pubcert = os.path.join(basedir, "public.cert")
165165
166166 try:
167− os.makedirs(basedir, mode=0o700)
167+ os.makedirs(basedir, mode=0700)
168168
169169 certtool_cmd("-p", "--bits", CERT_BITS, "--outfile", privkey)
170170
@@ -301,7 +301,7 @@ class Organisation(object):
301301 return None
302302 if name not in self.users.keys():
303303 output = taskd_cmd("add", "user", self.name, name,
304− capture_stdout=True, encoding='utf-8')
304+ capture_stdout=True)
305305 key = RE_USERKEY.search(output)
306306 if key is None:
307307 msg = "Unable to find key while creating user {}."
@@ -412,9 +412,9 @@ class Manager(object):
412412 if org is not None:
413413 if self.ignore_imperative and is_imperative(name):
414414 return
415− for user in list(org.users.keys()):
415+ for user in org.users.keys():
416416 org.del_user(user)
417− for group in list(org.groups.keys()):
417+ for group in org.groups.keys():
418418 org.del_group(group)
419419 taskd_cmd("remove", "org", name)
420420 del self._lazy_orgs[name]
nixos/modules/services/home-automation/zigbee2mqtt.nix → nixos/modules/services/misc/zigbee2mqtt.nixrenamed
The content is the same.
nixos/modules/services/misc/zookeeper.nix+1−8
@@ -114,13 +114,6 @@ in {
114114 type = types.package;
115115 };
116116
117− jre = mkOption {
118− description = "The JRE with which to run Zookeeper";
119− default = cfg.package.jre;
120− defaultText = literalExpression "pkgs.zookeeper.jre";
121− example = literalExpression "pkgs.jre";
122− type = types.package;
123− };
124117 };
125118
126119
@@ -138,7 +131,7 @@ in {
138131 after = [ "network.target" ];
139132 serviceConfig = {
140133 ExecStart = ''
141− ${cfg.jre}/bin/java \
134+ ${pkgs.jre}/bin/java \
142135 -cp "${cfg.package}/lib/*:${configDir}" \
143136 ${escapeShellArgs cfg.extraCmdLineOptions} \
144137 -Dzookeeper.datadir.autocreate=false \
nixos/modules/services/monitoring/collectd.nix+26−30
@@ -5,15 +5,36 @@ with lib;
55let
66 cfg = config.services.collectd;
77
8− baseDirLine = ''BaseDir "${cfg.dataDir}"'';
9− unvalidated_conf = pkgs.writeText "collectd-unvalidated.conf" cfg.extraConfig;
8+ unvalidated_conf = pkgs.writeText "collectd-unvalidated.conf" ''
9+ BaseDir "${cfg.dataDir}"
10+ AutoLoadPlugin ${boolToString cfg.autoLoadPlugin}
11+ Hostname "${config.networking.hostName}"
12+
13+ LoadPlugin syslog
14+ <Plugin "syslog">
15+ LogLevel "info"
16+ NotifyLevel "OKAY"
17+ </Plugin>
18+
19+ ${concatStrings (mapAttrsToList (plugin: pluginConfig: ''
20+ LoadPlugin ${plugin}
21+ <Plugin "${plugin}">
22+ ${pluginConfig}
23+ </Plugin>
24+ '') cfg.plugins)}
25+
26+ ${concatMapStrings (f: ''
27+ Include "${f}"
28+ '') cfg.include}
29+
30+ ${cfg.extraConfig}
31+ '';
1032
1133 conf = if cfg.validateConfig then
1234 pkgs.runCommand "collectd.conf" {} ''
1335 echo testing ${unvalidated_conf}
14− cp ${unvalidated_conf} collectd.conf
1536 # collectd -t fails if BaseDir does not exist.
16− substituteInPlace collectd.conf --replace ${lib.escapeShellArgs [ baseDirLine ]} 'BaseDir "."'
37+ sed '1s/^BaseDir.*$/BaseDir "."/' ${unvalidated_conf} > collectd.conf
1738 ${package}/bin/collectd -t -C collectd.conf
1839 cp ${unvalidated_conf} $out
1940 '' else unvalidated_conf;
@@ -102,8 +123,7 @@ in {
102123 extraConfig = mkOption {
103124 default = "";
104125 description = ''
105− Extra configuration for collectd. Use mkBefore to add lines before the
106− default config, and mkAfter to add them below.
126+ Extra configuration for collectd.
107127 '';
108128 type = lines;
109129 };
@@ -111,30 +131,6 @@ in {
111131 };
112132
113133 config = mkIf cfg.enable {
114− # 1200 is after the default (1000) but before mkAfter (1500).
115− services.collectd.extraConfig = lib.mkOrder 1200 ''
116− ${baseDirLine}
117− AutoLoadPlugin ${boolToString cfg.autoLoadPlugin}
118− Hostname "${config.networking.hostName}"
119−
120− LoadPlugin syslog
121− <Plugin "syslog">
122− LogLevel "info"
123− NotifyLevel "OKAY"
124− </Plugin>
125−
126− ${concatStrings (mapAttrsToList (plugin: pluginConfig: ''
127− LoadPlugin ${plugin}
128− <Plugin "${plugin}">
129− ${pluginConfig}
130− </Plugin>
131− '') cfg.plugins)}
132−
133− ${concatMapStrings (f: ''
134− Include "${f}"
135− '') cfg.include}
136− '';
137−
138134 systemd.tmpfiles.rules = [
139135 "d '${cfg.dataDir}' - ${cfg.user} - - -"
140136 ];
nixos/modules/services/monitoring/grafana.nix−5
@@ -214,11 +214,6 @@ let
214214 type = types.path;
215215 description = "Path grafana will watch for dashboards.";
216216 };
217− foldersFromFilesStructure = mkOption {
218− type = types.bool;
219− default = false;
220− description = "Use folder names from filesystem to create folders in Grafana.";
221− };
222217 };
223218 };
224219 };
nixos/modules/services/monitoring/mimir.nixdeleted−63
@@ -1,63 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−let
4− inherit (lib) escapeShellArgs mkEnableOption mkIf mkOption types;
5−
6− cfg = config.services.mimir;
7−
8− settingsFormat = pkgs.formats.yaml {};
9−in {
10− options.services.mimir = {
11− enable = mkEnableOption "mimir";
12−
13− configuration = mkOption {
14− type = (pkgs.formats.json {}).type;
15− default = {};
16− description = ''
17− Specify the configuration for Mimir in Nix.
18− '';
19− };
20−
21− configFile = mkOption {
22− type = types.nullOr types.path;
23− default = null;
24− description = ''
25− Specify a configuration file that Mimir should use.
26− '';
27− };
28− };
29−
30− config = mkIf cfg.enable {
31− assertions = [{
32− assertion = (
33− (cfg.configuration == {} -> cfg.configFile != null) &&
34− (cfg.configFile != null -> cfg.configuration == {})
35− );
36− message = ''
37− Please specify either
38− 'services.mimir.configuration' or
39− 'services.mimir.configFile'.
40− '';
41− }];
42−
43− systemd.services.mimir = {
44− description = "mimir Service Daemon";
45− wantedBy = [ "multi-user.target" ];
46−
47− serviceConfig = let
48− conf = if cfg.configFile == null
49− then settingsFormat.generate "config.yaml" cfg.configuration
50− else cfg.configFile;
51− in
52− {
53− ExecStart = "${pkgs.grafana-mimir}/bin/mimir --config.file=${conf}";
54− DynamicUser = true;
55− Restart = "always";
56− ProtectSystem = "full";
57− DevicePolicy = "closed";
58− NoNewPrivileges = true;
59− StateDirectory = "mimir";
60− };
61− };
62− };
63−}
nixos/modules/services/monitoring/nagios.nix+2−2
@@ -102,8 +102,8 @@ in
102102
103103 plugins = mkOption {
104104 type = types.listOf types.package;
105− default = with pkgs; [ monitoring-plugins msmtp mailutils ];
106− defaultText = literalExpression "[pkgs.monitoring-plugins pkgs.msmtp pkgs.mailutils]";
105+ default = with pkgs; [ monitoring-plugins ssmtp mailutils ];
106+ defaultText = literalExpression "[pkgs.monitoring-plugins pkgs.ssmtp pkgs.mailutils]";
107107 description = "
108108 Packages to be added to the Nagios <envar>PATH</envar>.
109109 Typically used to add plugins, but can be anything.
nixos/modules/services/monitoring/prometheus/default.nix+9−2
@@ -74,6 +74,7 @@ let
7474 }"
7575 "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}"
7676 "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
77+ "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
7778 ] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"
7879 ++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}";
7980
@@ -1562,8 +1563,6 @@ in
15621563 (mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])
15631564 (mkRemovedOptionModule [ "services" "prometheus" "environmentFile" ]
15641565 "It has been removed since it was causing issues (https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files, i.e. `basic_auth.password_file` and `authorization.credentials_file`.")
1565− (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerTimeout" ]
1566− "Deprecated upstream and no longer had any effect")
15671566 ];
15681567
15691568 options.services.prometheus = {
@@ -1720,6 +1719,14 @@ in
17201719 '';
17211720 };
17221721
1722+ alertmanagerTimeout = mkOption {
1723+ type = types.int;
1724+ default = 10;
1725+ description = ''
1726+ Alert manager HTTP API timeout (in seconds).
1727+ '';
1728+ };
1729+
17231730 webExternalUrl = mkOption {
17241731 type = types.nullOr types.str;
17251732 default = null;
nixos/modules/services/monitoring/prometheus/exporters.nix−2
@@ -29,7 +29,6 @@ let
2929 "blackbox"
3030 "buildkite-agent"
3131 "collectd"
32− "dmarc"
3332 "dnsmasq"
3433 "domain"
3534 "dovecot"
@@ -56,7 +55,6 @@ let
5655 "postfix"
5756 "postgres"
5857 "process"
59− "pve"
6058 "py-air-control"
6159 "redis"
6260 "rspamd"
nixos/modules/services/monitoring/prometheus/exporters.xml−21
@@ -19,7 +19,6 @@
1919<programlisting>
2020 services.prometheus.exporters.node = {
2121 enable = true;
22− port = 9100;
2322 enabledCollectors = [
2423 "logind"
2524 "systemd"
@@ -43,26 +42,6 @@
4342 <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available
4443 options</link>.
4544 </para>
46−
47− <para>
48− Prometheus can now be configured to consume the metrics produced by the exporter:
49− <programlisting>
50− services.prometheus = {
51− # ...
52−
53− scrapeConfigs = [
54− {
55− job_name = "node";
56− static_configs = [{
57− targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ];
58− }];
59− }
60− ];
61−
62− # ...
63− }
64− </programlisting>
65− </para>
6645 </section>
6746 <section xml:id="module-services-prometheus-exporters-new-exporter">
6847 <title>Adding a new exporter</title>
nixos/modules/services/monitoring/prometheus/exporters/bird.nix+1−1
@@ -17,7 +17,7 @@ in
1717 };
1818 birdSocket = mkOption {
1919 type = types.path;
20− default = "/run/bird/bird.ctl";
20+ default = "/var/run/bird.ctl";
2121 description = ''
2222 Path to BIRD2 (or BIRD1 v4) socket.
2323 '';
nixos/modules/services/monitoring/prometheus/exporters/dmarc.nixdeleted−117
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/kea.nix−4
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/pve.nixdeleted−118
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/systemd.nix+1−1
This diff is too big to show here.
nixos/modules/services/monitoring/prometheus/exporters/varnish.nix+2−3
This diff is too big to show here.
nixos/modules/services/network-filesystems/ipfs.nix+18−30
This diff is too big to show here.
nixos/modules/services/network-filesystems/samba.nix−1
This diff is too big to show here.
nixos/modules/services/networking/amuled.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/asterisk.nix+43−11
This diff is too big to show here.
nixos/modules/services/networking/bird.nix+2−1
This diff is too big to show here.
nixos/modules/services/networking/cloudflare-dyndns.nixdeleted−93
This diff is too big to show here.
nixos/modules/services/networking/consul.nix+6−32
This diff is too big to show here.
nixos/modules/services/networking/create_ap.nixdeleted−50
This diff is too big to show here.
nixos/modules/services/networking/dhcpd.nix+3−5
This diff is too big to show here.
nixos/modules/services/networking/envoy.nixdeleted−84
This diff is too big to show here.
nixos/modules/services/networking/headscale.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/https-dns-proxy.nixdeleted−128
This diff is too big to show here.
nixos/modules/services/networking/iwd.nix+6−15
This diff is too big to show here.
nixos/modules/services/networking/kea.nix+8−74
This diff is too big to show here.
nixos/modules/services/networking/lxd-image-server.nix+11−7
This diff is too big to show here.
nixos/modules/services/networking/mozillavpn.nixdeleted−19
This diff is too big to show here.
nixos/modules/services/networking/nbd.nixdeleted−159
This diff is too big to show here.
nixos/modules/services/networking/ncdns.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/networkmanager.nix+53−57
This diff is too big to show here.
nixos/modules/services/networking/nsd.nix+12−8
This diff is too big to show here.
nixos/modules/services/networking/openconnect.nixdeleted−137
This diff is too big to show here.
nixos/modules/services/networking/openfire.nixnew file+56
This diff is too big to show here.
nixos/modules/services/networking/pdns-recursor.nix+7−12
This diff is too big to show here.
nixos/modules/services/networking/pleroma.nix+4−4
This diff is too big to show here.
nixos/modules/services/networking/powerdns.nix+2−2
This diff is too big to show here.
nixos/modules/services/networking/prosody.nix−1
This diff is too big to show here.
nixos/modules/services/networking/shellhub-agent.nix+17−26
This diff is too big to show here.
nixos/modules/services/networking/snowflake-proxy.nixdeleted−81
This diff is too big to show here.
nixos/modules/services/networking/squid.nix+3−14
This diff is too big to show here.
nixos/modules/services/networking/ssh/sshd.nix−1
This diff is too big to show here.
nixos/modules/services/networking/supplicant.nix+1−1
This diff is too big to show here.
nixos/modules/services/networking/syncplay.nix+1−17
This diff is too big to show here.
nixos/modules/services/networking/tailscale.nix+1−9
This diff is too big to show here.
nixos/modules/services/networking/tox-node.nix+6−1
This diff is too big to show here.
nixos/modules/services/networking/unbound.nix−1
This diff is too big to show here.
nixos/modules/services/networking/vsftpd.nix−1
This diff is too big to show here.
nixos/modules/services/networking/wg-quick.nix+1−8
This diff is too big to show here.
nixos/modules/services/networking/zeronet.nix+1−1
This diff is too big to show here.
nixos/modules/services/security/fprot.nixnew file+82
This diff is too big to show here.
nixos/modules/services/security/oauth2_proxy.nix+4−9
This diff is too big to show here.
nixos/modules/services/security/opensnitch.nix+1−102
This diff is too big to show here.
nixos/modules/services/security/sslmate-agent.nixdeleted−32
This diff is too big to show here.
nixos/modules/services/security/tor.nix+2−11
This diff is too big to show here.
nixos/modules/services/system/earlyoom.nix+97−133
This diff is too big to show here.
nixos/modules/services/system/nscd.nix+8−17
This diff is too big to show here.
nixos/modules/services/system/systembus-notify.nixdeleted−27
This diff is too big to show here.
nixos/modules/services/ttys/kmscon.nix+5−24
This diff is too big to show here.
nixos/modules/services/video/epgstation/default.nix+168−180
This diff is too big to show here.
nixos/modules/services/video/epgstation/streaming.json+108−129
This diff is too big to show here.
nixos/modules/services/video/unifi-video.nix+82−86
This diff is too big to show here.
nixos/modules/services/wayland/cage.nix−2
This diff is too big to show here.
nixos/modules/services/web-apps/atlassian/jira.nix−1
This diff is too big to show here.
nixos/modules/services/web-apps/discourse.nix+3−9
This diff is too big to show here.
nixos/modules/services/web-apps/galene.nix−29
This diff is too big to show here.
nixos/modules/services/web-apps/jitsi-meet.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-apps/keycloak.nix+502−368
This diff is too big to show here.
nixos/modules/services/web-apps/keycloak.xml+81−61
This diff is too big to show here.
nixos/modules/services/web-apps/mastodon.nix+1−3
This diff is too big to show here.
nixos/modules/services/web-apps/netbox.nixdeleted−265
This diff is too big to show here.
nixos/modules/services/web-apps/nextcloud.nix+10−76
This diff is too big to show here.
nixos/modules/services/web-apps/nifi.nixdeleted−318
This diff is too big to show here.
nixos/modules/services/web-apps/plantuml-server.nix+3−18
This diff is too big to show here.
nixos/modules/services/web-servers/apache-httpd/default.nix+13−8
This diff is too big to show here.
nixos/modules/services/web-servers/hydron.nix+1−1
This diff is too big to show here.
nixos/modules/services/web-servers/nginx/default.nix+22−27
This diff is too big to show here.
nixos/modules/services/web-servers/nginx/vhost-options.nix+3−12
This diff is too big to show here.
nixos/modules/services/web-servers/pomerium.nix+3−7
This diff is too big to show here.
nixos/modules/services/web-servers/tomcat.nix+3−4
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/cinnamon.nix+3−3
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/enlightenment.nix−5
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/gnome.nix+69−43
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/lumina.nix−4
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/lxqt.nix+2−11
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/mate.nix+37−9
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/none.nix+5−44
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/pantheon.nix+5−4
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/pantheon.xml+3−3
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/plasma5.nix+2−2
This diff is too big to show here.
nixos/modules/services/x11/desktop-managers/xfce.nix+1−8
This diff is too big to show here.
nixos/modules/services/x11/display-managers/default.nix−1
This diff is too big to show here.
nixos/modules/services/x11/display-managers/gdm.nix+1−1
This diff is too big to show here.
nixos/modules/services/x11/display-managers/lightdm.nix−2
This diff is too big to show here.
nixos/modules/services/x11/window-managers/qtile.nix+4−11
This diff is too big to show here.
nixos/modules/services/x11/xserver.nix+6−10
This diff is too big to show here.
nixos/modules/system/activation/switch-to-configuration.plmode 100755 → 100644+301−460
This diff is too big to show here.
nixos/modules/system/activation/top-level.nix+5−12
This diff is too big to show here.
nixos/modules/system/boot/kernel.nix+2−2
This diff is too big to show here.
nixos/modules/system/boot/loader/grub/grub.nix−26
This diff is too big to show here.
nixos/modules/system/boot/loader/grub/install-grub.pl+3−5
This diff is too big to show here.
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py+5−16
This diff is too big to show here.
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−1
This diff is too big to show here.
nixos/modules/system/boot/luksroot.nix+7−74
This diff is too big to show here.
nixos/modules/system/boot/modprobe.nix+20
This diff is too big to show here.
nixos/modules/system/boot/networkd.nix+2−191
This diff is too big to show here.
nixos/modules/system/boot/stage-1-init.sh+6−3
This diff is too big to show here.
nixos/modules/system/boot/stage-1.nix+18−34
This diff is too big to show here.
nixos/modules/system/boot/stage-2-init.sh+98−66
This diff is too big to show here.
nixos/modules/system/boot/stage-2.nix+39−2
This diff is too big to show here.
nixos/modules/system/boot/systemd/nspawn.nix → nixos/modules/system/boot/systemd-nspawn.nixrenamed+1−7
This diff is too big to show here.
nixos/modules/system/boot/systemd.nix+683−58
This diff is too big to show here.
nixos/modules/system/boot/systemd/coredump.nixdeleted−57
This diff is too big to show here.
nixos/modules/system/boot/systemd/initrd-secrets.nixdeleted−36
This diff is too big to show here.
nixos/modules/system/boot/systemd/initrd.nixdeleted−502
This diff is too big to show here.
nixos/modules/system/boot/systemd/journald.nixdeleted−131
This diff is too big to show here.
nixos/modules/system/boot/systemd/logind.nixdeleted−114
This diff is too big to show here.
nixos/modules/system/boot/systemd/shutdown.nixdeleted−58
This diff is too big to show here.
nixos/modules/system/boot/systemd/tmpfiles.nixdeleted−120
This diff is too big to show here.
nixos/modules/system/boot/systemd/user.nixdeleted−153
This diff is too big to show here.
nixos/modules/system/boot/timesyncd.nix+5−17
This diff is too big to show here.
nixos/modules/tasks/auto-upgrade.nix+20−104
This diff is too big to show here.
nixos/modules/tasks/bcache.nix+6−16
This diff is too big to show here.
nixos/modules/tasks/filesystems.nix+1−30
This diff is too big to show here.
nixos/modules/tasks/filesystems/btrfs.nix+3−3
This diff is too big to show here.
nixos/modules/tasks/filesystems/cifs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/ext.nix+4−10
This diff is too big to show here.
nixos/modules/tasks/filesystems/f2fs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/jfs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/reiserfs.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/unionfs-fuse.nix+2−13
This diff is too big to show here.
nixos/modules/tasks/filesystems/vfat.nix+1−1
This diff is too big to show here.
nixos/modules/tasks/filesystems/xfs.nix+2−2
This diff is too big to show here.
nixos/modules/tasks/filesystems/zfs.nix+33−9
This diff is too big to show here.
nixos/modules/tasks/lvm.nix+6−55
This diff is too big to show here.
nixos/modules/tasks/network-interfaces-scripted.nix−2
This diff is too big to show here.
nixos/modules/tasks/network-interfaces-systemd.nix−2
This diff is too big to show here.
nixos/modules/tasks/network-interfaces.nix+13−36
This diff is too big to show here.
nixos/modules/tasks/swraid.nix+9−35
This diff is too big to show here.
nixos/modules/testing/test-instrumentation.nix+26−19
This diff is too big to show here.
nixos/modules/virtualisation/azure-agent.nix+9−5
This diff is too big to show here.
nixos/modules/virtualisation/azure-common.nix+1−5
This diff is too big to show here.
nixos/modules/virtualisation/libvirtd.nix−4
This diff is too big to show here.
nixos/modules/virtualisation/nixos-containers.nix+11−26
This diff is too big to show here.
nixos/modules/virtualisation/oci-containers.nix+9−7
This diff is too big to show here.
nixos/modules/virtualisation/openstack-config.nix+7−39
This diff is too big to show here.
nixos/modules/virtualisation/openstack-metadata-fetcher.nix+3−3
This diff is too big to show here.
nixos/modules/virtualisation/openstack-options.nixdeleted−71
This diff is too big to show here.
nixos/modules/virtualisation/podman/default.nix+1−4
This diff is too big to show here.
nixos/modules/virtualisation/qemu-vm.nix+7−43
This diff is too big to show here.
nixos/modules/virtualisation/vmware-host.nixdeleted−166
This diff is too big to show here.
nixos/modules/virtualisation/waydroid.nix+2−4
This diff is too big to show here.
nixos/release-combined.nix+1−2
This diff is too big to show here.
nixos/release-small.nix+1−2
This diff is too big to show here.
nixos/release.nix+2−2
This diff is too big to show here.
nixos/tests/aesmd.nix+1−1
This diff is too big to show here.
nixos/tests/agda.nix+1−1
This diff is too big to show here.
nixos/tests/airsonic.nix+1−1
This diff is too big to show here.
nixos/tests/all-terminfo.nixdeleted−31
This diff is too big to show here.
nixos/tests/all-tests.nix+7−41
This diff is too big to show here.
nixos/tests/amazon-init-shell.nix+1−1
This diff is too big to show here.
nixos/tests/apfs.nix+1−1
This diff is too big to show here.
nixos/tests/apparmor.nix+1−1
This diff is too big to show here.
nixos/tests/atd.nix+1−1
This diff is too big to show here.
nixos/tests/atop.nix+14−6
This diff is too big to show here.
nixos/tests/avahi.nix+1−1
This diff is too big to show here.
nixos/tests/bcachefs.nix+7−6
This diff is too big to show here.
nixos/tests/beanstalkd.nix+1−1
This diff is too big to show here.
nixos/tests/bees.nix+1−1
This diff is too big to show here.
nixos/tests/bind.nix+1−1
This diff is too big to show here.
nixos/tests/bitcoind.nix+1−1
This diff is too big to show here.
nixos/tests/blockbook-frontend.nix+1−1
This diff is too big to show here.
nixos/tests/boot-stage1.nix+1−1
This diff is too big to show here.
nixos/tests/boot.nix+1
This diff is too big to show here.
nixos/tests/botamusique.nix−4
This diff is too big to show here.
nixos/tests/bpf.nix+1−1
This diff is too big to show here.
nixos/tests/breitbandmessung.nix+1−1
This diff is too big to show here.
nixos/tests/brscan5.nix+1−1
This diff is too big to show here.
nixos/tests/buildkite-agents.nix+1−1
This diff is too big to show here.
nixos/tests/caddy.nix+3−3
This diff is too big to show here.
nixos/tests/cage.nix+1−1
This diff is too big to show here.
nixos/tests/cagebreak.nix+1−1
This diff is too big to show here.
nixos/tests/ceph-multi-node.nix+1−1
This diff is too big to show here.
nixos/tests/cfssl.nix+1−1
This diff is too big to show here.
nixos/tests/chromium.nix+18−20
This diff is too big to show here.
nixos/tests/clickhouse.nix+1−1
This diff is too big to show here.
nixos/tests/cloud-init.nix+1−1
This diff is too big to show here.
nixos/tests/cntr.nix+5−17
This diff is too big to show here.
nixos/tests/collectd.nix+2−7
This diff is too big to show here.
nixos/tests/common/lxd/config.yamldeleted−24
This diff is too big to show here.
nixos/tests/containers-bridge.nix+1−1
This diff is too big to show here.
nixos/tests/containers-custom-pkgs.nix+1−1
This diff is too big to show here.
nixos/tests/containers-ephemeral.nix+4−4
This diff is too big to show here.
nixos/tests/containers-extra_veth.nix+1−1
This diff is too big to show here.
nixos/tests/containers-hosts.nix+1−1
This diff is too big to show here.
nixos/tests/containers-imperative.nix+7−7
This diff is too big to show here.
nixos/tests/containers-ip.nix+1−1
This diff is too big to show here.
nixos/tests/containers-names.nix+1−1
This diff is too big to show here.
nixos/tests/containers-nested.nix+1−1
This diff is too big to show here.
nixos/tests/containers-portforward.nix+1−1
This diff is too big to show here.
nixos/tests/containers-tmpfs.nix+6−6
This diff is too big to show here.
nixos/tests/cri-o.nix+1−1
This diff is too big to show here.
nixos/tests/custom-ca.nix+90−104
This diff is too big to show here.
nixos/tests/disable-installer-tools.nix+1−1
This diff is too big to show here.
nixos/tests/dnsdist.nix+1−1
This diff is too big to show here.
nixos/tests/doas.nix+1−1
This diff is too big to show here.
nixos/tests/docker-tools-cross.nix+2−2
This diff is too big to show here.
nixos/tests/docker-tools.nix+1−1
This diff is too big to show here.
nixos/tests/documize.nix+1−1
This diff is too big to show here.
nixos/tests/domination.nix+1−1
This diff is too big to show here.
nixos/tests/dovecot.nix+1−1
This diff is too big to show here.
nixos/tests/earlyoom.nixdeleted−16
This diff is too big to show here.
nixos/tests/ecryptfs.nix+1−1
This diff is too big to show here.
nixos/tests/emacs-daemon.nix+2−2
This diff is too big to show here.
nixos/tests/empty-filedeleted
No changes to the content.
nixos/tests/enlightenment.nix+1−1
This diff is too big to show here.
nixos/tests/env.nix+1−1
This diff is too big to show here.
nixos/tests/envoy.nixdeleted−33
This diff is too big to show here.
nixos/tests/etebase-server.nix+1−1
This diff is too big to show here.
nixos/tests/etesync-dav.nix+1−1
This diff is too big to show here.
nixos/tests/fancontrol.nix+1−1
This diff is too big to show here.
nixos/tests/fcitx/default.nix+1−1
This diff is too big to show here.
nixos/tests/fenics.nix+1−1
This diff is too big to show here.
nixos/tests/firefox.nix+1−1
This diff is too big to show here.
nixos/tests/fish.nix+1−1
This diff is too big to show here.
nixos/tests/fluentd.nix+1−1
This diff is too big to show here.
nixos/tests/fontconfig-default-fonts.nix+1−1
This diff is too big to show here.
nixos/tests/fsck.nix+1−1
This diff is too big to show here.
nixos/tests/ft2-clone.nix+1−1
This diff is too big to show here.
nixos/tests/geth.nix+1−1
This diff is too big to show here.
nixos/tests/gitlab.nix+21−300
This diff is too big to show here.
nixos/tests/gitolite-fcgiwrap.nix+1−1
This diff is too big to show here.
nixos/tests/gnome-xorg.nix+1−2
This diff is too big to show here.
nixos/tests/gnome.nix+1−2
This diff is too big to show here.
nixos/tests/gotify-server.nix+1−1
This diff is too big to show here.
nixos/tests/graylog.nix+1−1
This diff is too big to show here.
nixos/tests/grocy.nix+1−1
This diff is too big to show here.
nixos/tests/grub.nix+1−1
This diff is too big to show here.
nixos/tests/hadoop/default.nixdeleted−7
This diff is too big to show here.
nixos/tests/hadoop/hadoop.nix+123−150
This diff is too big to show here.
nixos/tests/hadoop/hdfs.nix+18−43
This diff is too big to show here.
nixos/tests/hadoop/yarn.nix+13−21
This diff is too big to show here.
nixos/tests/hardened.nix+1−1
This diff is too big to show here.
nixos/tests/haste-server.nixdeleted−23
This diff is too big to show here.
nixos/tests/hbase.nixdeleted−30
This diff is too big to show here.
nixos/tests/herbstluftwm.nix+1−1
This diff is too big to show here.
nixos/tests/hibernate.nix−11
This diff is too big to show here.
nixos/tests/hitch/default.nix+1−1
This diff is too big to show here.
nixos/tests/hocker-fetchdocker/default.nix+1−1
This diff is too big to show here.
nixos/tests/hockeypuck.nix+1−1
This diff is too big to show here.
nixos/tests/home-assistant.nix+43
This diff is too big to show here.
nixos/tests/hostname.nix+1−1
This diff is too big to show here.
nixos/tests/hound.nix+1−1
This diff is too big to show here.
nixos/tests/hydra/default.nix+1−1
This diff is too big to show here.
nixos/tests/i3wm.nix+1−1
This diff is too big to show here.
nixos/tests/ihatemoney/default.nix+1−1
This diff is too big to show here.
nixos/tests/incron.nix+1−1
This diff is too big to show here.
nixos/tests/initrd-network.nix+1−1
This diff is too big to show here.
nixos/tests/initrd-secrets.nix+1−1
This diff is too big to show here.
nixos/tests/input-remapper.nixdeleted−52
This diff is too big to show here.
nixos/tests/installed-tests/appstream-qt.nixdeleted−9
This diff is too big to show here.
nixos/tests/installed-tests/appstream.nixdeleted−9
This diff is too big to show here.
nixos/tests/installed-tests/default.nix+1−3
This diff is too big to show here.
nixos/tests/installed-tests/gjs.nix−6
This diff is too big to show here.
nixos/tests/installer-systemd-stage-1.nixdeleted−33
This diff is too big to show here.
nixos/tests/installer.nix+2−16
This diff is too big to show here.
nixos/tests/invidious.nix+1−1
This diff is too big to show here.
nixos/tests/ipfs.nix−5
This diff is too big to show here.
nixos/tests/isso.nix+1−1
This diff is too big to show here.
nixos/tests/jellyfin.nix+1−1
This diff is too big to show here.
nixos/tests/jenkins.nix−2
This diff is too big to show here.
nixos/tests/jibri.nix+1−1
This diff is too big to show here.
nixos/tests/jitsi-meet.nix+2−2
This diff is too big to show here.
nixos/tests/k3s-single-node-docker.nix+1−1
This diff is too big to show here.
nixos/tests/k3s-single-node.nix+1−1
This diff is too big to show here.
nixos/tests/kbd-setfont-decompress.nix+1−1
This diff is too big to show here.
nixos/tests/kbd-update-search-paths-patch.nix+1−1
This diff is too big to show here.
nixos/tests/keepassxc.nix+9−43
This diff is too big to show here.
nixos/tests/kerberos/heimdal.nix+1−1
This diff is too big to show here.
nixos/tests/kerberos/mit.nix+1−1
This diff is too big to show here.
nixos/tests/kernel-generic.nix+1−1
This diff is too big to show here.
nixos/tests/kernel-latest-ath-user-regd.nix+1−1
This diff is too big to show here.
nixos/tests/kexec.nix+16−44
This diff is too big to show here.
nixos/tests/keycloak.nix+13−33
This diff is too big to show here.
nixos/tests/krb5/deprecated-config.nix+1−1
This diff is too big to show here.
nixos/tests/krb5/example-config.nix+1−1
This diff is too big to show here.
nixos/tests/ksm.nix+1−1
This diff is too big to show here.
nixos/tests/libinput.nix+1−1
This diff is too big to show here.
nixos/tests/libresprite.nix+1−1
This diff is too big to show here.
nixos/tests/lightdm.nix+1−1
This diff is too big to show here.
nixos/tests/limesurvey.nix+1−1
This diff is too big to show here.
nixos/tests/litestream.nix+1−1
This diff is too big to show here.
nixos/tests/login.nix+1−1
This diff is too big to show here.
nixos/tests/logrotate.nix+10−125
This diff is too big to show here.
nixos/tests/loki.nix+1−1
This diff is too big to show here.
nixos/tests/lorri/default.nix+1−1
This diff is too big to show here.
nixos/tests/lvm2/default.nixdeleted−45
This diff is too big to show here.
nixos/tests/lvm2/systemd-stage-1.nixdeleted−104
This diff is too big to show here.
nixos/tests/lvm2/thinpool.nixdeleted−32
This diff is too big to show here.
nixos/tests/lvm2/vdo.nixdeleted−27
This diff is too big to show here.
nixos/tests/lxd-image-server.nix+49−16
This diff is too big to show here.
nixos/tests/lxd-image.nixnew file+89
This diff is too big to show here.
nixos/tests/lxd-nftables.nix+1−1
This diff is too big to show here.
nixos/tests/lxd.nix+64−41
This diff is too big to show here.
nixos/tests/maestral.nixdeleted−72
This diff is too big to show here.
nixos/tests/magnetico.nix+1−1
This diff is too big to show here.
nixos/tests/mailcatcher.nix+3−8
This diff is too big to show here.
nixos/tests/mailhog.nix+1−1
This diff is too big to show here.
nixos/tests/matomo.nix+1−1
This diff is too big to show here.
nixos/tests/matrix-appservice-irc.nix+21−28
This diff is too big to show here.
nixos/tests/matrix-synapse.nix+18−46
This diff is too big to show here.
nixos/tests/matrix/mjolnir.nix+19−24
This diff is too big to show here.
nixos/tests/matrix/pantalaimon.nix+4−27
This diff is too big to show here.
nixos/tests/mediawiki.nix+1−1
This diff is too big to show here.
nixos/tests/meilisearch.nix+1−1
This diff is too big to show here.
nixos/tests/memcached.nix+1−1
This diff is too big to show here.
nixos/tests/minidlna.nix+2−4
This diff is too big to show here.
nixos/tests/misc.nix+4−4
This diff is too big to show here.
nixos/tests/mod_perl.nix+1−1
This diff is too big to show here.
nixos/tests/mongodb.nix−4
This diff is too big to show here.
nixos/tests/moodle.nix+1−1
This diff is too big to show here.
nixos/tests/moonraker.nixdeleted−45
This diff is too big to show here.
nixos/tests/mtp.nixdeleted−109
This diff is too big to show here.
nixos/tests/musescore.nix+1−1
This diff is too big to show here.
nixos/tests/mysql/mysql-autobackup.nix+1−1
This diff is too big to show here.
nixos/tests/nagios.nix+1−1
This diff is too big to show here.
nixos/tests/nar-serve.nix+1−1
This diff is too big to show here.
nixos/tests/nats.nix+13−11
This diff is too big to show here.
nixos/tests/navidrome.nix+1−1
This diff is too big to show here.
nixos/tests/nbd.nixdeleted−103
This diff is too big to show here.
nixos/tests/ncdns.nix+9−6
This diff is too big to show here.
nixos/tests/networking.nix+7−48
This diff is too big to show here.
nixos/tests/nextcloud/default.nix+1−1
This diff is too big to show here.
nixos/tests/nextcloud/with-mysql-and-memcached.nix+22−1
This diff is too big to show here.
nixos/tests/nginx-modsecurity.nix+1−1
This diff is too big to show here.
nixos/tests/nginx-pubhtml.nix+1−1
This diff is too big to show here.
nixos/tests/nginx-sandbox.nix+1−1
This diff is too big to show here.
nixos/tests/nginx-sso.nix+1−1
This diff is too big to show here.
nixos/tests/nginx-variants.nix+1−1
This diff is too big to show here.
nixos/tests/nix-ld.nixdeleted−20
This diff is too big to show here.
nixos/tests/nix-serve.nix+1−1
This diff is too big to show here.
nixos/tests/nixops/default.nix+2−2
This diff is too big to show here.
nixos/tests/nixos-generate-config.nix+1−1
This diff is too big to show here.
nixos/tests/noto-fonts.nix+1−1
This diff is too big to show here.
nixos/tests/novacomd.nix+1−1
This diff is too big to show here.
nixos/tests/oh-my-zsh.nix+1−1
This diff is too big to show here.
nixos/tests/openldap.nix+3−3
This diff is too big to show here.
nixos/tests/openssh.nix+6−12
This diff is too big to show here.
nixos/tests/opentabletdriver.nix+1−1
This diff is too big to show here.
nixos/tests/os-prober.nix+1−1
This diff is too big to show here.
nixos/tests/osrm-backend.nix+1−1
This diff is too big to show here.
nixos/tests/overlayfs.nix+1−1
This diff is too big to show here.
nixos/tests/pacemaker.nixdeleted−110
This diff is too big to show here.
nixos/tests/packagekit.nix+1−1
This diff is too big to show here.
nixos/tests/pam/pam-oath-login.nix+2−2
This diff is too big to show here.
nixos/tests/pam/pam-u2f.nix+1−1
This diff is too big to show here.
nixos/tests/pam/pam-ussh.nixdeleted−70
This diff is too big to show here.
nixos/tests/pantheon.nix+1−1
This diff is too big to show here.
nixos/tests/paperless.nix → nixos/tests/paperless-ng.nixrenamed+12−11
This diff is too big to show here.
nixos/tests/pdns-recursor.nix+1−4
This diff is too big to show here.
nixos/tests/pgadmin4.nix+47−37
This diff is too big to show here.
nixos/tests/php/fpm.nix+1−1
This diff is too big to show here.
nixos/tests/php/httpd.nix+1−1
This diff is too big to show here.
nixos/tests/php/pcre.nix+1−1
This diff is too big to show here.
nixos/tests/pict-rs.nix+1−1
This diff is too big to show here.
nixos/tests/plasma5-systemd-start.nix+1−1
This diff is too big to show here.
nixos/tests/plasma5.nix+1−1
This diff is too big to show here.
nixos/tests/plausible.nix+1−1
This diff is too big to show here.
nixos/tests/pleroma.nix+18−2
This diff is too big to show here.
nixos/tests/plikd.nix+1−1
This diff is too big to show here.
nixos/tests/plotinus.nix+1−1
This diff is too big to show here.
nixos/tests/postfix-raise-smtpd-tls-security-level.nix+1−1
This diff is too big to show here.
nixos/tests/postfix.nix+1−1
This diff is too big to show here.
nixos/tests/postgresql-wal-receiver.nix+1−1
This diff is too big to show here.
nixos/tests/postgresql.nix+1−1
This diff is too big to show here.
nixos/tests/power-profiles-daemon.nix+1−1
This diff is too big to show here.
nixos/tests/powerdns.nix−1
This diff is too big to show here.
nixos/tests/predictable-interface-names.nix+1−1
This diff is too big to show here.
nixos/tests/privacyidea.nix+1−1
This diff is too big to show here.
nixos/tests/privoxy.nix+1−1
This diff is too big to show here.
nixos/tests/prometheus-exporters.nix−30
This diff is too big to show here.
nixos/tests/pt2-clone.nix+1−1
This diff is too big to show here.
nixos/tests/pulseaudio.nix+1−1
This diff is too big to show here.
nixos/tests/qboot.nix+1−1
This diff is too big to show here.
nixos/tests/rabbitmq.nix+1−1
This diff is too big to show here.
nixos/tests/radicale.nix+1−1
This diff is too big to show here.
nixos/tests/rasdaemon.nix+1−1
This diff is too big to show here.
nixos/tests/redmine.nix+1−1
This diff is too big to show here.
nixos/tests/restart-by-activation-script.nix+1−1
This diff is too big to show here.
nixos/tests/retroarch.nix+1−1
This diff is too big to show here.
nixos/tests/riak.nix+1−1
This diff is too big to show here.
nixos/tests/rspamd.nix+5−5
This diff is too big to show here.
nixos/tests/rstudio-server.nix+6
This diff is too big to show here.
nixos/tests/rsyslogd.nix+2−2
This diff is too big to show here.
nixos/tests/sabnzbd.nix+1−1
This diff is too big to show here.
nixos/tests/sddm.nix+2−2
This diff is too big to show here.
nixos/tests/sfxr-qt.nixdeleted−32
This diff is too big to show here.
nixos/tests/shattered-pixel-dungeon.nix+1−1
This diff is too big to show here.
nixos/tests/shiori.nix+1−1
This diff is too big to show here.
nixos/tests/signal-desktop.nix+1−1
This diff is too big to show here.
nixos/tests/simple.nix+1−1
This diff is too big to show here.
nixos/tests/snapcast.nix−1
This diff is too big to show here.
nixos/tests/snapper.nix+1−1
This diff is too big to show here.
nixos/tests/soapui.nix+1−1
This diff is too big to show here.
nixos/tests/solr.nix+1−1
This diff is too big to show here.
nixos/tests/sourcehut.nix+1−1
This diff is too big to show here.
nixos/tests/sssd-ldap.nix+1−1
This diff is too big to show here.
nixos/tests/sssd.nix+1−1
This diff is too big to show here.
nixos/tests/starship.nix+1−1
This diff is too big to show here.
nixos/tests/step-ca.nix+2−3
This diff is too big to show here.
nixos/tests/sway.nix+1−1
This diff is too big to show here.
nixos/tests/switch-test.nix+36−337
This diff is too big to show here.
nixos/tests/sympa.nix+1−1
This diff is too big to show here.
nixos/tests/syncthing-init.nix+1−1
This diff is too big to show here.
nixos/tests/syncthing-relay.nix+1−1
This diff is too big to show here.
nixos/tests/systemd-analyze.nix+1−1
This diff is too big to show here.
nixos/tests/systemd-binfmt.nix+3−3
This diff is too big to show here.
nixos/tests/systemd-boot.nix+9−9
This diff is too big to show here.
nixos/tests/systemd-confinement.nix+4−27
This diff is too big to show here.
nixos/tests/systemd-cryptenroll.nix+1−1
This diff is too big to show here.
nixos/tests/systemd-escaping.nixdeleted−45
This diff is too big to show here.
nixos/tests/systemd-initrd-btrfs-raid.nixdeleted−45
This diff is too big to show here.
nixos/tests/systemd-initrd-luks-keyfile.nixdeleted−53
This diff is too big to show here.
nixos/tests/systemd-initrd-luks-password.nixdeleted−48
This diff is too big to show here.
nixos/tests/systemd-initrd-simple.nixdeleted−44
This diff is too big to show here.
nixos/tests/systemd-initrd-swraid.nixdeleted−50
This diff is too big to show here.
nixos/tests/systemd-journal.nix+1−1
This diff is too big to show here.
nixos/tests/systemd-machinectl.nix+1−1
This diff is too big to show here.
nixos/tests/systemd-networkd.nix−10
This diff is too big to show here.
nixos/tests/systemd-shutdown.nixdeleted−26
This diff is too big to show here.
nixos/tests/systemd-misc.nix → nixos/tests/systemd-unit-path.nixrenamed+2−17
This diff is too big to show here.
nixos/tests/systemd.nix+1−5
This diff is too big to show here.
nixos/tests/taskserver.nix−1
This diff is too big to show here.
nixos/tests/telegraf.nix+1−1
This diff is too big to show here.
nixos/tests/terminal-emulators.nixdeleted−207
This diff is too big to show here.
nixos/tests/tinywl.nix+1−2
This diff is too big to show here.
nixos/tests/tomcat.nixdeleted−21
This diff is too big to show here.
nixos/tests/tor.nix+15−10
This diff is too big to show here.
nixos/tests/transmission.nix+1−1
This diff is too big to show here.
nixos/tests/tsm-client-gui.nix+1−1
This diff is too big to show here.
nixos/tests/tuptime.nix+1−1
This diff is too big to show here.
nixos/tests/turbovnc-headless-server.nix+1−1
This diff is too big to show here.
nixos/tests/tuxguitar.nix+1−1
This diff is too big to show here.
nixos/tests/udisks2.nix+1−1
This diff is too big to show here.
nixos/tests/usbguard.nix+1−1
This diff is too big to show here.
nixos/tests/user-activation-scripts.nix+1−1
This diff is too big to show here.
nixos/tests/uwsgi.nix+1−1
This diff is too big to show here.
nixos/tests/v2ray.nix+1−1
This diff is too big to show here.
nixos/tests/vault-postgresql.nix+1−1
This diff is too big to show here.
nixos/tests/vault.nix+1−1
This diff is too big to show here.
nixos/tests/vaultwarden.nix+1
This diff is too big to show here.
nixos/tests/vector.nix+1−1
This diff is too big to show here.
nixos/tests/vengi-tools.nix+1−1
This diff is too big to show here.
nixos/tests/virtualbox.nix+1−1
This diff is too big to show here.
nixos/tests/web-apps/mastodon.nixdeleted−170
This diff is too big to show here.
nixos/tests/web-apps/netbox.nixdeleted−30
This diff is too big to show here.
nixos/tests/web-apps/nifi.nixdeleted−30
This diff is too big to show here.
nixos/tests/web-apps/peertube.nix+2−6
This diff is too big to show here.
nixos/tests/web-servers/unit-php.nix+1−1
This diff is too big to show here.
nixos/tests/wiki-js.nix+1−1
This diff is too big to show here.
nixos/tests/wine.nix+4−11
This diff is too big to show here.
nixos/tests/without-nix.nix+6−15
This diff is too big to show here.
nixos/tests/wmderland.nix+1−1
This diff is too big to show here.
nixos/tests/wpa_supplicant.nix+1−1
This diff is too big to show here.
nixos/tests/xfce.nix+1−1
This diff is too big to show here.
nixos/tests/xmonad-xdg-autostart.nixdeleted−35
This diff is too big to show here.
nixos/tests/xmonad.nix+1−1
This diff is too big to show here.
nixos/tests/xmpp/prosody-mysql.nixdeleted−124
This diff is too big to show here.
nixos/tests/xmpp/prosody.nix−1
This diff is too big to show here.
nixos/tests/xmpp/xmpp-sendmessage.nix+4−1
This diff is too big to show here.
nixos/tests/xterm.nix+1−1
This diff is too big to show here.
nixos/tests/yabar.nix+1−1
This diff is too big to show here.
nixos/tests/zfs.nix+1−51
This diff is too big to show here.
nixos/tests/zigbee2mqtt.nix+1−1
This diff is too big to show here.
nixos/tests/zoneminder.nix+1−1
This diff is too big to show here.
nixos/tests/zrepl.nixdeleted−66
This diff is too big to show here.
pkgs/applications/accessibility/espeakup/default.nixdeleted−46
This diff is too big to show here.
pkgs/applications/accessibility/squeekboard/default.nix+1−2
This diff is too big to show here.
pkgs/applications/accessibility/wvkbd/default.nixdeleted−36
This diff is too big to show here.
pkgs/applications/audio/ChowPhaser/default.nixdeleted−76
This diff is too big to show here.
pkgs/applications/audio/LibreArp/default.nixdeleted−53
This diff is too big to show here.
pkgs/applications/audio/LibreArp/lv2.nixdeleted−53
This diff is too big to show here.
pkgs/applications/audio/airwave/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/aj-snapshot/default.nix+3−2
This diff is too big to show here.
pkgs/applications/audio/amberol/default.nixdeleted−75
This diff is too big to show here.
pkgs/applications/audio/ams/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/audacity/0001-Use-a-different-approach-to-estimate-the-disk-space-.patchnew file+355
This diff is too big to show here.
pkgs/applications/audio/audacity/default.nix+35−58
This diff is too big to show here.
pkgs/applications/audio/audio-recorder/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/bespokesynth/default.nix−1
This diff is too big to show here.
pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/blanket/default.nix+7−7
This diff is too big to show here.
pkgs/applications/audio/callaudiod/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/cantata/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/cardinal/default.nixdeleted−67
This diff is too big to show here.
pkgs/applications/audio/carla/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/caudec/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/cider/default.nixdeleted−30
This diff is too big to show here.
pkgs/applications/audio/clementine/default.nix+10−3
This diff is too big to show here.
pkgs/applications/audio/cmt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/cmus/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/cmusfm/default.nix+10−16
This diff is too big to show here.
pkgs/applications/audio/csound/default.nix+4−4
This diff is too big to show here.
pkgs/applications/audio/deadbeef/default.nix+1
This diff is too big to show here.
pkgs/applications/audio/denemo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/dragonfly-reverb/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/easyeffects/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/eteroj.lv2/default.nixnew file+23
This diff is too big to show here.
pkgs/applications/audio/faust/faust2.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/faust/faustlive.nix+12−9
This diff is too big to show here.
pkgs/applications/audio/faustPhysicalModeling/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/flac/default.nix+10−2
This diff is too big to show here.
pkgs/applications/audio/fluidsynth/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/foo-yc20/default.nixnew file+29
This diff is too big to show here.
pkgs/applications/audio/friture/default.nix+12−3
This diff is too big to show here.
pkgs/applications/audio/ft2-clone/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/furnace/default.nixdeleted−100
This diff is too big to show here.
pkgs/applications/audio/gnome-podcasts/default.nix−11
This diff is too big to show here.
pkgs/applications/audio/gpodder/default.nix+4−9
This diff is too big to show here.
pkgs/applications/audio/gpodder/disable-autoupdate.patch+29−8
This diff is too big to show here.
pkgs/applications/audio/greg/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/gspeech/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/gtkpod/default.nix+4−5
This diff is too big to show here.
pkgs/applications/audio/guitarix/default.nix−2
This diff is too big to show here.
pkgs/applications/audio/helio-workstation/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/hivelytracker/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/hqplayer-desktop/default.nix−1
This diff is too big to show here.
pkgs/applications/audio/industrializer/default.nix+3−1
This diff is too big to show here.
pkgs/applications/audio/jacktrip/default.nixdeleted−61
This diff is too big to show here.
pkgs/applications/audio/jamesdsp/default.nix+5−40
This diff is too big to show here.
pkgs/applications/audio/jamin/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/jellycli/default.nixdeleted−33
This diff is too big to show here.
pkgs/applications/audio/jellycli/fix-test-dir.patchdeleted−13
This diff is too big to show here.
pkgs/applications/audio/jmusicbot/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/libopenmpt/default.nixnew file+42
This diff is too big to show here.
pkgs/applications/audio/lollypop/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/losslessaudiochecker/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/lv2lint/default.nixdeleted−22
This diff is too big to show here.
pkgs/applications/audio/lyrebird/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/mid2key/default.nix+4−7
This diff is too big to show here.
pkgs/applications/audio/midas/generic.nix+5−4
This diff is too big to show here.
pkgs/applications/audio/moc/default.nix+3−5
This diff is too big to show here.
pkgs/applications/audio/mopidy/mopidy.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/mopidy/youtube.nix+5−6
This diff is too big to show here.
pkgs/applications/audio/mopidy/ytmusic.nix+2−11
This diff is too big to show here.
pkgs/applications/audio/musescore/darwin.nix+1
This diff is too big to show here.
pkgs/applications/audio/musescore/default.nix+1
This diff is too big to show here.
pkgs/applications/audio/musikcube/default.nix+3−5
This diff is too big to show here.
pkgs/applications/audio/ncspot/default.nix+7−3
This diff is too big to show here.
pkgs/applications/audio/ncspot/rust_1_57_support.patchnew file+21
This diff is too big to show here.
pkgs/applications/audio/noise-repellent/default.nix+9−11
This diff is too big to show here.
pkgs/applications/audio/ocenaudio/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/odin2/default.nixdeleted−79
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/eteroj.nixdeleted−10
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/generic.nixdeleted−37
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/jit.nixdeleted−12
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/mephisto.nixdeleted−17
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/midi_matrix.nixdeleted−10
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/moony.nixdeleted−13
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/orbit.nixdeleted−12
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/patchmatrix.nixdeleted−13
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/router.nixdeleted−11
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/sherlock.nixdeleted−12
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/synthpod.nixdeleted−13
This diff is too big to show here.
pkgs/applications/audio/open-music-kontrollers/vm.nixdeleted−10
This diff is too big to show here.
pkgs/applications/audio/osdlyrics/default.nixdeleted−87
This diff is too big to show here.
pkgs/applications/audio/parlatype/default.nixnew file+66
This diff is too big to show here.
pkgs/applications/audio/patchage/default.nix+11−33
This diff is too big to show here.
pkgs/applications/audio/patchmatrix/default.nixnew file+45
This diff is too big to show here.
pkgs/applications/audio/pd-plugins/zexy/default.nix+1−2
This diff is too big to show here.
pkgs/applications/audio/pianobar/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/pipecontrol/default.nixdeleted−50
This diff is too big to show here.
pkgs/applications/audio/plexamp/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/praat/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/psst/default.nixdeleted−39
This diff is too big to show here.
pkgs/applications/audio/pt2-clone/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/puddletag/default.nix+9−46
This diff is too big to show here.
pkgs/applications/audio/pulseaudio-modules-bt/default.nixnew file+91
This diff is too big to show here.
pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patchnew file+11
This diff is too big to show here.
pkgs/applications/audio/pyradio/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/qmidiarp/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/qmmp/default.nix+1
This diff is too big to show here.
pkgs/applications/audio/qpwgraph/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/rhythmbox/default.nix−10
This diff is too big to show here.
pkgs/applications/audio/roomeqwizard/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/sfizz/default.nix+1−6
This diff is too big to show here.
pkgs/applications/audio/sfxr-qt/default.nix+2−24
This diff is too big to show here.
pkgs/applications/audio/sfxr-qt/test-export-square-wave/default.nixdeleted−6
This diff is too big to show here.
pkgs/applications/audio/sfxr-qt/test-export-square-wave/input.sfxjdeleted−29
This diff is too big to show here.
pkgs/applications/audio/shortwave/default.nix+12−9
This diff is too big to show here.
pkgs/applications/audio/sisco.lv2/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/snd/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/sonic-pi/default.nix+41−59
This diff is too big to show here.
pkgs/applications/audio/sonixd/default.nixdeleted−27
This diff is too big to show here.
pkgs/applications/audio/sound-juicer/default.nix−10
This diff is too big to show here.
pkgs/applications/audio/soundconverter/default.nixdeleted−85
This diff is too big to show here.
pkgs/applications/audio/soundkonverter/default.nix+1−1
This diff is too big to show here.
pkgs/applications/audio/soundscape-renderer/default.nix+11−13
This diff is too big to show here.
pkgs/applications/audio/soundwireserver/default.nix−1
This diff is too big to show here.
pkgs/applications/audio/spot/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/spotify-tui/default.nix−1
This diff is too big to show here.
pkgs/applications/audio/spotify/default.nix+5−5
This diff is too big to show here.
pkgs/applications/audio/sptlrx/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/squeezelite/default.nix+30−48
This diff is too big to show here.
pkgs/applications/audio/strawberry/default.nix+2−5
This diff is too big to show here.
pkgs/applications/audio/sunvox/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/synaesthesia/default.nixdeleted−33
This diff is too big to show here.
pkgs/applications/audio/timemachine/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/tonelib-gfx/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/tonelib-jam/default.nix+3−3
This diff is too big to show here.
pkgs/applications/audio/tonelib-metal/default.nixdeleted−60
This diff is too big to show here.
pkgs/applications/audio/viper4linux-gui/default.nixdeleted−82
This diff is too big to show here.
pkgs/applications/audio/viper4linux/default.nixdeleted−61
This diff is too big to show here.
pkgs/applications/audio/vmpk/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/vocal/default.nix+1−7
This diff is too big to show here.
pkgs/applications/audio/whipper/default.nix−8
This diff is too big to show here.
pkgs/applications/audio/x42-plugins/default.nix+2−2
This diff is too big to show here.
pkgs/applications/audio/xsynth-dssi/default.nix+1−2
This diff is too big to show here.
pkgs/applications/audio/yoshimi/default.nix+18−49
This diff is too big to show here.
pkgs/applications/backup/pika-backup/default.nix−9
This diff is too big to show here.
pkgs/applications/blockchains/alfis/default.nix+3−3
This diff is too big to show here.
pkgs/applications/blockchains/bisq-desktop/default.nix+4−3
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin-unlimited/default.nix+1−1
This diff is too big to show here.
pkgs/applications/blockchains/bitcoin/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/btcpayserver/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/btcpayserver/deps.nix+29−29
This diff is too big to show here.
pkgs/applications/blockchains/cgminer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/chia-plotter/default.nix+6−13
This diff is too big to show here.
pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch+11−24
This diff is too big to show here.
pkgs/applications/blockchains/chia/default.nix+2−6
This diff is too big to show here.
pkgs/applications/blockchains/clightning/default.nix+5−15
This diff is too big to show here.
pkgs/applications/blockchains/dogecoin/default.nix+1−1
This diff is too big to show here.
pkgs/applications/blockchains/electrs/default.nix+3−3
This diff is too big to show here.
pkgs/applications/blockchains/elements/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/erigon.nix+3−3
This diff is too big to show here.
pkgs/applications/blockchains/exodus/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/go-ethereum/default.nix+3−3
This diff is too big to show here.
pkgs/applications/blockchains/ledger-live-desktop/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/lightning-loop/default.nix+3−3
This diff is too big to show here.
pkgs/applications/blockchains/litecoin/default.nix+2−1
This diff is too big to show here.
pkgs/applications/blockchains/lnd/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/lndmanage/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/monero-cli/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/monero-gui/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/namecoin/default.nix+6−5
This diff is too big to show here.
pkgs/applications/blockchains/nbxplorer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/blockchains/nbxplorer/deps.nix−15
This diff is too big to show here.
pkgs/applications/blockchains/nearcore/default.nixdeleted−42
This diff is too big to show here.
pkgs/applications/blockchains/openethereum/default.nix+3−3
This diff is too big to show here.
pkgs/applications/blockchains/polkadot/default.nix+25−21
This diff is too big to show here.
pkgs/applications/blockchains/snarkos/default.nix+1−1
This diff is too big to show here.
pkgs/applications/blockchains/solana/default.nix+5−10
This diff is too big to show here.
pkgs/applications/blockchains/solana/pin.jsondeleted−5
This diff is too big to show here.
pkgs/applications/blockchains/solana/update.shdeleted−33
This diff is too big to show here.
pkgs/applications/blockchains/stellar-core/default.nix+3−7
This diff is too big to show here.
pkgs/applications/blockchains/trezor-suite/default.nix+3−3
This diff is too big to show here.
pkgs/applications/blockchains/wasabibackend/default.nix+1−1
This diff is too big to show here.
pkgs/applications/blockchains/zcash/default.nix+6−6
This diff is too big to show here.
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix+5−6
This diff is too big to show here.
pkgs/applications/editors/android-studio/common.nix+3−5
This diff is too big to show here.
pkgs/applications/editors/android-studio/default.nix+7−8
This diff is too big to show here.
pkgs/applications/editors/apostrophe/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/bless/default.nix+6−12
This diff is too big to show here.
pkgs/applications/editors/bluej/default.nix+10−37
This diff is too big to show here.
pkgs/applications/editors/cudatext/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/cudatext/deps.json+12−12
This diff is too big to show here.
pkgs/applications/editors/eclipse/build-eclipse.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/eclipse/default.nix+13−13
This diff is too big to show here.
pkgs/applications/editors/eclipse/plugins.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/ed/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/emacs/27.nixnew file+11
This diff is too big to show here.
pkgs/applications/editors/emacs/28.nixdeleted−5
This diff is too big to show here.
pkgs/applications/editors/emacs/at-fdcwd.patchnew file+15
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/cedet/default.nixnew file+52
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nixdeleted−23
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix+100−269
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix+3−4
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/ement/default.nix+3−11
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nixdeleted−30
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix+1−7
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix−8
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix+55−69
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/plz/default.nix+4−12
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json+2820−3860
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.jsondeleted−32
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nixdeleted−44
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/update-defaults.pydeleted−74
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tsc/default.nixdeleted−89
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tsc/src.jsondeleted−10
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/tsc/update.pydeleted−122
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/updatedeleted−10
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/update-manualdeleted−7
This diff is too big to show here.
pkgs/applications/editors/emacs/elisp-packages/update-manual.nixdeleted−11
This diff is too big to show here.
pkgs/applications/editors/emacs/generic.nix+6−11
This diff is too big to show here.
pkgs/applications/editors/ghostwriter/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/gnome-builder/default.nix+18−8
This diff is too big to show here.
pkgs/applications/editors/helix/default.nix+10−13
This diff is too big to show here.
pkgs/applications/editors/hexdino/default.nix+6−6
This diff is too big to show here.
pkgs/applications/editors/jetbrains/linux.nix → pkgs/applications/editors/jetbrains/common.nixrenamed+19−16
This diff is too big to show here.
pkgs/applications/editors/jetbrains/darwin.nixdeleted−36
This diff is too big to show here.
pkgs/applications/editors/jetbrains/default.nix+113−121
This diff is too big to show here.
pkgs/applications/editors/jetbrains/update.plnew file+101
This diff is too big to show here.
pkgs/applications/editors/jetbrains/update.pydeleted−100
This diff is too big to show here.
pkgs/applications/editors/jetbrains/versions.jsondeleted−296
This diff is too big to show here.
pkgs/applications/editors/jucipp/default.nix+2−1
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/octave/default.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/octave/kernel.nix+6−4
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/wolfram/default.nixdeleted−22
This diff is too big to show here.
pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nixdeleted−32
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names+19−20
This diff is too big to show here.
pkgs/applications/editors/kakoune/plugins/update.py+2−2
This diff is too big to show here.
pkgs/applications/editors/kodestudio/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/lapce/default.nixdeleted−99
This diff is too big to show here.
pkgs/applications/editors/leo-editor/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/lifeograph/default.nix+5−5
This diff is too big to show here.
pkgs/applications/editors/marker/default.nix+1−4
This diff is too big to show here.
pkgs/applications/editors/mg/default.nix−4
This diff is too big to show here.
pkgs/applications/editors/micro/default.nix+1−3
This diff is too big to show here.
pkgs/applications/editors/micro/test-with-expect.nixdeleted−30
This diff is too big to show here.
pkgs/applications/editors/mle/default.nix+1−11
This diff is too big to show here.
pkgs/applications/editors/music/tuxguitar/default.nix+3−3
This diff is too big to show here.
pkgs/applications/editors/neovim/default.nix+22−13
This diff is too big to show here.
pkgs/applications/editors/neovim/neovide/default.nix+6−6
This diff is too big to show here.
pkgs/applications/editors/neovim/neovim-remote.nix+3−2
This diff is too big to show here.
pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock+2−2
This diff is too big to show here.
pkgs/applications/editors/neovim/ruby_provider/gemset.nix+5−5
This diff is too big to show here.
pkgs/applications/editors/netbeans/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/oed/default.nix−9
This diff is too big to show here.
pkgs/applications/editors/okteta/default.nix−2
This diff is too big to show here.
pkgs/applications/editors/oni2/common.nix+1
This diff is too big to show here.
pkgs/applications/editors/pinegrow/default.nix+7−17
This diff is too big to show here.
pkgs/applications/editors/poke/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/qxmledit/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/rstudio/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/setzer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/sigil/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/sublime/3/common.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/texmaker/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/texstudio/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/tiled/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/vim/common.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/vim/configurable.nix+34−7
This diff is too big to show here.
pkgs/applications/editors/vim/macvim.nix+3−3
This diff is too big to show here.
pkgs/applications/editors/vim/macvim.patch+34−32
This diff is too big to show here.
pkgs/applications/editors/vim/plugins/build-vim-plugin.nix−2
This diff is too big to show here.
pkgs/applications/editors/vim/plugins/default.nix+3−8
This diff is too big to show here.
pkgs/applications/editors/vim/plugins/generated.nix+1468−1625
This diff is too big to show here.
pkgs/applications/editors/vim/plugins/overrides.nix+8−37
This diff is too big to show here.
pkgs/applications/editors/vim/plugins/update.py+16−47
This diff is too big to show here.
pkgs/applications/editors/vim/plugins/vim-command-check-hook.shdeleted−25
This diff is too big to show here.
pkgs/applications/editors/vim/plugins/vim-plugin-names+1000−1014
This diff is too big to show here.
pkgs/applications/editors/vim/plugins/vim-utils.nix+57−91
This diff is too big to show here.
pkgs/applications/editors/vscode/extensions/default.nix+35−170
This diff is too big to show here.
pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix+1−1
This diff is too big to show here.
pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix+1
This diff is too big to show here.
pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json+17−10
This diff is too big to show here.
pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/editors/vscode/extensions/rust-analyzer/update.shdeleted−49
This diff is too big to show here.
pkgs/applications/editors/vscode/generic.nix+5−12
This diff is too big to show here.
pkgs/applications/editors/vscode/update-vscodium.sh+12−16
This diff is too big to show here.
pkgs/applications/editors/vscode/vscode.nix+6−6
This diff is too big to show here.
pkgs/applications/editors/vscode/vscodium.nix+13−10
This diff is too big to show here.
pkgs/applications/editors/wxhexeditor/default.nix+1−2
This diff is too big to show here.
pkgs/applications/editors/xedit/default.nix+2−2
This diff is too big to show here.
pkgs/applications/emulators/bsnes/ares/default.nix → pkgs/applications/emulators/ares/default.nixrenamed
The content is the same.
pkgs/applications/emulators/bsnes/ares/fix-ruby.patch → pkgs/applications/emulators/ares/fix-ruby.patchrenamed
The content is the same.
pkgs/applications/emulators/basiliskii/default.nixdeleted−28
This diff is too big to show here.
pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patchdeleted−10
This diff is too big to show here.
pkgs/applications/emulators/bsnes/bsnes-hd/default.nix → pkgs/applications/emulators/bsnes-hd/default.nixrenamed
The content is the same.
pkgs/applications/emulators/bsnes/bsnes-hd/macos-copy-app-to-prefix.patch → pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patchrenamed
The content is the same.
pkgs/applications/emulators/bsnes/bsnes-hd/macos-replace-sips-with-png2icns.patch → pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patchrenamed
The content is the same.
pkgs/applications/emulators/cdemu/vhba.nix+1−1
This diff is too big to show here.
pkgs/applications/emulators/collapseos-cvm/default.nixdeleted−30
This diff is too big to show here.
pkgs/applications/emulators/commanderx16/emulator.nix+5−7
This diff is too big to show here.
pkgs/applications/emulators/commanderx16/rom.nix+6−12
This diff is too big to show here.
pkgs/applications/emulators/dolphin-emu/master.nix+7−7
This diff is too big to show here.
pkgs/applications/emulators/dolphin-emu/primehack.nix+2−2
This diff is too big to show here.
pkgs/applications/emulators/epsxe/default.nixnew file+52
This diff is too big to show here.
pkgs/applications/emulators/fakenes/build.patchnew file+84
This diff is too big to show here.
pkgs/applications/emulators/fakenes/default.nixnew file+34
This diff is too big to show here.
pkgs/applications/emulators/fceux/default.nix+2−2
This diff is too big to show here.
pkgs/applications/emulators/flycast/default.nixdeleted−52
This diff is too big to show here.
pkgs/applications/emulators/goldberg-emu/default.nixdeleted−52
This diff is too big to show here.
pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patchdeleted−34
This diff is too big to show here.
pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch → pkgs/applications/emulators/higan/001-include-cmath.patchrenamed
The content is the same.
pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch → pkgs/applications/emulators/higan/002-sips-to-png2icns.patchrenamed
The content is the same.
pkgs/applications/emulators/bsnes/higan/default.nix → pkgs/applications/emulators/higan/default.nixrenamed
The content is the same.
pkgs/applications/emulators/mame/0001-Revert-Added-PDF-documentation-to-dist.mak.patchdeleted−37
This diff is too big to show here.
pkgs/applications/emulators/mame/default.nix+14−64
This diff is too big to show here.
pkgs/applications/emulators/melonDS/default.nix+2−2
This diff is too big to show here.
pkgs/applications/emulators/proton-caller/default.nix+3−4
This diff is too big to show here.
pkgs/applications/emulators/qmc2/default.nixnew file+41
This diff is too big to show here.
pkgs/applications/emulators/reicast/default.nixnew file+52
This diff is too big to show here.
pkgs/applications/emulators/retroarch/disable-menu_show_core_updater.patch → pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patchrenamed+1−1
This diff is too big to show here.
pkgs/applications/emulators/retroarch/use-fixed-paths-on-libretro_info_path.patch → pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patchrenamed+17−21
This diff is too big to show here.
pkgs/applications/emulators/retroarch/cores.nix+43−16
This diff is too big to show here.
pkgs/applications/emulators/retroarch/default.nix+8−25
This diff is too big to show here.
pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patchnew file+13
This diff is too big to show here.
pkgs/applications/emulators/retroarch/hashes.json+150−139
This diff is too big to show here.
pkgs/applications/emulators/retroarch/update_cores.py → pkgs/applications/emulators/retroarch/update.pyrenamed+13−7
This diff is too big to show here.
pkgs/applications/emulators/retroarch/wrapper.nix+6−10
This diff is too big to show here.
pkgs/applications/emulators/ripes/default.nixdeleted−50
This diff is too big to show here.
pkgs/applications/emulators/rpcs3/default.nix+4−4
This diff is too big to show here.
pkgs/applications/emulators/ryujinx/appdir.patchdeleted−23
This diff is too big to show here.
pkgs/applications/emulators/ryujinx/default.nix+25−21
This diff is too big to show here.
pkgs/applications/emulators/ryujinx/deps.nix+10−10
This diff is too big to show here.
pkgs/applications/emulators/ryujinx/log.patchnew file+21
This diff is too big to show here.
pkgs/applications/emulators/ryujinx/updater.sh+26−55
This diff is too big to show here.
pkgs/applications/emulators/snes9x-gtk/default.nixnew file+36
This diff is too big to show here.
pkgs/applications/emulators/snes9x/default.nixdeleted−130
This diff is too big to show here.
pkgs/applications/emulators/tinyemu/default.nix+1−6
This diff is too big to show here.
pkgs/applications/emulators/vice/default.nix+12−108
This diff is too big to show here.
pkgs/applications/emulators/wine/base.nix+4−4
This diff is too big to show here.
pkgs/applications/emulators/wine/packages.nix+3−3
This diff is too big to show here.
pkgs/applications/emulators/wine/sources.nix+3−3
This diff is too big to show here.
pkgs/applications/emulators/wine/vkd3d.nix+3−5
This diff is too big to show here.
pkgs/applications/emulators/yuzu/base.nixnew file+86
This diff is too big to show here.
pkgs/applications/emulators/yuzu/compatibility-list.jsondeleted−1
This diff is too big to show here.
pkgs/applications/emulators/yuzu/default.nix+10−22
This diff is too big to show here.
pkgs/applications/emulators/yuzu/generic.nixdeleted−157
This diff is too big to show here.
pkgs/applications/emulators/yuzu/update.shdeleted−102
This diff is too big to show here.
pkgs/applications/emulators/zesarux/default.nix−8
This diff is too big to show here.
pkgs/applications/finance/cryptowatch/default.nixdeleted−57
This diff is too big to show here.
pkgs/applications/finance/irpf/default.nixdeleted−73
This diff is too big to show here.
pkgs/applications/gis/grass/default.nix+37−11
This diff is too big to show here.
pkgs/applications/gis/qgis/unwrapped-ltr.nix+2−2
This diff is too big to show here.
pkgs/applications/gis/qgis/unwrapped.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/ImageMagick/6.x.nix+1−1
This diff is too big to show here.
pkgs/applications/graphics/ImageMagick/7.0.nix+11−6
This diff is too big to show here.
pkgs/applications/graphics/apitrace/default.nix−6
This diff is too big to show here.
pkgs/applications/graphics/apitrace/glibc-2.34-compat.patchdeleted−13
This diff is too big to show here.
pkgs/applications/graphics/avocode/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/awesomebump/default.nix+1−1
This diff is too big to show here.
pkgs/applications/graphics/cloudcompare/default.nix+12−47
This diff is too big to show here.
pkgs/applications/graphics/cq-editor/default.nix+1−1
This diff is too big to show here.
pkgs/applications/graphics/darktable/default.nix−2
This diff is too big to show here.
pkgs/applications/graphics/digikam/default.nix+3−14
This diff is too big to show here.
pkgs/applications/graphics/drawing/default.nix+2−15
This diff is too big to show here.
pkgs/applications/graphics/drawio/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/exrtools/default.nix+1−1
This diff is too big to show here.
pkgs/applications/graphics/foxotron/default.nix+3−3
This diff is too big to show here.
pkgs/applications/graphics/geeqie/default.nix+4−4
This diff is too big to show here.
pkgs/applications/graphics/gimp/default.nix−1
This diff is too big to show here.
pkgs/applications/graphics/gimp/plugins/default.nix+1−40
This diff is too big to show here.
pkgs/applications/graphics/gimp/wrapper.nix−2
This diff is too big to show here.
pkgs/applications/graphics/glimpse/default.nix−1
This diff is too big to show here.
pkgs/applications/graphics/glimpse/wrapper.nix−2
This diff is too big to show here.
pkgs/applications/graphics/gnome-obfuscate/default.nixdeleted−70
This diff is too big to show here.
pkgs/applications/graphics/gnome-photos/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/gpicview/default.nix+1
This diff is too big to show here.
pkgs/applications/graphics/graphicsmagick/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/gscan2pdf/default.nix+4−2
This diff is too big to show here.
pkgs/applications/graphics/gthumb/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/hdrmerge/default.nixdeleted−76
This diff is too big to show here.
pkgs/applications/graphics/hugin/default.nix+11−2
This diff is too big to show here.
pkgs/applications/graphics/hydrus/default.nix+3−6
This diff is too big to show here.
pkgs/applications/graphics/icon-library/default.nix+12−18
This diff is too big to show here.
pkgs/applications/graphics/imgbrd-grabber/default.nix+1−1
This diff is too big to show here.
pkgs/applications/graphics/inkscape/default.nix−9
This diff is too big to show here.
pkgs/applications/graphics/inkscape/extensions.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/jpegrescan/default.nix+1−5
This diff is too big to show here.
pkgs/applications/graphics/lightburn/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/menyoki/default.nix+3−3
This diff is too big to show here.
pkgs/applications/graphics/mtpaint/default.nix+5−3
This diff is too big to show here.
pkgs/applications/graphics/mypaint/default.nix−10
This diff is too big to show here.
pkgs/applications/graphics/nomacs/default.nix+1
This diff is too big to show here.
pkgs/applications/graphics/nsxiv/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/ocrfeeder/default.nix+8−5
This diff is too big to show here.
pkgs/applications/graphics/openboard/default.nix+1−9
This diff is too big to show here.
pkgs/applications/graphics/openscad/default.nix−4
This diff is too big to show here.
pkgs/applications/graphics/ovito/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/paraview/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/photivo/default.nixnew file+54
This diff is too big to show here.
pkgs/applications/graphics/photivo/gcc6.patchnew file+13
This diff is too big to show here.
pkgs/applications/graphics/pixeluvo/default.nix−1
This diff is too big to show here.
pkgs/applications/graphics/pixinsight/default.nix+3−3
This diff is too big to show here.
pkgs/applications/graphics/rawtherapee/default.nix−3
This diff is too big to show here.
pkgs/applications/graphics/rawtherapee/fix-6324.patchdeleted−356
This diff is too big to show here.
pkgs/applications/graphics/rnote/default.nix+3−5
This diff is too big to show here.
pkgs/applications/graphics/sane/backends/brscan4/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/sane/backends/brscan5/default.nix+21−29
This diff is too big to show here.
pkgs/applications/graphics/sane/config.nix+1−1
This diff is too big to show here.
pkgs/applications/graphics/shotwell/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/synfigstudio/default.nix+2−2
This diff is too big to show here.
pkgs/applications/graphics/tesseract/default.nix−6
This diff is too big to show here.
pkgs/applications/graphics/tesseract/fetch-language-hashes+2−2
This diff is too big to show here.
pkgs/applications/graphics/tesseract/languages.nix+245−245
This diff is too big to show here.
pkgs/applications/graphics/tesseract/tesseract3.nix+3−14
This diff is too big to show here.
pkgs/applications/graphics/tesseract/tesseract4.nix+3−15
This diff is too big to show here.
pkgs/applications/graphics/tesseract/tesseract5.nixdeleted−39
This diff is too big to show here.
pkgs/applications/graphics/tesseract/wrapper.nix+3−29
This diff is too big to show here.
pkgs/applications/graphics/unigine-heaven/default.nixdeleted−107
This diff is too big to show here.
pkgs/applications/graphics/unigine-sanctuary/default.nixdeleted−97
This diff is too big to show here.
pkgs/applications/graphics/unigine-superposition/default.nixdeleted−146
This diff is too big to show here.
pkgs/applications/graphics/unigine-tropics/default.nixdeleted−95
This diff is too big to show here.
pkgs/applications/graphics/unigine-valley/default.nix+99−120
This diff is too big to show here.
pkgs/applications/graphics/weylus/default.nix+38−53
This diff is too big to show here.
pkgs/applications/graphics/xfig/default.nix+2−13
This diff is too big to show here.
pkgs/applications/graphics/xournal/default.nix+3−3
This diff is too big to show here.
pkgs/applications/graphics/yed/default.nix+2−2
This diff is too big to show here.
pkgs/applications/kde/default.nix+1−4
This diff is too big to show here.
pkgs/applications/kde/fetch.sh+1−1
This diff is too big to show here.
pkgs/applications/kde/kaddressbook.nix−4
This diff is too big to show here.
pkgs/applications/kde/kalarm.nix+2−2
This diff is too big to show here.
pkgs/applications/kde/kalarmcal.nixnew file+19
This diff is too big to show here.
pkgs/applications/kde/kdegraphics-thumbnailers.nix+2−2
This diff is too big to show here.
pkgs/applications/kde/kdepim-addons.nix+2−2
This diff is too big to show here.
pkgs/applications/kde/kdepim-runtime/default.nix+2−2
This diff is too big to show here.
pkgs/applications/kde/kmousetool.nixdeleted−35
This diff is too big to show here.
pkgs/applications/kde/konsole.nix+1−3
This diff is too big to show here.
pkgs/applications/kde/picmi.nix+11−1
This diff is too big to show here.
pkgs/applications/kde/pimcommon.nix+2−2
This diff is too big to show here.
pkgs/applications/kde/skanpage.nixdeleted−32
This diff is too big to show here.
pkgs/applications/kde/srcs.nix+921−937
This diff is too big to show here.
pkgs/applications/kde/yakuake.nix−2
This diff is too big to show here.
pkgs/applications/logging/sosreport/default.nixdeleted−51
This diff is too big to show here.
pkgs/applications/misc/1password-gui/beta.nixdeleted−132
This diff is too big to show here.
pkgs/applications/misc/1password-gui/default.nix+5−18
This diff is too big to show here.
pkgs/applications/misc/1password/default.nix+29−46
This diff is too big to show here.
pkgs/applications/misc/ArchiSteamFarm/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix+18−18
This diff is too big to show here.
pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix+18−18
This diff is too big to show here.
pkgs/applications/misc/HentaiAtHome/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/ablog/default.nixdeleted−36
This diff is too big to show here.
pkgs/applications/misc/abook/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/almanah/default.nix+1−13
This diff is too big to show here.
pkgs/applications/misc/anytype/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/appeditor/default.nix−5
This diff is too big to show here.
pkgs/applications/misc/archivy/default.nix+3−9
This diff is too big to show here.
pkgs/applications/misc/audio/sox/default.nix+7−14
This diff is too big to show here.
pkgs/applications/misc/audio/wavesurfer/default.nixnew file+30
This diff is too big to show here.
pkgs/applications/misc/authy/default.nix+7−30
This diff is too big to show here.
pkgs/applications/misc/autospotting/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/avizo/default.nix+9−2
This diff is too big to show here.
pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patchnew file+15
This diff is too big to show here.
pkgs/applications/misc/avrdudess/default.nix+4−5
This diff is too big to show here.
pkgs/applications/misc/azuredatastudio/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/barrier/default.nix+1−12
This diff is too big to show here.
pkgs/applications/misc/batsignal/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/bikeshed/default.nixdeleted−77
This diff is too big to show here.
pkgs/applications/misc/blender/default.nix+15−16
This diff is too big to show here.
pkgs/applications/misc/bottles/default.nix+11−10
This diff is too big to show here.
pkgs/applications/misc/buku/default.nix+1−2
This diff is too big to show here.
pkgs/applications/misc/calcoo/0001-javac-encoding.diffdeleted−21
This diff is too big to show here.
pkgs/applications/misc/calcoo/default.nixdeleted−58
This diff is too big to show here.
pkgs/applications/misc/calcurse/default.nix+3−4
This diff is too big to show here.
pkgs/applications/misc/calibre/default.nix+2−5
This diff is too big to show here.
pkgs/applications/misc/catclock/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/charm/default.nix+5−3
This diff is too big to show here.
pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patchdeleted−31
This diff is too big to show here.
pkgs/applications/misc/cobang/default.nixdeleted−102
This diff is too big to show here.
pkgs/applications/misc/copyq/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/crow-translate/default.nix+4−4
This diff is too big to show here.
pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch+1−1
This diff is too big to show here.
pkgs/applications/misc/cubiomes-viewer/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/dasel/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/dbeaver/default.nix+36−8
This diff is too big to show here.
pkgs/applications/misc/ddgr/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/debian-goodies/default.nixdeleted−70
This diff is too big to show here.
pkgs/applications/misc/dunst/default.nix+4−4
This diff is too big to show here.
pkgs/applications/misc/electron-cash/default.nix+2−3
This diff is too big to show here.
pkgs/applications/misc/electrum-grs/default.nix+22−4
This diff is too big to show here.
pkgs/applications/misc/electrum/default.nix+35−4
This diff is too big to show here.
pkgs/applications/misc/eos-installer/default.nixdeleted−48
This diff is too big to show here.
pkgs/applications/misc/evtest/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/faircamp/default.nixdeleted−56
This diff is too big to show here.
pkgs/applications/misc/faircamp/test-wav.nixdeleted−14
This diff is too big to show here.
pkgs/applications/misc/ff2mpv/default.nixdeleted−34
This diff is too big to show here.
pkgs/applications/misc/firestarter/default.nix+1−3
This diff is too big to show here.
pkgs/applications/misc/fluidd/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/font-manager/default.nix+12−2
This diff is too big to show here.
pkgs/applications/misc/foxitreader/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/freeplane/default.nix+15−20
This diff is too big to show here.
pkgs/applications/misc/fspy/default.nix+3−2
This diff is too big to show here.
pkgs/applications/misc/fuzzel/default.nix−2
This diff is too big to show here.
pkgs/applications/misc/gallery-dl/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/genact/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/globe-cli/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/gnome-firmware-updater/default.nixnew file+75
This diff is too big to show here.
pkgs/applications/misc/gnome-firmware/default.nixdeleted−63
This diff is too big to show here.
pkgs/applications/misc/gnome-secrets/default.nix+10−4
This diff is too big to show here.
pkgs/applications/misc/gnome-solanum/default.nixdeleted−80
This diff is too big to show here.
pkgs/applications/misc/gofu/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/gosmore/default.nix+4−2
This diff is too big to show here.
pkgs/applications/misc/gpsprune/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/gpxsee/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/gramps/default.nix−4
This diff is too big to show here.
pkgs/applications/misc/gremlin-console/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/gsctl/default.nix+7−13
This diff is too big to show here.
pkgs/applications/misc/gsimplecal/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/gtk2fontsel/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/hcl2json/default.nixdeleted−27
This diff is too big to show here.
pkgs/applications/misc/hello/default.nix+9−11
This diff is too big to show here.
pkgs/applications/misc/hello/test.nixdeleted−8
This diff is too big to show here.
pkgs/applications/misc/hubstaff/default.nix+4−4
This diff is too big to show here.
pkgs/applications/misc/hugo/default.nix+6−6
This diff is too big to show here.
pkgs/applications/misc/index-fm/default.nix+2
This diff is too big to show here.
pkgs/applications/misc/ipmiview/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/join-desktop/default.nixdeleted−73
This diff is too big to show here.
pkgs/applications/misc/joplin-desktop/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/joshuto/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/josm/default.nix+4−4
This diff is too big to show here.
pkgs/applications/misc/k4dirstat/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/kchmviewer/default.nixdeleted−48
This diff is too big to show here.
pkgs/applications/misc/keepassx/community.nix+1−2
This diff is too big to show here.
pkgs/applications/misc/keylight-controller-mschneider82/default.nixdeleted−53
This diff is too big to show here.
pkgs/applications/misc/kiln/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/kjv/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/klayout/default.nix+6−8
This diff is too big to show here.
pkgs/applications/misc/koreader/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/kratos/default.nix+4−4
This diff is too big to show here.
pkgs/applications/misc/libosmocore/default.nix+6−21
This diff is too big to show here.
pkgs/applications/misc/lighthouse/default.nixnew file+35
This diff is too big to show here.
pkgs/applications/misc/limesctl/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/logseq/default.nix+4−5
This diff is too big to show here.
pkgs/applications/misc/lutris/default.nix+12−14
This diff is too big to show here.
pkgs/applications/misc/lutris/fhsenv.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/lutris/fixes.patchnew file+67
This diff is too big to show here.
pkgs/applications/misc/marktext/default.nix+8−7
This diff is too big to show here.
pkgs/applications/misc/masterpdfeditor/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/mediaelch/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/mediainfo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/megacmd/default.nix+10−5
This diff is too big to show here.
pkgs/applications/misc/megasync/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/mepo/default.nix+8−34
This diff is too big to show here.
pkgs/applications/misc/metadata-cleaner/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/minigalaxy/default.nix+3−7
This diff is too big to show here.
pkgs/applications/misc/mkgmap/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/mkgmap/splitter/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/mob/default.nix+4−4
This diff is too big to show here.
pkgs/applications/misc/moonlight-qt/default.nix+2−3
This diff is too big to show here.
pkgs/applications/misc/mop/default.nix+13−12
This diff is too big to show here.
pkgs/applications/misc/mop/deps.nixnew file+11
This diff is too big to show here.
pkgs/applications/misc/mucommander/default.nix+4−4
This diff is too big to show here.
pkgs/applications/misc/multibootusb/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patchdeleted−25
This diff is too big to show here.
pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patchdeleted−57
This diff is too big to show here.
pkgs/applications/misc/mupdf/1.17.nix+1
This diff is too big to show here.
pkgs/applications/misc/mupdf/default.nix+16−45
This diff is too big to show here.
pkgs/applications/misc/nix-tour/default.nix+19−35
This diff is too big to show here.
pkgs/applications/misc/nnn/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/notejot/default.nix+11−4
This diff is too big to show here.
pkgs/applications/misc/nut/default.nix+1−2
This diff is too big to show here.
pkgs/applications/misc/nwg-drawer/default.nix+7−21
This diff is too big to show here.
pkgs/applications/misc/obsidian/default.nix+59−73
This diff is too big to show here.
pkgs/applications/misc/octoprint/default.nix+205−8
This diff is too big to show here.
pkgs/applications/misc/oil-buku/default.nix → pkgs/applications/misc/oil/default.nixrenamed+6−5
This diff is too big to show here.
pkgs/applications/misc/opencpn/default.nix+16−85
This diff is too big to show here.
pkgs/applications/misc/orca/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/organicmaps/default.nixdeleted−86
This diff is too big to show here.
pkgs/applications/misc/osmscout-server/default.nix+24−3
This diff is too big to show here.
pkgs/applications/misc/otpclient/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/p2pool/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/pcmanx-gtk2/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/pdfdiff/default.nix+5−3
This diff is too big to show here.
pkgs/applications/misc/pdfpc/default.nix+4−3
This diff is too big to show here.
pkgs/applications/misc/pdfslicer/default.nix−6
This diff is too big to show here.
pkgs/applications/misc/pdfstudio/default.nix+4−4
This diff is too big to show here.
pkgs/applications/misc/phoc/default.nix+3−10
This diff is too big to show here.
pkgs/applications/misc/phwmon/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/playonlinux/default.nix+3−18
This diff is too big to show here.
pkgs/applications/misc/polybar/default.nix+2−12
This diff is too big to show here.
pkgs/applications/misc/polybar/remove-hardcoded-etc.diffdeleted−13
This diff is too big to show here.
pkgs/applications/misc/portfolio-filemanager/default.nix+2−6
This diff is too big to show here.
pkgs/applications/misc/prusa-slicer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/prusa-slicer/super-slicer.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/pure-maps/default.nix+2−3
This diff is too big to show here.
pkgs/applications/misc/pytrainer/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/qmetro/default.nix+3−2
This diff is too big to show here.
pkgs/applications/misc/ranger/default.nix+4−13
This diff is too big to show here.
pkgs/applications/misc/regextester/default.nix+1
This diff is too big to show here.
pkgs/applications/misc/rm-improved/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/sampler/default.nix+2−5
This diff is too big to show here.
pkgs/applications/misc/seatd/default.nix+3−7
This diff is too big to show here.
pkgs/applications/misc/sigal/default.nix+13−17
This diff is too big to show here.
pkgs/applications/misc/sigi/default.nix+7−9
This diff is too big to show here.
pkgs/applications/misc/sioyek/default.nixdeleted−56
This diff is too big to show here.
pkgs/applications/misc/skate/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/skytemple/default.nix+2−5
This diff is too big to show here.
pkgs/applications/misc/sleepyhead/default.nix+4−2
This diff is too big to show here.
pkgs/applications/misc/slic3r/default.nix+4−5
This diff is too big to show here.
pkgs/applications/misc/slides/default.nix+4−5
This diff is too big to show here.
pkgs/applications/misc/slmenu/default.nix+21−10
This diff is too big to show here.
pkgs/applications/misc/snowsql/default.nix+3−4
This diff is too big to show here.
pkgs/applications/misc/solaar/default.nix+2−3
This diff is too big to show here.
pkgs/applications/misc/spicetify-cli/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/sqls/default.nix+3−5
This diff is too big to show here.
pkgs/applications/misc/stag/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/stog/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/stork/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/sway-launcher-desktop/default.nixdeleted−42
This diff is too big to show here.
pkgs/applications/misc/systembus-notify/default.nix+5−39
This diff is too big to show here.
pkgs/applications/misc/taskwarrior-tui/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/taskwarrior/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/terminal-typeracer/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/ticker/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/timewarrior/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/toipe/default.nixdeleted−20
This diff is too big to show here.
pkgs/applications/misc/tootle/default.nix−5
This diff is too big to show here.
pkgs/applications/misc/tpmmanager/default.nix+5−6
This diff is too big to show here.
pkgs/applications/misc/trenchbroom/default.nix−13
This diff is too big to show here.
pkgs/applications/misc/tty-share/default.nix+4−6
This diff is too big to show here.
pkgs/applications/misc/tty-solitaire/default.nix−1
This diff is too big to show here.
pkgs/applications/misc/tuhi/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/tut/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/tvbrowser/bin.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/udiskie/default.nix+25−30
This diff is too big to show here.
pkgs/applications/misc/udiskie/locale-path.patchdeleted−17
This diff is too big to show here.
pkgs/applications/misc/upwork/default.nix+4−14
This diff is too big to show here.
pkgs/applications/misc/urlview/default.nix+5−5
This diff is too big to show here.
pkgs/applications/misc/veracrypt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/vit/default.nix+5−3
This diff is too big to show here.
pkgs/applications/misc/waybar/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/wego/default.nix+13−11
This diff is too big to show here.
pkgs/applications/misc/wego/deps.nixnew file+48
This diff is too big to show here.
pkgs/applications/misc/whalebird/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/wlclock/default.nixdeleted−46
This diff is too big to show here.
pkgs/tools/X11/xdragon/default.nix → pkgs/applications/misc/xdragon/default.nixrenamed+3−3
This diff is too big to show here.
pkgs/applications/misc/xmr-stak/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/xmrig/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/xmrig/moneroocean.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/xpdf/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/xplr/default.nix+3−3
This diff is too big to show here.
pkgs/applications/misc/xteddy/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/ydict/default.nixdeleted−28
This diff is too big to show here.
pkgs/applications/misc/yubioath-desktop/default.nix+1−1
This diff is too big to show here.
pkgs/applications/misc/zathura/core/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/zettlr/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/zola/default.nix+2−2
This diff is too big to show here.
pkgs/applications/misc/zscroll/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/alpnpass/default.nixdeleted−34
This diff is too big to show here.
pkgs/applications/networking/appgate-sdp/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/bee/bee.nix+3−1
This diff is too big to show here.
pkgs/applications/networking/browsers/bombadillo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/browsers/brave/default.nix+53−72
This diff is too big to show here.
pkgs/applications/networking/browsers/chromium/browser.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/browsers/chromium/common.nix+32−27
This diff is too big to show here.
pkgs/applications/networking/browsers/chromium/default.nix+10−5
This diff is too big to show here.
pkgs/applications/networking/browsers/chromium/get-commit-message.py+3−3
This diff is too big to show here.
pkgs/applications/networking/browsers/chromium/ungoogled-flags.tomldeleted−23
This diff is too big to show here.
pkgs/applications/networking/browsers/chromium/update.py−11
This diff is too big to show here.
pkgs/applications/networking/browsers/chromium/upstream-info.json+30−30
This diff is too big to show here.
pkgs/applications/kde/falkon.nix → pkgs/applications/networking/browsers/falkon/default.nixrenamed+13−4
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix+393−393
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox-bin/default.nix+3−1
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+393−393
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+393−393
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox/common.nix+171−286
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox/librewolf/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox/librewolf/src.json+5−5
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox/packages.nix+5−6
This diff is too big to show here.
pkgs/applications/networking/browsers/firefox/wrapper.nix+18−15
This diff is too big to show here.
pkgs/applications/networking/browsers/google-chrome/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/browsers/lagrange/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/browsers/links2/default.nix−1
This diff is too big to show here.
pkgs/applications/networking/browsers/microsoft-edge/browser.nixdeleted−191
This diff is too big to show here.
pkgs/applications/networking/browsers/microsoft-edge/default.nixdeleted−20
This diff is too big to show here.
pkgs/applications/networking/browsers/microsoft-edge/update.shdeleted−50
This diff is too big to show here.
pkgs/applications/networking/browsers/opera/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/browsers/palemoon/default.nix+14−21
This diff is too big to show here.
pkgs/applications/networking/browsers/qtchan/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/browsers/qutebrowser/default.nix+5−8
This diff is too big to show here.
pkgs/applications/networking/browsers/surf/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+4−11
This diff is too big to show here.
pkgs/applications/networking/browsers/vieb/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/browsers/vieb/package.json+17−12
This diff is too big to show here.
pkgs/applications/networking/browsers/vieb/yarn.lock+1481−1276
This diff is too big to show here.
pkgs/applications/networking/browsers/vieb/yarn.nix+1546−1330
This diff is too big to show here.
pkgs/applications/networking/browsers/vivaldi/default.nix+3−5
This diff is too big to show here.
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/browsers/vivaldi/update.sh+1−5
This diff is too big to show here.
pkgs/applications/networking/browsers/vivaldi/widevine.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/browsers/webbrowser/default.nixnew file+109
This diff is too big to show here.
pkgs/applications/networking/browsers/yandex-browser/default.nix+11−18
This diff is too big to show here.
pkgs/applications/networking/c14/default.nixnew file+22
This diff is too big to show here.
pkgs/applications/networking/cawbird/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cisco-packet-tracer/8.nix+2−3
This diff is too big to show here.
pkgs/applications/networking/cloudflare-dyndns/default.nixdeleted−53
This diff is too big to show here.
pkgs/applications/networking/cloudflared/default.nix+6−17
This diff is too big to show here.
pkgs/applications/networking/cluster/argo-rollouts/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/argo/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/argocd-autopilot/default.nixdeleted−54
This diff is too big to show here.
pkgs/applications/networking/cluster/argocd/default.nix+32−16
This diff is too big to show here.
pkgs/applications/networking/cluster/arkade/default.nix+4−4
This diff is too big to show here.
pkgs/applications/networking/cluster/atlantis/default.nix+5−8
This diff is too big to show here.
pkgs/applications/networking/cluster/cilium/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix+3−4
This diff is too big to show here.
pkgs/applications/networking/cluster/clusterctl/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/cmctl/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/cni/plugins.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/driftctl/default.nix+41−41
This diff is too big to show here.
pkgs/applications/networking/cluster/flink/default.nix+3−2
This diff is too big to show here.
pkgs/applications/networking/cluster/fluxcd/default.nix+5−5
This diff is too big to show here.
pkgs/applications/networking/cluster/fluxcd/update.sh+31−38
This diff is too big to show here.
pkgs/applications/networking/cluster/fluxctl/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/fn-cli/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/hadoop/default.nix+16−52
This diff is too big to show here.
pkgs/applications/networking/cluster/helm-docs/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/helm/chart-testing/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/helm/default.nix+9−21
This diff is too big to show here.
pkgs/applications/networking/cluster/helmfile/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/istioctl/default.nix+6−9
This diff is too big to show here.
pkgs/applications/networking/cluster/k3s/default.nix+14−29
This diff is too big to show here.
pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patchnew file+37
This diff is too big to show here.
pkgs/applications/networking/cluster/k3s/update.sh+1−1
This diff is too big to show here.
pkgs/applications/networking/cluster/k9s/default.nix+2−3
This diff is too big to show here.
pkgs/applications/networking/cluster/kn/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/kompose/default.nix+7−17
This diff is too big to show here.
pkgs/applications/networking/cluster/kontemplate/default.nix+1
This diff is too big to show here.
pkgs/applications/networking/cluster/kops/default.nix+9−9
This diff is too big to show here.
pkgs/applications/networking/cluster/krane/Gemfile.lock+12−12
This diff is too big to show here.
pkgs/applications/networking/cluster/krane/gemset.nix+20−20
This diff is too big to show here.
pkgs/applications/networking/cluster/krelay/default.nixdeleted−31
This diff is too big to show here.
pkgs/applications/networking/cluster/kube-capacity/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/kube3d/default.nix+12−29
This diff is too big to show here.
pkgs/applications/networking/cluster/kubecfg/default.nix+7−7
This diff is too big to show here.
pkgs/applications/networking/cluster/kubecolor/default.nix+1−3
This diff is too big to show here.
pkgs/applications/networking/cluster/kubeless/default.nixnew file+38
This diff is too big to show here.
pkgs/applications/networking/cluster/kubemqctl/default.nixdeleted−25
This diff is too big to show here.
pkgs/applications/networking/cluster/kubent/default.nixdeleted−29
This diff is too big to show here.
pkgs/applications/networking/cluster/kubernetes/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/kubernetes/kubectl.nix−1
This diff is too big to show here.
pkgs/applications/networking/cluster/kubeseal/default.nix+2
This diff is too big to show here.
pkgs/applications/networking/cluster/kuttl/default.nix−1
This diff is too big to show here.
pkgs/applications/networking/cluster/linkerd/edge.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/nerdctl/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/nixops/default.nix−2
This diff is too big to show here.
pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix+7−7
This diff is too big to show here.
pkgs/applications/networking/cluster/nixops/poetry.lock+117−88
This diff is too big to show here.
pkgs/applications/networking/cluster/nixops/pyproject.toml+1−4
This diff is too big to show here.
pkgs/applications/networking/cluster/nomad-pack/default.nix+4−4
This diff is too big to show here.
pkgs/applications/networking/cluster/nomad/1.1.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/ocm/default.nixdeleted−32
This diff is too big to show here.
pkgs/applications/networking/cluster/octant/default.nix+5−5
This diff is too big to show here.
pkgs/applications/networking/cluster/odo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/openshift/default.nix+51−35
This diff is too big to show here.
pkgs/applications/networking/cluster/pachyderm/default.nix−1
This diff is too big to show here.
pkgs/applications/networking/cluster/pgo-client/default.nix−1
This diff is too big to show here.
pkgs/applications/networking/cluster/pluto/default.nixdeleted−27
This diff is too big to show here.
pkgs/applications/networking/cluster/popeye/default.nix+4−3
This diff is too big to show here.
pkgs/applications/networking/cluster/qbec/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/rancher/default.nix+5−3
This diff is too big to show here.
pkgs/applications/networking/cluster/sonobuoy/default.nix+4−4
This diff is too big to show here.
pkgs/applications/networking/cluster/spark/default.nix+27−42
This diff is too big to show here.
pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix+4−9
This diff is too big to show here.
pkgs/applications/networking/cluster/starboard/default.nix+9−15
This diff is too big to show here.
pkgs/applications/networking/cluster/talosctl/default.nix+11−13
This diff is too big to show here.
pkgs/applications/networking/cluster/tanka/default.nix−1
This diff is too big to show here.
pkgs/applications/networking/cluster/tektoncd-cli/default.nix+6−9
This diff is too big to show here.
pkgs/applications/networking/cluster/terraform-providers/default.nix+2−6
This diff is too big to show here.
pkgs/applications/networking/cluster/terraform-providers/providers.json+326−378
This diff is too big to show here.
pkgs/applications/networking/cluster/terraform-providers/update-all-providers+5−8
This diff is too big to show here.
pkgs/applications/networking/cluster/terraform-providers/update-provider+36−34
This diff is too big to show here.
pkgs/applications/networking/cluster/terraform/default.nix+4−5
This diff is too big to show here.
pkgs/applications/networking/cluster/terragrunt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/tfswitch/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/tgswitch/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/tilt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/vcluster/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/velero/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/cluster/waypoint/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/cluster/werf/default.nix+4−11
This diff is too big to show here.
pkgs/applications/networking/cozy-drive/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/dnscontrol/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/feedreaders/gnome-feeds/default.nix−2
This diff is too big to show here.
pkgs/applications/networking/feedreaders/newsboat/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/feedreaders/rss2email/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/firewalld/default.nixdeleted−104
This diff is too big to show here.
pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patchdeleted−13
This diff is too big to show here.
pkgs/applications/networking/flexget/default.nix+4−10
This diff is too big to show here.
pkgs/applications/networking/gmailctl/default.nix+4−4
This diff is too big to show here.
pkgs/applications/networking/gns3/default.nix+8−7
This diff is too big to show here.
pkgs/applications/networking/gns3/gui.nix+7−29
This diff is too big to show here.
pkgs/applications/networking/gns3/server.nix+22−36
This diff is too big to show here.
pkgs/applications/networking/ids/zeek/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/alfaview/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/bluejeans/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nixdeleted−50
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nixdeleted−35
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/caprine-bin/default.nixdeleted−25
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/chatty/default.nix+4−6
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/cinny/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix+23−27
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json+9−12
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh+1−1
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/discord/default.nix+4−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+3−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/element/keytar/default.nix+1−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/element/pin.json+4−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/element/seshat/default.nix+1−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/ferdi/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/fluffychat/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/fractal/default.nix+1−12
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/franz/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/gajim/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/gotktrix/default.nixdeleted−42
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/gtmess/default.nixnew file+20
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix+3−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/kaidan/default.nix−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/kdeltachat/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/linphone/default.nix+13−40
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch+31−56
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patchdeleted−27
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch+6−6
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/matrixcli/default.nix+5−5
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/mirage/default.nix−1
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/neochat/default.nix+2−8
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/nheko/default.nix+2−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix+10−8
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix+8−6
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/pond/default.nix+8−8
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/profanity/default.nix+22−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/psi-plus/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/qtox/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/ripcord/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/schildichat/pin.json+4−6
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix+3−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix+8−33
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/schildichat/update.sh−4
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix+3−41
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+4−6
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/sky/default.nixdeleted−66
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/slack/default.nix+7−7
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/teams/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/teamspeak/client.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix+33−191
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patchdeleted−57
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patchdeleted−424
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patchdeleted−38
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patchdeleted−68
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix+15−111
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nixdeleted−23
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−10
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/tdesktop/kf594.diffdeleted−57
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/tensor/default.nix+4−5
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/threema-desktop/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/torchat/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/vk-messenger/default.nix+5−5
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+5−6
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/zoom-us/default.nix+8−47
This diff is too big to show here.
pkgs/applications/networking/instant-messengers/zulip/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/ipfs-cluster/default.nix+4−4
This diff is too big to show here.
pkgs/applications/networking/ipfs/default.nix+10−18
This diff is too big to show here.
pkgs/applications/networking/irc/bip/default.nix+1−2
This diff is too big to show here.
pkgs/applications/networking/irc/communi/default.nix+4−5
This diff is too big to show here.
pkgs/applications/networking/irc/ircdog/default.nix+4−5
This diff is too big to show here.
pkgs/applications/networking/irc/irssi/fish/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/irc/kirc/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/irc/quassel/default.nix+1
This diff is too big to show here.
pkgs/applications/networking/irc/senpai/default.nix+4−4
This diff is too big to show here.
pkgs/applications/networking/irc/tiny/default.nix+4−8
This diff is too big to show here.
pkgs/applications/networking/irc/weechat/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/irc/wraith/configure.patch+1−1
This diff is too big to show here.
pkgs/applications/networking/irc/wraith/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/juju/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/lieer/default.nix+1
This diff is too big to show here.
pkgs/applications/networking/linssid/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/maestral-qt/default.nix−3
This diff is too big to show here.
pkgs/applications/networking/mailreaders/aerc/default.nix+14−23
This diff is too big to show here.
pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch+56−86
This diff is too big to show here.
pkgs/applications/networking/mailreaders/alot/default.nix+7−1
This diff is too big to show here.
pkgs/development/python-modules/notmuch2/default.nix → pkgs/applications/networking/mailreaders/alot/notmuch.nixrenamed−6
This diff is too big to show here.
pkgs/applications/networking/mailreaders/claws-mail/default.nix+14−6
This diff is too big to show here.
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix+4−11
This diff is too big to show here.
pkgs/applications/networking/mailreaders/himalaya/default.nix+6−10
This diff is too big to show here.
pkgs/applications/networking/mailreaders/mailspring/default.nix+4−9
This diff is too big to show here.
pkgs/applications/networking/mailreaders/meli/default.nix+2−1
This diff is too big to show here.
pkgs/applications/networking/mailreaders/mutt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/mailreaders/neomutt/default.nix+12−2
This diff is too big to show here.
pkgs/applications/networking/mailreaders/notbit/default.nixnew file+30
This diff is too big to show here.
pkgs/applications/networking/mailreaders/notmuch-bower/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/mailreaders/notmuch/default.nix+3−8
This diff is too big to show here.
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+261−261
This diff is too big to show here.
pkgs/applications/networking/mailreaders/thunderbird/packages.nix+4−6
This diff is too big to show here.
pkgs/applications/networking/misc/zammad/default.nix+1−5
This diff is too big to show here.
pkgs/applications/networking/misc/zammad/gemset.nix+1319−1093
This diff is too big to show here.
pkgs/applications/networking/misc/zammad/package.json+11−15
This diff is too big to show here.
pkgs/applications/networking/misc/zammad/source.json+5−5
This diff is too big to show here.
pkgs/applications/networking/misc/zammad/update.nix−2
This diff is too big to show here.
pkgs/applications/networking/misc/zammad/update.sh+2−2
This diff is too big to show here.
pkgs/applications/networking/misc/zammad/yarn.lock+2008−936
This diff is too big to show here.
pkgs/applications/networking/misc/zammad/yarn.nix+1880−760
This diff is too big to show here.
pkgs/applications/networking/modem-manager-gui/default.nix−15
This diff is too big to show here.
pkgs/applications/networking/mullvad-vpn/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/mullvad/default.nixdeleted−8
This diff is too big to show here.
pkgs/applications/networking/mullvad/libwg.nixdeleted−35
This diff is too big to show here.
pkgs/applications/networking/mullvad/mullvad.nixdeleted−107
This diff is too big to show here.
pkgs/applications/networking/mullvad/openvpn.nixdeleted−87
This diff is too big to show here.
pkgs/applications/networking/n8n/default.nix+1−7
This diff is too big to show here.
pkgs/applications/networking/n8n/node-packages.nix+899−941
This diff is too big to show here.
pkgs/applications/networking/newsreaders/liferea/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/nextcloud-client/default.nix+3−26
This diff is too big to show here.
pkgs/applications/networking/nextdns/default.nix+5−3
This diff is too big to show here.
pkgs/applications/networking/owamp/default.nix+1−2
This diff is too big to show here.
pkgs/applications/networking/owncloud-client/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/p2p/fragments/default.nix+41−54
This diff is too big to show here.
pkgs/applications/networking/p2p/fragments/dependency-resolution.patchnew file+25
This diff is too big to show here.
pkgs/applications/networking/p2p/frostwire/default.nix+6−6
This diff is too big to show here.
pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix+4−17
This diff is too big to show here.
pkgs/applications/networking/p2p/gnunet/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/p2p/tribler/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/p2p/twister/default.nixnew file+70
This diff is too big to show here.
pkgs/applications/networking/ping/default.nixnew file+76
This diff is too big to show here.
pkgs/applications/networking/pjsip/default.nix+1−7
This diff is too big to show here.
pkgs/applications/networking/protonvpn-gui/default.nix+16−33
This diff is too big to show here.
pkgs/applications/networking/remote/citrix-workspace/generic.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/remote/freerdp/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/remote/remmina/default.nix+5−7
This diff is too big to show here.
pkgs/applications/networking/remote/rustdesk/cargo.patchdeleted−50
This diff is too big to show here.
pkgs/applications/networking/remote/rustdesk/default.nixdeleted−104
This diff is too big to show here.
pkgs/applications/networking/remote/vmware-horizon-client/default.nix+4−5
This diff is too big to show here.
pkgs/applications/networking/remote/x2goclient/default.nix+6−36
This diff is too big to show here.
pkgs/applications/networking/resilio-sync/default.nix+19−19
This diff is too big to show here.
pkgs/applications/networking/seafile-client/default.nix+3−5
This diff is too big to show here.
pkgs/applications/networking/seahub/default.nix+5−12
This diff is too big to show here.
pkgs/applications/networking/seaweedfs/default.nix+5−6
This diff is too big to show here.
pkgs/applications/networking/shellhub-agent/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/sniffers/sngrep/default.nix+13−2
This diff is too big to show here.
pkgs/applications/networking/sniffers/wireshark/default.nix+7−22
This diff is too big to show here.
pkgs/applications/networking/soju/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/sync/desync/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/sync/lsyncd/default.nix+1−2
This diff is too big to show here.
pkgs/applications/networking/sync/onedrive/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/sync/rclone/default.nix+5−10
This diff is too big to show here.
pkgs/applications/networking/sync/unison/default.nix+2−2
This diff is too big to show here.
pkgs/applications/networking/sync/wdt/default.nixdeleted−34
This diff is too big to show here.
pkgs/applications/networking/syncplay/default.nix+4−6
This diff is too big to show here.
pkgs/applications/networking/syncthing/default.nix+3−3
This diff is too big to show here.
pkgs/applications/networking/synology-drive-client/default.nix+4−4
This diff is too big to show here.
pkgs/applications/networking/termius/default.nix+13−8
This diff is too big to show here.
pkgs/applications/networking/tetrd/default.nix+1−1
This diff is too big to show here.
pkgs/applications/networking/zerobin/default.nix+1−1
This diff is too big to show here.
pkgs/applications/office/autokey/remove-requires-dbus-python.patchnew file+11
This diff is too big to show here.
pkgs/applications/office/banking/default.nix+9−20
This diff is too big to show here.
pkgs/applications/office/beamerpresenter/default.nix+22−45
This diff is too big to show here.
pkgs/applications/office/bookworm/default.nix+26−48
This diff is too big to show here.
pkgs/applications/office/buho/default.nixdeleted−58
This diff is too big to show here.
pkgs/applications/office/calligra/default.nix−16
This diff is too big to show here.
pkgs/applications/office/elementary-planner/default.nix+1−14
This diff is too big to show here.
pkgs/applications/office/fava/default.nix+3−15
This diff is too big to show here.
pkgs/applications/office/foliate/default.nix+1
This diff is too big to show here.
pkgs/applications/office/gnumeric/default.nix+2−3
This diff is too big to show here.
pkgs/applications/office/hledger-check-fancyassertions/default.nix+9−4
This diff is too big to show here.
pkgs/applications/office/jameica/default.nix+7−8
This diff is too big to show here.
pkgs/applications/kde/kalendar.nix → pkgs/applications/office/kalendar/default.nixrenamed+10−1
This diff is too big to show here.
pkgs/applications/office/khronos/default.nix+9−2
This diff is too big to show here.
pkgs/applications/office/ledger/default.nix+2−2
This diff is too big to show here.
pkgs/applications/office/libreoffice/default.nix+2−11
This diff is too big to show here.
pkgs/applications/office/libreoffice/soffice-template.desktopdeleted−6
This diff is too big to show here.
pkgs/applications/office/libreoffice/wrapper.nix+12−25
This diff is too big to show here.
pkgs/applications/office/micropad/default.nixdeleted−101
This diff is too big to show here.
pkgs/applications/office/micropad/package.jsondeleted−87
This diff is too big to show here.
pkgs/applications/office/micropad/yarn.lockdeleted−2006
This diff is too big to show here.
pkgs/applications/office/micropad/yarn.nixdeleted−2341
This diff is too big to show here.
pkgs/applications/office/mmex/default.nix+29−26
This diff is too big to show here.
pkgs/applications/office/morgen/default.nix+2−2
This diff is too big to show here.
pkgs/applications/office/paperless-ngx/default.nix → pkgs/applications/office/paperless-ng/default.nixrenamed+41−33
This diff is too big to show here.
pkgs/applications/office/paperwork/openpaperwork-core.nix−1
This diff is too big to show here.
pkgs/applications/office/paperwork/openpaperwork-gtk.nix−1
This diff is too big to show here.
pkgs/applications/office/paperwork/paperwork-gtk.nix+3−19
This diff is too big to show here.
pkgs/applications/office/paperwork/src.nix+2−2
This diff is too big to show here.
pkgs/applications/office/pinpoint/default.nix+2−2
This diff is too big to show here.
pkgs/applications/office/portfolio/default.nix+3−3
This diff is too big to show here.
pkgs/applications/office/qownnotes/default.nix+2−2
This diff is too big to show here.
pkgs/applications/office/scribus/unstable.nix−30
This diff is too big to show here.
pkgs/applications/office/softmaker/desktop_items.nix+1−3
This diff is too big to show here.
pkgs/applications/office/spice-up/default.nix+1
This diff is too big to show here.
pkgs/applications/office/timeline/default.nix+5−3
This diff is too big to show here.
pkgs/applications/office/treesheets/default.nix+31−29
This diff is too big to show here.
pkgs/applications/office/trilium/default.nix+3−3
This diff is too big to show here.
pkgs/applications/office/tusk/default.nix+2−3
This diff is too big to show here.
pkgs/applications/office/vnote/default.nix+2−2
This diff is too big to show here.
pkgs/applications/office/wpsoffice/default.nix+1
This diff is too big to show here.
pkgs/applications/office/zotero/default.nix+41−47
This diff is too big to show here.
pkgs/applications/radio/cubicsdr/default.nix+21−3
This diff is too big to show here.
pkgs/applications/radio/flex-ncat/default.nix−1
This diff is too big to show here.
pkgs/applications/radio/flrig/default.nix+2−4
This diff is too big to show here.
pkgs/applications/radio/freedv/default.nix+4−8
This diff is too big to show here.
pkgs/applications/radio/gnss-sdr/default.nix−6
This diff is too big to show here.
pkgs/applications/radio/gnuradio/3.9.nix+2−8
This diff is too big to show here.
pkgs/applications/radio/gnuradio/default.nix+3−10
This diff is too big to show here.
pkgs/applications/radio/gnuradio/wrapper.nix+4−5
This diff is too big to show here.
pkgs/applications/radio/gqrx/default.nix+2−2
This diff is too big to show here.
pkgs/applications/radio/kalibrate-rtl/default.nix+5−5
This diff is too big to show here.
pkgs/applications/radio/pothos/default.nix+2−2
This diff is too big to show here.
pkgs/applications/radio/rtl-ais/default.nix+1−2
This diff is too big to show here.
pkgs/applications/radio/rtl-sdr/default.nix+7−11
This diff is too big to show here.
pkgs/applications/radio/sdrplay/default.nix+1−1
This diff is too big to show here.
pkgs/applications/radio/soapysdrplay/default.nix+2−2
This diff is too big to show here.
pkgs/applications/radio/soundmodem/default.nix+3−3
This diff is too big to show here.
pkgs/applications/radio/splat/default.nixdeleted−55
This diff is too big to show here.
pkgs/applications/radio/srsran/default.nixdeleted−49
This diff is too big to show here.
pkgs/applications/radio/uhd/default.nix−2
This diff is too big to show here.
pkgs/applications/radio/urh/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/astronomy/astrolabe-generator/default.nix−1
This diff is too big to show here.
pkgs/applications/science/astronomy/gnuastro/default.nixdeleted−36
This diff is too big to show here.
pkgs/applications/science/astronomy/gprojector/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/astronomy/kstars/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/astronomy/openspace/assets.patchnew file+100
This diff is too big to show here.
pkgs/applications/science/astronomy/openspace/config.patchnew file+49
This diff is too big to show here.
pkgs/applications/science/astronomy/openspace/constexpr.patchnew file+91
This diff is too big to show here.
pkgs/applications/science/astronomy/openspace/default.nixnew file+90
This diff is too big to show here.
pkgs/applications/science/astronomy/openspace/vrpn.patchnew file+13
This diff is too big to show here.
pkgs/applications/science/astronomy/phd2/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/astronomy/siril/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/astronomy/stellarium/default.nix+4−4
This diff is too big to show here.
pkgs/applications/science/biology/angsd/default.nixdeleted−25
This diff is too big to show here.
pkgs/applications/science/biology/bayescan/default.nix−1
This diff is too big to show here.
pkgs/applications/science/biology/blast/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/biology/bwa/default.nix−2
This diff is too big to show here.
pkgs/applications/science/biology/clustal-omega/default.nix−1
This diff is too big to show here.
pkgs/applications/science/biology/cmtk/default.nix+1−4
This diff is too big to show here.
pkgs/applications/science/biology/dcm2niix/default.nix+7−42
This diff is too big to show here.
pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patchdeleted−36
This diff is too big to show here.
pkgs/applications/science/biology/eggnog-mapper/default.nix+16−30
This diff is too big to show here.
pkgs/applications/science/biology/flywheel-cli/default.nixdeleted−49
This diff is too big to show here.
pkgs/applications/science/biology/kssd/default.nix+1−2
This diff is too big to show here.
pkgs/applications/science/biology/last/default.nix+4−4
This diff is too big to show here.
pkgs/applications/science/biology/megahit/default.nix−3
This diff is too big to show here.
pkgs/applications/science/biology/minimap2/default.nix+1−2
This diff is too big to show here.
pkgs/applications/science/biology/ncbi-tools/default.nixnew file+34
This diff is too big to show here.
pkgs/applications/science/biology/picard-tools/default.nix−1
This diff is too big to show here.
pkgs/applications/science/biology/quast/default.nix+3−1
This diff is too big to show here.
pkgs/applications/science/biology/samtools/default.nix+1−8
This diff is too big to show here.
pkgs/applications/science/biology/tebreak/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/chemistry/jmol/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/chemistry/marvin/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/computer-architecture/qtrvsim/default.nixdeleted−30
This diff is too big to show here.
pkgs/applications/science/electronics/caneda/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/electronics/eagle/eagle7.nixnew file+97
This diff is too big to show here.
pkgs/applications/science/electronics/gaw/default.nixdeleted−34
This diff is too big to show here.
pkgs/applications/science/electronics/gerbv/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/electronics/kicad/versions.nix+21−21
This diff is too big to show here.
pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patchnew file+19
This diff is too big to show here.
pkgs/applications/science/electronics/magic-vlsi/default.nix+3−2
This diff is too big to show here.
pkgs/applications/science/electronics/ngspice/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/electronics/verilator/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/electronics/xcircuit/default.nix+8−4
This diff is too big to show here.
pkgs/applications/science/electronics/xschem/default.nixdeleted−46
This diff is too big to show here.
pkgs/applications/science/engineering/brmodelo/default.nixdeleted−109
This diff is too big to show here.
pkgs/applications/science/logic/abc/default.nix+3−3
This diff is too big to show here.
pkgs/applications/science/logic/coq/default.nix+14−15
This diff is too big to show here.
pkgs/applications/science/logic/cvc5/default.nixdeleted−34
This diff is too big to show here.
pkgs/applications/science/logic/easycrypt/default.nixdeleted−50
This diff is too big to show here.
pkgs/applications/science/logic/easycrypt/runtest.nixdeleted−24
This diff is too big to show here.
pkgs/applications/science/logic/elan/default.nix+3−3
This diff is too big to show here.
pkgs/applications/science/logic/fast-downward/default.nix+12−19
This diff is too big to show here.
pkgs/applications/science/logic/isabelle/components/default.nixdeleted−5
This diff is too big to show here.
pkgs/applications/science/logic/isabelle/components/isabelle-linter.nixdeleted−22
This diff is too big to show here.
pkgs/applications/science/logic/isabelle/components/mkBuild.nixdeleted−36
This diff is too big to show here.
pkgs/applications/science/logic/isabelle/default.nix+3−80
This diff is too big to show here.
pkgs/applications/science/logic/jonprl/default.nixnew file+35
This diff is too big to show here.
pkgs/applications/science/logic/key/default.nix+3−2
This diff is too big to show here.
pkgs/applications/science/logic/klee/default.nix+17−64
This diff is too big to show here.
pkgs/applications/science/logic/klee/klee-uclibc.nixdeleted−98
This diff is too big to show here.
pkgs/applications/science/logic/lean/default.nix+3−3
This diff is too big to show here.
pkgs/applications/science/logic/lean2/default.nixnew file+37
This diff is too big to show here.
pkgs/applications/science/logic/naproche/default.nixdeleted−38
This diff is too big to show here.
pkgs/applications/science/logic/nuXmv/default.nixdeleted−33
This diff is too big to show here.
pkgs/applications/science/logic/opensmt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/logic/otter/default.nixnew file+53
This diff is too big to show here.
pkgs/applications/science/logic/potassco/clingcon.nix−5
This diff is too big to show here.
pkgs/applications/science/logic/symbiyosys/default.nix−1
This diff is too big to show here.
pkgs/applications/science/logic/symfpu/default.nixdeleted−26
This diff is too big to show here.
pkgs/applications/science/logic/tlaplus/toolbox.nix+1−1
This diff is too big to show here.
pkgs/applications/science/logic/why3/with-provers.nix+1−1
This diff is too big to show here.
pkgs/applications/science/logic/z3/4.4.0.nix+1−1
This diff is too big to show here.
pkgs/applications/science/logic/z3/default.nix+66−66
This diff is too big to show here.
pkgs/applications/science/machine-learning/finalfusion-utils/default.nix−1
This diff is too big to show here.
pkgs/applications/science/math/R/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/math/adolc/default.nixdeleted−23
This diff is too big to show here.
pkgs/applications/science/math/caffe/default.nix+4−9
This diff is too big to show here.
pkgs/applications/science/math/calc/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/math/calculix/calculix.patch+9−10
This diff is too big to show here.
pkgs/applications/science/math/calculix/default.nix+3−6
This diff is too big to show here.
pkgs/applications/science/math/cemu/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/math/cntk/default.nix+7−12
This diff is too big to show here.
pkgs/applications/science/math/fricas/default.nix+6−3
This diff is too big to show here.
pkgs/applications/science/math/giac/default.nix+16−12
This diff is too big to show here.
pkgs/applications/science/math/mxnet/default.nix+2−14
This diff is too big to show here.
pkgs/applications/science/math/nasc/default.nix+1
This diff is too big to show here.
pkgs/applications/science/math/qalculate-gtk/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/math/sage/README.md+2−2
This diff is too big to show here.
pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patchdeleted−13
This diff is too big to show here.
pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patchnew file+52
This diff is too big to show here.
pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patchdeleted−81
This diff is too big to show here.
pkgs/applications/science/math/sage/sage-env.nix−2
This diff is too big to show here.
pkgs/applications/science/math/sage/sage-src.nix+16−57
This diff is too big to show here.
pkgs/applications/science/math/sage/sagelib.nix+3−8
This diff is too big to show here.
pkgs/applications/science/math/scilab-bin/default.nix+20−17
This diff is too big to show here.
pkgs/applications/science/math/wolfram-engine/default.nixdeleted−143
This diff is too big to show here.
pkgs/applications/science/math/wolfram-engine/l10ns.nixdeleted−51
This diff is too big to show here.
pkgs/applications/science/math/wolfram-engine/notebook.nixdeleted−9
This diff is too big to show here.
pkgs/applications/science/math/wxmaxima/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/medicine/xmedcon/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/misc/bada-bib/default.nix+4−3
This diff is too big to show here.
pkgs/applications/science/misc/colmap/default.nix+6−22
This diff is too big to show here.
pkgs/applications/science/misc/cwltool/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/misc/fityk/default.nix+5−6
This diff is too big to show here.
pkgs/applications/science/misc/golly/beta.nixnew file+50
This diff is too big to show here.
pkgs/applications/science/misc/netlogo/default.nix+1−1
This diff is too big to show here.
pkgs/applications/science/misc/openmvs/default.nixnew file+77
This diff is too big to show here.
pkgs/applications/science/misc/rink/default.nix+3−3
This diff is too big to show here.
pkgs/applications/science/misc/root/5.nix−5
This diff is too big to show here.
pkgs/applications/science/misc/root/default.nix+1−1
This diff is too big to show here.
pkgs/applications/science/misc/simgrid/default.nix+2−4
This diff is too big to show here.
pkgs/applications/science/misc/snakemake/default.nix+13−27
This diff is too big to show here.
pkgs/applications/science/molecular-dynamics/gromacs/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/physics/xfitter/default.nix+30−34
This diff is too big to show here.
pkgs/applications/science/physics/xfitter/undefined_behavior.patchnew file+454
This diff is too big to show here.
pkgs/applications/science/programming/jflap/default.nixdeleted−32
This diff is too big to show here.
pkgs/applications/science/robotics/inav-configurator/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/robotics/mavproxy/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/robotics/mission-planner/default.nix+2−2
This diff is too big to show here.
pkgs/applications/science/robotics/sumorobot-manager/default.nix+1−1
This diff is too big to show here.
pkgs/applications/system/monitor/default.nix+3−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/alacritty/default.nix+6−7
This diff is too big to show here.
pkgs/applications/terminal-emulators/contour/default.nix+1−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/cool-retro-term/default.nix+1−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/ctx/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/darktile/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/eterm/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/foot/default.nix+2−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/germinal/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/gnome-console/default.nixdeleted−69
This diff is too big to show here.
pkgs/applications/terminal-emulators/guake/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/hyper/default.nix+3−5
This diff is too big to show here.
pkgs/applications/terminal-emulators/iterm2/default.nix+30−24
This diff is too big to show here.
pkgs/applications/terminal-emulators/kermit-terminal/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/kgx/default.nixnew file+76
This diff is too big to show here.
pkgs/applications/terminal-emulators/kitty/default.nix+26−58
This diff is too big to show here.
pkgs/applications/terminal-emulators/lxterminal/default.nix+1−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/mlterm/default.nix+1−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/mrxvt/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/roxterm/default.nix+3−5
This diff is too big to show here.
pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix+1−1
This diff is too big to show here.
pkgs/applications/terminal-emulators/rxvt-unicode/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix+1−5
This diff is too big to show here.
pkgs/applications/terminal-emulators/sakura/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/st/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/stupidterm/default.nix+1−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/syncterm/default.nix−2
This diff is too big to show here.
pkgs/applications/terminal-emulators/terminator/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/termite/default.nix+2−5
This diff is too big to show here.
pkgs/applications/terminal-emulators/termonad/default.nix+2−5
This diff is too big to show here.
pkgs/applications/terminal-emulators/tilda/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/tilix/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/wayst/default.nix−3
This diff is too big to show here.
pkgs/applications/terminal-emulators/wezterm/default.nix+9−23
This diff is too big to show here.
pkgs/applications/terminal-emulators/xterm/default.nix+3−6
This diff is too big to show here.
pkgs/applications/version-management/bcompare/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/bitkeeper/default.nixnew file+56
This diff is too big to show here.
pkgs/applications/version-management/commit-formatter/default.nix−1
This diff is too big to show here.
pkgs/applications/version-management/commitizen/default.nix+1−1
This diff is too big to show here.
pkgs/applications/version-management/dvc/default.nix+11−25
This diff is too big to show here.
pkgs/applications/version-management/dvc/dvc-daemon.patch+1−1
This diff is too big to show here.
pkgs/applications/version-management/fnc/default.nixdeleted−40
This diff is too big to show here.
pkgs/applications/version-management/gerrit/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix+44−41
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix−1
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/cgit/common.nixdeleted−77
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/cgit/default.nix+69−7
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/cgit/pink.nixdeleted−23
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix+4−5
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/delta/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/gg/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/gh/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/ghorg/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix+7−7
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix+1−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-branchless/default.nix+5−5
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-cliff/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-crypt/default.nix+7−17
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-dit/default.nixnew file+58
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-extras/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix+12−5
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-machete/default.nix+10−5
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-secret/default.nix+6−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-team/default.nixdeleted−31
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git-vendor/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/git/default.nix+18−27
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/gitbatch/default.nix+10−12
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/gitbatch/deps.nixnew file+543
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/glab/default.nix+1−10
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/glitter/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/hut/default.nixdeleted−40
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/lab/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/scmpuff/default.nix+9−14
This diff is too big to show here.
pkgs/applications/version-management/git-and-tools/scmpuff/deps.nixnew file+273
This diff is too big to show here.
pkgs/applications/version-management/git-lfs/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-repo/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-review/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/git-sizer/default.nix+6−15
This diff is too big to show here.
pkgs/applications/version-management/gitea/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/github-desktop/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/gitkraken/default.nix+5−10
This diff is too big to show here.
pkgs/applications/version-management/gitlab/data.json+8−8
This diff is too big to show here.
pkgs/applications/version-management/gitlab/gitaly/Gemfile+1−1
This diff is too big to show here.
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock+13−13
This diff is too big to show here.
pkgs/applications/version-management/gitlab/gitaly/default.nix+5−5
This diff is too big to show here.
pkgs/applications/version-management/gitlab/gitaly/gemset.nix+16−16
This diff is too big to show here.
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile+14−23
This diff is too big to show here.
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock+109−147
This diff is too big to show here.
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix+96−233
This diff is too big to show here.
pkgs/applications/version-management/gitoxide/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/gitqlient/default.nixdeleted−41
This diff is too big to show here.
pkgs/applications/version-management/gogs/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/got/default.nix+4−3
This diff is too big to show here.
pkgs/applications/version-management/jujutsu/default.nixdeleted−61
This diff is too big to show here.
pkgs/applications/version-management/meld/default.nix−11
This diff is too big to show here.
pkgs/applications/version-management/mercurial/default.nix+3−7
This diff is too big to show here.
pkgs/applications/version-management/monotone/default.nix−2
This diff is too big to show here.
pkgs/applications/version-management/p4/default.nix+1−1
This diff is too big to show here.
pkgs/applications/version-management/pijul/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/rcs/default.nix+1−1
This diff is too big to show here.
pkgs/applications/version-management/redmine/Gemfile+2−2
This diff is too big to show here.
pkgs/applications/version-management/redmine/Gemfile.lock+50−48
This diff is too big to show here.
pkgs/applications/version-management/redmine/default.nix+6−4
This diff is too big to show here.
pkgs/applications/version-management/redmine/gemset.nix+49−39
This diff is too big to show here.
pkgs/applications/version-management/redmine/update.shdeleted−17
This diff is too big to show here.
pkgs/applications/version-management/smartgithg/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/subversion/default.nix+10−5
This diff is too big to show here.
pkgs/applications/version-management/tkrev/default.nix → pkgs/applications/version-management/tkcvs/default.nixrenamed+5−8
This diff is too big to show here.
pkgs/applications/version-management/tortoisehg/default.nix+2−2
This diff is too big to show here.
pkgs/applications/version-management/verco/default.nix+3−3
This diff is too big to show here.
pkgs/applications/version-management/yadm/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/ani-cli/default.nixdeleted−44
This diff is too big to show here.
pkgs/applications/video/byzanz/default.nix+1−1
This diff is too big to show here.
pkgs/applications/video/celluloid/default.nix+4−2
This diff is too big to show here.
pkgs/applications/video/clapper/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/clickshare-csc1/default.nix+2
This diff is too big to show here.
pkgs/applications/video/corrscope/default.nix+12−4
This diff is too big to show here.
pkgs/applications/video/davinci-resolve/default.nixdeleted−179
This diff is too big to show here.
pkgs/applications/video/entangle/default.nix+6−14
This diff is too big to show here.
pkgs/applications/video/epgstation/client/package.jsondeleted−57
This diff is too big to show here.
pkgs/applications/video/epgstation/default.nix+23−58
This diff is too big to show here.
pkgs/applications/video/epgstation/epgstation.1+1−5
This diff is too big to show here.
pkgs/applications/video/epgstation/package.json+63−50
This diff is too big to show here.
pkgs/applications/video/epgstation/update.nix+16−13
This diff is too big to show here.
pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch+13−42
This diff is too big to show here.
pkgs/applications/video/f1viewer/default.nix+3−3
This diff is too big to show here.
pkgs/applications/video/ffmpeg-normalize/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/filebot/default.nix+3−3
This diff is too big to show here.
pkgs/applications/video/freetube/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/go-chromecast/default.nix+3−3
This diff is too big to show here.
pkgs/applications/video/gpu-screen-recorder/default.nixdeleted−50
This diff is too big to show here.
pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patchdeleted−38
This diff is too big to show here.
pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nixdeleted−46
This diff is too big to show here.
pkgs/applications/video/handbrake/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/hdhomerun-config-gui/default.nix+1−3
This diff is too big to show here.
pkgs/applications/video/hyperion-ng/default.nixdeleted−50
This diff is too big to show here.
pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patchdeleted−88
This diff is too big to show here.
pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/kodi/unwrapped.nix+7−22
This diff is too big to show here.
pkgs/applications/video/kodi/wrapper.nix+6
This diff is too big to show here.
pkgs/applications/video/lbry/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/lightworks/default.nix+4−4
This diff is too big to show here.
pkgs/applications/video/losslesscut-bin/appimage.nix+2−2
This diff is too big to show here.
pkgs/applications/video/losslesscut-bin/default.nix+5−5
This diff is too big to show here.
pkgs/applications/video/losslesscut-bin/dmg.nix+2−2
This diff is too big to show here.
pkgs/applications/video/losslesscut-bin/windows.nix+2−3
This diff is too big to show here.
pkgs/applications/video/makemkv/default.nix+12−12
This diff is too big to show here.
pkgs/applications/video/mirakurun/default.nix+6−4
This diff is too big to show here.
pkgs/applications/video/mirakurun/update.nix+7−3
This diff is too big to show here.
pkgs/applications/video/mkvtoolnix/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/mpv/default.nix+2−3
This diff is too big to show here.
pkgs/applications/video/mpv/scripts/autocrop.nixdeleted−19
This diff is too big to show here.
pkgs/applications/video/mpv/scripts/autodeint.nixdeleted−19
This diff is too big to show here.
pkgs/applications/video/mpv/scripts/vr-reversal.nixdeleted−35
This diff is too big to show here.
pkgs/applications/video/natron/default.nix+2−3
This diff is too big to show here.
pkgs/applications/video/obs-studio/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/obs-studio/plugins/default.nix−1
This diff is too big to show here.
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nixdeleted−35
This diff is too big to show here.
pkgs/applications/video/p2pvc/default.nix+1−2
This diff is too big to show here.
pkgs/applications/video/peek/default.nix+2
This diff is too big to show here.
pkgs/applications/video/pitivi/default.nix+1−10
This diff is too big to show here.
pkgs/applications/video/qmplay2/default.nix+2−2
This diff is too big to show here.
pkgs/applications/video/quvi/library.nix−1
This diff is too big to show here.
pkgs/applications/video/quvi/scripts.nix−1
This diff is too big to show here.
pkgs/applications/video/quvi/tool.nix−1
This diff is too big to show here.
pkgs/applications/video/smplayer/default.nix+3−5
This diff is too big to show here.
pkgs/applications/video/streamlink-twitch-gui/bin.nix+5−5
This diff is too big to show here.
pkgs/applications/video/streamlink/default.nix+3−2
This diff is too big to show here.
pkgs/applications/video/vdr/plugins.nix+80−5
This diff is too big to show here.
pkgs/applications/video/vlc/default.nix+7−2
This diff is too big to show here.
pkgs/applications/video/webcamoid/default.nix+9−4
This diff is too big to show here.
pkgs/applications/video/webtorrent_desktop/default.nix+87−68
This diff is too big to show here.
pkgs/applications/video/yuview/default.nixdeleted−45
This diff is too big to show here.
pkgs/applications/video/yuview/disable_version_check.patchdeleted−15
This diff is too big to show here.
pkgs/applications/virtualization/OVMF/default.nix+1−2
This diff is too big to show here.
pkgs/applications/virtualization/arion/default.nix+5−7
This diff is too big to show here.
pkgs/applications/virtualization/cloud-hypervisor/default.nix+3−5
This diff is too big to show here.
pkgs/applications/virtualization/colima/default.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/containerd/1.4.nixnew file+51
This diff is too big to show here.
pkgs/applications/virtualization/containerd/default.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/cri-o/default.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/crosvm/Cargo.lockdeleted−1500
This diff is too big to show here.
pkgs/applications/virtualization/crosvm/default.nix+41−9
This diff is too big to show here.
pkgs/applications/virtualization/crosvm/generate-cargo.shdeleted−7
This diff is too big to show here.
pkgs/applications/virtualization/crosvm/update.py+22−23
This diff is too big to show here.
pkgs/applications/virtualization/crosvm/upstream-info.json+20−11
This diff is too big to show here.
pkgs/applications/virtualization/crun/default.nix+2−3
This diff is too big to show here.
pkgs/applications/virtualization/distrobox/default.nixdeleted−38
This diff is too big to show here.
pkgs/applications/virtualization/docker-slim/default.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/docker/buildx.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/docker/compose.nix+3−3
This diff is too big to show here.
pkgs/applications/virtualization/docker/default.nix+12−22
This diff is too big to show here.
pkgs/applications/virtualization/docker/gc.nix+3−3
This diff is too big to show here.
pkgs/applications/virtualization/docker/proxy.nix+3−3
This diff is too big to show here.
pkgs/applications/virtualization/ecs-agent/default.nix−1
This diff is too big to show here.
pkgs/applications/virtualization/firecracker/default.nix+1−1
This diff is too big to show here.
pkgs/applications/virtualization/firectl/default.nix+6−6
This diff is too big to show here.
pkgs/applications/virtualization/firectl/gomod.patchnew file+15
This diff is too big to show here.
pkgs/applications/virtualization/flintlock/default.nixdeleted−49
This diff is too big to show here.
pkgs/applications/virtualization/gvisor/containerd-shim.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/gvisor/default.nix+1−1
This diff is too big to show here.
pkgs/applications/virtualization/imgcrypt/default.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/kvmtool/default.nixdeleted−23
This diff is too big to show here.
pkgs/applications/virtualization/lima/default.nix+3−8
This diff is too big to show here.
pkgs/applications/virtualization/looking-glass-client/default.nix+1−1
This diff is too big to show here.
pkgs/applications/virtualization/open-vm-tools/default.nix+5−20
This diff is too big to show here.
pkgs/applications/virtualization/podman-tui/default.nix+3−11
This diff is too big to show here.
pkgs/applications/virtualization/podman/default.nix+2−4
This diff is too big to show here.
pkgs/applications/virtualization/podman/wrapper.nix−5
This diff is too big to show here.
pkgs/applications/virtualization/qemu/9p-ignore-noatime.patchnew file+44
This diff is too big to show here.
pkgs/applications/virtualization/qemu/default.nix+13−26
This diff is too big to show here.
pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patchdeleted−190
This diff is too big to show here.
pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patchdeleted−208
This diff is too big to show here.
pkgs/applications/virtualization/qemu/utils.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/runc/default.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/seabios/default.nix+6−7
This diff is too big to show here.
pkgs/applications/virtualization/singularity/default.nix+2−2
This diff is too big to show here.
pkgs/applications/virtualization/spike/default.nix+14−9
This diff is too big to show here.
pkgs/applications/virtualization/virt-manager/default.nix+23−37
This diff is too big to show here.
pkgs/applications/virtualization/virt-viewer/default.nix+3−12
This diff is too big to show here.
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix+7−4
This diff is too big to show here.
pkgs/applications/virtualization/vmware-workstation/default.nixdeleted−341
This diff is too big to show here.
pkgs/applications/virtualization/vmware-workstation/vmware-bootstrapdeleted−11
This diff is too big to show here.
pkgs/applications/virtualization/vmware-workstation/vmware-configdeleted−21
This diff is too big to show here.
pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrapdeleted−5
This diff is too big to show here.
pkgs/applications/virtualization/vmware-workstation/vmware-modconfigdeleted−8
This diff is too big to show here.
pkgs/applications/virtualization/x11docker/default.nix+2−2
This diff is too big to show here.
pkgs/applications/window-managers/afterstep/default.nix+1−13
This diff is too big to show here.
pkgs/applications/window-managers/berry/default.nix+5−3
This diff is too big to show here.
pkgs/applications/window-managers/btops/default.nix+5−5
This diff is too big to show here.
pkgs/applications/window-managers/clfswm/default.nixnew file+50
This diff is too big to show here.
pkgs/applications/window-managers/clfswm/require-clx.patchnew file+13
This diff is too big to show here.
pkgs/applications/window-managers/herbstluftwm/default.nix+4−9
This diff is too big to show here.
pkgs/applications/window-managers/i3/status-rust.nix+3−3
This diff is too big to show here.
pkgs/applications/window-managers/i3/wsr.nix+3−3
This diff is too big to show here.
pkgs/applications/window-managers/icewm/default.nix+8−9
This diff is too big to show here.
pkgs/applications/window-managers/labwc/default.nix+8−3
This diff is too big to show here.
pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patchnew file+29
This diff is too big to show here.
pkgs/applications/window-managers/phosh/default.nix+5−4
This diff is too big to show here.
pkgs/applications/window-managers/qtile/default.nix+3−26
This diff is too big to show here.
pkgs/applications/window-managers/sway/bg.nix+2−2
This diff is too big to show here.
pkgs/applications/window-managers/sway/default.nix+5−18
This diff is too big to show here.
pkgs/applications/window-managers/sway/idle.nix+3−7
This diff is too big to show here.
pkgs/applications/window-managers/sway/lock-effects.nix−8
This diff is too big to show here.
pkgs/applications/window-managers/sway/lock.nix+7−2
This diff is too big to show here.
pkgs/applications/window-managers/sway/wrapper.nix+1−2
This diff is too big to show here.
pkgs/applications/window-managers/taffybar/default.nix+1−2
This diff is too big to show here.
pkgs/applications/window-managers/wmfs/default.nix+5−1
This diff is too big to show here.
pkgs/applications/window-managers/wmii-hg/default.nixnew file+46
This diff is too big to show here.
pkgs/applications/window-managers/wmii/default.nixdeleted−72
This diff is too big to show here.
pkgs/applications/window-managers/xmonad/wrapper.nix+1−2
This diff is too big to show here.
pkgs/build-support/alternatives/blas/default.nix+14−17
This diff is too big to show here.
pkgs/build-support/alternatives/lapack/default.nix+13−16
This diff is too big to show here.
pkgs/build-support/appimage/default.nix+1−4
This diff is too big to show here.
pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix+1−33
This diff is too big to show here.
pkgs/build-support/build-fhs-userenv/env.nix−32
This diff is too big to show here.
pkgs/build-support/build-graalvm-native-image/default.nix+5−7
This diff is too big to show here.
pkgs/build-support/cc-wrapper/add-flags.sh+4−14
This diff is too big to show here.
pkgs/build-support/docker/default.nix+25−17
This diff is too big to show here.
pkgs/build-support/docker/examples.nix+1−1
This diff is too big to show here.
pkgs/build-support/dotnet/build-dotnet-module/default.nix+37−11
This diff is too big to show here.
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh+1−2
This diff is too big to show here.
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh+1−2
This diff is too big to show here.
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh+4−5
This diff is too big to show here.
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh+4−5
This diff is too big to show here.
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh+1−2
This diff is too big to show here.
pkgs/build-support/dotnet/make-nuget-deps/default.nixdeleted−9
This diff is too big to show here.
pkgs/build-support/dotnet/make-nuget-source/default.nixdeleted−38
This diff is too big to show here.
pkgs/build-support/dotnet/nuget-to-nix/default.nix+3−25
This diff is too big to show here.
pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh+3−9
This diff is too big to show here.
pkgs/build-support/emacs/wrapper.nix+2−16
This diff is too big to show here.
pkgs/build-support/emacs/wrapper.sh+1−1
This diff is too big to show here.
pkgs/build-support/fake-nss/default.nixdeleted−24
This diff is too big to show here.
pkgs/build-support/fetchfirefoxaddon/default.nix+2−2
This diff is too big to show here.
pkgs/build-support/fetchgit/default.nix+1−2
This diff is too big to show here.
pkgs/build-support/fetchipfs/default.nix+2
This diff is too big to show here.
pkgs/build-support/fetchnextcloudapp/default.nix+6−1
This diff is too big to show here.
pkgs/build-support/fetchpatch/default.nix+17−32
This diff is too big to show here.
pkgs/build-support/fetchpatch/tests.nix−16
This diff is too big to show here.
pkgs/build-support/fetchurl/default.nix+3−1
This diff is too big to show here.
pkgs/build-support/fetchurl/mirrors.nix+233−265
This diff is too big to show here.
pkgs/build-support/kernel/make-initrd-ng-tool.nixdeleted−16
This diff is too big to show here.
pkgs/build-support/kernel/make-initrd-ng.nixdeleted−93
This diff is too big to show here.
pkgs/build-support/kernel/make-initrd-ng/Cargo.lockdeleted−5
This diff is too big to show here.
pkgs/build-support/kernel/make-initrd-ng/Cargo.tomldeleted−9
This diff is too big to show here.
pkgs/build-support/kernel/make-initrd-ng/README.mddeleted−79
This diff is too big to show here.
pkgs/build-support/kernel/make-initrd-ng/src/main.rsdeleted−216
This diff is too big to show here.
pkgs/build-support/kernel/make-initrd.nix+2−2
This diff is too big to show here.
pkgs/build-support/kernel/make-initrd.sh+1−1
This diff is too big to show here.
pkgs/build-support/make-darwin-bundle/default.nix+4−4
This diff is too big to show here.
pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix+14−13
This diff is too big to show here.
pkgs/build-support/make-desktopitem/default.nix+20−15
This diff is too big to show here.
pkgs/build-support/nix-gitignore/default.nix+6
This diff is too big to show here.
pkgs/build-support/ocaml/dune.nix+5−8
This diff is too big to show here.
pkgs/build-support/ocaml/oasis.nix+1−1
This diff is too big to show here.
pkgs/build-support/rust/build-rust-crate/build-crate.nix+2−3
This diff is too big to show here.
pkgs/build-support/rust/build-rust-crate/configure-crate.nix+1−2
This diff is too big to show here.
pkgs/build-support/rust/build-rust-crate/default.nix+4−11
This diff is too big to show here.
pkgs/build-support/rust/default-crate-overrides.nix+1−1
This diff is too big to show here.
pkgs/build-support/rust/import-cargo-lock.nix+1−6
This diff is too big to show here.
pkgs/build-support/setup-hooks/auto-patchelf.pydeleted−335
This diff is too big to show here.
pkgs/build-support/setup-hooks/auto-patchelf.sh+312−23
This diff is too big to show here.
pkgs/build-support/setup-hooks/copy-desktop-items.sh+4−5
This diff is too big to show here.
pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh+22−193
This diff is too big to show here.
pkgs/build-support/setup-hooks/make-wrapper.sh+1−22
This diff is too big to show here.
pkgs/build-support/setup-hooks/postgresql-test-hook/default.nixdeleted−9
This diff is too big to show here.
pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.shdeleted−79
This diff is too big to show here.
pkgs/build-support/setup-hooks/postgresql-test-hook/test.nixdeleted−27
This diff is too big to show here.
pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh+4
This diff is too big to show here.
pkgs/build-support/singularity-tools/default.nix+1−3
This diff is too big to show here.
pkgs/build-support/testers/test-equal-derivation.nix → pkgs/build-support/test-equal-derivation.nixrenamed+18−1
This diff is too big to show here.
pkgs/build-support/testers/default.nixdeleted−18
This diff is too big to show here.
pkgs/build-support/trivial-builders.nix+39−9
This diff is too big to show here.
pkgs/build-support/trivial-builders/test/write-text-file.nixdeleted−34
This diff is too big to show here.
pkgs/build-support/writers/default.nix+3−39
This diff is too big to show here.
pkgs/build-support/writers/test.nix−27
This diff is too big to show here.
pkgs/common-updater/git-updater.nix+2−6
This diff is too big to show here.
pkgs/common-updater/scripts/list-git-tags+1−1
This diff is too big to show here.
pkgs/data/documentation/execline-man-pages/default.nix+2−2
This diff is too big to show here.
pkgs/data/documentation/gnome-user-docs/default.nix+2−2
This diff is too big to show here.
pkgs/data/documentation/man-pages/default.nix+1
This diff is too big to show here.
pkgs/data/documentation/rnrs/r3rs.nixnew file+7
This diff is too big to show here.
pkgs/data/documentation/s6-man-pages/default.nix+1−1
This diff is too big to show here.
pkgs/data/documentation/s6-networking-man-pages/default.nix+2−2
This diff is too big to show here.
pkgs/data/documentation/scheme-manpages/default.nix+3−3
This diff is too big to show here.
pkgs/data/documentation/std-man-pages/default.nix+3−4
This diff is too big to show here.
pkgs/data/documentation/zeal/default.nix+2−2
This diff is too big to show here.
pkgs/data/fonts/amiri/default.nix+2−2
This diff is too big to show here.
pkgs/data/fonts/annapurna-sil/default.nixdeleted−29
This diff is too big to show here.
pkgs/data/fonts/borg-sans-mono/default.nixdeleted−26
This diff is too big to show here.
pkgs/data/fonts/ccsymbols/default.nixdeleted−32
This diff is too big to show here.
pkgs/data/fonts/comic-mono/comic-mono-weight.confdeleted−14
This diff is too big to show here.
pkgs/data/fonts/comic-mono/default.nixdeleted−35
This diff is too big to show here.
pkgs/data/fonts/dancing-script/default.nixdeleted−27
This diff is too big to show here.
pkgs/data/fonts/ezra-sil/default.nixdeleted−26
This diff is too big to show here.
pkgs/data/fonts/galatia-sil/default.nixdeleted−29
This diff is too big to show here.
pkgs/data/fonts/google-fonts/default.nix+3−3
This diff is too big to show here.
pkgs/data/fonts/iosevka/bin.nix+2−3
This diff is too big to show here.
pkgs/data/fonts/iosevka/variants.nix+92−92
This diff is too big to show here.
pkgs/data/fonts/kacst/default.nixdeleted−22
This diff is too big to show here.
pkgs/data/fonts/lao/default.nixdeleted−22
This diff is too big to show here.
pkgs/data/fonts/lmodern/default.nix+5−5
This diff is too big to show here.
pkgs/data/fonts/lxgw-wenkai/default.nix+2−2
This diff is too big to show here.
pkgs/data/fonts/material-design-icons/default.nix+6−3
This diff is too big to show here.
pkgs/data/fonts/mplus-outline-fonts/default.nix+19−39
This diff is too big to show here.
pkgs/data/fonts/noto-fonts/default.nix+17−13
This diff is too big to show here.
pkgs/data/fonts/rictydiminished-with-firacode/default.nix+4−5
This diff is too big to show here.
pkgs/data/fonts/sarasa-gothic/default.nix+2−2
This diff is too big to show here.
pkgs/data/fonts/source-sans-pro/default.nixdeleted−30
This diff is too big to show here.
pkgs/data/fonts/source-serif-pro/default.nixdeleted−30
This diff is too big to show here.
pkgs/data/fonts/sudo/default.nix+2−2
This diff is too big to show here.
pkgs/data/fonts/times-newer-roman/default.nix+1−1
This diff is too big to show here.
pkgs/data/fonts/twitter-color-emoji/default.nix+2−2
This diff is too big to show here.
pkgs/data/fonts/uni-vga/default.nix+6−4
This diff is too big to show here.
pkgs/data/fonts/unifont/default.nix+3−3
This diff is too big to show here.
pkgs/data/fonts/unifont_upper/default.nix+2−2
This diff is too big to show here.
pkgs/data/fonts/vazir-fonts/default.nix+2−2
This diff is too big to show here.
pkgs/data/icons/comixcursors/default.nix+25−5
This diff is too big to show here.
pkgs/data/icons/elementary-xfce-icon-theme/default.nix+3−3
This diff is too big to show here.
pkgs/data/icons/faba-icon-theme/default.nix+3−2
This diff is too big to show here.
pkgs/data/icons/flat-remix-icon-theme/default.nix+5−6
This diff is too big to show here.
pkgs/data/icons/hicolor-icon-theme/default.nix+2−3
This diff is too big to show here.
pkgs/data/icons/humanity-icon-theme/default.nix+4−4
This diff is too big to show here.
pkgs/data/icons/kora-icon-theme/default.nix+2−2
This diff is too big to show here.
pkgs/data/icons/luna-icons/default.nix+2−5
This diff is too big to show here.
pkgs/data/icons/numix-icon-theme-circle/default.nix+2−2
This diff is too big to show here.
pkgs/data/icons/numix-icon-theme-square/default.nix+2−2
This diff is too big to show here.
pkgs/data/icons/papirus-icon-theme/default.nix+2−2
This diff is too big to show here.
pkgs/data/icons/tango-icon-theme/default.nix+2−3
This diff is too big to show here.
pkgs/data/icons/tela-circle-icon-theme/default.nix+4−7
This diff is too big to show here.
pkgs/data/icons/whitesur-icon-theme/default.nix+2−2
This diff is too big to show here.
pkgs/data/misc/brise/default.nix+1−2
This diff is too big to show here.
pkgs/data/misc/cacert/default.nix+2−2
This diff is too big to show here.
pkgs/data/misc/cacert/update.sh+10−7
This diff is too big to show here.
pkgs/data/misc/cldr-annotations/default.nixdeleted−24
This diff is too big to show here.
pkgs/data/misc/cldr-emoji-annotation/default.nixnew file+27
This diff is too big to show here.
pkgs/data/misc/ddccontrol-db/default.nix+2−1
This diff is too big to show here.
pkgs/data/misc/dns-root-data/default.nix+1−2
This diff is too big to show here.
pkgs/data/misc/freepats/default.nix+2−3
This diff is too big to show here.
pkgs/data/misc/hackage/default.nix+1−2
This diff is too big to show here.
pkgs/data/misc/hackage/pin.json+4−4
This diff is too big to show here.
pkgs/data/misc/iana-etc/default.nix+3−2
This diff is too big to show here.
pkgs/data/misc/miscfiles/default.nix+2−3
This diff is too big to show here.
pkgs/data/misc/mobile-broadband-provider-info/default.nix+2−2
This diff is too big to show here.
pkgs/data/misc/nixos-artwork/wallpapers.nix−16
This diff is too big to show here.
pkgs/data/misc/shared-desktop-ontologies/default.nix+2−3
This diff is too big to show here.
pkgs/data/misc/shared-mime-info/default.nix−1
This diff is too big to show here.
pkgs/data/misc/spdx-license-list-data/default.nix+4−21
This diff is too big to show here.
pkgs/data/misc/tzdata/default.nix+4−5
This diff is too big to show here.
pkgs/data/misc/unicode-emoji/default.nix+12−4
This diff is too big to show here.
pkgs/data/misc/v2ray-domain-list-community/default.nix+2−2
This diff is too big to show here.
pkgs/data/misc/v2ray-geoip/default.nix+3−3
This diff is too big to show here.
pkgs/data/misc/wireless-regdb/default.nix+2−2
This diff is too big to show here.
pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix+3−4
This diff is too big to show here.
pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix+8−3
This diff is too big to show here.
pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix+5−2
This diff is too big to show here.
pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix+5−2
This diff is too big to show here.
pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix+5−2
This diff is too big to show here.
pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix+5−2
This diff is too big to show here.
pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix+4−6
This diff is too big to show here.
pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix+2−3
This diff is too big to show here.
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix+1−5
This diff is too big to show here.
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patchdeleted−11
This diff is too big to show here.
pkgs/data/soundfonts/fluid/default.nix+1−2
This diff is too big to show here.
pkgs/data/soundfonts/generaluser/default.nixdeleted−25
This diff is too big to show here.
pkgs/data/soundfonts/ydp-grand/default.nix+1−1
This diff is too big to show here.
pkgs/data/themes/arc/default.nix+12−15
This diff is too big to show here.
pkgs/data/themes/dracula-theme/default.nix+1−1
This diff is too big to show here.
pkgs/data/themes/flat-remix-gnome/default.nix+4−4
This diff is too big to show here.
pkgs/data/themes/flat-remix-gtk/default.nix+2−2
This diff is too big to show here.
pkgs/data/themes/gnome-breeze/default.nixnew file+25
This diff is too big to show here.
pkgs/data/themes/graphite-gtk-theme/default.nix+4−7
This diff is too big to show here.
pkgs/data/themes/greybird/default.nix+3−16
This diff is too big to show here.
pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix+3−3
This diff is too big to show here.
pkgs/data/themes/layan-kde/default.nixdeleted−46
This diff is too big to show here.
pkgs/data/themes/nordic/default.nix+17−17
This diff is too big to show here.
pkgs/data/themes/orchis-theme/default.nix+2−2
This diff is too big to show here.
pkgs/data/themes/vimix/default.nix+4−12
This diff is too big to show here.
pkgs/data/themes/yaru/default.nix+5−2
This diff is too big to show here.
pkgs/desktops/arcan/arcan/clone-sources.nix+1−1
This diff is too big to show here.
pkgs/desktops/arcan/durden/default.nix+3−7
This diff is too big to show here.
pkgs/desktops/arcan/pipeworld/default.nix+3−7
This diff is too big to show here.
pkgs/desktops/arcan/prio/default.nix+1−5
This diff is too big to show here.
pkgs/desktops/arcan/xarcan/default.nix+12−4
This diff is too big to show here.
pkgs/desktops/cdesktopenv/default.nix+4−17
This diff is too big to show here.
pkgs/desktops/enlightenment/econnman/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/enlightenment/ecrire/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/enlightenment/efl/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/enlightenment/enlightenment/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/enlightenment/ephoto/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/enlightenment/evisum/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/enlightenment/rage/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/enlightenment/terminology/default.nix+2−4
This diff is too big to show here.
pkgs/desktops/gnome-2/bindings/gnome-python/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix+4−6
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/ORBit2/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/gnome-common/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix+4−5
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix+3−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libIDL/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix+3−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libbonobo/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libbonoboui/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libglade/default.nix+8−6
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libgnome/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix+4−5
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libgnomecups/default.nix+3−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix+2−3
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix+4−5
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libgnomeui/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix+4−5
This diff is too big to show here.
pkgs/desktops/gnome/apps/file-roller/default.nix+16−4
This diff is too big to show here.
pkgs/desktops/gnome/apps/gedit/default.nix+2−5
This diff is too big to show here.
pkgs/desktops/gnome/apps/ghex/default.nix+13−22
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-books/default.nix+1−12
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-boxes/default.nix+2−9
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patchdeleted−22
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-calendar/default.nix+36−20
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patchnew file+17
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-characters/default.nix+19−19
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-clocks/default.nix+12−11
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-connections/default.nix+4−6
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-logs/default.nix+15−8
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-maps/default.nix+5−5
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-music/default.nix+18−8
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-nettool/default.nix+11−61
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-notes/default.nix+1−12
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix+7−8
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-text-editor/default.nix+10−2
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-todo/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/gnome/apps/gnome-weather/default.nix+9−7
This diff is too big to show here.
pkgs/desktops/gnome/apps/polari/default.nix+12−59
This diff is too big to show here.
pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/core/baobab/default.nix+10−16
This diff is too big to show here.
pkgs/desktops/gnome/core/dconf-editor/default.nix−13
This diff is too big to show here.
pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patchdeleted−14
This diff is too big to show here.
pkgs/desktops/gnome/core/eog/default.nix+19−23
This diff is too big to show here.
pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patchdeleted−13
This diff is too big to show here.
pkgs/desktops/gnome/core/epiphany/default.nix+20−2
This diff is too big to show here.
pkgs/desktops/gnome/core/evince/default.nix+26−12
This diff is too big to show here.
pkgs/desktops/gnome/core/evolution-data-server/default.nix+14−82
This diff is too big to show here.
pkgs/desktops/gnome/core/gdm/default.nix+2−4
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-backgrounds/default.nix+8−23
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nixdeleted−97
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-bluetooth/default.nix+15−12
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-calculator/default.nix+16−8
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-contacts/default.nix+25−14
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-control-center/default.nix+23−31
This diff is too big to show here.
pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch → pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patchrenamed
The content is the same.
pkgs/development/libraries/gnome-desktop/default.nix → pkgs/desktops/gnome/core/gnome-desktop/default.nixrenamed+3−4
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-dictionary/default.nix+7−56
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-disk-utility/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-font-viewer/default.nix+8−36
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-initial-setup/default.nix+2−4
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-keyring/default.nix+3−2
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix+7−33
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-screenshot/default.nix+15−54
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-session/ctl.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-session/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix+1−20
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-shell/default.nix+8−7
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch+5−5
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-software/default.nix+6−8
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-system-monitor/default.nix+10−2
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-terminal/default.nix+2−5
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-tour/default.nix+11−6
This diff is too big to show here.
pkgs/desktops/gnome/core/gnome-user-share/default.nix−5
This diff is too big to show here.
pkgs/desktops/gnome/core/gucharmap/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome/core/mutter/3.38/default.nix+1−3
This diff is too big to show here.
pkgs/desktops/gnome/core/mutter/default.nix+4−6
This diff is too big to show here.
pkgs/desktops/gnome/core/nautilus/default.nix+17−4
This diff is too big to show here.
pkgs/desktops/gnome/core/simple-scan/default.nix+4−3
This diff is too big to show here.
pkgs/desktops/gnome/core/sushi/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/core/totem/default.nix+8−6
This diff is too big to show here.
pkgs/desktops/gnome/core/yelp-xsl/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/core/yelp/default.nix+2−4
This diff is too big to show here.
pkgs/desktops/gnome/core/zenity/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/default.nix+22−8
This diff is too big to show here.
pkgs/desktops/gnome/devtools/devhelp/default.nix+1−12
This diff is too big to show here.
pkgs/desktops/gnome/extensions/arcmenu/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/extensions/collisions.json−50
This diff is too big to show here.
pkgs/desktops/gnome/extensions/default.nix+2−3
This diff is too big to show here.
pkgs/desktops/gnome/extensions/extensionOverrides.nix−28
This diff is too big to show here.
pkgs/desktops/gnome/extensions/extensionRenames.nix+9−17
This diff is too big to show here.
pkgs/desktops/gnome/extensions/extensions.json+342−401
This diff is too big to show here.
pkgs/desktops/gnome/extensions/freon/default.nix+61
This diff is too big to show here.
pkgs/desktops/gnome/extensions/freon/fix_paths.patch+15−15
This diff is too big to show here.
pkgs/desktops/gnome/extensions/gsconnect/default.nix+4−4
This diff is too big to show here.
pkgs/desktops/gnome/extensions/impatience/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/gnome/extensions/manuallyPackaged.nix+2
This diff is too big to show here.
pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix+35
This diff is too big to show here.
pkgs/desktops/gnome/extensions/pop-shell/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix+3−5
This diff is too big to show here.
pkgs/desktops/gnome/extensions/system-monitor/default.nix+24−11
This diff is too big to show here.
pkgs/desktops/gnome/extensions/update-extensions.py+47−67
This diff is too big to show here.
pkgs/desktops/gnome/games/aisleriot/default.nix+5−4
This diff is too big to show here.
pkgs/desktops/gnome/games/five-or-more/default.nix+6−31
This diff is too big to show here.
pkgs/desktops/gnome/games/gnome-2048/default.nix+1−12
This diff is too big to show here.
pkgs/desktops/gnome/games/gnome-chess/default.nix+3−4
This diff is too big to show here.
pkgs/desktops/gnome/games/gnome-mahjongg/default.nix+6−38
This diff is too big to show here.
pkgs/desktops/gnome/games/gnome-sudoku/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/games/gnome-tetravex/default.nix+8−45
This diff is too big to show here.
pkgs/desktops/gnome/games/hitori/default.nix+5−4
This diff is too big to show here.
pkgs/desktops/gnome/games/swell-foop/default.nix+4−3
This diff is too big to show here.
pkgs/desktops/gnome/games/tali/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/misc/gitg/default.nix−10
This diff is too big to show here.
pkgs/desktops/gnome/misc/gnome-applets/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/gnome/misc/gnome-flashback/default.nix+5−6
This diff is too big to show here.
pkgs/desktops/gnome/misc/gnome-panel/default.nix+3−14
This diff is too big to show here.
pkgs/desktops/gnome/misc/gnome-tweaks/default.nix+3−4
This diff is too big to show here.
pkgs/desktops/gnome/misc/gpaste/default.nix+4−9
This diff is too big to show here.
pkgs/desktops/gnome/misc/gpaste/fix-paths.patch+7−13
This diff is too big to show here.
pkgs/desktops/gnome/misc/libgnome-games-support/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/gnome/misc/metacity/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/lumina/lumina-calculator/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/lumina/lumina-pdf/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/lumina/lumina/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/lxqt/compton-conf/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/lxqt/default.nix+5−2
This diff is too big to show here.
pkgs/desktops/lxqt/libfm-qt/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/liblxqt/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/libqtxdg/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/libsysstat/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/lxqt/lximage-qt/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-about/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-admin/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-archiver/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-build-tools/default.nix+5−10
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-config/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-notificationd/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-panel/default.nix+3−4
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-policykit/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-runner/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-session/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-sudo/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/lxqt-themes/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/obconf-qt/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/pavucontrol-qt/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/pcmanfm-qt/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/qlipper/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/lxqt/qps/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/qterminal/default.nix+3−6
This diff is too big to show here.
pkgs/desktops/lxqt/qtermwidget/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/screengrab/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix−41
This diff is too big to show here.
pkgs/desktops/mate/caja-extensions/default.nix+1−17
This diff is too big to show here.
pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch−169
This diff is too big to show here.
pkgs/desktops/mate/default.nix−2
This diff is too big to show here.
pkgs/desktops/mate/mate-backgrounds/default.nix+1−10
This diff is too big to show here.
pkgs/desktops/mate/mate-control-center/default.nix+1−3
This diff is too big to show here.
pkgs/desktops/mate/mate-panel/default.nix−7
This diff is too big to show here.
pkgs/desktops/mate/mate-settings-daemon/wrapped.nix−22
This diff is too big to show here.
pkgs/desktops/mate/mate-terminal/default.nix+1−3
This diff is too big to show here.
pkgs/desktops/mate/mate-tweak/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/appcenter/default.nix+2−12
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-calculator/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-camera/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-code/default.nix+14−2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-dock/default.nix−8
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-feedback/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-files/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-mail/default.nix+2−10
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-music/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-photos/default.nix+2−10
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-tasks/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/elementary-videos/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/sideload/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/switchboard/default.nix+17−2
This diff is too big to show here.
pkgs/desktops/pantheon/apps/switchboard/wrapper.nix+1−2
This diff is too big to show here.
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix+5−12
This diff is too big to show here.
pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix+6−6
This diff is too big to show here.
pkgs/desktops/pantheon/default.nix+12−10
This diff is too big to show here.
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix+15−6
This diff is too big to show here.
pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch+21
This diff is too big to show here.
pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix+2
This diff is too big to show here.
pkgs/desktops/pantheon/desktop/gala/default.nix+17−4
This diff is too big to show here.
pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix+2−4
This diff is too big to show here.
pkgs/desktops/pantheon/desktop/wingpanel/default.nix+2−4
This diff is too big to show here.
pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix+1−2
This diff is too big to show here.
pkgs/desktops/pantheon/granite/7/default.nix−73
This diff is too big to show here.
pkgs/desktops/pantheon/services/elementary-notifications/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix−43
This diff is too big to show here.
pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/bluedevil.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/breeze-grub.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/breeze-gtk.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/breeze-plymouth/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/breeze-qt5.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/default.nix+6−7
This diff is too big to show here.
pkgs/desktops/plasma-5/discover.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/fetch.sh+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kactivitymanagerd.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kde-cli-tools.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kde-gtk-config/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kdecoration.nix+3−3
This diff is too big to show here.
pkgs/desktops/plasma-5/kdeplasma-addons.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kgamma5.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/khotkeys.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kinfocenter.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kmenuedit.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kscreen.nix+3−3
This diff is too big to show here.
pkgs/desktops/plasma-5/kscreenlocker.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/ksshaskpass.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/ksystemstats.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kwallet-pam.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kwayland-integration.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kwayland-server/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch+4−4
This diff is too big to show here.
pkgs/desktops/plasma-5/kwin/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/kwrited.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/layer-shell-qt.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/libkscreen/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch+3−2
This diff is too big to show here.
pkgs/desktops/plasma-5/libksysguard/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/milou.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/oxygen.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-browser-integration.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-desktop/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-disks.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-integration/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-nano/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-nm/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-pa.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-phone-components/default.nix+3−3
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-sdk.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-systemmonitor.nix+1−7
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-thunderbolt.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-vault/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch+26−17
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch+2−2
This diff is too big to show here.
pkgs/desktops/plasma-5/plasma-workspace/default.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/polkit-kde-agent.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/powerdevil.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/qqc2-breeze-style.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/sddm-kcm.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/srcs.nix+216−216
This diff is too big to show here.
pkgs/desktops/plasma-5/systemsettings.nix+1−1
This diff is too big to show here.
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix+1−1
This diff is too big to show here.
pkgs/desktops/xfce/applications/mousepad/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/xfce/applications/orage/default.nix+40−35
This diff is too big to show here.
pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix−49
This diff is too big to show here.
pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/xfce/applications/xfce4-terminal/default.nix+3−5
This diff is too big to show here.
pkgs/desktops/xfce/core/thunar/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/xfce/core/xfce4-panel/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/xfce/default.nix+6−3
This diff is too big to show here.
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix+2−2
This diff is too big to show here.
pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix+2−2
This diff is too big to show here.
pkgs/development/beam-modules/elvis-erlang/default.nix+1−2
This diff is too big to show here.
pkgs/development/beam-modules/erlang-ls/default.nix+3−3
This diff is too big to show here.
pkgs/development/beam-modules/erlang-ls/rebar-deps.nix+7−8
This diff is too big to show here.
pkgs/development/chez-modules/chez-mit/default.nix+7−8
This diff is too big to show here.
pkgs/development/chez-modules/chez-scmutils/default.nix+7−8
This diff is too big to show here.
pkgs/development/chez-modules/chez-srfi/default.nix+4−5
This diff is too big to show here.
pkgs/development/compilers/4th/001-install-manual-fixup.diff−12
This diff is too big to show here.
pkgs/development/compilers/4th/default.nix+5−12
This diff is too big to show here.
pkgs/development/compilers/abcl/default.nix+1−6
This diff is too big to show here.
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py−1
This diff is too big to show here.
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix+3−4
This diff is too big to show here.
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/adoptopenjdk-bin/sources.json+100−244
This diff is too big to show here.
pkgs/development/compilers/alan/2.nix−31
This diff is too big to show here.
pkgs/development/compilers/alan/default.nix−48
This diff is too big to show here.
pkgs/development/compilers/aldor/default.nix+53
This diff is too big to show here.
pkgs/development/compilers/algol68g/default.nix−1
This diff is too big to show here.
pkgs/development/compilers/aliceml/default.nix+58
This diff is too big to show here.
pkgs/development/compilers/aliceml/make.patch+20
This diff is too big to show here.
pkgs/development/compilers/aliceml/seam.patch+13
This diff is too big to show here.
pkgs/development/compilers/bluespec/default.nix+5−13
This diff is too big to show here.
pkgs/development/compilers/bs-platform/ocaml.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/bupc/default.nix+1
This diff is too big to show here.
pkgs/development/compilers/carp/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/chez/default.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/chicken/5/chicken.nix+1−6
This diff is too big to show here.
pkgs/development/compilers/chicken/5/eggs.nix+4−464
This diff is too big to show here.
pkgs/development/compilers/chicken/5/eggs.scm−8
This diff is too big to show here.
pkgs/development/compilers/ciao/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/coreclr/default.nix+100
This diff is too big to show here.
pkgs/development/compilers/crystal/build-package.nix+3−25
This diff is too big to show here.
pkgs/development/compilers/crystal/default.nix+2−10
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh−14
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/common.nix+18−40
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/default.nix+90
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/extension.nix−15
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix−51
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/redist/extension.nix−32
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.4.4.json−862
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.5.2.json−873
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.6.2.json−873
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/redist/overrides.nix−72
This diff is too big to show here.
pkgs/development/compilers/cudatoolkit/versions.toml−61
This diff is too big to show here.
pkgs/development/compilers/dictu/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/dmd/binary.nix+2−3
This diff is too big to show here.
pkgs/development/compilers/dotnet/build-dotnet.nix+18−17
This diff is too big to show here.
pkgs/development/compilers/dotnet/default.nix+50−136
This diff is too big to show here.
pkgs/development/compilers/dotnet/print-hashes.sh+60−101
This diff is too big to show here.
pkgs/development/compilers/ecl/16.1.2.nix+2−1
This diff is too big to show here.
pkgs/development/compilers/edk2/default.nix+15−3
This diff is too big to show here.
pkgs/development/compilers/elm/default.nix−15
This diff is too big to show here.
pkgs/development/compilers/elm/packages/node-packages.nix+860−1122
This diff is too big to show here.
pkgs/development/compilers/emscripten/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/fasm/bin.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/fennel/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/fsharp/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/gambit/build.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/gcc/10/default.nix+11−12
This diff is too big to show here.
pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch−70
This diff is too big to show here.
pkgs/development/compilers/gcc/11/default.nix+8−3
This diff is too big to show here.
pkgs/development/compilers/gcc/4.8/default.nix+9−4
This diff is too big to show here.
pkgs/development/compilers/gcc/4.9/default.nix+9−4
This diff is too big to show here.
pkgs/development/compilers/gcc/6/default.nix+8−5
This diff is too big to show here.
pkgs/development/compilers/gcc/6/gnat-glibc234.patch−30
This diff is too big to show here.
pkgs/development/compilers/gcc/7/default.nix+8−7
This diff is too big to show here.
pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch−70
This diff is too big to show here.
pkgs/development/compilers/gcc/8/default.nix+8−4
This diff is too big to show here.
pkgs/development/compilers/gcc/9/default.nix+9−10
This diff is too big to show here.
pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch−70
This diff is too big to show here.
pkgs/development/compilers/gcc/builder.sh−4
This diff is too big to show here.
pkgs/development/compilers/ghc/8.10.2-binary.nix−14
This diff is too big to show here.
pkgs/development/compilers/ghc/8.10.7-binary.nix+1−14
This diff is too big to show here.
pkgs/development/compilers/ghc/8.10.7.nix+1−5
This diff is too big to show here.
pkgs/development/compilers/ghc/8.8.4.nix−4
This diff is too big to show here.
pkgs/development/compilers/ghc/9.0.2.nix+4−33
This diff is too big to show here.
pkgs/development/compilers/ghc/9.2.1.nix+10−17
This diff is too big to show here.
pkgs/development/compilers/ghc/head.nix+3−7
This diff is too big to show here.
pkgs/development/compilers/ghcjs/8.10/common-overrides.nix+3−32
This diff is too big to show here.
pkgs/development/compilers/ghcjs/8.10/default.nix+1−2
This diff is too big to show here.
pkgs/development/compilers/ghcjs/ghcjs-base.nix+4−5
This diff is too big to show here.
pkgs/development/compilers/gleam/default.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/glslang/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/go-jsonnet/default.nix+5−12
This diff is too big to show here.
pkgs/development/compilers/go/1.16.nix+5−6
This diff is too big to show here.
pkgs/development/compilers/go/1.17.nix+5−6
This diff is too big to show here.
pkgs/development/compilers/go/1.18.nix+5−5
This diff is too big to show here.
pkgs/development/compilers/go/2-dev.nix+276
This diff is too big to show here.
pkgs/development/compilers/go/ssl-cert-file-2-dev.patch+54
This diff is too big to show here.
pkgs/development/compilers/graalvm/community-edition/default.nix+10−58
This diff is too big to show here.
pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json−42
This diff is too big to show here.
pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json−42
This diff is too big to show here.
pkgs/development/compilers/graalvm/community-edition/hashes.nix+57
This diff is too big to show here.
pkgs/development/compilers/graalvm/community-edition/mkGraal.nix+112−112
This diff is too big to show here.
pkgs/development/compilers/graalvm/community-edition/update.nix−225
This diff is too big to show here.
pkgs/development/compilers/graalvm/community-edition/update.sh+81
This diff is too big to show here.
pkgs/development/compilers/graalvm/enterprise-edition.nix+183
This diff is too big to show here.
pkgs/development/compilers/hare/config-template.mk−27
This diff is too big to show here.
pkgs/development/compilers/hare/hare.nix−93
This diff is too big to show here.
pkgs/development/compilers/hare/harec.nix−45
This diff is too big to show here.
pkgs/development/compilers/haxe/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/hhvm/default.nix+68
This diff is too big to show here.
pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch+20
This diff is too big to show here.
pkgs/development/compilers/hip/default.nix+6−7
This diff is too big to show here.
pkgs/development/compilers/inklecate/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/inklecate/deps-darwin.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/inklecate/deps-linux.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/ios-cross-compile/9.2.nix+2−3
This diff is too big to show here.
pkgs/development/compilers/jasmin-compiler/default.nix−41
This diff is too big to show here.
pkgs/development/compilers/julia/1.6-bin.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/kotlin/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/kotlin/native.nix+4−4
This diff is too big to show here.
pkgs/development/compilers/ldc/binary.nix+2−3
This diff is too big to show here.
pkgs/development/compilers/ligo/default.nix+14−43
This diff is too big to show here.
pkgs/development/compilers/llvm/10/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/10/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/11/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/11/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/12/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/12/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch−18
This diff is too big to show here.
pkgs/development/compilers/llvm/13/clang/default.nix+4−1
This diff is too big to show here.
pkgs/development/compilers/llvm/13/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/llvm/13/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/13/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/14/clang/default.nix−1
This diff is too big to show here.
pkgs/development/compilers/llvm/14/default.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/llvm/14/libcxxabi/default.nix−1
This diff is too big to show here.
pkgs/development/compilers/llvm/14/libunwind/default.nix−1
This diff is too big to show here.
pkgs/development/compilers/llvm/14/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/14/lldb/default.nix−1
This diff is too big to show here.
pkgs/development/compilers/llvm/14/llvm/default.nix−9
This diff is too big to show here.
pkgs/development/compilers/llvm/14/openmp/default.nix+3−15
This diff is too big to show here.
pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch+54
This diff is too big to show here.
pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch+48−4
This diff is too big to show here.
pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch−12
This diff is too big to show here.
pkgs/development/compilers/llvm/5/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/5/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/6/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/6/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/7/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/7/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/8/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/8/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/9/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/9/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/git/lld/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/llvm/git/llvm/default.nix−6
This diff is too big to show here.
pkgs/development/compilers/llvm/multi.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch+78
This diff is too big to show here.
pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch+33
This diff is too big to show here.
pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix+6−3
This diff is too big to show here.
pkgs/development/compilers/llvm/rocm/default.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/llvm/rocm/llvm/default.nix+1−3
This diff is too big to show here.
pkgs/development/compilers/llvm/update.sh+2−6
This diff is too big to show here.
pkgs/development/compilers/mit-scheme/default.nix+1−2
This diff is too big to show here.
pkgs/development/compilers/mruby/default.nix+1−9
This diff is too big to show here.
pkgs/development/compilers/mrustc/default.nix−1
This diff is too big to show here.
pkgs/development/compilers/muon/default.nix
This diff is too big to show here.
pkgs/development/compilers/nim/default.nix+4−4
This diff is too big to show here.
pkgs/development/compilers/obliv-c/default.nix+3−5
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.00.1.nix+1−7
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.01.0.nix+1−7
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.02.nix+1−7
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.03.nix−6
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.04.nix−6
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.05.nix−6
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.06.nix−6
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.07.nix−6
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.08.nix−6
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.09.nix−6
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.10.nix−3
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.11.nix−3
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.12.nix+2−7
This diff is too big to show here.
pkgs/development/compilers/ocaml/4.14.nix−6
This diff is too big to show here.
pkgs/development/compilers/ocaml/Makefile.nixpkgs−16
This diff is too big to show here.
pkgs/development/compilers/ocaml/generic.nix+12−24
This diff is too big to show here.
pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch−37
This diff is too big to show here.
pkgs/development/compilers/ocaml/metaocaml-3.09.nix+34
This diff is too big to show here.
pkgs/development/compilers/open-watcom/v2.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/opendylan/bin.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/opendylan/default.nix+4−5
This diff is too big to show here.
pkgs/development/compilers/openjdk/11.nix+4−8
This diff is too big to show here.
pkgs/development/compilers/openjdk/16.nix−1
This diff is too big to show here.
pkgs/development/compilers/openjdk/17.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/openjdk/8.nix+72−14
This diff is too big to show here.
pkgs/development/compilers/openjdk/darwin/8.nix−6
This diff is too big to show here.
pkgs/development/compilers/openjdk/fix-glibc-2.34.patch−24
This diff is too big to show here.
pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch+3−21
This diff is too big to show here.
pkgs/development/compilers/openjdk/jre.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/osl/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/polyml/5.6.nix+1−9
This diff is too big to show here.
pkgs/development/compilers/polyml/5.7.nix+2−10
This diff is too big to show here.
pkgs/development/compilers/polyml/default.nix+1−7
This diff is too big to show here.
pkgs/development/compilers/ponyc/default.nix+11−2
This diff is too big to show here.
pkgs/development/compilers/ponyc/disable-tests.patch+7−9
This diff is too big to show here.
pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch+12−17
This diff is too big to show here.
pkgs/development/compilers/ponyc/pony-corral.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/purescript/purescript/default.nix+7−5
This diff is too big to show here.
pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js+1−1
This diff is too big to show here.
pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/qbe/default.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/reason/default.nix+7−7
This diff is too big to show here.
pkgs/development/compilers/roslyn/create-deps.sh+1−1
This diff is too big to show here.
pkgs/development/compilers/roslyn/default.nix+3−2
This diff is too big to show here.
pkgs/development/compilers/roslyn/deps.nix+142−142
This diff is too big to show here.
pkgs/development/compilers/rust/1_58.nix+63
This diff is too big to show here.
pkgs/development/compilers/rust/1_60.nix−64
This diff is too big to show here.
pkgs/development/compilers/rust/binary.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/rust/cargo.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/rust/clippy.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/rust/make-rust-platform.nix+3−3
This diff is too big to show here.
pkgs/development/compilers/rust/print-hashes.sh−1
This diff is too big to show here.
pkgs/development/compilers/rust/rust-lib-src.nix+10−5
This diff is too big to show here.
pkgs/development/compilers/rust/rust-src.nix+24−20
This diff is too big to show here.
pkgs/development/compilers/rust/rustfmt.nix+4−4
This diff is too big to show here.
pkgs/development/compilers/sbcl/2.2.4.nix−4
This diff is too big to show here.
pkgs/development/compilers/scala/dotty.nix+1−2
This diff is too big to show here.
pkgs/development/compilers/scryer-prolog/cargo.patch+74−27
This diff is too big to show here.
pkgs/development/compilers/scryer-prolog/default.nix+6−19
This diff is too big to show here.
pkgs/development/compilers/scryer-prolog/fix-tests.patch−29
This diff is too big to show here.
pkgs/development/compilers/sdcc/default.nix+2−2
This diff is too big to show here.
pkgs/development/compilers/solc/default.nix+12−44
This diff is too big to show here.
pkgs/development/compilers/souffle/default.nix+27−8
This diff is too big to show here.
pkgs/development/compilers/squeak/default.nix+28−178
This diff is too big to show here.
pkgs/development/compilers/squeak/squeak-configure-version.patch−94
This diff is too big to show here.
pkgs/development/compilers/squeak/squeak-plugins-discovery.patch−34
This diff is too big to show here.
pkgs/development/compilers/squeak/squeak-squeaksh-nixpkgs.patch−40
This diff is too big to show here.
pkgs/development/compilers/swift/default.nix+7−2
This diff is too big to show here.
pkgs/development/compilers/tinygo/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/uasm/default.nix+18−31
This diff is too big to show here.
pkgs/development/compilers/urn/default.nix+1−2
This diff is too big to show here.
pkgs/development/compilers/urweb/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/vala/default.nix+5−15
This diff is too big to show here.
pkgs/development/compilers/vlang/default.nix+1−1
This diff is too big to show here.
pkgs/development/compilers/x11basic/default.nix+1−2
This diff is too big to show here.
pkgs/development/compilers/yosys/default.nix+4−4
This diff is too big to show here.
pkgs/development/compilers/zulu/8.nix+3−9
This diff is too big to show here.
pkgs/development/compilers/zulu/default.nix+1−7
This diff is too big to show here.
pkgs/development/coq-modules/CoLoR/default.nix+1−2
This diff is too big to show here.
pkgs/development/coq-modules/VST/default.nix−1
This diff is too big to show here.
pkgs/development/coq-modules/Verdi/default.nix−3
This diff is too big to show here.
pkgs/development/coq-modules/aac-tactics/default.nix+2−6
This diff is too big to show here.
pkgs/development/coq-modules/compcert/default.nix−5
This diff is too big to show here.
pkgs/development/coq-modules/coqprime/default.nix+1−2
This diff is too big to show here.
pkgs/development/coq-modules/coqtail-math/default.nix+1−6
This diff is too big to show here.
pkgs/development/coq-modules/flocq/default.nix+2−2
This diff is too big to show here.
pkgs/development/coq-modules/gappalib/default.nix+1−2
This diff is too big to show here.
pkgs/development/coq-modules/mathcomp-word/default.nix+1−2
This diff is too big to show here.
pkgs/development/coq-modules/metacoq/default.nix−76
This diff is too big to show here.
pkgs/development/coq-modules/metalib/default.nix+3−7
This diff is too big to show here.
pkgs/development/coq-modules/parsec/default.nix+2−6
This diff is too big to show here.
pkgs/development/coq-modules/relation-algebra/default.nix+1−8
This diff is too big to show here.
pkgs/development/coq-modules/simple-io/default.nix+3−10
This diff is too big to show here.
pkgs/development/coq-modules/smtcoq/default.nix−26
This diff is too big to show here.
pkgs/development/coq-modules/tlc/default.nix−2
This diff is too big to show here.
pkgs/development/coq-modules/trakt/default.nix−24
This diff is too big to show here.
pkgs/development/dotnet-modules/python-language-server/default.nix+3−3
This diff is too big to show here.
pkgs/development/embedded/bossa/default.nix+6−7
This diff is too big to show here.
pkgs/development/embedded/fpga/apio/default.nix+4−5
This diff is too big to show here.
pkgs/development/embedded/openocd/default.nix−11
This diff is too big to show here.
pkgs/development/embedded/platformio/core.nix+35−15
This diff is too big to show here.
pkgs/development/embedded/platformio/default.nix+2−2
This diff is too big to show here.
pkgs/development/embedded/platformio/fix-searchpath.patch+1−1
This diff is too big to show here.
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch+1−1
This diff is too big to show here.
pkgs/development/embedded/stm32/betaflight/default.nix+64
This diff is too big to show here.
pkgs/development/embedded/stm32/inav/default.nix+56
This diff is too big to show here.
pkgs/development/embedded/stm32/stm32cubemx/default.nix+2−2
This diff is too big to show here.
pkgs/development/embedded/stm32/stm32flash/default.nix+2−2
This diff is too big to show here.
pkgs/development/gnuradio-modules/osmosdr/default.nix−2
This diff is too big to show here.
pkgs/development/go-modules/generic/default.nix+5−12
This diff is too big to show here.
pkgs/development/go-packages/generic/default.nix+3−11
This diff is too big to show here.
pkgs/development/guile-modules/guile-ssh/default.nix+2−2
This diff is too big to show here.
pkgs/development/haskell-modules/HACKING.md+1−1
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-arm.nix+1
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-common.nix+376−777
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-darwin.nix+9−11
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix+7−60
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+3−6
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+6−41
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix+52−23
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix+88−62
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-ghc-head.nix+4−14
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-ghcjs.nix+1−1
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml+656−798
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml+86−70
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml+810−957
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml+221−1121
This diff is too big to show here.
pkgs/development/haskell-modules/configuration-nix.nix+32−43
This diff is too big to show here.
pkgs/development/haskell-modules/generic-builder.nix+7−10
This diff is too big to show here.
pkgs/development/haskell-modules/hackage-packages.nix+12307−9071
This diff is too big to show here.
pkgs/development/haskell-modules/hoogle.nix−7
This diff is too big to show here.
pkgs/development/haskell-modules/make-package-set.nix+2−14
This diff is too big to show here.
pkgs/development/haskell-modules/non-hackage-packages.nix+2−1
This diff is too big to show here.
pkgs/development/haskell-modules/package-list.nix+1−7
This diff is too big to show here.
pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch−69
This diff is too big to show here.
pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch+33
This diff is too big to show here.
pkgs/development/haskell-modules/patches/lambdabot-core-ghc9.patch−95
This diff is too big to show here.
pkgs/development/haskell-modules/patches/lambdabot-novelty-plugins-ghc9.patch−58
This diff is too big to show here.
pkgs/development/haskell-modules/patches/misfortune-ghc9.patch−70
This diff is too big to show here.
pkgs/development/haskell-modules/patches/regex-compat-tdfa-ghc-9.0.patch−19
This diff is too big to show here.
pkgs/development/haskell-modules/patches/xmonad-nix.patch+73
This diff is too big to show here.
pkgs/development/haskell-modules/with-packages-wrapper.nix+4−4
This diff is too big to show here.
pkgs/development/idris-modules/default.nix+1−1
This diff is too big to show here.
pkgs/development/interpreters/acl2/default.nix+3−3
This diff is too big to show here.
pkgs/development/interpreters/alda/default.nix+3−3
This diff is too big to show here.
pkgs/development/interpreters/bats/default.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/ceptre/default.nix+4−6
This diff is too big to show here.
pkgs/development/interpreters/chibi/default.nix+13−11
This diff is too big to show here.
pkgs/development/interpreters/clisp/default.nix+3−3
This diff is too big to show here.
pkgs/development/interpreters/clisp/hg.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/clojure/babashka.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/clojure/default.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/dart/default.nix+1−6
This diff is too big to show here.
pkgs/development/interpreters/dhall/build-dhall-directory-package.nix+2−1
This diff is too big to show here.
pkgs/development/interpreters/duktape/default.nix−1
This diff is too big to show here.
pkgs/development/interpreters/elixir/1.13.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/elixir/generic-builder.nix+1−1
This diff is too big to show here.
pkgs/development/interpreters/gnu-apl/default.nix+1−3
This diff is too big to show here.
pkgs/development/interpreters/guile/1.8.nix+1
This diff is too big to show here.
pkgs/development/interpreters/guile/2.0.nix+1
This diff is too big to show here.
pkgs/development/interpreters/guile/2.2.nix+3−2
This diff is too big to show here.
pkgs/development/interpreters/guile/3.0.nix+6−23
This diff is too big to show here.
pkgs/development/interpreters/janet/default.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/jimtcl/default.nix+9−20
This diff is too big to show here.
pkgs/development/interpreters/joker/default.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/lolcode/default.nix−1
This diff is too big to show here.
pkgs/development/interpreters/love/0.10.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/love/11.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/luajit/2.0.nix+3−3
This diff is too big to show here.
pkgs/development/interpreters/luajit/2.1.nix+3−3
This diff is too big to show here.
pkgs/development/interpreters/luajit/default.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/maude/default.nix−4
This diff is too big to show here.
pkgs/development/interpreters/nickel/default.nix−33
This diff is too big to show here.
pkgs/development/interpreters/octave/default.nix+10−3
This diff is too big to show here.
pkgs/development/interpreters/perl/default.nix+18−21
This diff is too big to show here.
pkgs/development/interpreters/php/7.4.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/php/8.0.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/php/8.1.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/php/generic.nix+1−5
This diff is too big to show here.
pkgs/development/interpreters/picoc/default.nix+1−3
This diff is too big to show here.
pkgs/development/interpreters/pixie/default.nix+93
This diff is too big to show here.
pkgs/development/interpreters/pixie/dust.nix+46
This diff is too big to show here.
pkgs/development/interpreters/pixie/load_paths.patch+25
This diff is too big to show here.
pkgs/development/interpreters/pixie/make-paths-configurable.patch+119
This diff is too big to show here.
pkgs/development/interpreters/pure/default.nix+46
This diff is too big to show here.
pkgs/development/interpreters/python-cosmopolitan/default.nix−39
This diff is too big to show here.
pkgs/development/interpreters/python-cosmopolitan/ioctl.patch−12
This diff is too big to show here.
pkgs/development/interpreters/python/cpython/3.11/python-3.x-distutils-C++.patch−257
This diff is too big to show here.
pkgs/development/interpreters/python/cpython/default.nix+13−16
This diff is too big to show here.
pkgs/development/interpreters/python/default.nix+27−20
This diff is too big to show here.
pkgs/development/interpreters/python/graalpython/default.nix+21
This diff is too big to show here.
pkgs/development/interpreters/python/hooks/default.nix−6
This diff is too big to show here.
pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh−3
This diff is too big to show here.
pkgs/development/interpreters/python/hooks/sphinx-hook.sh−57
This diff is too big to show here.
pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix+2
This diff is too big to show here.
pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py+8−10
This diff is too big to show here.
pkgs/development/interpreters/python/wrapper.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/racket/default.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/racket/minimal.nix+3−4
This diff is too big to show here.
pkgs/development/interpreters/rakudo/default.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/rakudo/moarvm.nix+2−2
This diff is too big to show here.
pkgs/development/interpreters/rakudo/nqp.nix+2−12
This diff is too big to show here.
pkgs/development/interpreters/ruby/default.nix+30−26
This diff is too big to show here.
pkgs/development/interpreters/ruby/patchsets.nix+3−3
This diff is too big to show here.
pkgs/development/interpreters/ruby/rbinstall-new-rubygems-compat.patch−87
This diff is too big to show here.
pkgs/development/interpreters/ruby/rubygems/default.nix+1−1
This diff is too big to show here.