commit 62fe01651911043bd3db0add920af3d2935d9869 · pyrox.dev/nixpkgs

+29 -21

CONTRIBUTING.md

···

       567
       567
        
         That is, write

     

       568
       568
        
       

     

       569
       569
        
         ```nix

     

       570
       570
       -
         { stdenv, fetchurl, perl }: <...>

     

       570
       570
       +
         {

     

       571
       571
       +
           stdenv,

     

       572
       572
       +
           fetchurl,

     

       573
       573
       +
           perl,

     

       574
       574
       +
         }:

     

       575
       575
       +
         <...>

     

       571
       576
        
         ```

     

       572
       577
        
       

     

       573
       578
        
         instead of

     
···

       579
       584
        
         or

     

       580
       585
        
       

     

       581
       586
        
         ```nix

     

       582
       582
       -
         { stdenv, fetchurl, perl, ... }: <...>

     

       587
       587
       +
         {

     

       588
       588
       +
           stdenv,

     

       589
       589
       +
           fetchurl,

     

       590
       590
       +
           perl,

     

       591
       591
       +
           ...

     

       592
       592
       +
         }:

     

       593
       593
       +
         <...>

     

       583
       594
        
         ```

     

       584
       595
        
       

     

       585
       596
        
         For functions that are truly generic in the number of arguments, but have some required arguments, you should write them using an `@`-pattern:

     

       586
       597
        
       

     

       587
       598
        
         ```nix

     

       588
       588
       -
         { stdenv, doCoverageAnalysis ? false, ... } @ args:

     

       599
       599
       +
         {

     

       600
       600
       +
           stdenv,

     

       601
       601
       +
           doCoverageAnalysis ? false,

     

       602
       602
       +
           ...

     

       603
       603
       +
         }@args:

     

       589
       604
        
       

     

       590
       590
       -
         stdenv.mkDerivation (args // {

     

       591
       591
       -
           foo = if doCoverageAnalysis then "bla" else "";

     

       592
       592
       -
         })

     

       605
       605
       +
         stdenv.mkDerivation (args // { foo = if doCoverageAnalysis then "bla" else ""; })

     

       593
       606
        
         ```

     

       594
       607
        
       

     

       595
       608
        
         instead of

     
···

       597
       610
        
         ```nix

     

       598
       611
        
         args:

     

       599
       612
        
       

     

       600
       600
       -
         args.stdenv.mkDerivation (args // {

     

       601
       601
       -
           foo = if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "";

     

       602
       602
       -
         })

     

       613
       613
       +
         args.stdenv.mkDerivation (

     

       614
       614
       +
           args

     

       615
       615
       +
           // {

     

       616
       616
       +
             foo = if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "";

     

       617
       617
       +
           }

     

       618
       618
       +
         )

     

       603
       619
        
         ```

     

       604
       620
        
       

     

       605
       621
        
       - Unnecessary string conversions should be avoided.

     

       606
       622
        
         Do

     

       607
       623
        
       

     

       608
       624
        
         ```nix

     

       609
       609
       -
         {

     

       610
       610
       -
           rev = version;

     

       611
       611
       -
         }

     

       625
       625
       +
         { rev = version; }

     

       612
       626
        
         ```

     

       613
       627
        
       

     

       614
       628
        
         instead of

     

       615
       629
        
       

     

       616
       630
        
         ```nix

     

       617
       617
       -
         {

     

       618
       618
       -
           rev = "${version}";

     

       619
       619
       -
         }

     

       631
       631
       +
         { rev = "${version}"; }

     

       620
       632
        
         ```

     

       621
       633
        
       

     

       622
       634
        
       - Building lists conditionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`.

     

       623
       635
        
       

     

       624
       636
        
         ```nix

     

       625
       625
       -
         {

     

       626
       626
       -
           buildInputs = lib.optional stdenv.hostPlatform.isDarwin iconv;

     

       627
       627
       -
         }

     

       637
       637
       +
         { buildInputs = lib.optional stdenv.hostPlatform.isDarwin iconv; }

     

       628
       638
        
         ```

     

       629
       639
        
       

     

       630
       640
        
         instead of

     

       631
       641
        
       

     

       632
       642
        
         ```nix

     

       633
       633
       -
         {

     

       634
       634
       -
           buildInputs = if stdenv.hostPlatform.isDarwin then [ iconv ] else null;

     

       635
       635
       -
         }

     

       643
       643
       +
         { buildInputs = if stdenv.hostPlatform.isDarwin then [ iconv ] else null; }

     

       636
       644
        
         ```

     

       637
       645
        
       

     

       638
       646
        
         As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.

+1 -4

doc/build-helpers/fixed-point-arguments.chapter.md

···

       60
       60
        
           }@args:

     

       61
       61
        
           {

     

       62
       62
        
             # Arguments to pass

     

       63
       63
       -
             inherit

     

       64
       64
       -
               preferLocalBuild

     

       65
       65
       -
               allowSubstitute

     

       66
       66
       -
               ;

     

       63
       63
       +
             inherit preferLocalBuild allowSubstitute;

     

       67
       64
        
             # Some expressions involving specialArg

     

       68
       65
        
             greeting = if specialArg "hi" then "hi" else "hello";

     

       69
       66
        
           };

+2 -6

doc/build-helpers/images/appimagetools.section.md

···

       37
       37
        
           hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw=";

     

       38
       38
        
         };

     

       39
       39
        
       in

     

       40
       40
       -
       appimageTools.wrapType2 {

     

       41
       41
       -
         inherit pname version src;

     

       42
       42
       -
       }

     

       40
       40
       +
       appimageTools.wrapType2 { inherit pname version src; }

     

       43
       41
        
       ```

     

       44
       42
        
       

     

       45
       43
        
       :::

     
···

       104
       102
        
           hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";

     

       105
       103
        
         };

     

       106
       104
        
       

     

       107
       107
       -
         appimageContents = appimageTools.extract {

     

       108
       108
       -
           inherit pname version src;

     

       109
       109
       -
         };

     

       105
       105
       +
         appimageContents = appimageTools.extract { inherit pname version src; };

     

       110
       106
        
       in

     

       111
       107
        
       appimageTools.wrapType2 {

     

       112
       108
        
         inherit pname version src;

+1 -4

doc/build-helpers/images/binarycache.section.md

···

       33
       33
        
       The following derivation will construct a flat-file binary cache containing the closure of `hello`.

     

       34
       34
        
       

     

       35
       35
        
       ```nix

     

       36
       36
       -
       { mkBinaryCache, hello }:

     

       37
       37
       -
       mkBinaryCache {

     

       38
       38
       -
         rootPaths = [ hello ];

     

       39
       39
       -
       }

     

       36
       36
       +
       { mkBinaryCache, hello }: mkBinaryCache { rootPaths = [ hello ]; }

     

       40
       37
        
       ```

     

       41
       38
        
       

     

       42
       39
        
       Build the cache on a machine.

+1 -3

doc/build-helpers/images/dockertools.section.md

···

       1577
       1577
        
       dockerTools.streamNixShellImage {

     

       1578
       1578
        
         tag = "latest";

     

       1579
       1579
        
         drv = hello.overrideAttrs (old: {

     

       1580
       1580
       -
           nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [

     

       1581
       1581
       -
             cowsay

     

       1582
       1582
       -
           ];

     

       1580
       1580
       +
           nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ cowsay ];

     

       1583
       1581
        
         });

     

       1584
       1582
        
       }

     

       1585
       1583
        
       ```

+1 -3

doc/build-helpers/images/ocitools.section.md

···

       82
       82
        
         bash,

     

       83
       83
        
       }:

     

       84
       84
        
       ociTools.buildContainer {

     

       85
       85
       -
         args = [

     

       86
       86
       -
           (lib.getExe bash)

     

       87
       87
       -
         ];

     

       85
       85
       +
         args = [ (lib.getExe bash) ];

     

       88
       86
        
       

     

       89
       87
        
         readonly = false;

     

       90
       88
        
       }

+13 -18

doc/build-helpers/special/checkpoint-build.section.md

···

       7
       7
        
       However, we can tell Nix explicitly what the previous build state was, by representing that previous state as a derivation output. This allows the passed build state to be used for an incremental build.

     

       8
       8
        
       

     

       9
       9
        
       To change a normal derivation to a checkpoint based build, these steps must be taken:

     

       10
       10
       -
         - apply `prepareCheckpointBuild` on the desired derivation, e.g.

     

       11
       11
       -
       ```nix

     

       12
       12
       -
       {

     

       13
       13
       -
         checkpointArtifacts = (pkgs.checkpointBuildTools.prepareCheckpointBuild pkgs.virtualbox);

     

       14
       14
       -
       }

     

       15
       15
       -
       ```

     

       16
       16
       -
         - change something you want in the sources of the package, e.g. use a source override:

     

       17
       17
       -
       ```nix

     

       18
       18
       -
       {

     

       19
       19
       -
         changedVBox = pkgs.virtualbox.overrideAttrs (old: {

     

       20
       20
       -
           src = path/to/vbox/sources;

     

       21
       21
       -
         });

     

       22
       22
       -
       }

     

       23
       23
       -
       ```

     

       10
       10
       +
         ```nix

     

       11
       11
       +
         {

     

       12
       12
       +
           checkpointArtifacts = (pkgs.checkpointBuildTools.prepareCheckpointBuild pkgs.virtualbox);

     

       13
       13
       +
         }

     

       14
       14
       +
         ```

     

       15
       15
       +
         ```nix

     

       16
       16
       +
         {

     

       17
       17
       +
           changedVBox = pkgs.virtualbox.overrideAttrs (old: {

     

       18
       18
       +
             src = path/to/vbox/sources;

     

       19
       19
       +
           });

     

       20
       20
       +
         }

     

       21
       21
       +
         ```

     

       24
       22
        
         - use `mkCheckpointBuild changedVBox checkpointArtifacts`

     

       25
       23
        
         - enjoy shorter build times

     

       26
       24
        
       

     
···

       30
       28
        
         pkgs ? import <nixpkgs> { },

     

       31
       29
        
       }:

     

       32
       30
        
       let

     

       33
       33
       -
         inherit (pkgs.checkpointBuildTools)

     

       34
       34
       -
           prepareCheckpointBuild

     

       35
       35
       -
           mkCheckpointBuild

     

       36
       36
       -
           ;

     

       31
       31
       +
         inherit (pkgs.checkpointBuildTools) prepareCheckpointBuild mkCheckpointBuild;

     

       37
       32
        
         helloCheckpoint = prepareCheckpointBuild pkgs.hello;

     

       38
       33
        
         changedHello = pkgs.hello.overrideAttrs (_: {

     

       39
       34
        
           doCheck = false;

+3 -9

doc/build-helpers/testers.chapter.md

···

       15
       15
        
       

     

       16
       16
        
       ```nix

     

       17
       17
        
       {

     

       18
       18
       -
         passthru.tests.pkg-config = testers.hasPkgConfigModules {

     

       19
       19
       -
           package = finalAttrs.finalPackage;

     

       20
       20
       -
         };

     

       18
       18
       +
         passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };

     

       21
       19
        
       

     

       22
       20
        
         meta.pkgConfigModules = [ "libfoo" ];

     

       23
       21
        
       }

     
···

       74
       72
        
       # Check hyperlinks in the `nix` documentation

     

       75
       73
        
       

     

       76
       74
        
       ```nix

     

       77
       77
       -
       testers.lycheeLinkCheck {

     

       78
       78
       -
         site = nix.doc + "/share/doc/nix/manual";

     

       79
       79
       -
       }

     

       75
       75
       +
       testers.lycheeLinkCheck { site = nix.doc + "/share/doc/nix/manual"; }

     

       80
       76
        
       ```

     

       81
       77
        
       

     

       82
       78
        
       :::

     
···

       269
       265
        
       This example will run the command `hello --version`, and then check that the version of the `hello` package is in the output of the command.

     

       270
       266
        
       

     

       271
       267
        
       ```nix

     

       272
       272
       -
       {

     

       273
       273
       -
         passthru.tests.version = testers.testVersion { package = hello; };

     

       274
       274
       -
       }

     

       268
       268
       +
       { passthru.tests.version = testers.testVersion { package = hello; }; }

     

       275
       269
        
       ```

     

       276
       270
        
       

     

       277
       271
        
       :::

+7 -6

doc/build-helpers/trivial-build-helpers.chapter.md

···

       152
       152
        
       

     

       153
       153
        
       Likewise, `runCommandCC name derivationArgs buildCommand` is equivalent to

     

       154
       154
        
       ```nix

     

       155
       155
       -
       runCommandWith {

     

       156
       156
       -
         inherit name derivationArgs;

     

       157
       157
       -
       } buildCommand

     

       155
       155
       +
       runCommandWith { inherit name derivationArgs; } buildCommand

     

       158
       156
        
       ```

     

       159
       157
        
       :::

     

       160
       158
        
       

     
···

       713
       711
        
         # Writes contents of files to /nix/store/<store path>

     

       714
       712
        
         concatText

     

       715
       713
        
         "my-file"

     

       716
       716
       -
         [ file1 file2 ]

     

       714
       714
       +
         [

     

       715
       715
       +
           file1

     

       716
       716
       +
           file2

     

       717
       717
       +
         ]

     

       717
       718
        
       

     

       718
       719
        
         # Writes contents of files to /nix/store/<store path>

     

       719
       720
        
         concatScript

     
···

       790
       791
        
       For example,

     

       791
       792
        
       

     

       792
       793
        
       ```nix

     

       793
       793
       -
       writeClosure [ (writeScriptBin "hi" ''${hello}/bin/hello'') ]

     

       794
       794
       +
       writeClosure [ (writeScriptBin "hi" "${hello}/bin/hello") ]

     

       794
       795
        
       ```

     

       795
       796
        
       

     

       796
       797
        
       produces an output path `/nix/store/<hash>-runtime-deps` containing

     
···

       816
       817
        
       For example,

     

       817
       818
        
       

     

       818
       819
        
       ```nix

     

       819
       819
       -
       writeDirectReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'')

     

       820
       820
       +
       writeDirectReferencesToFile (writeScriptBin "hi" "${hello}/bin/hello")

     

       820
       821
        
       ```

     

       821
       822
        
       

     

       822
       823
        
       produces an output path `/nix/store/<hash>-runtime-references` containing

+1 -1

doc/functions/generators.section.md

···

       27
       27
        
           } ":";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       +
         # the INI file can now be given as plain old nix values

     

       30
       31
        
       in

     

       31
       31
       -
       # the INI file can now be given as plain old nix values

     

       32
       32
        
       customToINI {

     

       33
       33
        
         main = {

     

       34
       34
        
           pushinfo = true;

+15 -6

doc/functions/nix-gitignore.section.md

···

       15
       15
        
         src = nix-gitignore.gitignoreSource [ ] ./source;

     

       16
       16
        
         # Simplest version

     

       17
       17
        
       

     

       18
       18
       -
         src = nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source;

     

       18
       18
       +
         src = nix-gitignore.gitignoreSource ''

     

       19
       19
       +
           supplemental-ignores

     

       20
       20
       +
         '' ./source;

     

       19
       21
        
         # This one reads the ./source/.gitignore and concats the auxiliary ignores

     

       20
       22
        
       

     

       21
       21
       -
         src = nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source;

     

       23
       23
       +
         src = nix-gitignore.gitignoreSourcePure ''

     

       24
       24
       +
           ignore-this

     

       25
       25
       +
           ignore-that

     

       26
       26
       +
         '' ./source;

     

       22
       27
        
         # Use this string as gitignore, don't read ./source/.gitignore.

     

       23
       28
        
       

     

       24
       24
       -
         src = nix-gitignore.gitignoreSourcePure [ "ignore-this\nignore-that\n" ~/.gitignore ] ./source;

     

       29
       29
       +
         src = nix-gitignore.gitignoreSourcePure [

     

       30
       30
       +
           ''

     

       31
       31
       +
             ignore-this

     

       32
       32
       +
             ignore-that

     

       33
       33
       +
           ''

     

       34
       34
       +
           ~/.gitignore

     

       35
       35
       +
         ] ./source;

     

       25
       36
        
         # It also accepts a list (of strings and paths) that will be concatenated

     

       26
       37
        
         # once the paths are turned to strings via readFile.

     

       27
       38
        
       }

     
···

       41
       52
        
       If you want to make your own filter from scratch, you may use

     

       42
       53
        
       

     

       43
       54
        
       ```nix

     

       44
       44
       -
       {

     

       45
       45
       -
         gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;

     

       46
       46
       -
       }

     

       55
       55
       +
       { gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root; }

     

       47
       56
        
       ```

     

       48
       57
        
       

     

       49
       58
        
       ## gitignore files in subdirectories {#sec-pkgs-nix-gitignore-usage-recursive}

+1 -3

doc/hooks/breakpoint.section.md

···

       3
       3
        
       This hook makes a build pause instead of stopping when a failure occurs. It prevents Nix from cleaning up the build environment immediately and allows the user to attach to the build environment. Upon a build error, it will print instructions that can be used to enter the environment for debugging. breakpointHook is only available on Linux. To use it, add `breakpointHook` to `nativeBuildInputs` in the package to be inspected.

     

       4
       4
        
       

     

       5
       5
        
       ```nix

     

       6
       6
       -
       {

     

       7
       7
       -
         nativeBuildInputs = [ breakpointHook ];

     

       8
       8
       -
       }

     

       6
       6
       +
       { nativeBuildInputs = [ breakpointHook ]; }

     

       9
       7
        
       ```

     

       10
       8
        
       

     

       11
       9
        
       When a build failure occurs, an instruction will be printed showing how to attach to the build sandbox.

+4 -10

doc/hooks/memcached-test-hook.section.md

···

       4
       4
        
       This hook starts a Memcached server during `checkPhase`. Example:

     

       5
       5
        
       

     

       6
       6
        
       ```nix

     

       7
       7
       -
       {

     

       8
       8
       -
         stdenv,

     

       9
       9
       -
         memcachedTestHook,

     

       10
       10
       -
       }:

     

       7
       7
       +
       { stdenv, memcachedTestHook }:

     

       11
       8
        
       stdenv.mkDerivation {

     

       12
       9
        
       

     

       13
       10
        
         # ...

     

       14
       11
        
       

     

       15
       15
       -
         nativeCheckInputs = [

     

       16
       16
       -
           memcachedTestHook

     

       17
       17
       -
         ];

     

       12
       12
       +
         nativeCheckInputs = [ memcachedTestHook ];

     

       18
       13
        
       }

     

       19
       14
        
       ```

     

       20
       15
        
       

     
···

       45
       40
        
       

     

       46
       41
        
         # ...

     

       47
       42
        
       

     

       48
       48
       -
         nativeCheckInputs = [

     

       49
       49
       -
           memcachedTestHook

     

       50
       50
       -
         ];

     

       43
       43
       +
         nativeCheckInputs = [ memcachedTestHook ];

     

       51
       44
        
       

     

       52
       45
        
         preCheck = ''

     

       53
       46
        
           memcachedTestPort=1234;

     

       54
       47
        
         '';

     

       55
       48
        
       }

     

       49
       49
       +
       ```

+1 -3

doc/hooks/patch-rc-path-hooks.section.md

···

       38
       38
        
       

     

       39
       39
        
         # ...

     

       40
       40
        
       

     

       41
       41
       -
         nativeBuildInputs = [

     

       42
       42
       -
           patchRcPathFish

     

       43
       43
       -
         ];

     

       41
       41
       +
         nativeBuildInputs = [ patchRcPathFish ];

     

       44
       42
        
       

     

       45
       43
        
         postFixup = ''

     

       46
       44
        
           patchRcPathFish $out/bin/this-foo.fish ${

+2 -6

doc/hooks/redis-test-hook.section.md

···

       13
       13
        
       

     

       14
       14
        
         # ...

     

       15
       15
        
       

     

       16
       16
       -
         nativeCheckInputs = [

     

       17
       17
       -
           redisTestHook

     

       18
       18
       -
         ];

     

       16
       16
       +
         nativeCheckInputs = [ redisTestHook ];

     

       19
       17
        
       }

     

       20
       18
        
       ```

     

       21
       19
        
       

     
···

       56
       54
        
       

     

       57
       55
        
         # ...

     

       58
       56
        
       

     

       59
       59
       -
         nativeCheckInputs = [

     

       60
       60
       -
           redisTestHook

     

       61
       61
       -
         ];

     

       57
       57
       +
         nativeCheckInputs = [ redisTestHook ];

     

       62
       58
        
       

     

       63
       59
        
         preCheck = ''

     

       64
       60
        
           redisTestPort=6390;

+9 -13

doc/hooks/tauri.section.md

···

       35
       35
        
           hash = "...";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
       -
         nativeBuildInputs =

     

       39
       39
       -
           [

     

       40
       40
       -
             # Pull in our main hook

     

       41
       41
       -
             cargo-tauri.hook

     

       38
       38
       +
         nativeBuildInputs = [

     

       39
       39
       +
           # Pull in our main hook

     

       40
       40
       +
           cargo-tauri.hook

     

       42
       41
        
       

     

       43
       43
       -
             # Setup npm

     

       44
       44
       -
             nodejs

     

       45
       45
       -
             npmHooks.npmConfigHook

     

       42
       42
       +
           # Setup npm

     

       43
       43
       +
           nodejs

     

       44
       44
       +
           npmHooks.npmConfigHook

     

       46
       45
        
       

     

       47
       47
       -
             # Make sure we can find our libraries

     

       48
       48
       -
             pkg-config

     

       49
       49
       -
           ]

     

       50
       50
       -
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       51
       51
       -
             wrapGAppsHook4

     

       52
       52
       -
           ];

     

       46
       46
       +
           # Make sure we can find our libraries

     

       47
       47
       +
           pkg-config

     

       48
       48
       +
         ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];

     

       53
       49
        
       

     

       54
       50
        
         buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

     

       55
       51
        
           glib-networking # Most Tauri apps need networking

+1 -3

doc/hooks/udevCheckHook.section.md

···

       16
       16
        
       stdenv.mkDerivation (finalAttrs: {

     

       17
       17
        
         # ...

     

       18
       18
        
       

     

       19
       19
       -
         nativeInstallCheckInputs = [

     

       20
       20
       -
           udevCheckHook

     

       21
       21
       -
         ];

     

       19
       19
       +
         nativeInstallCheckInputs = [ udevCheckHook ];

     

       22
       20
        
         doInstallCheck = true;

     

       23
       21
        
       

     

       24
       22
        
         # ...

+1 -3

doc/hooks/versionCheckHook.section.md

···

       15
       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
        
         # ...

     

       17
       17
        
       

     

       18
       18
       -
         nativeInstallCheckInputs = [

     

       19
       19
       -
           versionCheckHook

     

       20
       20
       -
         ];

     

       18
       18
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       21
       19
        
         doInstallCheck = true;

     

       22
       20
        
       

     

       23
       21
        
         # ...

+1 -3

doc/hooks/zig.section.md

···

       16
       16
        
       stdenv.mkDerivation {

     

       17
       17
        
         # . . .

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [

     

       20
       20
       -
           zig.hook

     

       21
       21
       -
         ];

     

       19
       19
       +
         nativeBuildInputs = [ zig.hook ];

     

       22
       20
        
       

     

       23
       21
        
         zigBuildFlags = [ "-Dman-pages=true" ];

     

       24
       22

+1 -3

doc/interoperability/cyclonedx.md

···

       79
       79
        
               sha256,

     

       80
       80
        
               ...

     

       81
       81
        
             }:

     

       82
       82
       -
             pkgs.fetchzip {

     

       83
       83
       -
               inherit name url sha256;

     

       84
       84
       -
             };

     

       82
       82
       +
             pkgs.fetchzip { inherit name url sha256; };

     

       85
       83
        
         };

     

       86
       84
        
       

     

       87
       85
        
       in

+1 -3

doc/languages-frameworks/agda.section.md

···

       144
       144
        
         version = "1.0";

     

       145
       145
        
         pname = "my-agda-lib";

     

       146
       146
        
         src = ./.;

     

       147
       147
       -
         buildInputs = [

     

       148
       148
       -
           agdaPackages.standard-library

     

       149
       149
       -
         ];

     

       147
       147
       +
         buildInputs = [ agdaPackages.standard-library ];

     

       150
       148
        
       }

     

       151
       149
        
       ```

     

       152
       150

+4 -14

doc/languages-frameworks/android.section.md

···

       8
       8
        
       Use the `android-studio-full` attribute for a very complete Android SDK, including system images:

     

       9
       9
        
       

     

       10
       10
        
       ```nix

     

       11
       11
       -
       {

     

       12
       12
       -
         buildInputs = [ android-studio-full ];

     

       13
       13
       -
       }

     

       11
       11
       +
       { buildInputs = [ android-studio-full ]; }

     

       14
       12
        
       ```

     

       15
       13
        
       

     

       16
       14
        
       This is identical to:

     

       17
       15
        
       

     

       18
       16
        
       ```nix

     

       19
       19
       -
       {

     

       20
       20
       -
         buildInputs = [ androidStudioPackages.stable.full ];

     

       21
       21
       -
       }

     

       17
       17
       +
       { buildInputs = [ androidStudioPackages.stable.full ]; }

     

       22
       18
        
       ```

     

       23
       19
        
       

     

       24
       20
        
       Alternatively, you can pass composeAndroidPackages to the `withSdk` passthru:

     
···

       26
       22
        
       ```nix

     

       27
       23
        
       {

     

       28
       24
        
         buildInputs = [

     

       29
       29
       -
           (android-studio.withSdk

     

       30
       30
       -
             (androidenv.composeAndroidPackages {

     

       31
       31
       -
               includeNDK = true;

     

       32
       32
       -
             }).androidsdk

     

       33
       33
       -
           )

     

       25
       25
       +
           (android-studio.withSdk (androidenv.composeAndroidPackages { includeNDK = true; }).androidsdk)

     

       34
       26
        
         ];

     

       35
       27
        
       }

     

       36
       28
        
       ```

     
···

       58
       50
        
             "arm64-v8a"

     

       59
       51
        
           ];

     

       60
       52
        
           includeNDK = true;

     

       61
       61
       -
           includeExtras = [

     

       62
       62
       -
             "extras;google;auto"

     

       63
       63
       -
           ];

     

       53
       53
       +
           includeExtras = [ "extras;google;auto" ];

     

       64
       54
        
         };

     

       65
       55
        
       in

     

       66
       56
        
       androidComposition.androidsdk

+3 -11

doc/languages-frameworks/beam.section.md

···

       65
       65
        
           overlays = [ ];

     

       66
       66
        
         };

     

       67
       67
        
       in

     

       68
       68
       -
       pkgs.mkShell {

     

       69
       69
       -
         packages = [ pkgs.beamPackages.rebar3 ];

     

       70
       70
       -
       }

     

       68
       68
       +
       pkgs.mkShell { packages = [ pkgs.beamPackages.rebar3 ]; }

     

       71
       69
        
       ```

     

       72
       70
        
       :::

     

       73
       71
        
       

     
···

       324
       322
        
       let

     

       325
       323
        
         elixir = beam.packages.erlang_27.elixir_1_18;

     

       326
       324
        
       in

     

       327
       327
       -
       mkShell {

     

       328
       328
       -
         buildInputs = [ elixir ];

     

       329
       329
       -
       }

     

       325
       325
       +
       mkShell { buildInputs = [ elixir ]; }

     

       330
       326
        
       ```

     

       331
       327
        
       

     

       332
       328
        
       ### Using an overlay {#beam-using-overlays}

     
···

       348
       344
        
         pkgs = import <nixpkgs> { overlays = [ elixir_1_18_1_overlay ]; };

     

       349
       345
        
       in

     

       350
       346
        
       with pkgs;

     

       351
       351
       -
       mkShell {

     

       352
       352
       -
         buildInputs = [

     

       353
       353
       -
           elixir_1_18

     

       354
       354
       -
         ];

     

       355
       355
       -
       }

     

       347
       347
       +
       mkShell { buildInputs = [ elixir_1_18 ]; }

     

       356
       348
        
       ```

     

       357
       349
        
       

     

       358
       350
        
       #### Elixir - Phoenix project {#elixir---phoenix-project}

+2 -2

doc/languages-frameworks/chicken.section.md

···

       77
       77
        
             );

     

       78
       78
        
           }

     

       79
       79
        
         );

     

       80
       80
       +
         # Here, `myChickenPackages.chickenEggs.json-rpc`, which depends on `srfi-180` will use

     

       81
       81
       +
         # the local copy of `srfi-180`.

     

       80
       82
        
       in

     

       81
       81
       -
       # Here, `myChickenPackages.chickenEggs.json-rpc`, which depends on `srfi-180` will use

     

       82
       82
       -
       # the local copy of `srfi-180`.

     

       83
       83
        
       <...>

     

       84
       84
        
       ```

+2 -6

doc/languages-frameworks/coq.section.md

···

       145
       145
        
       For example, assuming you have a special `mathcomp` dependency you want to use, here is how you could override the `mathcomp` dependency:

     

       146
       146
        
       

     

       147
       147
        
       ```nix

     

       148
       148
       -
       multinomials.override {

     

       149
       149
       -
         mathcomp = my-special-mathcomp;

     

       150
       150
       -
       }

     

       148
       148
       +
       multinomials.override { mathcomp = my-special-mathcomp; }

     

       151
       149
        
       ```

     

       152
       150
        
       

     

       153
       151
        
       In Nixpkgs, all Coq derivations take a `version` argument.  This can be overridden in order to easily use a different version:

     

       154
       152
        
       

     

       155
       153
        
       ```nix

     

       156
       156
       -
       coqPackages.multinomials.override {

     

       157
       157
       -
         version = "1.5.1";

     

       158
       158
       -
       }

     

       154
       154
       +
       coqPackages.multinomials.override { version = "1.5.1"; }

     

       159
       155
        
       ```

     

       160
       156
        
       

     

       161
       157
        
       Refer to [](#coq-packages-attribute-sets-coqpackages) for all the different formats that you can potentially pass to `version`, as well as the restrictions.

+2 -6

doc/languages-frameworks/cuda.section.md

···

       146
       146
        
       When using `callPackage`, you can choose to pass in a different variant, e.g. when a package requires a specific version of CUDA:

     

       147
       147
        
       

     

       148
       148
        
       ```nix

     

       149
       149
       -
       {

     

       150
       150
       -
         mypkg = callPackage { cudaPackages = cudaPackages_12_2; };

     

       151
       151
       -
       }

     

       149
       149
       +
       { mypkg = callPackage { cudaPackages = cudaPackages_12_2; }; }

     

       152
       150
        
       ```

     

       153
       151
        
       

     

       154
       152
        
       ::: {.caution}

     
···

       208
       206
        
       The NVIDIA Container Toolkit can be enabled in NixOS like follows:

     

       209
       207
        
       

     

       210
       208
        
       ```nix

     

       211
       211
       -
       {

     

       212
       212
       -
         hardware.nvidia-container-toolkit.enable = true;

     

       213
       213
       -
       }

     

       209
       209
       +
       { hardware.nvidia-container-toolkit.enable = true; }

     

       214
       210
        
       ```

     

       215
       211
        
       

     

       216
       212
        
       This will automatically enable a service that generates a CDI specification (located at `/var/run/cdi/nvidia-container-toolkit.json`) based on the auto-detected hardware of your machine. You can check this service by running:

+1 -3

doc/languages-frameworks/dhall.section.md

···

       94
       94
        
           hash = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0=";

     

       95
       95
        
         };

     

       96
       96
        
       

     

       97
       97
       -
         dhallOverlay = self: super: {

     

       98
       98
       -
           true = self.callPackage ./true.nix { };

     

       99
       99
       -
         };

     

       97
       97
       +
         dhallOverlay = self: super: { true = self.callPackage ./true.nix { }; };

     

       100
       98
        
       

     

       101
       99
        
         overlay = self: super: {

     

       102
       100
        
           dhallPackages = super.dhallPackages.override (old: {

+4 -4

doc/languages-frameworks/dotnet.section.md

···

       10
       10
        
       

     

       11
       11
        
       mkShell {

     

       12
       12
        
         name = "dotnet-env";

     

       13
       13
       -
         packages = [

     

       14
       14
       -
           dotnet-sdk

     

       15
       15
       -
         ];

     

       13
       13
       +
         packages = [ dotnet-sdk ];

     

       16
       14
        
       }

     

       17
       15
        
       ```

     

       18
       16
        
       

     
···

       161
       159
        
         projectFile = "src/project.sln";

     

       162
       160
        
         nugetDeps = ./deps.json; # see "Generating and updating NuGet dependencies" section for details

     

       163
       161
        
       

     

       164
       164
       -
         buildInputs = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.

     

       162
       162
       +
         buildInputs = [

     

       163
       163
       +
           referencedProject

     

       164
       164
       +
         ]; # `referencedProject` must contain `nupkg` in the folder structure.

     

       165
       165
        
       

     

       166
       166
        
         dotnet-sdk = dotnetCorePackages.sdk_8_0;

     

       167
       167
        
         dotnet-runtime = dotnetCorePackages.runtime_8_0;

+52 -55

doc/languages-frameworks/emscripten.section.md

···

       38
       38
        
       

     

       39
       39
        
       

     

       40
       40
        
       ```nix

     

       41
       41
       -
       (pkgs.zlib.override {

     

       42
       42
       -
         stdenv = pkgs.emscriptenStdenv;

     

       43
       43
       -
       }).overrideAttrs

     

       44
       44
       -
         (old: {

     

       45
       45
       -
           buildInputs = old.buildInputs ++ [ pkg-config ];

     

       46
       46
       -
           # we need to reset this setting!

     

       47
       47
       -
           env = (old.env or { }) // {

     

       48
       48
       -
             NIX_CFLAGS_COMPILE = "";

     

       49
       49
       -
           };

     

       41
       41
       +
       (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideAttrs (old: {

     

       42
       42
       +
         buildInputs = old.buildInputs ++ [ pkg-config ];

     

       43
       43
       +
         # we need to reset this setting!

     

       44
       44
       +
         env = (old.env or { }) // {

     

       45
       45
       +
           NIX_CFLAGS_COMPILE = "";

     

       46
       46
       +
         };

     

       50
       47
        
       

     

       51
       51
       -
           configurePhase = ''

     

       52
       52
       -
             # FIXME: Some tests require writing at $HOME

     

       53
       53
       -
             HOME=$TMPDIR

     

       54
       54
       -
             runHook preConfigure

     

       48
       48
       +
         configurePhase = ''

     

       49
       49
       +
           # FIXME: Some tests require writing at $HOME

     

       50
       50
       +
           HOME=$TMPDIR

     

       51
       51
       +
           runHook preConfigure

     

       55
       52
        
       

     

       56
       56
       -
             #export EMCC_DEBUG=2

     

       57
       57
       -
             emconfigure ./configure --prefix=$out --shared

     

       53
       53
       +
           #export EMCC_DEBUG=2

     

       54
       54
       +
           emconfigure ./configure --prefix=$out --shared

     

       58
       55
        
       

     

       59
       59
       -
             runHook postConfigure

     

       60
       60
       -
           '';

     

       56
       56
       +
           runHook postConfigure

     

       57
       57
       +
         '';

     

       61
       58
        
       

     

       62
       62
       -
           dontStrip = true;

     

       63
       63
       -
           outputs = [ "out" ];

     

       59
       59
       +
         dontStrip = true;

     

       60
       60
       +
         outputs = [ "out" ];

     

       64
       61
        
       

     

       65
       65
       -
           buildPhase = ''

     

       66
       66
       -
             runHook preBuild

     

       62
       62
       +
         buildPhase = ''

     

       63
       63
       +
           runHook preBuild

     

       67
       64
        
       

     

       68
       68
       -
             emmake make

     

       65
       65
       +
           emmake make

     

       69
       66
        
       

     

       70
       70
       -
             runHook postBuild

     

       71
       71
       -
           '';

     

       67
       67
       +
           runHook postBuild

     

       68
       68
       +
         '';

     

       72
       69
        
       

     

       73
       73
       -
           installPhase = ''

     

       74
       74
       -
             runHook preInstall

     

       70
       70
       +
         installPhase = ''

     

       71
       71
       +
           runHook preInstall

     

       75
       72
        
       

     

       76
       76
       -
             emmake make install

     

       73
       73
       +
           emmake make install

     

       77
       74
        
       

     

       78
       78
       -
             runHook postInstall

     

       79
       79
       -
           '';

     

       75
       75
       +
           runHook postInstall

     

       76
       76
       +
         '';

     

       80
       77
        
       

     

       81
       81
       -
           checkPhase = ''

     

       82
       82
       -
             runHook preCheck

     

       78
       78
       +
         checkPhase = ''

     

       79
       79
       +
           runHook preCheck

     

       83
       80
        
       

     

       84
       84
       -
             echo "================= testing zlib using node ================="

     

       81
       81
       +
           echo "================= testing zlib using node ================="

     

       85
       82
        
       

     

       86
       86
       -
             echo "Compiling a custom test"

     

       87
       87
       -
             set -x

     

       88
       88
       -
             emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \

     

       89
       89
       -
             libz.so.${old.version} -I . -o example.js

     

       83
       83
       +
           echo "Compiling a custom test"

     

       84
       84
       +
           set -x

     

       85
       85
       +
           emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \

     

       86
       86
       +
           libz.so.${old.version} -I . -o example.js

     

       90
       87
        
       

     

       91
       91
       -
             echo "Using node to execute the test"

     

       92
       92
       -
             ${pkgs.nodejs}/bin/node ./example.js

     

       88
       88
       +
           echo "Using node to execute the test"

     

       89
       89
       +
           ${pkgs.nodejs}/bin/node ./example.js

     

       93
       90
        
       

     

       94
       94
       -
             set +x

     

       95
       95
       -
             if [ $? -ne 0 ]; then

     

       96
       96
       -
               echo "test failed for some reason"

     

       97
       97
       -
               exit 1;

     

       98
       98
       -
             else

     

       99
       99
       -
               echo "it seems to work! very good."

     

       100
       100
       -
             fi

     

       101
       101
       -
             echo "================= /testing zlib using node ================="

     

       91
       91
       +
           set +x

     

       92
       92
       +
           if [ $? -ne 0 ]; then

     

       93
       93
       +
             echo "test failed for some reason"

     

       94
       94
       +
             exit 1;

     

       95
       95
       +
           else

     

       96
       96
       +
             echo "it seems to work! very good."

     

       97
       97
       +
           fi

     

       98
       98
       +
           echo "================= /testing zlib using node ================="

     

       102
       99
        
       

     

       103
       103
       -
             runHook postCheck

     

       104
       104
       -
           '';

     

       100
       100
       +
           runHook postCheck

     

       101
       101
       +
         '';

     

       105
       102
        
       

     

       106
       106
       -
           postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''

     

       107
       107
       -
             substituteInPlace configure \

     

       108
       108
       -
               --replace-fail '/usr/bin/libtool' 'ar' \

     

       109
       109
       -
               --replace-fail 'AR="libtool"' 'AR="ar"' \

     

       110
       110
       -
               --replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"'

     

       111
       111
       -
           '';

     

       112
       112
       -
         })

     

       103
       103
       +
         postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''

     

       104
       104
       +
           substituteInPlace configure \

     

       105
       105
       +
             --replace-fail '/usr/bin/libtool' 'ar' \

     

       106
       106
       +
             --replace-fail 'AR="libtool"' 'AR="ar"' \

     

       107
       107
       +
             --replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"'

     

       108
       108
       +
         '';

     

       109
       109
       +
       })

     

       113
       110
        
       ```

     

       114
       111
        
       

     

       115
       112
        
       :::{.example #usage-2-pkgs.buildemscriptenpackage}

+1 -4

doc/languages-frameworks/factor.section.md

···

       81
       81
        
       

     

       82
       82
        
       For instance, packaging the Bresenham algorithm for line interpolation looks like this, see `pkgs/development/compilers/factor-lang/vocabs/bresenham` for the complete file:

     

       83
       83
        
       ```nix

     

       84
       84
       -
       {

     

       85
       85
       -
         factorPackages,

     

       86
       86
       -
         fetchFromGitHub,

     

       87
       87
       -
       }:

     

       84
       84
       +
       { factorPackages, fetchFromGitHub }:

     

       88
       85
        
       

     

       89
       86
        
       factorPackages.buildFactorVocab {

     

       90
       87
        
         pname = "bresenham";

+1 -3

doc/languages-frameworks/gnome.section.md

···

       48
       48
        
       

     

       49
       49
        
       ```nix

     

       50
       50
        
       {

     

       51
       51
       -
         buildInputs = [

     

       52
       52
       -
           pantheon.elementary-icon-theme

     

       53
       53
       -
         ];

     

       51
       51
       +
         buildInputs = [ pantheon.elementary-icon-theme ];

     

       54
       52
        
         preFixup = ''

     

       55
       53
        
           gappsWrapperArgs+=(

     

       56
       54
        
             # The icon theme is hardcoded.

+2 -6

doc/languages-frameworks/go.section.md

···

       147
       147
        
       Tags can also be set conditionally:

     

       148
       148
        
       

     

       149
       149
        
       ```nix

     

       150
       150
       -
       {

     

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

     

       152
       152
       -
       }

     

       150
       150
       +
       { tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ]; }

     

       153
       151
        
       ```

     

       154
       152
        
       

     

       155
       153
        
       ### `deleteVendor` {#var-go-deleteVendor}

     
···

       283
       281
        
       ```nix

     

       284
       282
        
       {

     

       285
       283
        
         # -run and -skip accept regular expressions

     

       286
       286
       -
         checkFlags = [

     

       287
       287
       -
           "-run=^Test(Simple|Fast)$"

     

       288
       288
       -
         ];

     

       284
       284
       +
         checkFlags = [ "-run=^Test(Simple|Fast)$" ];

     

       289
       285
        
       }

     

       290
       286
        
       ```

     

       291
       287

+5 -7

doc/languages-frameworks/haskell.section.md

···

       783
       783
        
       one provided by `haskellPackages`:

     

       784
       784
        
       

     

       785
       785
        
       ```nix

     

       786
       786
       -
       haskellPackages.nix-tree.override {

     

       787
       787
       -
         brick = haskellPackages.brick_0_67;

     

       788
       788
       -
       }

     

       786
       786
       +
       haskellPackages.nix-tree.override { brick = haskellPackages.brick_0_67; }

     

       789
       787
        
       ```

     

       790
       788
        
       

     

       791
       789
        
       <!-- TODO(@sternenseemann): This belongs in the next section

     
···

       841
       839
        
             install -Dm644 man/${drv.pname}.1 -t "$out/share/man/man1"

     

       842
       840
        
           '';

     

       843
       841
        
         });

     

       844
       844
       -
       in

     

       845
       842
        
       

     

       843
       843
       +
       in

     

       846
       844
        
       installManPage haskellPackages.pnbackup

     

       847
       845
        
       ```

     

       848
       846
        
       

     
···

       1310
       1308
        
         ghcName = "ghc92";

     

       1311
       1309
        
         # Desired new setting

     

       1312
       1310
        
         enableProfiling = true;

     

       1313
       1313
       -
       in

     

       1314
       1311
        
       

     

       1312
       1312
       +
       in

     

       1315
       1313
        
       [

     

       1316
       1314
        
         # The first overlay modifies the GHC derivation so that it does or does not

     

       1317
       1315
        
         # build profiling versions of the core libraries bundled with it. It is

     
···

       1322
       1320
        
           final: prev:

     

       1323
       1321
        
           let

     

       1324
       1322
        
             inherit (final) lib;

     

       1325
       1325
       -
           in

     

       1326
       1323
        
       

     

       1324
       1324
       +
           in

     

       1327
       1325
        
           {

     

       1328
       1326
        
             haskell = prev.haskell // {

     

       1329
       1327
        
               compiler = prev.haskell.compiler // {

     
···

       1341
       1339
        
           let

     

       1342
       1340
        
             inherit (final) lib;

     

       1343
       1341
        
             haskellLib = final.haskell.lib.compose;

     

       1344
       1344
       -
           in

     

       1345
       1342
        
       

     

       1343
       1343
       +
           in

     

       1346
       1344
        
           {

     

       1347
       1345
        
             haskell = prev.haskell // {

     

       1348
       1346
        
               packages = prev.haskell.packages // {

+4 -12

doc/languages-frameworks/ios.section.md

···

       31
       31
        
       let

     

       32
       32
        
         pkgs = import <nixpkgs> { };

     

       33
       33
        
       

     

       34
       34
       -
         xcodeenv = import ./xcodeenv {

     

       35
       35
       -
           inherit (pkgs) stdenv;

     

       36
       36
       -
         };

     

       34
       34
       +
         xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; };

     

       37
       35
        
       in

     

       38
       36
        
       xcodeenv.composeXcodeWrapper {

     

       39
       37
        
         version = "9.2";

     
···

       65
       63
        
       let

     

       66
       64
        
         pkgs = import <nixpkgs> { };

     

       67
       65
        
       

     

       68
       68
       -
         xcodeenv = import ./xcodeenv {

     

       69
       69
       -
           inherit (pkgs) stdenv;

     

       70
       70
       -
         };

     

       66
       66
       +
         xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; };

     

       71
       67
        
       in

     

       72
       68
        
       xcodeenv.buildApp {

     

       73
       69
        
         name = "MyApp";

     
···

       161
       157
        
       let

     

       162
       158
        
         pkgs = import <nixpkgs> { };

     

       163
       159
        
       

     

       164
       164
       -
         xcodeenv = import ./xcodeenv {

     

       165
       165
       -
           inherit (pkgs) stdenv;

     

       166
       166
       -
         };

     

       160
       160
       +
         xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; };

     

       167
       161
        
       in

     

       168
       162
        
       xcode.simulateApp {

     

       169
       163
        
         name = "simulate";

     
···

       195
       189
        
       let

     

       196
       190
        
         pkgs = import <nixpkgs> { };

     

       197
       191
        
       

     

       198
       198
       -
         xcodeenv = import ./xcodeenv {

     

       199
       199
       -
           inherit (pkgs) stdenv;

     

       200
       200
       -
         };

     

       192
       192
       +
         xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; };

     

       201
       193
        
       in

     

       202
       194
        
       xcode.simulateApp {

     

       203
       195
        
         name = "simulate";

+1 -5

doc/languages-frameworks/java.section.md

···

       108
       108
        
       selecting a 'headless' build to avoid including a link to GTK+:

     

       109
       109
        
       

     

       110
       110
        
       ```nix

     

       111
       111
       -
       {

     

       112
       112
       -
         my_jre = pkgs.jre_minimal.override {

     

       113
       113
       -
           jdk = jdk11_headless;

     

       114
       114
       -
         };

     

       115
       115
       -
       }

     

       111
       111
       +
       { my_jre = pkgs.jre_minimal.override { jdk = jdk11_headless; }; }

     

       116
       112
        
       ```

     

       117
       113
        
       

     

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

+7 -17

doc/languages-frameworks/javascript.section.md

···

       303
       303
        
         version = "0.1.0";

     

       304
       304
        
         src = ./.;

     

       305
       305
        
       

     

       306
       306
       -
         npmDeps = importNpmLock {

     

       307
       307
       -
           npmRoot = ./.;

     

       308
       308
       -
         };

     

       306
       306
       +
         npmDeps = importNpmLock { npmRoot = ./.; };

     

       309
       307
        
       

     

       310
       308
        
         npmConfigHook = importNpmLock.npmConfigHook;

     

       311
       309
        
       }

     
···

       456
       454
        
       `pnpm.configHook` supports adding additional `pnpm install` flags via `pnpmInstallFlags` which can be set to a Nix string array:

     

       457
       455
        
       

     

       458
       456
        
       ```nix

     

       459
       459
       -
       {

     

       460
       460
       -
         pnpm,

     

       461
       461
       -
       }:

     

       457
       457
       +
       { pnpm }:

     

       462
       458
        
       

     

       463
       459
        
       stdenv.mkDerivation (finalAttrs: {

     

       464
       460
        
         pname = "foo";

     
···

       470
       466
        
       

     

       471
       467
        
         pnpmInstallFlags = [ "--shamefully-hoist" ];

     

       472
       468
        
       

     

       473
       473
       -
         pnpmDeps = pnpm.fetchDeps {

     

       474
       474
       -
           inherit (finalAttrs) pnpmInstallFlags;

     

       475
       475
       -
         };

     

       469
       469
       +
         pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pnpmInstallFlags; };

     

       476
       470
        
       })

     

       477
       471
        
       ```

     

       478
       472
        
       

     
···

       699
       693
        
       

     

       700
       694
        
       ```nix

     

       701
       695
        
       {

     

       702
       702
       -
         nativeBuildInputs = [

     

       703
       703
       -
           writableTmpDirAsHomeHook

     

       704
       704
       -
         ];

     

       696
       696
       +
         nativeBuildInputs = [ writableTmpDirAsHomeHook ];

     

       705
       697
        
       

     

       706
       698
        
         buildPhase = ''

     

       707
       699
        
           runHook preBuild

     
···

       716
       708
        
       The `distPhase` is packing the package's dependencies in a tarball using `yarn pack`. You can disable it using:

     

       717
       709
        
       

     

       718
       710
        
       ```nix

     

       719
       719
       -
       {

     

       720
       720
       -
         doDist = false;

     

       721
       721
       -
       }

     

       711
       711
       +
       { doDist = false; }

     

       722
       712
        
       ```

     

       723
       713
        
       

     

       724
       714
        
       The configure phase can sometimes fail because it makes many assumptions which may not always apply. One common override is:

     
···

       837
       827
        
       

     

       838
       828
        
       let

     

       839
       829
        
         yarn-berry = yarn-berry_4;

     

       840
       840
       -
       in

     

       841
       830
        
       

     

       831
       831
       +
       in

     

       842
       832
        
       stdenv.mkDerivation (finalAttrs: {

     

       843
       833
        
         pname = "foo";

     

       844
       834
        
         version = "0-unstable-1980-01-01";

     
···

       892
       882
        
       

     

       893
       883
        
       let

     

       894
       884
        
         yarn-berry = yarn-berry_4;

     

       895
       895
       -
       in

     

       896
       885
        
       

     

       886
       886
       +
       in

     

       897
       887
        
       stdenv.mkDerivation (finalAttrs: {

     

       898
       888
        
         pname = "foo";

     

       899
       889
        
         version = "0-unstable-1980-01-01";

+2 -8

doc/languages-frameworks/lisp.section.md

···

       49
       49
        
       let

     

       50
       50
        
         sbcl' = sbcl.withPackages (ps: [ ps.alexandria ]);

     

       51
       51
        
       in

     

       52
       52
       -
       mkShell {

     

       53
       53
       -
         packages = [ sbcl' ];

     

       54
       54
       -
       }

     

       52
       52
       +
       mkShell { packages = [ sbcl' ]; }

     

       55
       53
        
       ```

     

       56
       54
        
       

     

       57
       55
        
       Such a Lisp can be now used e.g. to compile your sources:

     
···

       192
       190
        
             hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ=";

     

       193
       191
        
           };

     

       194
       192
        
         };

     

       195
       195
       -
         sbcl' = sbcl.withOverrides (

     

       196
       196
       -
           self: super: {

     

       197
       197
       -
             inherit alexandria;

     

       198
       198
       -
           }

     

       199
       199
       -
         );

     

       193
       193
       +
         sbcl' = sbcl.withOverrides (self: super: { inherit alexandria; });

     

       200
       194
        
       in

     

       201
       195
        
       sbcl'.pkgs.alexandria

     

       202
       196
        
       ```

+1 -3

doc/languages-frameworks/neovim.section.md

···

       117
       117
        
       For instance:

     

       118
       118
        
       ```nix

     

       119
       119
        
       {

     

       120
       120
       -
         rtp-nvim = neovimUtils.buildNeovimPlugin {

     

       121
       121
       -
           luaAttr = luaPackages.rtp-nvim;

     

       122
       122
       -
         };

     

       120
       120
       +
         rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; };

     

       123
       121
        
       }

     

       124
       122
        
       ```

     

       125
       123
        
       To update these packages, you should use the lua updater rather than vim's.

+1 -3

doc/languages-frameworks/nim.section.md

···

       26
       26
        
       

     

       27
       27
        
         lockFile = ./lock.json;

     

       28
       28
        
       

     

       29
       29
       -
         nimFlags = [

     

       30
       30
       -
           "-d:NimblePkgVersion=${finalAttrs.version}"

     

       31
       31
       -
         ];

     

       29
       29
       +
         nimFlags = [ "-d:NimblePkgVersion=${finalAttrs.version}" ];

     

       32
       30
        
       })

     

       33
       31
        
       ```

     

       34
       32

+1 -3

doc/languages-frameworks/octave.section.md

···

       44
       44
        
       }:

     

       45
       45
        
       

     

       46
       46
        
       pkgs.mkShell {

     

       47
       47
       -
         nativeBuildInputs = with pkgs; [

     

       48
       48
       -
           (octave.withPackages (opkgs: with opkgs; [ symbolic ]))

     

       49
       49
       -
         ];

     

       47
       47
       +
         nativeBuildInputs = with pkgs; [ (octave.withPackages (opkgs: with opkgs; [ symbolic ])) ];

     

       50
       48
        
       }

     

       51
       49
        
       ```

     

       52
       50

+1 -7

doc/languages-frameworks/php.section.md

···

       267
       267
        
       

     

       268
       268
        
         # PHP version containing the `ast` extension enabled

     

       269
       269
        
         php = php.buildEnv {

     

       270
       270
       -
           extensions = (

     

       271
       271
       -
             { enabled, all }:

     

       272
       272
       -
             enabled

     

       273
       273
       -
             ++ (with all; [

     

       274
       274
       -
               ast

     

       275
       275
       -
             ])

     

       276
       276
       -
           );

     

       270
       270
       +
           extensions = ({ enabled, all }: enabled ++ (with all; [ ast ]));

     

       277
       271
        
         };

     

       278
       272
        
       

     

       279
       273
        
         # The composer vendor hash

+26 -89

doc/languages-frameworks/python.section.md

···

       126
       126
        
           pluggy

     

       127
       127
        
         ];

     

       128
       128
        
       

     

       129
       129
       -
         nativeCheckInputs = [

     

       130
       130
       -
           hypothesis

     

       131
       131
       -
         ];

     

       129
       129
       +
         nativeCheckInputs = [ hypothesis ];

     

       132
       130
        
       

     

       133
       131
        
         meta = {

     

       134
       132
        
           changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";

     
···

       271
       269
        
         python3MyBlas = pkgs.python3.override {

     

       272
       270
        
           packageOverrides = self: super: {

     

       273
       271
        
             # We need toPythonModule for the package set to evaluate this

     

       274
       274
       -
             blas = super.toPythonModule (

     

       275
       275
       -
               super.pkgs.blas.override {

     

       276
       276
       -
                 blasProvider = super.pkgs.mkl;

     

       277
       277
       -
               }

     

       278
       278
       -
             );

     

       279
       279
       -
             lapack = super.toPythonModule (

     

       280
       280
       -
               super.pkgs.lapack.override {

     

       281
       281
       -
                 lapackProvider = super.pkgs.mkl;

     

       282
       282
       -
               }

     

       283
       283
       -
             );

     

       272
       272
       +
             blas = super.toPythonModule (super.pkgs.blas.override { blasProvider = super.pkgs.mkl; });

     

       273
       273
       +
             lapack = super.toPythonModule (super.pkgs.lapack.override { lapackProvider = super.pkgs.mkl; });

     

       284
       274
        
           };

     

       285
       275
        
         };

     

       286
       276
        
       }

     
···

       323
       313
        
           hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw=";

     

       324
       314
        
         };

     

       325
       315
        
       

     

       326
       326
       -
         build-system = with python3Packages; [

     

       327
       327
       -
           setuptools

     

       328
       328
       -
         ];

     

       316
       316
       +
         build-system = with python3Packages; [ setuptools ];

     

       329
       317
        
       

     

       330
       318
        
         dependencies = with python3Packages; [

     

       331
       319
        
           tornado

     
···

       357
       345
        
       applied to the reference:

     

       358
       346
        
       

     

       359
       347
        
       ```nix

     

       360
       360
       -
       {

     

       361
       361
       -
         python3Packages,

     

       362
       362
       -
       }:

     

       348
       348
       +
       { python3Packages }:

     

       363
       349
        
       

     

       364
       350
        
       python3Packages.toPythonApplication python3Packages.youtube-dl

     

       365
       351
        
       ```

     
···

       395
       381
        
         pname = "psycopg2-binary";

     

       396
       382
        
         inherit (psycopg2) optional-dependencies version;

     

       397
       383
        
         dependencies = [ psycopg2 ];

     

       398
       398
       -
         meta = {

     

       399
       399
       -
           inherit (psycopg2.meta) description homepage;

     

       400
       400
       -
         };

     

       384
       384
       +
         meta = { inherit (psycopg2.meta) description homepage; };

     

       401
       385
        
       }

     

       402
       386
        
       ```

     

       403
       387
        
       

     
···

       443
       427
        
         pythonEnv = myPython.withPackages (ps: [ ps.my-editable ]);

     

       444
       428
        
       

     

       445
       429
        
       in

     

       446
       446
       -
       pkgs.mkShell {

     

       447
       447
       -
         packages = [ pythonEnv ];

     

       448
       448
       -
       }

     

       430
       430
       +
       pkgs.mkShell { packages = [ pythonEnv ]; }

     

       449
       431
        
       ```

     

       450
       432
        
       

     

       451
       433
        
       #### `python.buildEnv` function {#python.buildenv-function}

     
···

       942
       924
        
           hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";

     

       943
       925
        
         };

     

       944
       926
        
       

     

       945
       945
       -
         build-system = [

     

       946
       946
       -
           setuptools

     

       947
       947
       -
         ];

     

       927
       927
       +
         build-system = [ setuptools ];

     

       948
       928
        
       

     

       949
       929
        
         # has no tests

     

       950
       930
        
         doCheck = false;

     
···

       1001
       981
        
               hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";

     

       1002
       982
        
             };

     

       1003
       983
        
       

     

       1004
       1004
       -
             build-system = [

     

       1005
       1005
       -
               python313.pkgs.setuptools

     

       1006
       1006
       -
             ];

     

       984
       984
       +
             build-system = [ python313.pkgs.setuptools ];

     

       1007
       985
        
       

     

       1008
       986
        
             # has no tests

     

       1009
       987
        
             doCheck = false;

     
···

       1080
       1058
        
           hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong=";

     

       1081
       1059
        
         };

     

       1082
       1060
        
       

     

       1083
       1083
       -
         build-system = [

     

       1084
       1084
       -
           setuptools

     

       1085
       1085
       -
         ];

     

       1061
       1061
       +
         build-system = [ setuptools ];

     

       1086
       1062
        
       

     

       1087
       1063
        
         dependencies = [

     

       1088
       1064
        
           multipledispatch

     
···

       1090
       1066
        
           python-dateutil

     

       1091
       1067
        
         ];

     

       1092
       1068
        
       

     

       1093
       1093
       -
         nativeCheckInputs = [

     

       1094
       1094
       -
           pytestCheckHook

     

       1095
       1095
       -
         ];

     

       1069
       1069
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       1096
       1070
        
       

     

       1097
       1071
        
         meta = {

     

       1098
       1072
        
           changelog = "https://github.com/blaze/datashape/releases/tag/${version}";

     
···

       1133
       1107
        
           hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk=";

     

       1134
       1108
        
         };

     

       1135
       1109
        
       

     

       1136
       1136
       -
         build-system = [

     

       1137
       1137
       -
           setuptools

     

       1138
       1138
       -
         ];

     

       1110
       1110
       +
         build-system = [ setuptools ];

     

       1139
       1111
        
       

     

       1140
       1112
        
         buildInputs = [

     

       1141
       1113
        
           libxml2

     
···

       1197
       1169
        
           hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ=";

     

       1198
       1170
        
         };

     

       1199
       1171
        
       

     

       1200
       1200
       -
         build-system = [

     

       1201
       1201
       -
           setuptools

     

       1202
       1202
       -
         ];

     

       1172
       1172
       +
         build-system = [ setuptools ];

     

       1203
       1173
        
       

     

       1204
       1174
        
         buildInputs = [

     

       1205
       1175
        
           fftw

     
···

       1307
       1277
        
       Adding `pytest` is not required, since it is included with `pytestCheckHook`.

     

       1308
       1278
        
       

     

       1309
       1279
        
       ```nix

     

       1310
       1310
       -
       {

     

       1311
       1311
       -
         nativeCheckInputs = [

     

       1312
       1312
       -
           pytestCheckHook

     

       1313
       1313
       -
         ];

     

       1314
       1314
       -
       }

     

       1280
       1280
       +
       { nativeCheckInputs = [ pytestCheckHook ]; }

     

       1315
       1281
        
       ```

     

       1316
       1282
        
       

     

       1317
       1283
        
       `pytestCheckHook` recognizes the following attributes:

     
···

       1340
       1306
        
       

     

       1341
       1307
        
       ```nix

     

       1342
       1308
        
       {

     

       1343
       1343
       -
         nativeCheckInputs = [

     

       1344
       1344
       -
           pytestCheckHook

     

       1345
       1345
       -
         ];

     

       1309
       1309
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       1346
       1310
        
       

     

       1347
       1311
        
         # Allow running the following test paths and test objects.

     

       1348
       1312
        
         enabledTestPaths = [

     
···

       1402
       1366
        
       {

     

       1403
       1367
        
         __structuredAttrs = true;

     

       1404
       1368
        
       

     

       1405
       1405
       -
         disabledTests = [

     

       1406
       1406
       -
           "Foo and bar"

     

       1407
       1407
       -
         ];

     

       1369
       1369
       +
         disabledTests = [ "Foo and bar" ];

     

       1408
       1370
        
       }

     

       1409
       1371
        
       ```

     

       1410
       1372
        
       

     
···

       1492
       1454
        
           "pkg1"

     

       1493
       1455
        
           "pkg3"

     

       1494
       1456
        
         ];

     

       1495
       1495
       -
         pythonRemoveDeps = [

     

       1496
       1496
       -
           "pkg2"

     

       1497
       1497
       -
         ];

     

       1457
       1457
       +
         pythonRemoveDeps = [ "pkg2" ];

     

       1498
       1458
        
       }

     

       1499
       1459
        
       ```

     

       1500
       1460
        
       

     
···

       1509
       1469
        
       example:

     

       1510
       1470
        
       

     

       1511
       1471
        
       ```nix

     

       1512
       1512
       -
       {

     

       1513
       1513
       -
         pythonRelaxDeps = true;

     

       1514
       1514
       -
       }

     

       1472
       1472
       +
       { pythonRelaxDeps = true; }

     

       1515
       1473
        
       ```

     

       1516
       1474
        
       

     

       1517
       1475
        
       which would result in the following `requirements.txt` file:

     
···

       1547
       1505
        
       

     

       1548
       1506
        
       ```nix

     

       1549
       1507
        
       {

     

       1550
       1550
       -
         nativeCheckInputs = [

     

       1551
       1551
       -
           unittestCheckHook

     

       1552
       1552
       -
         ];

     

       1508
       1508
       +
         nativeCheckInputs = [ unittestCheckHook ];

     

       1553
       1509
        
       

     

       1554
       1510
        
         unittestFlags = [

     

       1555
       1511
        
           "-s"

     
···

       1575
       1531
        
           "doc"

     

       1576
       1532
        
         ];

     

       1577
       1533
        
       

     

       1578
       1578
       -
         nativeBuildInputs = [

     

       1579
       1579
       -
           sphinxHook

     

       1580
       1580
       -
         ];

     

       1534
       1534
       +
         nativeBuildInputs = [ sphinxHook ];

     

       1581
       1535
        
       }

     

       1582
       1536
        
       ```

     

       1583
       1537
        
       

     
···

       1652
       1606
        
           hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";

     

       1653
       1607
        
         };

     

       1654
       1608
        
       

     

       1655
       1655
       -
         build-system = [

     

       1656
       1656
       -
           setuptools

     

       1657
       1657
       -
         ];

     

       1609
       1609
       +
         build-system = [ setuptools ];

     

       1658
       1610
        
       

     

       1659
       1611
        
         meta = {

     

       1660
       1612
        
           changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}";

     
···

       1717
       1669
        
                 });

     

       1718
       1670
        
               };

     

       1719
       1671
        
             in

     

       1720
       1720
       -
             pkgs.python310.override {

     

       1721
       1721
       -
               inherit packageOverrides;

     

       1722
       1722
       -
             };

     

       1672
       1672
       +
             pkgs.python310.override { inherit packageOverrides; };

     

       1723
       1673
        
       

     

       1724
       1674
        
         in

     

       1725
       1725
       -
         python.withPackages (ps: [

     

       1726
       1726
       -
           ps.pandas

     

       1727
       1727
       -
         ])

     

       1675
       1675
       +
         python.withPackages (ps: [ ps.pandas ])

     

       1728
       1676
        
       ).env

     

       1729
       1677
        
       ```

     

       1730
       1678
        
       

     
···

       1743
       1691
        
       

     

       1744
       1692
        
       (

     

       1745
       1693
        
         let

     

       1746
       1746
       -
           packageOverrides = self: super: {

     

       1747
       1747
       -
             scipy = super.scipy_0_17;

     

       1748
       1748
       -
           };

     

       1694
       1694
       +
           packageOverrides = self: super: { scipy = super.scipy_0_17; };

     

       1749
       1695
        
         in

     

       1750
       1750
       -
         (pkgs.python310.override {

     

       1751
       1751
       -
           inherit packageOverrides;

     

       1752
       1752
       -
         }).withPackages

     

       1753
       1753
       -
           (ps: [

     

       1754
       1754
       -
             ps.blaze

     

       1755
       1755
       -
           ])

     

       1696
       1696
       +
         (pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])

     

       1756
       1697
        
       ).env

     

       1757
       1698
        
       ```

     

       1758
       1699
        
       

     
···

       2000
       1941
        
       

     

       2001
       1942
        
       ```nix

     

       2002
       1943
        
       {

     

       2003
       2003
       -
         myPythonPackages = python3Packages.override {

     

       2004
       2004
       -
           overrides = self: super: {

     

       2005
       2005
       -
             twisted = <...>;

     

       2006
       2006
       -
           };

     

       2007
       2007
       -
         };

     

       1944
       1944
       +
         myPythonPackages = python3Packages.override { overrides = self: super: { twisted = <...>; }; };

     

       2008
       1945
        
       }

     

       2009
       1946
        
       ```

     

       2010
       1947

+1 -1

doc/languages-frameworks/qt.section.md

···

       52
       52
        
       stdenv.mkDerivation {

     

       53
       53
        
         # ...

     

       54
       54
        
         nativeBuildInputs = [ qt6.wrapQtAppsHook ];

     

       55
       55
       -
         qtWrapperArgs = [ ''--prefix PATH : /path/to/bin'' ];

     

       55
       55
       +
         qtWrapperArgs = [ "--prefix PATH : /path/to/bin" ];

     

       56
       56
        
       }

     

       57
       57
        
       ```

     

       58
       58

+6 -2

doc/languages-frameworks/ruby.section.md

···

       172
       172
        
         myRuby = pkgs.ruby.override {

     

       173
       173
        
           defaultGemConfig = pkgs.defaultGemConfig // {

     

       174
       174
        
             pg = attrs: {

     

       175
       175
       -
               buildFlags = [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ];

     

       175
       175
       +
               buildFlags = [

     

       176
       176
       +
                 "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config"

     

       177
       177
       +
               ];

     

       176
       178
        
             };

     

       177
       179
        
           };

     

       178
       180
        
         };

     
···

       193
       195
        
           gemdir = ./.;

     

       194
       196
        
           gemConfig = pkgs.defaultGemConfig // {

     

       195
       197
        
             pg = attrs: {

     

       196
       196
       -
               buildFlags = [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ];

     

       198
       198
       +
               buildFlags = [

     

       199
       199
       +
                 "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config"

     

       200
       200
       +
               ];

     

       197
       201
        
             };

     

       198
       202
        
           };

     

       199
       203
        
         };

+4 -12

doc/languages-frameworks/rust.section.md

···

       62
       62
        
       :::

     

       63
       63
        
       

     

       64
       64
        
       ```nix

     

       65
       65
       -
       {

     

       66
       66
       -
         cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8=";

     

       67
       67
       -
       }

     

       65
       65
       +
       { cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; }

     

       68
       66
        
       ```

     

       69
       67
        
       

     

       70
       68
        
       If this method does not work, you can resort to copying the `Cargo.lock` file into nixpkgs

     
···

       77
       75
        
       `cargoHash` as follows:

     

       78
       76
        
       

     

       79
       77
        
       ```nix

     

       80
       80
       -
       {

     

       81
       81
       -
         cargoHash = lib.fakeHash;

     

       82
       82
       -
       }

     

       78
       78
       +
       { cargoHash = lib.fakeHash; }

     

       83
       79
        
       ```

     

       84
       80
        
       

     

       85
       81
        
       Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)

     
···

       478
       474
        
       `importCargoLock` can be used as follows:

     

       479
       475
        
       

     

       480
       476
        
       ```nix

     

       481
       481
       -
       {

     

       482
       482
       -
         cargoDeps = rustPlatform.importCargoLock {

     

       483
       483
       -
           lockFile = ./Cargo.lock;

     

       484
       484
       -
         };

     

       485
       485
       -
       }

     

       477
       477
       +
       { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; }

     

       486
       478
        
       ```

     

       487
       479
        
       

     

       488
       480
        
       If the `Cargo.lock` file includes git dependencies, then their output

     
···

       1000
       992
        
           cargo = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);

     

       1001
       993
        
           rustc = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);

     

       1002
       994
        
         };

     

       1003
       1003
       -
       in

     

       1004
       995
        
       

     

       996
       996
       +
       in

     

       1005
       997
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       1006
       998
        
         pname = "ripgrep";

     

       1007
       999
        
         version = "14.1.1";

-1

doc/languages-frameworks/scheme.section.md

···

       25
       25
        
           akkuPackages.chez-srfi

     

       26
       26
        
         ];

     

       27
       27
        
       }

     

       28
       28
       -
       

     

       29
       28
        
       ```

     

       30
       29
        
       

     

       31
       30
        
       The package index is located in `pkgs/tools/package-management/akku`

+4 -10

doc/languages-frameworks/swift.section.md

···

       80
       80
        
       let

     

       81
       81
        
         # Pass the generated files to the helper.

     

       82
       82
        
         generated = swiftpm2nix.helpers ./nix;

     

       83
       83
       -
       in

     

       84
       83
        
       

     

       84
       84
       +
       in

     

       85
       85
        
       stdenv.mkDerivation (finalAttrs: {

     

       86
       86
        
         pname = "myproject";

     

       87
       87
        
         version = "0.0.0";

     
···

       131
       131
        
       If you'd like to build a different configuration than `release`:

     

       132
       132
        
       

     

       133
       133
        
       ```nix

     

       134
       134
       -
       {

     

       135
       135
       -
         swiftpmBuildConfig = "debug";

     

       136
       136
       -
       }

     

       134
       134
       +
       { swiftpmBuildConfig = "debug"; }

     

       137
       135
        
       ```

     

       138
       136
        
       

     

       139
       137
        
       It is also possible to provide additional flags to `swift build`:

     

       140
       138
        
       

     

       141
       139
        
       ```nix

     

       142
       142
       -
       {

     

       143
       143
       -
         swiftpmFlags = [ "--disable-dead-strip" ];

     

       144
       144
       -
       }

     

       140
       140
       +
       { swiftpmFlags = [ "--disable-dead-strip" ]; }

     

       145
       141
        
       ```

     

       146
       142
        
       

     

       147
       143
        
       The default `buildPhase` already passes `-j` for parallel building.

     
···

       155
       151
        
       `checkPhase`, but it must be enabled with:

     

       156
       152
        
       

     

       157
       153
        
       ```nix

     

       158
       158
       -
       {

     

       159
       159
       -
         doCheck = true;

     

       160
       160
       -
       }

     

       154
       154
       +
       { doCheck = true; }

     

       161
       155
        
       ```

     

       162
       156
        
       

     

       163
       157
        
       This essentially runs: `swift test -c release`

+17 -25

doc/languages-frameworks/texlive.section.md

···

       214
       214
        
       

     

       215
       215
        
         latex_with_foiltex = texliveSmall.withPackages (_: [ foiltex ]);

     

       216
       216
        
       in

     

       217
       217
       -
       runCommand "test.pdf"

     

       218
       218
       -
         {

     

       219
       219
       -
           nativeBuildInputs = [ latex_with_foiltex ];

     

       220
       220
       -
         }

     

       221
       221
       -
         ''

     

       222
       222
       -
           cat >test.tex <<EOF

     

       223
       223
       -
           \documentclass{foils}

     

       217
       217
       +
       runCommand "test.pdf" { nativeBuildInputs = [ latex_with_foiltex ]; } ''

     

       218
       218
       +
         cat >test.tex <<EOF

     

       219
       219
       +
         \documentclass{foils}

     

       224
       220
        
       

     

       225
       225
       -
           \title{Presentation title}

     

       226
       226
       -
           \date{}

     

       221
       221
       +
         \title{Presentation title}

     

       222
       222
       +
         \date{}

     

       227
       223
        
       

     

       228
       228
       -
           \begin{document}

     

       229
       229
       -
           \maketitle

     

       230
       230
       -
           \end{document}

     

       231
       231
       -
           EOF

     

       232
       232
       -
             pdflatex test.tex

     

       233
       233
       -
             cp test.pdf $out

     

       234
       234
       -
         ''

     

       224
       224
       +
         \begin{document}

     

       225
       225
       +
         \maketitle

     

       226
       226
       +
         \end{document}

     

       227
       227
       +
         EOF

     

       228
       228
       +
           pdflatex test.tex

     

       229
       229
       +
           cp test.pdf $out

     

       230
       230
       +
       ''

     

       235
       231
        
       ```

     

       236
       232
        
       

     

       237
       233
        
       ## LuaLaTeX font cache {#sec-language-texlive-lualatex-font-cache}

     
···

       239
       235
        
       The font cache for LuaLaTeX is written to `$HOME`.

     

       240
       236
        
       Therefore, it is necessary to set `$HOME` to a writable path, e.g. [before using LuaLaTeX in nix derivations](https://github.com/NixOS/nixpkgs/issues/180639):

     

       241
       237
        
       ```nix

     

       242
       242
       -
       runCommandNoCC "lualatex-hello-world"

     

       243
       243
       -
         {

     

       244
       244
       -
           buildInputs = [ texliveFull ];

     

       245
       245
       -
         }

     

       246
       246
       -
         ''

     

       247
       247
       -
           mkdir $out

     

       248
       248
       -
           echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex

     

       249
       249
       -
           env HOME=$(mktemp -d) lualatex  -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex

     

       250
       250
       -
         ''

     

       238
       238
       +
       runCommandNoCC "lualatex-hello-world" { buildInputs = [ texliveFull ]; } ''

     

       239
       239
       +
         mkdir $out

     

       240
       240
       +
         echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex

     

       241
       241
       +
         env HOME=$(mktemp -d) lualatex  -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex

     

       242
       242
       +
       ''

     

       251
       243
        
       ```

     

       252
       244
        
       

     

       253
       245
        
       Additionally, [the cache of a user can diverge from the nix store](https://github.com/NixOS/nixpkgs/issues/278718).

+2 -7

doc/languages-frameworks/typst.section.md

···

       25
       25
        
           typstPackages = old.typstPackages.extend (

     

       26
       26
        
             _: previous: {

     

       27
       27
        
               polylux_0_4_0 = previous.polylux_0_4_0.overrideAttrs (oldPolylux: {

     

       28
       28
       -
                 src = oldPolylux.src.overrideAttrs {

     

       29
       29
       -
                   outputHash = YourUpToDatePolyluxHash;

     

       30
       30
       -
                 };

     

       28
       28
       +
                 src = oldPolylux.src.overrideAttrs { outputHash = YourUpToDatePolyluxHash; };

     

       31
       29
        
               });

     

       32
       30
        
             }

     

       33
       31
        
           );

     
···

       47
       45
        
       Here's how to define a custom Typst package:

     

       48
       46
        
       

     

       49
       47
        
       ```nix

     

       50
       50
       -
       {

     

       51
       51
       -
         buildTypstPackage,

     

       52
       52
       -
         typstPackages,

     

       53
       53
       -
       }:

     

       48
       48
       +
       { buildTypstPackage, typstPackages }:

     

       54
       49
        
       

     

       55
       50
        
       buildTypstPackage (finalAttrs: {

     

       56
       51
        
         pname = "my-typst-package";

+5 -11

doc/packages/cataclysm-dda.section.md

···

       29
       29
        
       `$XDG_CONFIG_HOME/cataclysm-dda`, override the derivation:

     

       30
       30
        
       

     

       31
       31
        
       ```nix

     

       32
       32
       -
       cataclysm-dda.override {

     

       33
       33
       -
         useXdgDir = true;

     

       34
       34
       -
       }

     

       32
       32
       +
       cataclysm-dda.override { useXdgDir = true; }

     

       35
       33
        
       ```

     

       36
       34
        
       

     

       37
       35
        
       ## Important note for overriding packages {#important-note-for-overriding-packages}

     
···

       62
       60
        
       

     

       63
       61
        
         # or by using a helper function `attachPkgs`.

     

       64
       62
        
         goodExample2 = attachPkgs pkgs myCDDA;

     

       65
       65
       -
       in

     

       66
       63
        
       

     

       67
       67
       -
       # badExample                     # parallel building disabled

     

       68
       68
       -
       # goodExample1.withMods (_: [])  # parallel building enabled

     

       64
       64
       +
         # badExample                     # parallel building disabled

     

       65
       65
       +
         # goodExample1.withMods (_: [])  # parallel building enabled

     

       66
       66
       +
       in

     

       69
       67
        
       goodExample2.withMods (_: [ ]) # parallel building enabled

     

       70
       68
        
       ```

     

       71
       69
        
       

     
···

       75
       73
        
       attribute:

     

       76
       74
        
       

     

       77
       75
        
       ```nix

     

       78
       78
       -
       cataclysm-dda.withMods (

     

       79
       79
       -
         mods: with mods; [

     

       80
       80
       -
           tileset.UndeadPeople

     

       81
       81
       -
         ]

     

       82
       82
       -
       )

     

       76
       76
       +
       cataclysm-dda.withMods (mods: with mods; [ tileset.UndeadPeople ])

     

       83
       77
        
       ```

     

       84
       78
        
       

     

       85
       79
        
       All mods, soundpacks, and tilesets available in nixpkgs are found in

+1 -3

doc/packages/inkscape.section.md

···

       8
       8
        
       

     

       9
       9
        
       ```nix

     

       10
       10
        
       inkscape-with-extensions.override {

     

       11
       11
       -
         inkscapeExtensions = with inkscape-extensions; [

     

       12
       12
       -
           inkstitch

     

       13
       13
       -
         ];

     

       11
       11
       +
         inkscapeExtensions = with inkscape-extensions; [ inkstitch ];

     

       14
       12
        
       }

     

       15
       13
        
       ```

     

       16
       14

+1 -3

doc/packages/kakoune.section.md

···

       3
       3
        
       Kakoune can be built to autoload plugins:

     

       4
       4
        
       

     

       5
       5
        
       ```nix

     

       6
       6
       -
       (kakoune.override {

     

       7
       7
       -
         plugins = with pkgs.kakounePlugins; [ parinfer-rust ];

     

       8
       8
       -
       })

     

       6
       6
       +
       (kakoune.override { plugins = with pkgs.kakounePlugins; [ parinfer-rust ]; })

     

       9
       7
        
       ```

+1 -3

doc/packages/urxvt.section.md

···

       77
       77
        
       If the plugin is itself a Perl package that needs to be imported from other plugins or scripts, add the following passthrough:

     

       78
       78
        
       

     

       79
       79
        
       ```nix

     

       80
       80
       -
       {

     

       81
       81
       -
         passthru.perlPackages = [ "self" ];

     

       82
       82
       -
       }

     

       80
       80
       +
       { passthru.perlPackages = [ "self" ]; }

     

       83
       81
        
       ```

     

       84
       82
        
       

     

       85
       83
        
       This will make the urxvt wrapper pick up the dependency and set up the Perl path accordingly.

+1 -1

doc/release-notes/rl-2505.section.md

···

       496
       496
        
         ```nix

     

       497
       497
        
         let

     

       498
       498
        
           pkgs = import <nixpkgs> { };

     

       499
       499
       -
         in

     

       500
       499
        
       

     

       500
       500
       +
         in

     

       501
       501
        
         pkgs.caddy.withPlugins {

     

       502
       502
        
           plugins = [

     

       503
       503
        
             # tagged upstream

+6 -16

doc/stdenv/cross-compilation.chapter.md

···

       135
       135
        
       Many packages assume that an unprefixed binutils (`cc`/`ar`/`ld` etc.) is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefix. For instance, instead of `cc`, use `${stdenv.cc.targetPrefix}cc`.

     

       136
       136
        
       

     

       137
       137
        
       ```nix

     

       138
       138
       -
       {

     

       139
       139
       -
         makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

     

       140
       140
       -
       }

     

       138
       138
       +
       { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; }

     

       141
       139
        
       ```

     

       142
       140
        
       

     

       143
       141
        
       #### How do I avoid compiling a GCC cross-compiler from source? {#cross-qa-avoid-compiling-gcc-cross-compiler}

     
···

       152
       150
        
       Add the following to your `mkDerivation` invocation.

     

       153
       151
        
       

     

       154
       152
        
       ```nix

     

       155
       155
       -
       {

     

       156
       156
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       157
       157
       -
       }

     

       153
       153
       +
       { depsBuildBuild = [ buildPackages.stdenv.cc ]; }

     

       158
       154
        
       ```

     

       159
       155
        
       

     

       160
       156
        
       #### My package’s testsuite needs to run host platform code. {#cross-testsuite-runs-host-code}

     
···

       162
       158
        
       Add the following to your `mkDerivation` invocation.

     

       163
       159
        
       

     

       164
       160
        
       ```nix

     

       165
       165
       -
       {

     

       166
       166
       -
         doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

     

       167
       167
       -
       }

     

       161
       161
       +
       { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; }

     

       168
       162
        
       ```

     

       169
       163
        
       

     

       170
       164
        
       #### Package using Meson needs to run binaries for the host platform during build. {#cross-meson-runs-host-code}

     
···

       175
       169
        
       

     

       176
       170
        
       ```nix

     

       177
       171
        
       {

     

       178
       178
       -
         nativeBuildInputs =

     

       179
       179
       -
           [

     

       180
       180
       -
             meson

     

       181
       181
       -
           ]

     

       182
       182
       -
           ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [

     

       183
       183
       -
             mesonEmulatorHook

     

       184
       184
       -
           ];

     

       172
       172
       +
         nativeBuildInputs = [

     

       173
       173
       +
           meson

     

       174
       174
       +
         ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];

     

       185
       175
        
       }

     

       186
       176
        
       ```

     

       187
       177

+2 -6

doc/stdenv/meta.chapter.md

···

       108
       108
        
       The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is:

     

       109
       109
        
       

     

       110
       110
        
       ```nix

     

       111
       111
       -
       {

     

       112
       112
       -
         meta.platforms = lib.platforms.linux;

     

       113
       113
       -
       }

     

       111
       111
       +
       { meta.platforms = lib.platforms.linux; }

     

       114
       112
        
       ```

     

       115
       113
        
       

     

       116
       114
        
       Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types.

     
···

       164
       162
        
       - Does not cross compile

     

       165
       163
        
       

     

       166
       164
        
         ```nix

     

       167
       167
       -
         {

     

       168
       168
       -
           meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);

     

       169
       169
       -
         }

     

       165
       165
       +
         { meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }

     

       170
       166
        
         ```

     

       171
       167
        
       

     

       172
       168
        
       - Broken if all of a certain set of its dependencies are broken

+5 -17

doc/stdenv/stdenv.chapter.md

···

       541
       541
        
           # An example of an attribute containing a function

     

       542
       542
        
           passthru.appendPackages =

     

       543
       543
        
             packages':

     

       544
       544
       -
             finalAttrs.finalPackage.overrideAttrs (

     

       545
       545
       -
               newSelf: super: {

     

       546
       546
       -
                 packages = super.packages ++ packages';

     

       547
       547
       -
               }

     

       548
       548
       -
             );

     

       544
       544
       +
             finalAttrs.finalPackage.overrideAttrs (newSelf: super: { packages = super.packages ++ packages'; });

     

       549
       545
        
       

     

       550
       546
        
           # For illustration purposes; referenced as

     

       551
       547
        
           # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below.

     
···

       787
       783
        
       A list of strings passed as additional flags to `make`. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use `buildFlags` (see below).

     

       788
       784
        
       

     

       789
       785
        
       ```nix

     

       790
       790
       -
       {

     

       791
       791
       -
         makeFlags = [ "PREFIX=$(out)" ];

     

       792
       792
       -
       }

     

       786
       786
       +
       { makeFlags = [ "PREFIX=$(out)" ]; }

     

       793
       787
        
       ```

     

       794
       788
        
       

     

       795
       789
        
       ::: {.note}

     
···

       839
       833
        
       Controls whether the check phase is executed. By default it is skipped, but if `doCheck` is set to true, the check phase is usually executed. Thus you should set

     

       840
       834
        
       

     

       841
       835
        
       ```nix

     

       842
       842
       -
       {

     

       843
       843
       -
         doCheck = true;

     

       844
       844
       -
       }

     

       836
       836
       +
       { doCheck = true; }

     

       845
       837
        
       ```

     

       846
       838
        
       

     

       847
       839
        
       in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doCheck` is set, as the newly-built program won’t run on the platform used to build it.

     
···

       894
       886
        
       The make targets that perform the installation. Defaults to `install`. Example:

     

       895
       887
        
       

     

       896
       888
        
       ```nix

     

       897
       897
       -
       {

     

       898
       898
       -
         installTargets = "install-bin install-doc";

     

       899
       899
       -
       }

     

       889
       889
       +
       { installTargets = "install-bin install-doc"; }

     

       900
       890
        
       ```

     

       901
       891
        
       

     

       902
       892
        
       ##### `installFlags` / `installFlagsArray` {#var-stdenv-installFlags}

     
···

       1085
       1075
        
       Controls whether the installCheck phase is executed. By default it is skipped, but if `doInstallCheck` is set to true, the installCheck phase is usually executed. Thus you should set

     

       1086
       1076
        
       

     

       1087
       1077
        
       ```nix

     

       1088
       1088
       -
       {

     

       1089
       1089
       -
         doInstallCheck = true;

     

       1090
       1090
       -
       }

     

       1078
       1078
       +
       { doInstallCheck = true; }

     

       1091
       1079
        
       ```

     

       1092
       1080
        
       

     

       1093
       1081
        
       in the derivation to enable install checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doInstallCheck` is set, as the newly-built program won’t run on the platform used to build it.

+6 -24

doc/using/configuration.chapter.md

···

       21
       21
        
       A user's Nixpkgs configuration is stored in a user-specific configuration file located at `~/.config/nixpkgs/config.nix`. For example:

     

       22
       22
        
       

     

       23
       23
        
       ```nix

     

       24
       24
       -
       {

     

       25
       25
       -
         allowUnfree = true;

     

       26
       26
       -
       }

     

       24
       24
       +
       { allowUnfree = true; }

     

       27
       25
        
       ```

     

       28
       26
        
       

     

       29
       27
        
       :::{.caution}

     
···

       44
       42
        
       -   For permanently allowing broken packages to be built, you may add `allowBroken = true;` to your user's configuration file, like this:

     

       45
       43
        
       

     

       46
       44
        
           ```nix

     

       47
       47
       -
           {

     

       48
       48
       -
             allowBroken = true;

     

       49
       49
       -
           }

     

       45
       45
       +
           { allowBroken = true; }

     

       50
       46
        
           ```

     

       51
       47
        
       

     

       52
       48
        
       

     
···

       63
       59
        
       -   For permanently allowing unsupported packages to be built, you may add `allowUnsupportedSystem = true;` to your user's configuration file, like this:

     

       64
       60
        
       

     

       65
       61
        
           ```nix

     

       66
       66
       -
           {

     

       67
       67
       -
             allowUnsupportedSystem = true;

     

       68
       68
       -
           }

     

       62
       62
       +
           { allowUnsupportedSystem = true; }

     

       69
       63
        
           ```

     

       70
       64
        
       

     

       71
       65
        
       The difference between a package being unsupported on some system and being broken is admittedly a bit fuzzy. If a program *ought* to work on a certain platform, but doesn't, the platform should be included in `meta.platforms`, but marked as broken with e.g.  `meta.broken = !hostPlatform.isWindows`. Of course, this begs the question of what "ought" means exactly. That is left to the package maintainer.

     
···

       90
       84
        
           This option is a function which accepts a package as a parameter, and returns a boolean. The following example configuration accepts a package and always returns false:

     

       91
       85
        
       

     

       92
       86
        
           ```nix

     

       93
       93
       -
           {

     

       94
       94
       -
             allowUnfreePredicate = (pkg: false);

     

       95
       95
       -
           }

     

       87
       87
       +
           { allowUnfreePredicate = (pkg: false); }

     

       96
       88
        
           ```

     

       97
       89
        
       

     

       98
       90
        
           For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code:

     
···

       151
       143
        
           The following example configuration permits the installation of the hypothetically insecure package `hello`, version `1.2.3`:

     

       152
       144
        
       

     

       153
       145
        
           ```nix

     

       154
       154
       -
           {

     

       155
       155
       -
             permittedInsecurePackages = [

     

       156
       156
       -
               "hello-1.2.3"

     

       157
       157
       -
             ];

     

       158
       158
       -
           }

     

       146
       146
       +
           { permittedInsecurePackages = [ "hello-1.2.3" ]; }

     

       159
       147
        
           ```

     

       160
       148
        
       

     

       161
       149
        
       -   It is also possible to create a custom policy around which insecure packages to allow and deny, by overriding the `allowInsecurePredicate` configuration option.

     
···

       165
       153
        
           The following configuration example allows any version of the `ovftool` package:

     

       166
       154
        
       

     

       167
       155
        
           ```nix

     

       168
       168
       -
           {

     

       169
       169
       -
             allowInsecurePredicate =

     

       170
       170
       -
               pkg:

     

       171
       171
       -
               builtins.elem (lib.getName pkg) [

     

       172
       172
       -
                 "ovftool"

     

       173
       173
       -
               ];

     

       174
       174
       -
           }

     

       156
       156
       +
           { allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ "ovftool" ]; }

     

       175
       157
        
           ```

     

       176
       158
        
       

     

       177
       159
        
           Note that `permittedInsecurePackages` is only checked if `allowInsecurePredicate` is not specified.

+6 -18

doc/using/overlays.chapter.md

···

       48
       48
        
       self: super:

     

       49
       49
        
       

     

       50
       50
        
       {

     

       51
       51
       -
         boost = super.boost.override {

     

       52
       52
       -
           python = self.python3;

     

       53
       53
       -
         };

     

       54
       54
       -
         rr = super.callPackage ./pkgs/rr {

     

       55
       55
       -
           stdenv = self.stdenv_32bit;

     

       56
       56
       -
         };

     

       51
       51
       +
         boost = super.boost.override { python = self.python3; };

     

       52
       52
       +
         rr = super.callPackage ./pkgs/rr { stdenv = self.stdenv_32bit; };

     

       57
       53
        
       }

     

       58
       54
        
       ```

     

       59
       55
        
       

     
···

       99
       95
        
       self: super:

     

       100
       96
        
       

     

       101
       97
        
       {

     

       102
       102
       -
         blas = super.blas.override {

     

       103
       103
       -
           blasProvider = self.mkl;

     

       104
       104
       -
         };

     

       98
       98
       +
         blas = super.blas.override { blasProvider = self.mkl; };

     

       105
       99
        
       

     

       106
       106
       -
         lapack = super.lapack.override {

     

       107
       107
       -
           lapackProvider = self.mkl;

     

       108
       108
       -
         };

     

       100
       100
       +
         lapack = super.lapack.override { lapackProvider = self.mkl; };

     

       109
       101
        
       }

     

       110
       102
        
       ```

     

       111
       103
        
       

     
···

       123
       115
        
       self: super:

     

       124
       116
        
       

     

       125
       117
        
       {

     

       126
       126
       -
         blas = super.blas.override {

     

       127
       127
       -
           blasProvider = self.lapack-reference;

     

       128
       128
       -
         };

     

       118
       118
       +
         blas = super.blas.override { blasProvider = self.lapack-reference; };

     

       129
       119
        
       

     

       130
       130
       -
         lapack = super.lapack.override {

     

       131
       131
       -
           lapackProvider = self.lapack-reference;

     

       132
       132
       -
         };

     

       120
       120
       +
         lapack = super.lapack.override { lapackProvider = self.lapack-reference; };

     

       133
       121
        
       }

     

       134
       122
        
       ```

     

       135
       123

+3 -13

doc/using/overrides.chapter.md

···

       31
       31
        
       

     

       32
       32
        
       ```nix

     

       33
       33
        
       import pkgs.path {

     

       34
       34
       -
         overlays = [

     

       35
       35
       -
           (self: super: {

     

       36
       36
       -
             foo = super.foo.override { barSupport = true; };

     

       37
       37
       -
           })

     

       38
       38
       -
         ];

     

       34
       34
       +
         overlays = [ (self: super: { foo = super.foo.override { barSupport = true; }; }) ];

     

       39
       35
        
       }

     

       40
       36
        
       ```

     

       41
       37
        
       

     
···

       67
       63
        
       ```nix

     

       68
       64
        
       {

     

       69
       65
        
         helloBar = pkgs.hello.overrideAttrs (

     

       70
       70
       -
           finalAttrs: previousAttrs: {

     

       71
       71
       -
             pname = previousAttrs.pname + "-bar";

     

       72
       72
       -
           }

     

       66
       66
       +
           finalAttrs: previousAttrs: { pname = previousAttrs.pname + "-bar"; }

     

       73
       67
        
         );

     

       74
       68
        
       }

     

       75
       69
        
       ```

     
···

       85
       79
        
       Function arguments can be omitted entirely if there is no need to access `previousAttrs` or `finalAttrs`.

     

       86
       80
        
       

     

       87
       81
        
       ```nix

     

       88
       88
       -
       {

     

       89
       89
       -
         helloWithDebug = pkgs.hello.overrideAttrs {

     

       90
       90
       -
           separateDebugInfo = true;

     

       91
       91
       -
         };

     

       92
       92
       -
       }

     

       82
       82
       +
       { helloWithDebug = pkgs.hello.overrideAttrs { separateDebugInfo = true; }; }

     

       93
       83
        
       ```

     

       94
       84
        
       

     

       95
       85
        
       In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`.

+2 -4

maintainers/README.md

···

       86
       86
        
       

     

       87
       87
        
         Given a maintainer entry like this:

     

       88
       88
        
       

     

       89
       89
       -
         ``` nix

     

       89
       89
       +
         ```nix

     

       90
       90
        
         {

     

       91
       91
        
           example = {

     

       92
       92
        
             email = "user@example.com";

     

       93
       93
        
             name = "Example User";

     

       94
       94
       -
             keys = [{

     

       95
       95
       -
               fingerprint = "0000 0000 2A70 6423 0AED  3C11 F04F 7A19 AAA6 3AFE";

     

       96
       96
       -
             }];

     

       94
       94
       +
             keys = [ { fingerprint = "0000 0000 2A70 6423 0AED  3C11 F04F 7A19 AAA6 3AFE"; } ];

     

       97
       95
        
           };

     

       98
       96
        
         }

     

       99
       97
        
         ```

+2 -4

nixos/doc/manual/administration/container-networking.section.md

···

       28
       28
        
       ```nix

     

       29
       29
        
       {

     

       30
       30
        
         networking.nat.enable = true;

     

       31
       31
       -
         networking.nat.internalInterfaces = ["ve-+"];

     

       31
       31
       +
         networking.nat.internalInterfaces = [ "ve-+" ];

     

       32
       32
        
         networking.nat.externalInterface = "eth0";

     

       33
       33
        
       }

     

       34
       34
        
       ```

     
···

       40
       40
        
       managing container interfaces:

     

       41
       41
        
       

     

       42
       42
        
       ```nix

     

       43
       43
       -
       {

     

       44
       44
       -
         networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];

     

       45
       45
       -
       }

     

       43
       43
       +
       { networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; }

     

       46
       44
        
       ```

     

       47
       45
        
       

     

       48
       46
        
       You may need to restart your system for the changes to take effect.

+2 -6

nixos/doc/manual/administration/control-groups.chapter.md

···

       39
       39
        
       `configuration.nix`:

     

       40
       40
        
       

     

       41
       41
        
       ```nix

     

       42
       42
       -
       {

     

       43
       43
       -
         systemd.services.httpd.serviceConfig.CPUShares = 512;

     

       44
       44
       -
       }

     

       42
       42
       +
       { systemd.services.httpd.serviceConfig.CPUShares = 512; }

     

       45
       43
        
       ```

     

       46
       44
        
       

     

       47
       45
        
       By default, every cgroup has 1024 CPU shares, so this will halve the CPU

     
···

       54
       52
        
       `httpd.service` to 512 MiB of RAM (excluding swap):

     

       55
       53
        
       

     

       56
       54
        
       ```nix

     

       57
       57
       -
       {

     

       58
       58
       -
         systemd.services.httpd.serviceConfig.MemoryLimit = "512M";

     

       59
       59
       -
       }

     

       55
       55
       +
       { systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; }

     

       60
       56
        
       ```

     

       61
       57
        
       

     

       62
       58
        
       The command `systemd-cgtop` shows a continuously updated list of all

+7 -6

nixos/doc/manual/administration/declarative-containers.section.md

···

       6
       6
        
       

     

       7
       7
        
       ```nix

     

       8
       8
        
       {

     

       9
       9
       -
         containers.database =

     

       10
       10
       -
           { config =

     

       11
       11
       -
               { config, pkgs, ... }:

     

       12
       12
       -
               { services.postgresql.enable = true;

     

       9
       9
       +
         containers.database = {

     

       10
       10
       +
           config =

     

       11
       11
       +
             { config, pkgs, ... }:

     

       12
       12
       +
             {

     

       13
       13
       +
               services.postgresql.enable = true;

     

       13
       14
        
               services.postgresql.package = pkgs.postgresql_14;

     

       14
       14
       -
               };

     

       15
       15
       -
           };

     

       15
       15
       +
             };

     

       16
       16
       +
         };

     

       16
       17
        
       }

     

       17
       18
        
       ```

     

       18
       19

+1 -3

nixos/doc/manual/administration/service-mgmt.chapter.md

···

       82
       82
        
       package, use (e.g):

     

       83
       83
        
       

     

       84
       84
        
       ```nix

     

       85
       85
       -
       {

     

       86
       86
       -
         systemd.packages = [ pkgs.packagekit ];

     

       87
       87
       -
       }

     

       85
       85
       +
       { systemd.packages = [ pkgs.packagekit ]; }

     

       88
       86
        
       ```

     

       89
       87
        
       

     

       90
       88
        
       Usually NixOS modules written by the community do the above, plus take

+52 -36

nixos/doc/manual/configuration/abstractions.section.md

···

       4
       4
        
       

     

       5
       5
        
       ```nix

     

       6
       6
        
       {

     

       7
       7
       -
         services.httpd.virtualHosts =

     

       8
       8
       -
           { "blog.example.org" = {

     

       9
       9
       -
               documentRoot = "/webroot/blog.example.org";

     

       10
       10
       -
               adminAddr = "alice@example.org";

     

       11
       11
       -
               forceSSL = true;

     

       12
       12
       -
               enableACME = true;

     

       13
       13
       -
             };

     

       14
       14
       -
             "wiki.example.org" = {

     

       15
       15
       -
               documentRoot = "/webroot/wiki.example.org";

     

       16
       16
       -
               adminAddr = "alice@example.org";

     

       17
       17
       -
               forceSSL = true;

     

       18
       18
       -
               enableACME = true;

     

       19
       19
       -
             };

     

       7
       7
       +
         services.httpd.virtualHosts = {

     

       8
       8
       +
           "blog.example.org" = {

     

       9
       9
       +
             documentRoot = "/webroot/blog.example.org";

     

       10
       10
       +
             adminAddr = "alice@example.org";

     

       11
       11
       +
             forceSSL = true;

     

       12
       12
       +
             enableACME = true;

     

       20
       13
        
           };

     

       14
       14
       +
           "wiki.example.org" = {

     

       15
       15
       +
             documentRoot = "/webroot/wiki.example.org";

     

       16
       16
       +
             adminAddr = "alice@example.org";

     

       17
       17
       +
             forceSSL = true;

     

       18
       18
       +
             enableACME = true;

     

       19
       19
       +
           };

     

       20
       20
       +
         };

     

       21
       21
        
       }

     

       22
       22
        
       ```

     

       23
       23
        
       

     

       24
       24
        
       It defines two virtual hosts with nearly identical configuration; the only difference is the document root directories. To prevent this duplication, we can use a `let`:

     

       25
       25
        
       ```nix

     

       26
       26
        
       let

     

       27
       27
       -
         commonConfig =

     

       28
       28
       -
           { adminAddr = "alice@example.org";

     

       29
       29
       -
             forceSSL = true;

     

       30
       30
       -
             enableACME = true;

     

       31
       31
       -
           };

     

       27
       27
       +
         commonConfig = {

     

       28
       28
       +
           adminAddr = "alice@example.org";

     

       29
       29
       +
           forceSSL = true;

     

       30
       30
       +
           enableACME = true;

     

       31
       31
       +
         };

     

       32
       32
        
       in

     

       33
       33
        
       {

     

       34
       34
       -
         services.httpd.virtualHosts =

     

       35
       35
       -
           { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });

     

       36
       36
       -
             "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.org"; });

     

       37
       37
       -
           };

     

       34
       34
       +
         services.httpd.virtualHosts = {

     

       35
       35
       +
           "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });

     

       36
       36
       +
           "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.org"; });

     

       37
       37
       +
         };

     

       38
       38
        
       }

     

       39
       39
        
       ```

     

       40
       40
        
       

     
···

       45
       45
        
       ```nix

     

       46
       46
        
       {

     

       47
       47
        
         services.httpd.virtualHosts =

     

       48
       48
       -
           let commonConfig = { /* ... */ }; in

     

       49
       49
       -
           { "blog.example.org" = (commonConfig // { /* ... */ });

     

       50
       50
       -
             "wiki.example.org" = (commonConfig // { /* ... */ });

     

       48
       48
       +
           let

     

       49
       49
       +
             commonConfig = {

     

       50
       50
       +
               # ...

     

       51
       51
       +
             };

     

       52
       52
       +
           in

     

       53
       53
       +
           {

     

       54
       54
       +
             "blog.example.org" = (

     

       55
       55
       +
               commonConfig

     

       56
       56
       +
               // {

     

       57
       57
       +
                 # ...

     

       58
       58
       +
               }

     

       59
       59
       +
             );

     

       60
       60
       +
             "wiki.example.org" = (

     

       61
       61
       +
               commonConfig

     

       62
       62
       +
               // {

     

       63
       63
       +
                 # ...

     

       64
       64
       +
               }

     

       65
       65
       +
             );

     

       51
       66
        
           };

     

       52
       67
        
       }

     

       53
       68
        
       ```

     
···

       60
       75
        
       {

     

       61
       76
        
         services.httpd.virtualHosts =

     

       62
       77
        
           let

     

       63
       63
       -
             makeVirtualHost = webroot:

     

       64
       64
       -
               { documentRoot = webroot;

     

       65
       65
       -
                 adminAddr = "alice@example.org";

     

       66
       66
       -
                 forceSSL = true;

     

       67
       67
       -
                 enableACME = true;

     

       68
       68
       -
               };

     

       69
       69
       -
           in

     

       70
       70
       -
             { "example.org" = (makeVirtualHost "/webroot/example.org");

     

       71
       71
       -
               "example.com" = (makeVirtualHost "/webroot/example.com");

     

       72
       72
       -
               "example.gov" = (makeVirtualHost "/webroot/example.gov");

     

       73
       73
       -
               "example.nl" = (makeVirtualHost "/webroot/example.nl");

     

       78
       78
       +
             makeVirtualHost = webroot: {

     

       79
       79
       +
               documentRoot = webroot;

     

       80
       80
       +
               adminAddr = "alice@example.org";

     

       81
       81
       +
               forceSSL = true;

     

       82
       82
       +
               enableACME = true;

     

       74
       83
        
             };

     

       84
       84
       +
           in

     

       85
       85
       +
           {

     

       86
       86
       +
             "example.org" = (makeVirtualHost "/webroot/example.org");

     

       87
       87
       +
             "example.com" = (makeVirtualHost "/webroot/example.com");

     

       88
       88
       +
             "example.gov" = (makeVirtualHost "/webroot/example.gov");

     

       89
       89
       +
             "example.nl" = (makeVirtualHost "/webroot/example.nl");

     

       90
       90
       +
           };

     

       75
       91
        
       }

     

       76
       92
        
       ```

     

       77
       93

+3 -4

nixos/doc/manual/configuration/ad-hoc-network-config.section.md

···

       7
       7
        
       

     

       8
       8
        
       ```nix

     

       9
       9
        
       {

     

       10
       10
       -
         networking.localCommands =

     

       11
       11
       -
           ''

     

       12
       12
       -
             ip -6 addr add 2001:610:685:1::1/64 dev eth0

     

       13
       13
       -
           '';

     

       10
       10
       +
         networking.localCommands = ''

     

       11
       11
       +
           ip -6 addr add 2001:610:685:1::1/64 dev eth0

     

       12
       12
       +
         '';

     

       14
       13
        
       }

     

       15
       14
        
       ```

+11 -13

nixos/doc/manual/configuration/adding-custom-packages.section.md

···

       23
       23
        
       Finally, you add it to [](#opt-environment.systemPackages), e.g.

     

       24
       24
        
       

     

       25
       25
        
       ```nix

     

       26
       26
       -
       {

     

       27
       27
       -
         environment.systemPackages = [ pkgs.my-package ];

     

       28
       28
       -
       }

     

       26
       26
       +
       { environment.systemPackages = [ pkgs.my-package ]; }

     

       29
       27
        
       ```

     

       30
       28
        
       

     

       31
       29
        
       and you run `nixos-rebuild`, specifying your own Nixpkgs tree:

     
···

       43
       41
        
       {

     

       44
       42
        
         environment.systemPackages =

     

       45
       43
        
           let

     

       46
       46
       -
             my-hello = with pkgs; stdenv.mkDerivation rec {

     

       47
       47
       -
               name = "hello-2.8";

     

       48
       48
       -
               src = fetchurl {

     

       49
       49
       -
                 url = "mirror://gnu/hello/${name}.tar.gz";

     

       50
       50
       -
                 hash = "sha256-5rd/gffPfa761Kn1tl3myunD8TuM+66oy1O7XqVGDXM=";

     

       44
       44
       +
             my-hello =

     

       45
       45
       +
               with pkgs;

     

       46
       46
       +
               stdenv.mkDerivation rec {

     

       47
       47
       +
                 name = "hello-2.8";

     

       48
       48
       +
                 src = fetchurl {

     

       49
       49
       +
                   url = "mirror://gnu/hello/${name}.tar.gz";

     

       50
       50
       +
                   hash = "sha256-5rd/gffPfa761Kn1tl3myunD8TuM+66oy1O7XqVGDXM=";

     

       51
       51
       +
                 };

     

       51
       52
        
               };

     

       52
       52
       -
             };

     

       53
       53
        
           in

     

       54
       54
        
           [ my-hello ];

     

       55
       55
        
       }

     
···

       59
       59
        
       separate Nix expression, e.g.

     

       60
       60
        
       

     

       61
       61
        
       ```nix

     

       62
       62
       -
       {

     

       63
       63
       -
         environment.systemPackages = [ (import ./my-hello.nix) ];

     

       64
       64
       -
       }

     

       62
       62
       +
       { environment.systemPackages = [ (import ./my-hello.nix) ]; }

     

       65
       63
        
       ```

     

       66
       64
        
       

     

       67
       65
        
       where `my-hello.nix` contains:

     

       68
       66
        
       

     

       69
       67
        
       ```nix

     

       70
       70
       -
       with import <nixpkgs> {}; # bring all of Nixpkgs into scope

     

       68
       68
       +
       with import <nixpkgs> { }; # bring all of Nixpkgs into scope

     

       71
       69
        
       

     

       72
       70
        
       stdenv.mkDerivation rec {

     

       73
       71
        
         name = "hello-2.8";

+6 -3

nixos/doc/manual/configuration/config-file.section.md

···

       5
       5
        
       ```nix

     

       6
       6
        
       { config, pkgs, ... }:

     

       7
       7
        
       

     

       8
       8
       -
       { /* option definitions */

     

       8
       8
       +
       {

     

       9
       9
       +
         # option definitions

     

       9
       10
        
       }

     

       10
       11
        
       ```

     

       11
       12
        
       

     
···

       19
       20
        
       ```nix

     

       20
       21
        
       { config, pkgs, ... }:

     

       21
       22
        
       

     

       22
       22
       -
       { services.httpd.enable = true;

     

       23
       23
       +
       {

     

       24
       24
       +
         services.httpd.enable = true;

     

       23
       25
        
         services.httpd.adminAddr = "alice@example.org";

     

       24
       26
        
         services.httpd.virtualHosts.localhost.documentRoot = "/webroot";

     

       25
       27
        
       }

     
···

       38
       40
        
       ```nix

     

       39
       41
        
       { config, pkgs, ... }:

     

       40
       42
        
       

     

       41
       41
       -
       { services = {

     

       43
       43
       +
       {

     

       44
       44
       +
         services = {

     

       42
       45
        
           httpd = {

     

       43
       46
        
             enable = true;

     

       44
       47
        
             adminAddr = "alice@example.org";

+12 -14

nixos/doc/manual/configuration/customizing-packages.section.md

···

       41
       41
        
       {

     

       42
       42
        
         environment.systemPackages = with pkgs; [

     

       43
       43
        
           sl

     

       44
       44
       -
           (pass.withExtensions (subpkgs: with subpkgs; [

     

       45
       45
       -
             pass-audit

     

       46
       46
       -
             pass-otp

     

       47
       47
       -
             pass-genphrase

     

       48
       48
       -
           ]))

     

       49
       49
       -
           (python3.withPackages (subpkgs: with subpkgs; [

     

       50
       50
       -
               requests

     

       51
       51
       -
           ]))

     

       44
       44
       +
           (pass.withExtensions (

     

       45
       45
       +
             subpkgs: with subpkgs; [

     

       46
       46
       +
               pass-audit

     

       47
       47
       +
               pass-otp

     

       48
       48
       +
               pass-genphrase

     

       49
       49
       +
             ]

     

       50
       50
       +
           ))

     

       51
       51
       +
           (python3.withPackages (subpkgs: with subpkgs; [ requests ]))

     

       52
       52
        
           cowsay

     

       53
       53
        
         ];

     

       54
       54
        
       }

     
···

       62
       62
        
       specify that as follows:

     

       63
       63
        
       

     

       64
       64
        
       ```nix

     

       65
       65
       -
       {

     

       66
       66
       -
         environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];

     

       67
       67
       -
       }

     

       65
       65
       +
       { environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; }

     

       68
       66
        
       ```

     

       69
       67
        
       

     

       70
       68
        
       The function `override` performs the call to the Nix function that

     
···

       109
       107
        
       

     

       110
       108
        
       ```nix

     

       111
       109
        
       {

     

       112
       112
       -
         nixpkgs.config.packageOverrides = pkgs:

     

       113
       113
       -
           { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };

     

       114
       114
       -
           };

     

       110
       110
       +
         nixpkgs.config.packageOverrides = pkgs: {

     

       111
       111
       +
           emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };

     

       112
       112
       +
         };

     

       115
       113
        
       }

     

       116
       114
        
       ```

     

       117
       115

+1 -3

nixos/doc/manual/configuration/declarative-packages.section.md

···

       7
       7
        
       email application:

     

       8
       8
        
       

     

       9
       9
        
       ```nix

     

       10
       10
       -
       {

     

       11
       11
       -
         environment.systemPackages = [ pkgs.thunderbird ];

     

       12
       12
       -
       }

     

       10
       10
       +
       { environment.systemPackages = [ pkgs.thunderbird ]; }

     

       13
       11
        
       ```

     

       14
       12
        
       

     

       15
       13
        
       The effect of this specification is that the Thunderbird package from

+4 -4

nixos/doc/manual/configuration/file-systems.chapter.md

···

       7
       7
        
       

     

       8
       8
        
       ```nix

     

       9
       9
        
       {

     

       10
       10
       -
         fileSystems."/data" =

     

       11
       11
       -
           { device = "/dev/disk/by-label/data";

     

       12
       12
       -
             fsType = "ext4";

     

       13
       13
       -
           };

     

       10
       10
       +
         fileSystems."/data" = {

     

       11
       11
       +
           device = "/dev/disk/by-label/data";

     

       12
       12
       +
           fsType = "ext4";

     

       13
       13
       +
         };

     

       14
       14
        
       }

     

       15
       15
        
       ```

     

       16
       16

+13 -6

nixos/doc/manual/configuration/firewall.section.md

···

       5
       5
        
       traffic. It is enabled by default. It can be disabled as follows:

     

       6
       6
        
       

     

       7
       7
        
       ```nix

     

       8
       8
       -
       {

     

       9
       9
       -
         networking.firewall.enable = false;

     

       10
       10
       -
       }

     

       8
       8
       +
       { networking.firewall.enable = false; }

     

       11
       9
        
       ```

     

       12
       10
        
       

     

       13
       11
        
       If the firewall is enabled, you can open specific TCP ports to the

     
···

       15
       13
        
       

     

       16
       14
        
       ```nix

     

       17
       15
        
       {

     

       18
       18
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       16
       16
       +
         networking.firewall.allowedTCPPorts = [

     

       17
       17
       +
           80

     

       18
       18
       +
           443

     

       19
       19
       +
         ];

     

       19
       20
        
       }

     

       20
       21
        
       ```

     

       21
       22
        
       

     
···

       28
       29
        
       ```nix

     

       29
       30
        
       {

     

       30
       31
        
         networking.firewall.allowedTCPPortRanges = [

     

       31
       31
       -
           { from = 4000; to = 4007; }

     

       32
       32
       -
           { from = 8000; to = 8010; }

     

       32
       32
       +
           {

     

       33
       33
       +
             from = 4000;

     

       34
       34
       +
             to = 4007;

     

       35
       35
       +
           }

     

       36
       36
       +
           {

     

       37
       37
       +
             from = 8000;

     

       38
       38
       +
             to = 8010;

     

       39
       39
       +
           }

     

       33
       40
        
         ];

     

       34
       41
        
       }

     

       35
       42
        
       ```

+7 -28

nixos/doc/manual/configuration/gpu-accel.chapter.md

···

       55
       55
        
       enables OpenCL support:

     

       56
       56
        
       

     

       57
       57
        
       ```nix

     

       58
       58
       -
       {

     

       59
       59
       -
         hardware.graphics.extraPackages = [

     

       60
       60
       -
           rocmPackages.clr.icd

     

       61
       61
       -
         ];

     

       62
       62
       -
       }

     

       58
       58
       +
       { hardware.graphics.extraPackages = [ rocmPackages.clr.icd ]; }

     

       63
       59
        
       ```

     

       64
       60
        
       

     

       65
       61
        
       ### Intel {#sec-gpu-accel-opencl-intel}

     
···

       75
       71
        
       configuration can be used:

     

       76
       72
        
       

     

       77
       73
        
       ```nix

     

       78
       78
       -
       {

     

       79
       79
       -
         hardware.graphics.extraPackages = [

     

       80
       80
       -
           intel-compute-runtime

     

       81
       81
       -
         ];

     

       82
       82
       -
       }

     

       74
       74
       +
       { hardware.graphics.extraPackages = [ intel-compute-runtime ]; }

     

       83
       75
        
       ```

     

       84
       76
        
       

     

       85
       77
        
       ## Vulkan {#sec-gpu-accel-vulkan}

     
···

       145
       137
        
       

     

       146
       138
        
       ```nix

     

       147
       139
        
       {

     

       148
       148
       -
         hardware.graphics.extraPackages = [

     

       149
       149
       -
           pkgs.amdvlk

     

       150
       150
       -
         ];

     

       140
       140
       +
         hardware.graphics.extraPackages = [ pkgs.amdvlk ];

     

       151
       141
        
       

     

       152
       142
        
         # To enable Vulkan support for 32-bit applications, also add:

     

       153
       153
       -
         hardware.graphics.extraPackages32 = [

     

       154
       154
       -
           pkgs.driversi686Linux.amdvlk

     

       155
       155
       -
         ];

     

       143
       143
       +
         hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];

     

       156
       144
        
       

     

       157
       145
        
         # Force radv

     

       158
       146
        
         environment.variables.AMD_VULKAN_ICD = "RADV";

     

       159
       147
        
         # Or

     

       160
       160
       -
         environment.variables.VK_ICD_FILENAMES =

     

       161
       161
       -
           "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";

     

       148
       148
       +
         environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";

     

       162
       149
        
       }

     

       163
       150
        
       ```

     

       164
       151
        
       

     
···

       183
       170
        
       Modern Intel GPUs use the iHD driver, which can be installed with:

     

       184
       171
        
       

     

       185
       172
        
       ```nix

     

       186
       186
       -
       {

     

       187
       187
       -
         hardware.graphics.extraPackages = [

     

       188
       188
       -
           intel-media-driver

     

       189
       189
       -
         ];

     

       190
       190
       -
       }

     

       173
       173
       +
       { hardware.graphics.extraPackages = [ intel-media-driver ]; }

     

       191
       174
        
       ```

     

       192
       175
        
       

     

       193
       176
        
       Older Intel GPUs use the i965 driver, which can be installed with:

     

       194
       177
        
       

     

       195
       178
        
       ```nix

     

       196
       196
       -
       {

     

       197
       197
       -
         hardware.graphics.extraPackages = [

     

       198
       198
       -
           intel-vaapi-driver

     

       199
       199
       -
         ];

     

       200
       200
       -
       }

     

       179
       179
       +
       { hardware.graphics.extraPackages = [ intel-vaapi-driver ]; }

     

       201
       180
        
       ```

     

       202
       181
        
       

     

       203
       182
        
       ## Common issues {#sec-gpu-accel-common-issues}

+7 -7

nixos/doc/manual/configuration/ipv4-config.section.md

···

       6
       6
        
       

     

       7
       7
        
       ```nix

     

       8
       8
        
       {

     

       9
       9
       -
         networking.interfaces.eth0.ipv4.addresses = [ {

     

       10
       10
       -
           address = "192.168.1.2";

     

       11
       11
       -
           prefixLength = 24;

     

       12
       12
       -
         } ];

     

       9
       9
       +
         networking.interfaces.eth0.ipv4.addresses = [

     

       10
       10
       +
           {

     

       11
       11
       +
             address = "192.168.1.2";

     

       12
       12
       +
             prefixLength = 24;

     

       13
       13
       +
           }

     

       14
       14
       +
         ];

     

       13
       15
        
       }

     

       14
       16
        
       ```

     

       15
       17
        
       

     
···

       32
       34
        
       The host name is set using [](#opt-networking.hostName):

     

       33
       35
        
       

     

       34
       36
        
       ```nix

     

       35
       35
       -
       {

     

       36
       36
       -
         networking.hostName = "cartman";

     

       37
       37
       -
       }

     

       37
       37
       +
       { networking.hostName = "cartman"; }

     

       38
       38
        
       ```

     

       39
       39
        
       

     

       40
       40
        
       The default host name is `nixos`. Set it to the empty string (`""`) to

+8 -10

nixos/doc/manual/configuration/ipv6-config.section.md

···

       9
       9
        
       IPv6 support globally by setting:

     

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
       -
       {

     

       13
       13
       -
         networking.enableIPv6 = false;

     

       14
       14
       -
       }

     

       12
       12
       +
       { networking.enableIPv6 = false; }

     

       15
       13
        
       ```

     

       16
       14
        
       

     

       17
       15
        
       You can disable IPv6 on a single interface using a normal sysctl (in

     

       18
       16
        
       this example, we use interface `eth0`):

     

       19
       17
        
       

     

       20
       18
        
       ```nix

     

       21
       21
       -
       {

     

       22
       22
       -
         boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;

     

       23
       23
       -
       }

     

       19
       19
       +
       { boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; }

     

       24
       20
        
       ```

     

       25
       21
        
       

     

       26
       22
        
       As with IPv4 networking interfaces are automatically configured via

     
···

       28
       24
        
       

     

       29
       25
        
       ```nix

     

       30
       26
        
       {

     

       31
       31
       -
         networking.interfaces.eth0.ipv6.addresses = [ {

     

       32
       32
       -
           address = "fe00:aa:bb:cc::2";

     

       33
       33
       -
           prefixLength = 64;

     

       34
       34
       -
         } ];

     

       27
       27
       +
         networking.interfaces.eth0.ipv6.addresses = [

     

       28
       28
       +
           {

     

       29
       29
       +
             address = "fe00:aa:bb:cc::2";

     

       30
       30
       +
             prefixLength = 64;

     

       31
       31
       +
           }

     

       32
       32
       +
         ];

     

       35
       33
        
       }

     

       36
       34
        
       ```

     

       37
       35

+6 -7

nixos/doc/manual/configuration/kubernetes.chapter.md

···

       24
       24
        
       addonManager, kube-proxy and etcd:

     

       25
       25
        
       

     

       26
       26
        
       ```nix

     

       27
       27
       -
       {

     

       28
       28
       -
         services.kubernetes.roles = [ "master" ];

     

       29
       29
       -
       }

     

       27
       27
       +
       { services.kubernetes.roles = [ "master" ]; }

     

       30
       28
        
       ```

     

       31
       29
        
       

     

       32
       30
        
       While this will enable the kubelet and kube-proxy only:

     

       33
       31
        
       

     

       34
       32
        
       ```nix

     

       35
       35
       -
       {

     

       36
       36
       -
         services.kubernetes.roles = [ "node" ];

     

       37
       37
       -
       }

     

       33
       33
       +
       { services.kubernetes.roles = [ "node" ]; }

     

       38
       34
        
       ```

     

       39
       35
        
       

     

       40
       36
        
       Assigning both the master and node roles is usable if you want a single

     
···

       42
       38
        
       

     

       43
       39
        
       ```nix

     

       44
       40
        
       {

     

       45
       45
       -
         services.kubernetes.roles = [ "master" "node" ];

     

       41
       41
       +
         services.kubernetes.roles = [

     

       42
       42
       +
           "master"

     

       43
       43
       +
           "node"

     

       44
       44
       +
         ];

     

       46
       45
        
       }

     

       47
       46
        
       ```

     

       48
       47

+17 -19

nixos/doc/manual/configuration/linux-kernel.chapter.md

···

       5
       5
        
       kernel:

     

       6
       6
        
       

     

       7
       7
        
       ```nix

     

       8
       8
       -
       {

     

       9
       9
       -
         boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10;

     

       10
       10
       -
       }

     

       8
       8
       +
       { boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; }

     

       11
       9
        
       ```

     

       12
       10
        
       

     

       13
       11
        
       Note that this not only replaces the kernel, but also packages that are

     
···

       43
       41
        
       

     

       44
       42
        
       ```nix

     

       45
       43
        
       {

     

       46
       46
       -
         nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs {

     

       47
       47
       -
           linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override {

     

       48
       48
       -
             extraConfig = ''

     

       49
       49
       -
               KGDB y

     

       50
       50
       -
             '';

     

       44
       44
       +
         nixpkgs.config.packageOverrides =

     

       45
       45
       +
           pkgs:

     

       46
       46
       +
           pkgs.lib.recursiveUpdate pkgs {

     

       47
       47
       +
             linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override {

     

       48
       48
       +
               extraConfig = ''

     

       49
       49
       +
                 KGDB y

     

       50
       50
       +
               '';

     

       51
       51
       +
             };

     

       51
       52
        
           };

     

       52
       52
       -
         };

     

       53
       53
        
       }

     

       54
       54
        
       ```

     

       55
       55
        
       

     
···

       64
       64
        
       

     

       65
       65
        
       ```nix

     

       66
       66
        
       {

     

       67
       67
       -
         boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];

     

       67
       67
       +
         boot.kernelModules = [

     

       68
       68
       +
           "fuse"

     

       69
       69
       +
           "kvm-intel"

     

       70
       70
       +
           "coretemp"

     

       71
       71
       +
         ];

     

       68
       72
        
       }

     

       69
       73
        
       ```

     

       70
       74
        
       

     
···

       72
       76
        
       file system), you can use [](#opt-boot.initrd.kernelModules):

     

       73
       77
        
       

     

       74
       78
        
       ```nix

     

       75
       75
       -
       {

     

       76
       76
       -
         boot.initrd.kernelModules = [ "cifs" ];

     

       77
       77
       -
       }

     

       79
       79
       +
       { boot.initrd.kernelModules = [ "cifs" ]; }

     

       78
       80
        
       ```

     

       79
       81
        
       

     

       80
       82
        
       This causes the specified modules and their dependencies to be added to

     
···

       84
       86
        
       [](#opt-boot.kernel.sysctl), e.g.

     

       85
       87
        
       

     

       86
       88
        
       ```nix

     

       87
       87
       -
       {

     

       88
       88
       -
         boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;

     

       89
       89
       -
       }

     

       89
       89
       +
       { boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; }

     

       90
       90
        
       ```

     

       91
       91
        
       

     

       92
       92
        
       sets the kernel's TCP keepalive time to 120 seconds. To see the

     
···

       99
       99
        
       To use your custom kernel package in your NixOS configuration, set

     

       100
       100
        
       

     

       101
       101
        
       ```nix

     

       102
       102
       -
       {

     

       103
       103
       -
         boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel;

     

       104
       104
       -
       }

     

       102
       102
       +
       { boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel; }

     

       105
       103
        
       ```

     

       106
       104
        
       

     

       107
       105
        
       ## Rust {#sec-linux-rust}

+4 -7

nixos/doc/manual/configuration/luks-file-systems.section.md

···

       39
       39
        
       encrypted partition, it is necessary to add the following grub option:

     

       40
       40
        
       

     

       41
       41
        
       ```nix

     

       42
       42
       -
       {

     

       43
       43
       -
         boot.loader.grub.enableCryptodisk = true;

     

       44
       44
       -
       }

     

       42
       42
       +
       { boot.loader.grub.enableCryptodisk = true; }

     

       45
       43
        
       ```

     

       46
       44
        
       

     

       47
       45
        
       ## FIDO2 {#sec-luks-file-systems-fido2}

     
···

       74
       72
        
       ```nix

     

       75
       73
        
       {

     

       76
       74
        
         boot.initrd.luks.fido2Support = true;

     

       77
       77
       -
         boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7";

     

       75
       75
       +
         boot.initrd.luks.devices."/dev/sda2".fido2.credential =

     

       76
       76
       +
           "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7";

     

       78
       77
        
       }

     

       79
       78
        
       ```

     

       80
       79
        
       

     
···

       83
       82
        
       as [Trezor](https://trezor.io/).

     

       84
       83
        
       

     

       85
       84
        
       ```nix

     

       86
       86
       -
       {

     

       87
       87
       -
         boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true;

     

       88
       88
       -
       }

     

       85
       85
       +
       { boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; }

     

       89
       86
        
       ```

     

       90
       87
        
       

     

       91
       88
        
       ### systemd Stage 1 {#sec-luks-file-systems-fido2-systemd}

+3 -5

nixos/doc/manual/configuration/mattermost.chapter.md

···

       71
       71
        
       {

     

       72
       72
        
         services.mattermost = {

     

       73
       73
        
           plugins = with pkgs; [

     

       74
       74
       -
             /*

     

       75
       75
       -
              * todo

     

       76
       76
       -
              * 0.7.1

     

       77
       77
       -
              * https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.7.1

     

       78
       78
       -
              */

     

       74
       74
       +
             # todo

     

       75
       75
       +
             # 0.7.1

     

       76
       76
       +
             # https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.7.1

     

       79
       77
        
             (fetchurl {

     

       80
       78
        
               # Note: Don't unpack the tarball; the NixOS module will repack it for you.

     

       81
       79
        
               url = "https://github.com/mattermost-community/mattermost-plugin-todo/releases/download/v0.7.1/com.mattermost.plugin-todo-0.7.1.tar.gz";

+21 -16

nixos/doc/manual/configuration/modularity.section.md

···

       13
       13
        
       ```nix

     

       14
       14
        
       { config, pkgs, ... }:

     

       15
       15
        
       

     

       16
       16
       -
       { imports = [ ./vpn.nix ./kde.nix ];

     

       16
       16
       +
       {

     

       17
       17
       +
         imports = [

     

       18
       18
       +
           ./vpn.nix

     

       19
       19
       +
           ./kde.nix

     

       20
       20
       +
         ];

     

       17
       21
        
         services.httpd.enable = true;

     

       18
       22
        
         environment.systemPackages = [ pkgs.emacs ];

     

       19
       23
        
         # ...

     
···

       26
       30
        
       ```nix

     

       27
       31
        
       { config, pkgs, ... }:

     

       28
       32
        
       

     

       29
       29
       -
       { services.xserver.enable = true;

     

       33
       33
       +
       {

     

       34
       34
       +
         services.xserver.enable = true;

     

       30
       35
        
         services.displayManager.sddm.enable = true;

     

       31
       36
        
         services.xserver.desktopManager.plasma5.enable = true;

     

       32
       37
        
         environment.systemPackages = [ pkgs.vim ];

     
···

       42
       47
        
       merged list. If you want it to appear first, you can use `mkBefore`:

     

       43
       48
        
       

     

       44
       49
        
       ```nix

     

       45
       45
       -
       {

     

       46
       46
       -
         boot.kernelModules = mkBefore [ "kvm-intel" ];

     

       47
       47
       -
       }

     

       50
       50
       +
       { boot.kernelModules = mkBefore [ "kvm-intel" ]; }

     

       48
       51
        
       ```

     

       49
       52
        
       

     

       50
       53
        
       This causes the `kvm-intel` kernel module to be loaded before any other

     
···

       62
       65
        
       over the others:

     

       63
       66
        
       

     

       64
       67
        
       ```nix

     

       65
       65
       -
       {

     

       66
       66
       -
         services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org";

     

       67
       67
       -
       }

     

       68
       68
       +
       { services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; }

     

       68
       69
        
       ```

     

       69
       70
        
       

     

       70
       71
        
       When using multiple modules, you may need to access configuration values

     
···

       84
       85
        
       ```nix

     

       85
       86
        
       { config, pkgs, ... }:

     

       86
       87
        
       

     

       87
       87
       -
       { environment.systemPackages =

     

       88
       88
       +
       {

     

       89
       89
       +
         environment.systemPackages =

     

       88
       90
        
           if config.services.xserver.enable then

     

       89
       89
       -
             [ pkgs.firefox

     

       91
       91
       +
             [

     

       92
       92
       +
               pkgs.firefox

     

       90
       93
        
               pkgs.thunderbird

     

       91
       94
        
             ]

     

       92
       95
        
           else

     
···

       126
       129
        
       ```nix

     

       127
       130
        
       { config, pkgs, ... }:

     

       128
       131
        
       

     

       129
       129
       -
       let netConfig = hostName: {

     

       130
       130
       -
         networking.hostName = hostName;

     

       131
       131
       -
         networking.useDHCP = false;

     

       132
       132
       -
       };

     

       132
       132
       +
       let

     

       133
       133
       +
         netConfig = hostName: {

     

       134
       134
       +
           networking.hostName = hostName;

     

       135
       135
       +
           networking.useDHCP = false;

     

       136
       136
       +
         };

     

       133
       137
        
       

     

       134
       138
        
       in

     

       135
       135
       -
       

     

       136
       136
       -
       { imports = [ (netConfig "nixos.localdomain") ]; }

     

       139
       139
       +
       {

     

       140
       140
       +
         imports = [ (netConfig "nixos.localdomain") ];

     

       141
       141
       +
       }

     

       137
       142
        
       ```

+5 -7

nixos/doc/manual/configuration/network-manager.section.md

···

       4
       4
        
       NetworkManager. You can enable NetworkManager by setting:

     

       5
       5
        
       

     

       6
       6
        
       ```nix

     

       7
       7
       -
       {

     

       8
       8
       -
         networking.networkmanager.enable = true;

     

       9
       9
       -
       }

     

       7
       7
       +
       { networking.networkmanager.enable = true; }

     

       10
       8
        
       ```

     

       11
       9
        
       

     

       12
       10
        
       some desktop managers (e.g., GNOME) enable NetworkManager automatically

     
···

       16
       14
        
       belong to the `networkmanager` group:

     

       17
       15
        
       

     

       18
       16
        
       ```nix

     

       19
       19
       -
       {

     

       20
       20
       -
         users.users.alice.extraGroups = [ "networkmanager" ];

     

       21
       21
       -
       }

     

       17
       17
       +
       { users.users.alice.extraGroups = [ "networkmanager" ]; }

     

       22
       18
        
       ```

     

       23
       19
        
       

     

       24
       20
        
       NetworkManager is controlled using either `nmcli` or `nmtui`

     
···

       38
       34
        
       ```nix

     

       39
       35
        
       {

     

       40
       36
        
         networking.networkmanager.unmanaged = [

     

       41
       41
       -
            "*" "except:type:wwan" "except:type:gsm"

     

       37
       37
       +
           "*"

     

       38
       38
       +
           "except:type:wwan"

     

       39
       39
       +
           "except:type:gsm"

     

       42
       40
        
         ];

     

       43
       41
        
       }

     

       44
       42
        
       ```

+1 -5

nixos/doc/manual/configuration/profiles.chapter.md

···

       8
       8
        
       `/etc/configuration.nix` as such:

     

       9
       9
        
       

     

       10
       10
        
       ```nix

     

       11
       11
       -
       {

     

       12
       12
       -
         imports = [

     

       13
       13
       -
           <nixpkgs/nixos/modules/profiles/profile-name.nix>

     

       14
       14
       -
         ];

     

       15
       15
       -
       }

     

       11
       11
       +
       { imports = [ <nixpkgs/nixos/modules/profiles/profile-name.nix> ]; }

     

       16
       12
        
       ```

     

       17
       13
        
       

     

       18
       14
        
       Even if some of these profiles seem only useful in the context of

+2 -5

nixos/doc/manual/configuration/ssh.section.md

···

       3
       3
        
       Secure shell (SSH) access to your machine can be enabled by setting:

     

       4
       4
        
       

     

       5
       5
        
       ```nix

     

       6
       6
       -
       {

     

       7
       7
       -
         services.openssh.enable = true;

     

       8
       8
       -
       }

     

       6
       6
       +
       { services.openssh.enable = true; }

     

       9
       7
        
       ```

     

       10
       8
        
       

     

       11
       9
        
       By default, root logins using a password are disallowed. They can be

     
···

       17
       15
        
       

     

       18
       16
        
       ```nix

     

       19
       17
        
       {

     

       20
       20
       -
         users.users.alice.openssh.authorizedKeys.keys =

     

       21
       21
       -
           [ "ssh-ed25519 AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];

     

       18
       18
       +
         users.users.alice.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];

     

       22
       19
        
       }

     

       23
       20
        
       ```

+19 -18

nixos/doc/manual/configuration/sshfs-file-systems.section.md

···

       41
       41
        
         fileSystems."/mnt/my-dir" = {

     

       42
       42
        
           device = "my-user@example.com:/my-dir/";

     

       43
       43
        
           fsType = "sshfs";

     

       44
       44
       -
           options =

     

       45
       45
       -
             [ # Filesystem options

     

       46
       46
       -
               "allow_other"          # for non-root access

     

       47
       47
       -
               "_netdev"              # this is a network fs

     

       48
       48
       -
               "x-systemd.automount"  # mount on demand

     

       44
       44
       +
           options = [

     

       45
       45
       +
             # Filesystem options

     

       46
       46
       +
             "allow_other" # for non-root access

     

       47
       47
       +
             "_netdev" # this is a network fs

     

       48
       48
       +
             "x-systemd.automount" # mount on demand

     

       49
       49
        
       

     

       50
       50
       -
               # SSH options

     

       51
       51
       -
               "reconnect"              # handle connection drops

     

       52
       52
       -
               "ServerAliveInterval=15" # keep connections alive

     

       53
       53
       -
               "IdentityFile=/var/secrets/example-key"

     

       54
       54
       -
             ];

     

       50
       50
       +
             # SSH options

     

       51
       51
       +
             "reconnect" # handle connection drops

     

       52
       52
       +
             "ServerAliveInterval=15" # keep connections alive

     

       53
       53
       +
             "IdentityFile=/var/secrets/example-key"

     

       54
       54
       +
           ];

     

       55
       55
        
         };

     

       56
       56
        
       }

     

       57
       57
        
       ```

     

       58
       58
        
       More options from `ssh_config(5)` can be given as well, for example you can change the default SSH port or specify a jump proxy:

     

       59
       59
        
       ```nix

     

       60
       60
        
       {

     

       61
       61
       -
         options =

     

       62
       62
       -
           [ "ProxyJump=bastion@example.com"

     

       63
       63
       -
             "Port=22"

     

       64
       64
       -
           ];

     

       61
       61
       +
         options = [

     

       62
       62
       +
           "ProxyJump=bastion@example.com"

     

       63
       63
       +
           "Port=22"

     

       64
       64
       +
         ];

     

       65
       65
        
       }

     

       66
       66
        
       ```

     

       67
       67
        
       It's also possible to change the `ssh` command used by SSHFS to connect to the server.

     

       68
       68
        
       For example:

     

       69
       69
        
       ```nix

     

       70
       70
        
       {

     

       71
       71
       -
         options =

     

       72
       72
       -
           [ (builtins.replaceStrings [" "] ["\\040"]

     

       73
       73
       -
               "ssh_command=${pkgs.openssh}/bin/ssh -v -L 8080:localhost:80")

     

       74
       74
       -
           ];

     

       71
       71
       +
         options = [

     

       72
       72
       +
           (builtins.replaceStrings [ " " ] [ "\\040" ]

     

       73
       73
       +
             "ssh_command=${pkgs.openssh}/bin/ssh -v -L 8080:localhost:80"

     

       74
       74
       +
           )

     

       75
       75
       +
         ];

     

       75
       76
        
       

     

       76
       77
        
       }

     

       77
       78
        
       ```

+28 -19

nixos/doc/manual/configuration/subversion.chapter.md

···

       24
       24
        
       {

     

       25
       25
        
         services.httpd.enable = true;

     

       26
       26
        
         services.httpd.adminAddr = "...";

     

       27
       27
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       27
       27
       +
         networking.firewall.allowedTCPPorts = [

     

       28
       28
       +
           80

     

       29
       29
       +
           443

     

       30
       30
       +
         ];

     

       28
       31
        
       }

     

       29
       32
        
       ```

     

       30
       33
        
       

     
···

       38
       41
        
       ```nix

     

       39
       42
        
       {

     

       40
       43
        
         services.httpd.extraModules = [

     

       41
       41
       -
             # note that order is *super* important here

     

       42
       42
       -
             { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; }

     

       43
       43
       -
             { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; }

     

       44
       44
       -
           ];

     

       45
       45
       -
           services.httpd.virtualHosts = {

     

       46
       46
       -
             "svn" = {

     

       47
       47
       -
                hostName = HOSTNAME;

     

       48
       48
       -
                documentRoot = DOCUMENTROOT;

     

       49
       49
       -
                locations."/svn".extraConfig = ''

     

       50
       50
       -
                    DAV svn

     

       51
       51
       -
                    SVNParentPath REPO_PARENT

     

       52
       52
       -
                    AuthzSVNAccessFile ACCESS_FILE

     

       53
       53
       -
                    AuthName "SVN Repositories"

     

       54
       54
       -
                    AuthType Basic

     

       55
       55
       -
                    AuthUserFile PASSWORD_FILE

     

       56
       56
       -
                    Require valid-user

     

       57
       57
       -
               '';

     

       58
       58
       -
             };

     

       44
       44
       +
           # note that order is *super* important here

     

       45
       45
       +
           {

     

       46
       46
       +
             name = "dav_svn";

     

       47
       47
       +
             path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so";

     

       48
       48
       +
           }

     

       49
       49
       +
           {

     

       50
       50
       +
             name = "authz_svn";

     

       51
       51
       +
             path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so";

     

       52
       52
       +
           }

     

       53
       53
       +
         ];

     

       54
       54
       +
         services.httpd.virtualHosts = {

     

       55
       55
       +
           "svn" = {

     

       56
       56
       +
             hostName = HOSTNAME;

     

       57
       57
       +
             documentRoot = DOCUMENTROOT;

     

       58
       58
       +
             locations."/svn".extraConfig = ''

     

       59
       59
       +
               DAV svn

     

       60
       60
       +
               SVNParentPath REPO_PARENT

     

       61
       61
       +
               AuthzSVNAccessFile ACCESS_FILE

     

       62
       62
       +
               AuthName "SVN Repositories"

     

       63
       63
       +
               AuthType Basic

     

       64
       64
       +
               AuthUserFile PASSWORD_FILE

     

       65
       65
       +
               Require valid-user

     

       66
       66
       +
             '';

     

       59
       67
        
           };

     

       68
       68
       +
         };

     

       60
       69
        
       }

     

       61
       70
        
       ```

     

       62
       71

+9 -16

nixos/doc/manual/configuration/user-mgmt.chapter.md

···

       11
       11
        
           isNormalUser = true;

     

       12
       12
        
           home = "/home/alice";

     

       13
       13
        
           description = "Alice Foobar";

     

       14
       14
       -
           extraGroups = [ "wheel" "networkmanager" ];

     

       14
       14
       +
           extraGroups = [

     

       15
       15
       +
             "wheel"

     

       16
       16
       +
             "networkmanager"

     

       17
       17
       +
           ];

     

       15
       18
        
           openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];

     

       16
       19
        
         };

     

       17
       20
        
       }

     
···

       40
       43
        
       manually by adding

     

       41
       44
        
       

     

       42
       45
        
       ```nix

     

       43
       43
       -
       {

     

       44
       44
       -
         uid = 1000;

     

       45
       45
       -
       }

     

       46
       46
       +
       { uid = 1000; }

     

       46
       47
        
       ```

     

       47
       48
        
       

     

       48
       49
        
       to the user specification.

     
···

       51
       52
        
       named `students` shall exist:

     

       52
       53
        
       

     

       53
       54
        
       ```nix

     

       54
       54
       -
       {

     

       55
       55
       -
         users.groups.students.gid = 1000;

     

       56
       56
       -
       }

     

       55
       55
       +
       { users.groups.students.gid = 1000; }

     

       57
       56
        
       ```

     

       58
       57
        
       

     

       59
       58
        
       As with users, the group ID (gid) is optional and will be assigned

     
···

       109
       108
        
       systemd-sysusers:

     

       110
       109
        
       

     

       111
       110
        
       ```nix

     

       112
       112
       -
       {

     

       113
       113
       -
         systemd.sysusers.enable = true;

     

       114
       114
       -
       }

     

       111
       111
       +
       { systemd.sysusers.enable = true; }

     

       115
       112
        
       ```

     

       116
       113
        
       

     

       117
       114
        
       The primary benefit of this is to remove a dependency on perl.

     
···

       137
       134
        
       You can enable Userborn via:

     

       138
       135
        
       

     

       139
       136
        
       ```nix

     

       140
       140
       -
       {

     

       141
       141
       -
         services.userborn.enable = true;

     

       142
       142
       -
       }

     

       137
       137
       +
       { services.userborn.enable = true; }

     

       143
       138
        
       ```

     

       144
       139
        
       

     

       145
       140
        
       You can configure Userborn to store the password files

     
···

       147
       142
        
       location to `/etc`:

     

       148
       143
        
       

     

       149
       144
        
       ```nix

     

       150
       150
       -
       {

     

       151
       151
       -
         services.userborn.passwordFilesLocation = "/persistent/etc";

     

       152
       152
       -
       }

     

       145
       145
       +
       { services.userborn.passwordFilesLocation = "/persistent/etc"; }

     

       153
       146
        
       ```

     

       154
       147
        
       

     

       155
       148
        
       This is useful when you store `/etc` on a `tmpfs` or if `/etc` is immutable

+1 -3

nixos/doc/manual/configuration/wayland.chapter.md

···

       9
       9
        
       server:

     

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
       -
       {

     

       13
       13
       -
       programs.sway.enable = true;

     

       14
       14
       -
       }

     

       12
       12
       +
       { programs.sway.enable = true; }

     

       15
       13
        
       ```

     

       16
       14
        
       

     

       17
       15
        
       This installs the sway compositor along with some essential utilities.

+8 -7

nixos/doc/manual/configuration/wireless.section.md

···

       7
       7
        
       NixOS will start wpa_supplicant for you if you enable this setting:

     

       8
       8
        
       

     

       9
       9
        
       ```nix

     

       10
       10
       -
       {

     

       11
       11
       -
         networking.wireless.enable = true;

     

       12
       12
       -
       }

     

       10
       10
       +
       { networking.wireless.enable = true; }

     

       13
       11
        
       ```

     

       14
       12
        
       

     

       15
       13
        
       NixOS lets you specify networks for wpa_supplicant declaratively:

     
···

       17
       15
        
       ```nix

     

       18
       16
        
       {

     

       19
       17
        
         networking.wireless.networks = {

     

       20
       20
       -
           echelon = {                # SSID with no spaces or special characters

     

       18
       18
       +
           echelon = {

     

       19
       19
       +
             # SSID with no spaces or special characters

     

       21
       20
        
             psk = "abcdefgh";

     

       22
       21
        
           };

     

       23
       23
       -
           "echelon's AP" = {         # SSID with spaces and/or special characters

     

       22
       22
       +
           "echelon's AP" = {

     

       23
       23
       +
             # SSID with spaces and/or special characters

     

       24
       24
        
             psk = "ijklmnop";

     

       25
       25
        
           };

     

       26
       26
       -
           echelon = {                # Hidden SSID

     

       26
       26
       +
           echelon = {

     

       27
       27
       +
             # Hidden SSID

     

       27
       28
        
             hidden = true;

     

       28
       29
        
             psk = "qrstuvwx";

     

       29
       30
        
           };

     

       30
       30
       -
           free.wifi = {};            # Public wireless network

     

       31
       31
       +
           free.wifi = { }; # Public wireless network

     

       31
       32
        
         };

     

       32
       33
        
       }

     

       33
       34
        
       ```

+14 -32

nixos/doc/manual/configuration/x-windows.chapter.md

···

       4
       4
        
       interface. It can be enabled as follows:

     

       5
       5
        
       

     

       6
       6
        
       ```nix

     

       7
       7
       -
       {

     

       8
       8
       -
         services.xserver.enable = true;

     

       9
       9
       -
       }

     

       7
       7
       +
       { services.xserver.enable = true; }

     

       10
       8
        
       ```

     

       11
       9
        
       

     

       12
       10
        
       The X server will automatically detect and use the appropriate video

     
···

       14
       12
        
       also specify a driver manually, e.g.

     

       15
       13
        
       

     

       16
       14
        
       ```nix

     

       17
       17
       -
       {

     

       18
       18
       -
         services.xserver.videoDrivers = [ "r128" ];

     

       19
       19
       -
       }

     

       15
       15
       +
       { services.xserver.videoDrivers = [ "r128" ]; }

     

       20
       16
        
       ```

     

       21
       17
        
       

     

       22
       18
        
       to enable X.org's `xf86-video-r128` driver.

     
···

       63
       59
        
       this to happen, you can set:

     

       64
       60
        
       

     

       65
       61
        
       ```nix

     

       66
       66
       -
       {

     

       67
       67
       -
         services.xserver.autorun = false;

     

       68
       68
       -
       }

     

       62
       62
       +
       { services.xserver.autorun = false; }

     

       69
       63
        
       ```

     

       70
       64
        
       

     

       71
       65
        
       The X server can then be started manually:

     
···

       78
       72
        
       Wine, you should also set the following:

     

       79
       73
        
       

     

       80
       74
        
       ```nix

     

       81
       81
       -
       {

     

       82
       82
       -
         hardware.graphics.enable32Bit = true;

     

       83
       83
       -
       }

     

       75
       75
       +
       { hardware.graphics.enable32Bit = true; }

     

       84
       76
        
       ```

     

       85
       77
        
       

     

       86
       78
        
       ## Auto-login {#sec-x11-auto-login}

     
···

       98
       90
        
       your window manager, you'd define:

     

       99
       91
        
       

     

       100
       92
        
       ```nix

     

       101
       101
       -
       {

     

       102
       102
       -
         services.displayManager.defaultSession = "none+i3";

     

       103
       103
       -
       }

     

       93
       93
       +
       { services.displayManager.defaultSession = "none+i3"; }

     

       104
       94
        
       ```

     

       105
       95
        
       

     

       106
       96
        
       Every display manager in NixOS supports auto-login, here is an example

     
···

       187
       177
        
       to set one. The recommended configuration for modern systems is:

     

       188
       178
        
       

     

       189
       179
        
       ```nix

     

       190
       190
       -
       {

     

       191
       191
       -
         services.xserver.videoDrivers = [ "modesetting" ];

     

       192
       192
       -
       }

     

       180
       180
       +
       { services.xserver.videoDrivers = [ "modesetting" ]; }

     

       193
       181
        
       ```

     

       194
       182
        
       ::: {.note}

     

       195
       183
        
       The `modesetting` driver doesn't currently provide a `TearFree` option (this

     
···

       204
       192
        
       ```nix

     

       205
       193
        
       {

     

       206
       194
        
         services.xserver.videoDrivers = [ "intel" ];

     

       207
       207
       -
           services.xserver.deviceSection = ''

     

       195
       195
       +
         services.xserver.deviceSection = ''

     

       208
       196
        
           Option "DRI" "2"

     

       209
       197
        
           Option "TearFree" "true"

     

       210
       198
        
         '';

     
···

       221
       209
        
       default because it's not free software. You can enable it as follows:

     

       222
       210
        
       

     

       223
       211
        
       ```nix

     

       224
       224
       -
       {

     

       225
       225
       -
         services.xserver.videoDrivers = [ "nvidia" ];

     

       226
       226
       -
       }

     

       212
       212
       +
       { services.xserver.videoDrivers = [ "nvidia" ]; }

     

       227
       213
        
       ```

     

       228
       214
        
       

     

       229
       215
        
       If you have an older card, you may have to use one of the legacy drivers:

     
···

       245
       231
        
       Latitude series) can be enabled as follows:

     

       246
       232
        
       

     

       247
       233
        
       ```nix

     

       248
       248
       -
       {

     

       249
       249
       -
         services.libinput.enable = true;

     

       250
       250
       -
       }

     

       234
       234
       +
       { services.libinput.enable = true; }

     

       251
       235
        
       ```

     

       252
       236
        
       

     

       253
       237
        
       The driver has many options (see [](#ch-options)).

     

       254
       238
        
       For instance, the following disables tap-to-click behavior:

     

       255
       239
        
       

     

       256
       240
        
       ```nix

     

       257
       257
       -
       {

     

       258
       258
       -
         services.libinput.touchpad.tapping = false;

     

       259
       259
       -
       }

     

       241
       241
       +
       { services.libinput.touchpad.tapping = false; }

     

       260
       242
        
       ```

     

       261
       243
        
       

     

       262
       244
        
       Note: the use of `services.xserver.synaptics` is deprecated since NixOS

     
···

       310
       292
        
       {

     

       311
       293
        
         services.xserver.xkb.extraLayouts.us-greek = {

     

       312
       294
        
           description = "US layout with alt-gr greek";

     

       313
       313
       -
           languages   = [ "eng" ];

     

       295
       295
       +
           languages = [ "eng" ];

     

       314
       296
        
           symbolsFile = /yourpath/symbols/us-greek;

     

       315
       297
        
         };

     

       316
       298
        
       }

     
···

       374
       356
        
       ```nix

     

       375
       357
        
       {

     

       376
       358
        
         services.xserver.xkb.extraLayouts.media = {

     

       377
       377
       -
           description  = "Multimedia keys remapping";

     

       378
       378
       -
           languages    = [ "eng" ];

     

       379
       379
       -
           symbolsFile  = /path/to/media-key;

     

       359
       359
       +
           description = "Multimedia keys remapping";

     

       360
       360
       +
           languages = [ "eng" ];

     

       361
       361
       +
           symbolsFile = /path/to/media-key;

     

       380
       362
        
           keycodesFile = /path/to/media-sym;

     

       381
       363
        
         };

     

       382
       364
        
       }

+15 -10

nixos/doc/manual/development/assertions.section.md

···

       13
       13
        
       {

     

       14
       14
        
         config = lib.mkIf config.services.foo.enable {

     

       15
       15
        
           warnings =

     

       16
       16
       -
             if config.services.foo.bar

     

       17
       17
       -
             then [ ''You have enabled the bar feature of the foo service.

     

       18
       18
       -
                      This is known to cause some specific problems in certain situations.

     

       19
       19
       -
                      '' ]

     

       20
       20
       -
             else [];

     

       16
       16
       +
             if config.services.foo.bar then

     

       17
       17
       +
               [

     

       18
       18
       +
                 ''

     

       19
       19
       +
                   You have enabled the bar feature of the foo service.

     

       20
       20
       +
                                  This is known to cause some specific problems in certain situations.

     

       21
       21
       +
                 ''

     

       22
       22
       +
               ]

     

       23
       23
       +
             else

     

       24
       24
       +
               [ ];

     

       21
       25
        
         };

     

       22
       26
        
       }

     

       23
       27
        
       ```

     
···

       30
       34
        
       { config, lib, ... }:

     

       31
       35
        
       {

     

       32
       36
        
         config = lib.mkIf config.services.syslogd.enable {

     

       33
       33
       -
           assertions =

     

       34
       34
       -
             [ { assertion = !config.services.rsyslogd.enable;

     

       35
       35
       -
                 message = "rsyslogd conflicts with syslogd";

     

       36
       36
       -
               }

     

       37
       37
       -
             ];

     

       37
       37
       +
           assertions = [

     

       38
       38
       +
             {

     

       39
       39
       +
               assertion = !config.services.rsyslogd.enable;

     

       40
       40
       +
               message = "rsyslogd conflicts with syslogd";

     

       41
       41
       +
             }

     

       42
       42
       +
           ];

     

       38
       43
        
         };

     

       39
       44
        
       }

     

       40
       45
        
       ```

+2 -1

nixos/doc/manual/development/bootspec.chapter.md

···

       20
       20
        
       An example for SecureBoot is to get the Nix store path to `/etc/os-release` in order to bake it into a unified kernel image:

     

       21
       21
        
       

     

       22
       22
        
       ```nix

     

       23
       23
       -
       { config, lib, ... }: {

     

       23
       23
       +
       { config, lib, ... }:

     

       24
       24
       +
       {

     

       24
       25
        
         boot.bootspec.extensions = {

     

       25
       26
        
           "org.secureboot.osRelease" = config.environment.etc."os-release".source;

     

       26
       27
        
         };

+2 -6

nixos/doc/manual/development/etc-overlay.section.md

···

       9
       9
        
       overlay filesystem:

     

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
       -
       {

     

       13
       13
       -
         system.etc.overlay.enable = true;

     

       14
       14
       -
       }

     

       12
       12
       +
       { system.etc.overlay.enable = true; }

     

       15
       13
        
       ```

     

       16
       14
        
       

     

       17
       15
        
       Using an overlay has two benefits:

     
···

       24
       22
        
       setting:

     

       25
       23
        
       

     

       26
       24
        
       ```nix

     

       27
       27
       -
       {

     

       28
       28
       -
         system.etc.overlay.mutable = false;

     

       29
       29
       -
       }

     

       25
       25
       +
       { system.etc.overlay.mutable = false; }

     

       30
       26
        
       ```

     

       31
       27
        
       

     

       32
       28
        
       The overlay is atomically replaced during system switch. However, files that

+2 -1

nixos/doc/manual/development/freeform-modules.section.md

···

       23
       23
        
       for a more complete example.

     

       24
       24
        
       

     

       25
       25
        
       ```nix

     

       26
       26
       -
       { lib, config, ... }: {

     

       26
       26
       +
       { lib, config, ... }:

     

       27
       27
       +
       {

     

       27
       28
        
       

     

       28
       29
        
         options.settings = lib.mkOption {

     

       29
       30
        
           type = lib.types.submodule {

+11 -6

nixos/doc/manual/development/importing-modules.section.md

···

       4
       4
        
       outside of Nixpkgs. These modules can be imported:

     

       5
       5
        
       

     

       6
       6
        
       ```nix

     

       7
       7
       -
       { config, lib, pkgs, ... }:

     

       7
       7
       +
       {

     

       8
       8
       +
         config,

     

       9
       9
       +
         lib,

     

       10
       10
       +
         pkgs,

     

       11
       11
       +
         ...

     

       12
       12
       +
       }:

     

       8
       13
        
       

     

       9
       14
        
       {

     

       10
       10
       -
         imports =

     

       11
       11
       -
           [ # Use a locally-available module definition in

     

       12
       12
       -
             # ./example-module/default.nix

     

       13
       13
       -
               ./example-module

     

       14
       14
       -
           ];

     

       15
       15
       +
         imports = [

     

       16
       16
       +
           # Use a locally-available module definition in

     

       17
       17
       +
           # ./example-module/default.nix

     

       18
       18
       +
           ./example-module

     

       19
       19
       +
         ];

     

       15
       20
        
       

     

       16
       21
        
         services.exampleModule.enable = true;

     

       17
       22
        
       }

+6 -1

nixos/doc/manual/development/meta-attributes.section.md

···

       11
       11
        
       file.

     

       12
       12
        
       

     

       13
       13
        
       ```nix

     

       14
       14
       -
       { config, lib, pkgs, ... }:

     

       14
       14
       +
       {

     

       15
       15
       +
         config,

     

       16
       16
       +
         lib,

     

       17
       17
       +
         pkgs,

     

       18
       18
       +
         ...

     

       19
       19
       +
       }:

     

       15
       20
        
       {

     

       16
       21
        
         options = {

     

       17
       22
        
           # ...

+2 -1

nixos/doc/manual/development/non-switchable-systems.section.md

···

       8
       8
        
       profile:

     

       9
       9
        
       

     

       10
       10
        
       ```nix

     

       11
       11
       -
       { modulesPath, ... }: {

     

       11
       11
       +
       { modulesPath, ... }:

     

       12
       12
       +
       {

     

       12
       13
        
         imports = [ "${modulesPath}/profiles/image-based-appliance.nix" ];

     

       13
       14
        
       }

     

       14
       15
        
       ```

+52 -43

nixos/doc/manual/development/option-declarations.section.md

···

       79
       79
        
       ### `mkEnableOption` usage

     

       80
       80
        
       ```nix

     

       81
       81
        
       lib.mkEnableOption "magic"

     

       82
       82
       -
       # is like

     

       83
       83
       -
       lib.mkOption {

     

       84
       84
       -
         type = lib.types.bool;

     

       85
       85
       -
         default = false;

     

       86
       86
       -
         example = true;

     

       87
       87
       -
         description = "Whether to enable magic.";

     

       88
       88
       -
       }

     

       82
       82
       +
         # is like

     

       83
       83
       +
         lib.mkOption

     

       84
       84
       +
         {

     

       85
       85
       +
           type = lib.types.bool;

     

       86
       86
       +
           default = false;

     

       87
       87
       +
           example = true;

     

       88
       88
       +
           description = "Whether to enable magic.";

     

       89
       89
       +
         }

     

       89
       90
        
       ```

     

       90
       91
        
       :::

     

       91
       92
        
       

     
···

       94
       95
        
       Usage:

     

       95
       96
        
       

     

       96
       97
        
       ```nix

     

       97
       97
       -
       mkPackageOption pkgs "name" { default = [ "path" "in" "pkgs" ]; example = "literal example"; }

     

       98
       98
       +
       mkPackageOption pkgs "name" {

     

       99
       99
       +
         default = [

     

       100
       100
       +
           "path"

     

       101
       101
       +
           "in"

     

       102
       102
       +
           "pkgs"

     

       103
       103
       +
         ];

     

       104
       104
       +
         example = "literal example";

     

       105
       105
       +
       }

     

       98
       106
        
       ```

     

       99
       107
        
       

     

       100
       108
        
       Creates an Option attribute set for an option that specifies the package a module should use for some purpose.

     
···

       127
       135
        
       ### Simple `mkPackageOption` usage

     

       128
       136
        
       ```nix

     

       129
       137
        
       lib.mkPackageOption pkgs "hello" { }

     

       130
       130
       -
       # is like

     

       131
       131
       -
       lib.mkOption {

     

       132
       132
       -
         type = lib.types.package;

     

       133
       133
       -
         default = pkgs.hello;

     

       134
       134
       -
         defaultText = lib.literalExpression "pkgs.hello";

     

       135
       135
       -
         description = "The hello package to use.";

     

       136
       136
       -
       }

     

       138
       138
       +
         # is like

     

       139
       139
       +
         lib.mkOption

     

       140
       140
       +
         {

     

       141
       141
       +
           type = lib.types.package;

     

       142
       142
       +
           default = pkgs.hello;

     

       143
       143
       +
           defaultText = lib.literalExpression "pkgs.hello";

     

       144
       144
       +
           description = "The hello package to use.";

     

       145
       145
       +
         }

     

       137
       146
        
       ```

     

       138
       147
        
       :::

     

       139
       148
        
       

     

       140
       149
        
       ::: {#ex-options-declarations-util-mkPackageOption-ghc .example}

     

       141
       150
        
       ### `mkPackageOption` with explicit default and example

     

       142
       151
        
       ```nix

     

       143
       143
       -
       lib.mkPackageOption pkgs "GHC" {

     

       144
       144
       -
         default = [ "ghc" ];

     

       145
       145
       -
         example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";

     

       146
       146
       -
       }

     

       147
       147
       -
       # is like

     

       148
       148
       -
       lib.mkOption {

     

       149
       149
       -
         type = lib.types.package;

     

       150
       150
       -
         default = pkgs.ghc;

     

       151
       151
       -
         defaultText = lib.literalExpression "pkgs.ghc";

     

       152
       152
       -
         example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";

     

       153
       153
       -
         description = "The GHC package to use.";

     

       154
       154
       -
       }

     

       152
       152
       +
       lib.mkPackageOption pkgs "GHC"

     

       153
       153
       +
         {

     

       154
       154
       +
           default = [ "ghc" ];

     

       155
       155
       +
           example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";

     

       156
       156
       +
         }

     

       157
       157
       +
         # is like

     

       158
       158
       +
         lib.mkOption

     

       159
       159
       +
         {

     

       160
       160
       +
           type = lib.types.package;

     

       161
       161
       +
           default = pkgs.ghc;

     

       162
       162
       +
           defaultText = lib.literalExpression "pkgs.ghc";

     

       163
       163
       +
           example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";

     

       164
       164
       +
           description = "The GHC package to use.";

     

       165
       165
       +
         }

     

       155
       166
        
       ```

     

       156
       167
        
       :::

     

       157
       168
        
       

     

       158
       169
        
       ::: {#ex-options-declarations-util-mkPackageOption-extraDescription .example}

     

       159
       170
        
       ### `mkPackageOption` with additional description text

     

       160
       171
        
       ```nix

     

       161
       161
       -
       mkPackageOption pkgs [ "python312Packages" "torch" ] {

     

       162
       162
       -
         extraDescription = "This is an example and doesn't actually do anything.";

     

       163
       163
       -
       }

     

       164
       164
       -
       # is like

     

       165
       165
       -
       lib.mkOption {

     

       166
       166
       -
         type = lib.types.package;

     

       167
       167
       -
         default = pkgs.python312Packages.torch;

     

       168
       168
       -
         defaultText = lib.literalExpression "pkgs.python312Packages.torch";

     

       169
       169
       -
         description = "The pytorch package to use. This is an example and doesn't actually do anything.";

     

       170
       170
       -
       }

     

       172
       172
       +
       mkPackageOption pkgs [ "python312Packages" "torch" ]

     

       173
       173
       +
         {

     

       174
       174
       +
           extraDescription = "This is an example and doesn't actually do anything.";

     

       175
       175
       +
         }

     

       176
       176
       +
         # is like

     

       177
       177
       +
         lib.mkOption

     

       178
       178
       +
         {

     

       179
       179
       +
           type = lib.types.package;

     

       180
       180
       +
           default = pkgs.python312Packages.torch;

     

       181
       181
       +
           defaultText = lib.literalExpression "pkgs.python312Packages.torch";

     

       182
       182
       +
           description = "The pytorch package to use. This is an example and doesn't actually do anything.";

     

       183
       183
       +
         }

     

       171
       184
        
       ```

     

       172
       185
        
       :::

     

       173
       186
        
       

     
···

       233
       246
        
       ### Extending `services.xserver.displayManager.enable` in the `gdm` module

     

       234
       247
        
       ```nix

     

       235
       248
        
       {

     

       236
       236
       -
         services.xserver.displayManager.enable = mkOption {

     

       237
       237
       -
           type = with types; nullOr (enum [ "gdm" ]);

     

       238
       238
       -
         };

     

       249
       249
       +
         services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "gdm" ]); };

     

       239
       250
        
       }

     

       240
       251
        
       ```

     

       241
       252
        
       :::

     
···

       244
       255
        
       ### Extending `services.xserver.displayManager.enable` in the `sddm` module

     

       245
       256
        
       ```nix

     

       246
       257
        
       {

     

       247
       247
       -
         services.xserver.displayManager.enable = mkOption {

     

       248
       248
       -
           type = with types; nullOr (enum [ "sddm" ]);

     

       249
       249
       -
         };

     

       258
       258
       +
         services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); };

     

       250
       259
        
       }

     

       251
       260
        
       ```

     

       252
       261
        
       :::

+50 -33

nixos/doc/manual/development/option-def.section.md

···

       21
       21
        
       

     

       22
       22
        
       ```nix

     

       23
       23
        
       {

     

       24
       24
       -
         config = if config.services.httpd.enable then {

     

       25
       25
       -
           environment.systemPackages = [ /* ... */ ];

     

       26
       26
       -
           # ...

     

       27
       27
       -
         } else {};

     

       24
       24
       +
         config =

     

       25
       25
       +
           if config.services.httpd.enable then

     

       26
       26
       +
             {

     

       27
       27
       +
               environment.systemPackages = [

     

       28
       28
       +
                 # ...

     

       29
       29
       +
               ];

     

       30
       30
       +
               # ...

     

       31
       31
       +
             }

     

       32
       32
       +
           else

     

       33
       33
       +
             { };

     

       28
       34
        
       }

     

       29
       35
        
       ```

     

       30
       36
        
       

     
···

       35
       41
        
       

     

       36
       42
        
       ```nix

     

       37
       43
        
       {

     

       38
       38
       -
         config = if config.services.httpd.enable then {

     

       39
       39
       -
           services.httpd.enable = false;

     

       40
       40
       -
         } else {

     

       41
       41
       -
           services.httpd.enable = true;

     

       42
       42
       -
         };

     

       44
       44
       +
         config =

     

       45
       45
       +
           if config.services.httpd.enable then

     

       46
       46
       +
             {

     

       47
       47
       +
               services.httpd.enable = false;

     

       48
       48
       +
             }

     

       49
       49
       +
           else

     

       50
       50
       +
             {

     

       51
       51
       +
               services.httpd.enable = true;

     

       52
       52
       +
             };

     

       43
       53
        
       }

     

       44
       54
        
       ```

     

       45
       55
        
       

     
···

       48
       58
        
       ```nix

     

       49
       59
        
       {

     

       50
       60
        
         config = mkIf config.services.httpd.enable {

     

       51
       51
       -
           environment.systemPackages = [ /* ... */ ];

     

       61
       61
       +
           environment.systemPackages = [

     

       62
       62
       +
             # ...

     

       63
       63
       +
           ];

     

       52
       64
        
           # ...

     

       53
       65
        
         };

     

       54
       66
        
       }

     
···

       60
       72
        
       ```nix

     

       61
       73
        
       {

     

       62
       74
        
         config = {

     

       63
       63
       -
           environment.systemPackages = if config.services.httpd.enable then [ /* ... */ ] else [];

     

       75
       75
       +
           environment.systemPackages =

     

       76
       76
       +
             if config.services.httpd.enable then

     

       77
       77
       +
               [

     

       78
       78
       +
                 # ...

     

       79
       79
       +
               ]

     

       80
       80
       +
             else

     

       81
       81
       +
               [ ];

     

       64
       82
        
           # ...

     

       65
       83
        
         };

     

       66
       84
        
       }

     
···

       75
       93
        
       You can specify an explicit priority by using `mkOverride`, e.g.

     

       76
       94
        
       

     

       77
       95
        
       ```nix

     

       78
       78
       -
       {

     

       79
       79
       -
         services.openssh.enable = mkOverride 10 false;

     

       80
       80
       -
       }

     

       96
       96
       +
       { services.openssh.enable = mkOverride 10 false; }

     

       81
       97
        
       ```

     

       82
       98
        
       

     

       83
       99
        
       This definition causes all other definitions with priorities above 10 to

     
···

       92
       108
        
       As an example,

     

       93
       109
        
       

     

       94
       110
        
       ```nix

     

       95
       95
       -
       {

     

       96
       96
       -
         hardware.firmware = mkBefore [ myFirmware ];

     

       97
       97
       -
       }

     

       111
       111
       +
       { hardware.firmware = mkBefore [ myFirmware ]; }

     

       98
       112
        
       ```

     

       99
       113
        
       

     

       100
       114
        
       This definition ensures that `myFirmware` comes before other unordered

     
···

       112
       126
        
       

     

       113
       127
        
       ```nix

     

       114
       128
        
       {

     

       115
       115
       -
         config = mkMerge

     

       116
       116
       -
           [ # Unconditional stuff.

     

       117
       117
       -
             { environment.systemPackages = [ /* ... */ ];

     

       118
       118
       -
             }

     

       119
       119
       -
             # Conditional stuff.

     

       120
       120
       -
             (mkIf config.services.bla.enable {

     

       121
       121
       -
               environment.systemPackages = [ /* ... */ ];

     

       122
       122
       -
             })

     

       123
       123
       -
           ];

     

       129
       129
       +
         config = mkMerge [

     

       130
       130
       +
           # Unconditional stuff.

     

       131
       131
       +
           {

     

       132
       132
       +
             environment.systemPackages = [

     

       133
       133
       +
               # ...

     

       134
       134
       +
             ];

     

       135
       135
       +
           }

     

       136
       136
       +
           # Conditional stuff.

     

       137
       137
       +
           (mkIf config.services.bla.enable {

     

       138
       138
       +
             environment.systemPackages = [

     

       139
       139
       +
               # ...

     

       140
       140
       +
             ];

     

       141
       141
       +
           })

     

       142
       142
       +
         ];

     

       124
       143
        
       }

     

       125
       144
        
       ```

     

       126
       145
        
       

     
···

       145
       164
        
       

     

       146
       165
        
       ```nix

     

       147
       166
        
       mkDefinition {

     

       148
       148
       -
          value = mkForce 42;

     

       149
       149
       -
          file = "somefile.nix";

     

       167
       167
       +
         value = mkForce 42;

     

       168
       168
       +
         file = "somefile.nix";

     

       150
       169
        
       }

     

       151
       170
        
       ```

     

       152
       171
        
       

     
···

       154
       173
        
       

     

       155
       174
        
       ```nix

     

       156
       175
        
       mkForce (mkDefinition {

     

       157
       157
       -
          value = 42;

     

       158
       158
       -
          file = "somefile.nix";

     

       176
       176
       +
         value = 42;

     

       177
       177
       +
         file = "somefile.nix";

     

       159
       178
        
       })

     

       160
       179
        
       ```

     

       161
       180
        
       

     
···

       164
       183
        
       ```nix

     

       165
       184
        
       {

     

       166
       185
        
         _file = "file.nix";

     

       167
       167
       -
         options.foo = mkOption {

     

       168
       168
       -
           default = 13;

     

       169
       169
       -
         };

     

       186
       186
       +
         options.foo = mkOption { default = 13; };

     

       170
       187
        
         config.foo = lib.mkDefinition {

     

       171
       188
        
           file = "custom place";

     

       172
       189
        
           # mkOptionDefault creates a conflict with the option foo's `default = 1` on purpose

+38 -36

nixos/doc/manual/development/option-types.section.md

···

       495
       495
        
       {

     

       496
       496
        
         options.mod = mkOption {

     

       497
       497
        
           description = "submodule example";

     

       498
       498
       -
           type = with types; submodule {

     

       499
       499
       -
             options = {

     

       500
       500
       -
               foo = mkOption {

     

       501
       501
       -
                 type = int;

     

       502
       502
       -
               };

     

       503
       503
       -
               bar = mkOption {

     

       504
       504
       -
                 type = str;

     

       498
       498
       +
           type =

     

       499
       499
       +
             with types;

     

       500
       500
       +
             submodule {

     

       501
       501
       +
               options = {

     

       502
       502
       +
                 foo = mkOption { type = int; };

     

       503
       503
       +
                 bar = mkOption { type = str; };

     

       505
       504
        
               };

     

       506
       505
        
             };

     

       507
       507
       -
           };

     

       508
       506
        
         };

     

       509
       507
        
       }

     

       510
       508
        
       ```

     
···

       516
       514
        
       let

     

       517
       515
        
         modOptions = {

     

       518
       516
        
           options = {

     

       519
       519
       -
             foo = mkOption {

     

       520
       520
       -
               type = int;

     

       521
       521
       -
             };

     

       522
       522
       -
             bar = mkOption {

     

       523
       523
       -
               type = int;

     

       524
       524
       -
             };

     

       517
       517
       +
             foo = mkOption { type = int; };

     

       518
       518
       +
             bar = mkOption { type = int; };

     

       525
       519
        
           };

     

       526
       520
        
         };

     

       527
       521
        
       in

     
···

       546
       540
        
       {

     

       547
       541
        
         options.mod = mkOption {

     

       548
       542
        
           description = "submodule example";

     

       549
       549
       -
           type = with types; listOf (submodule {

     

       550
       550
       -
             options = {

     

       551
       551
       -
               foo = mkOption {

     

       552
       552
       -
                 type = int;

     

       543
       543
       +
           type =

     

       544
       544
       +
             with types;

     

       545
       545
       +
             listOf (submodule {

     

       546
       546
       +
               options = {

     

       547
       547
       +
                 foo = mkOption { type = int; };

     

       548
       548
       +
                 bar = mkOption { type = str; };

     

       553
       549
        
               };

     

       554
       554
       -
               bar = mkOption {

     

       555
       555
       -
                 type = str;

     

       556
       556
       -
               };

     

       557
       557
       -
             };

     

       558
       558
       -
           });

     

       550
       550
       +
             });

     

       559
       551
        
         };

     

       560
       552
        
       }

     

       561
       553
        
       ```

     
···

       566
       558
        
       ```nix

     

       567
       559
        
       {

     

       568
       560
        
         config.mod = [

     

       569
       569
       -
           { foo = 1; bar = "one"; }

     

       570
       570
       -
           { foo = 2; bar = "two"; }

     

       561
       561
       +
           {

     

       562
       562
       +
             foo = 1;

     

       563
       563
       +
             bar = "one";

     

       564
       564
       +
           }

     

       565
       565
       +
           {

     

       566
       566
       +
             foo = 2;

     

       567
       567
       +
             bar = "two";

     

       568
       568
       +
           }

     

       571
       569
        
         ];

     

       572
       570
        
       }

     

       573
       571
        
       ```

     
···

       584
       582
        
       {

     

       585
       583
        
         options.mod = mkOption {

     

       586
       584
        
           description = "submodule example";

     

       587
       587
       -
           type = with types; attrsOf (submodule {

     

       588
       588
       -
             options = {

     

       589
       589
       -
               foo = mkOption {

     

       590
       590
       -
                 type = int;

     

       585
       585
       +
           type =

     

       586
       586
       +
             with types;

     

       587
       587
       +
             attrsOf (submodule {

     

       588
       588
       +
               options = {

     

       589
       589
       +
                 foo = mkOption { type = int; };

     

       590
       590
       +
                 bar = mkOption { type = str; };

     

       591
       591
        
               };

     

       592
       592
       -
               bar = mkOption {

     

       593
       593
       -
                 type = str;

     

       594
       594
       -
               };

     

       595
       595
       -
             };

     

       596
       596
       -
           });

     

       592
       592
       +
             });

     

       597
       593
        
         };

     

       598
       594
        
       }

     

       599
       595
        
       ```

     
···

       603
       599
        
       ### Definition of attribute sets of submodules

     

       604
       600
        
       ```nix

     

       605
       601
        
       {

     

       606
       606
       -
         config.mod.one = { foo = 1; bar = "one"; };

     

       607
       607
       -
         config.mod.two = { foo = 2; bar = "two"; };

     

       602
       602
       +
         config.mod.one = {

     

       603
       603
       +
           foo = 1;

     

       604
       604
       +
           bar = "one";

     

       605
       605
       +
         };

     

       606
       606
       +
         config.mod.two = {

     

       607
       607
       +
           foo = 2;

     

       608
       608
       +
           bar = "two";

     

       609
       609
       +
         };

     

       608
       610
        
       }

     

       609
       611
        
       ```

     

       610
       612
        
       :::

+18 -8

nixos/doc/manual/development/replace-modules.section.md

···

       25
       25
        
       nixos-unstable unless explicitly configured to do so.

     

       26
       26
        
       

     

       27
       27
        
       ```nix

     

       28
       28
       -
       { config, lib, pkgs, ... }:

     

       28
       28
       +
       {

     

       29
       29
       +
         config,

     

       30
       30
       +
         lib,

     

       31
       31
       +
         pkgs,

     

       32
       32
       +
         ...

     

       33
       33
       +
       }:

     

       29
       34
        
       

     

       30
       35
        
       {

     

       31
       36
        
         disabledModules = [ "services/databases/postgresql.nix" ];

     

       32
       37
        
       

     

       33
       33
       -
         imports =

     

       34
       34
       -
           [ # Use postgresql service from nixos-unstable channel.

     

       35
       35
       -
             # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable

     

       36
       36
       -
             <nixos-unstable/nixos/modules/services/databases/postgresql.nix>

     

       37
       37
       -
           ];

     

       38
       38
       +
         imports = [

     

       39
       39
       +
           # Use postgresql service from nixos-unstable channel.

     

       40
       40
       +
           # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable

     

       41
       41
       +
           <nixos-unstable/nixos/modules/services/databases/postgresql.nix>

     

       42
       42
       +
         ];

     

       38
       43
        
       

     

       39
       44
        
         services.postgresql.enable = true;

     

       40
       45
        
       }

     
···

       45
       50
        
       without having to know its implementation details.

     

       46
       51
        
       

     

       47
       52
        
       ```nix

     

       48
       48
       -
       { config, lib, pkgs, ... }:

     

       53
       53
       +
       {

     

       54
       54
       +
         config,

     

       55
       55
       +
         lib,

     

       56
       56
       +
         pkgs,

     

       57
       57
       +
         ...

     

       58
       58
       +
       }:

     

       49
       59
        
       

     

       50
       60
        
       let

     

       51
       61
        
         inherit (lib) mkIf mkOption types;

     

       52
       62
        
         cfg = config.programs.man;

     

       53
       53
       -
       in

     

       54
       63
        
       

     

       64
       64
       +
       in

     

       55
       65
        
       {

     

       56
       66
        
         disabledModules = [ "services/programs/man.nix" ];

     

       57
       67

+3 -1

nixos/doc/manual/development/running-nixos-tests-interactively.section.md

···

       70
       70
        
       ```nix

     

       71
       71
        
       {

     

       72
       72
        
         name = "…";

     

       73
       73
       -
         nodes.machines = { /* … */ };

     

       73
       73
       +
         nodes.machines = {

     

       74
       74
       +
           # …

     

       75
       75
       +
         };

     

       74
       76
        
         interactive.sshBackdoor.enable = true;

     

       75
       77
        
       }

     

       76
       78
        
       ```

+15 -6

nixos/doc/manual/development/settings-options.section.md

···

       481
       481
        
       explanations.

     

       482
       482
        
       

     

       483
       483
        
       ```nix

     

       484
       484
       -
       { options, config, lib, pkgs, ... }:

     

       484
       484
       +
       {

     

       485
       485
       +
         options,

     

       486
       486
       +
         config,

     

       487
       487
       +
         lib,

     

       488
       488
       +
         pkgs,

     

       489
       489
       +
         ...

     

       490
       490
       +
       }:

     

       485
       491
        
       let

     

       486
       492
        
         cfg = config.services.foo;

     

       487
       493
        
         # Define the settings format used for this program

     

       488
       488
       -
         settingsFormat = pkgs.formats.json {};

     

       489
       489
       -
       in {

     

       494
       494
       +
         settingsFormat = pkgs.formats.json { };

     

       495
       495
       +
       in

     

       496
       496
       +
       {

     

       490
       497
        
       

     

       491
       498
        
         options.services.foo = {

     

       492
       499
        
           enable = lib.mkEnableOption "foo service";

     
···

       494
       501
        
           settings = lib.mkOption {

     

       495
       502
        
             # Setting this type allows for correct merging behavior

     

       496
       503
        
             type = settingsFormat.type;

     

       497
       497
       -
             default = {};

     

       504
       504
       +
             default = { };

     

       498
       505
        
             description = ''

     

       499
       506
        
               Configuration for foo, see

     

       500
       507
        
               <link xlink:href="https://example.com/docs/foo"/>

     
···

       528
       535
        
       

     

       529
       536
        
           # We know that the `user` attribute exists because we set a default value

     

       530
       537
        
           # for it above, allowing us to use it without worries here

     

       531
       531
       -
           users.users.${cfg.settings.user} = { isSystemUser = true; };

     

       538
       538
       +
           users.users.${cfg.settings.user} = {

     

       539
       539
       +
             isSystemUser = true;

     

       540
       540
       +
           };

     

       532
       541
        
       

     

       533
       542
        
           # ...

     

       534
       543
        
         };

     
···

       567
       576
        
             };

     

       568
       577
        
       

     

       569
       578
        
           };

     

       570
       570
       -
           default = {};

     

       579
       579
       +
           default = { };

     

       571
       580
        
           description = ''

     

       572
       581
        
             Configuration for Foo, see

     

       573
       582
        
             <link xlink:href="https://example.com/docs/foo"/>

+60 -37

nixos/doc/manual/development/writing-modules.chapter.md

···

       28
       28
        
       ```nix

     

       29
       29
        
       { config, pkgs, ... }:

     

       30
       30
        
       

     

       31
       31
       -
       { # option definitions

     

       31
       31
       +
       {

     

       32
       32
       +
         # option definitions

     

       32
       33
        
       }

     

       33
       34
        
       ```

     

       34
       35
        
       

     
···

       42
       43
        
       { config, pkgs, ... }:

     

       43
       44
        
       

     

       44
       45
        
       {

     

       45
       45
       -
         imports =

     

       46
       46
       -
           [ # paths of other modules

     

       47
       47
       -
           ];

     

       46
       46
       +
         imports = [

     

       47
       47
       +
           # paths of other modules

     

       48
       48
       +
         ];

     

       48
       49
        
       

     

       49
       50
        
         options = {

     

       50
       51
        
           # option declarations

     
···

       102
       103
        
       ::: {#locate-example .example}

     

       103
       104
        
       ### NixOS Module for the "locate" Service

     

       104
       105
        
       ```nix

     

       105
       105
       -
       { config, lib, pkgs, ... }:

     

       106
       106
       +
       {

     

       107
       107
       +
         config,

     

       108
       108
       +
         lib,

     

       109
       109
       +
         pkgs,

     

       110
       110
       +
         ...

     

       111
       111
       +
       }:

     

       106
       112
        
       

     

       107
       113
        
       let

     

       108
       108
       -
         inherit (lib) concatStringsSep mkIf mkOption optionalString types;

     

       114
       114
       +
         inherit (lib)

     

       115
       115
       +
           concatStringsSep

     

       116
       116
       +
           mkIf

     

       117
       117
       +
           mkOption

     

       118
       118
       +
           optionalString

     

       119
       119
       +
           types

     

       120
       120
       +
           ;

     

       109
       121
        
         cfg = config.services.locate;

     

       110
       110
       -
       in {

     

       122
       122
       +
       in

     

       123
       123
       +
       {

     

       111
       124
        
         options.services.locate = {

     

       112
       125
        
           enable = mkOption {

     

       113
       126
        
             type = types.bool;

     
···

       135
       148
        
         };

     

       136
       149
        
       

     

       137
       150
        
         config = {

     

       138
       138
       -
           systemd.services.update-locatedb =

     

       139
       139
       -
             { description = "Update Locate Database";

     

       140
       140
       -
               path  = [ pkgs.su ];

     

       141
       141
       -
               script =

     

       142
       142
       -
                 ''

     

       143
       143
       -
                   mkdir -p $(dirname ${toString cfg.output})

     

       144
       144
       -
                   chmod 0755 $(dirname ${toString cfg.output})

     

       145
       145
       -
                   exec updatedb \

     

       146
       146
       -
                     --localuser=${cfg.localuser} \

     

       147
       147
       -
                     ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \

     

       148
       148
       -
                     --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}

     

       149
       149
       -
                 '';

     

       150
       150
       -
             };

     

       151
       151
       +
           systemd.services.update-locatedb = {

     

       152
       152
       +
             description = "Update Locate Database";

     

       153
       153
       +
             path = [ pkgs.su ];

     

       154
       154
       +
             script = ''

     

       155
       155
       +
               mkdir -p $(dirname ${toString cfg.output})

     

       156
       156
       +
               chmod 0755 $(dirname ${toString cfg.output})

     

       157
       157
       +
               exec updatedb \

     

       158
       158
       +
                 --localuser=${cfg.localuser} \

     

       159
       159
       +
                 ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \

     

       160
       160
       +
                 --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}

     

       161
       161
       +
             '';

     

       162
       162
       +
           };

     

       151
       163
        
       

     

       152
       152
       -
           systemd.timers.update-locatedb = mkIf cfg.enable

     

       153
       153
       -
             { description = "Update timer for locate database";

     

       154
       154
       -
               partOf      = [ "update-locatedb.service" ];

     

       155
       155
       -
               wantedBy    = [ "timers.target" ];

     

       156
       156
       -
               timerConfig.OnCalendar = cfg.interval;

     

       157
       157
       -
             };

     

       164
       164
       +
           systemd.timers.update-locatedb = mkIf cfg.enable {

     

       165
       165
       +
             description = "Update timer for locate database";

     

       166
       166
       +
             partOf = [ "update-locatedb.service" ];

     

       167
       167
       +
             wantedBy = [ "timers.target" ];

     

       168
       168
       +
             timerConfig.OnCalendar = cfg.interval;

     

       169
       169
       +
           };

     

       158
       170
        
         };

     

       159
       171
        
       }

     

       160
       172
        
       ```

     
···

       163
       175
        
       ::: {#exec-escaping-example .example}

     

       164
       176
        
       ### Escaping in Exec directives

     

       165
       177
        
       ```nix

     

       166
       166
       -
       { config, pkgs, utils, ... }:

     

       178
       178
       +
       {

     

       179
       179
       +
         config,

     

       180
       180
       +
         pkgs,

     

       181
       181
       +
         utils,

     

       182
       182
       +
         ...

     

       183
       183
       +
       }:

     

       167
       184
        
       

     

       168
       185
        
       let

     

       169
       186
        
         cfg = config.services.echo;

     
···

       173
       190
        
             printf '%s\n' "$s"

     

       174
       191
        
           done

     

       175
       192
        
         '';

     

       176
       176
       -
         args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ];

     

       177
       177
       -
       in {

     

       178
       178
       -
         systemd.services.echo =

     

       179
       179
       -
           { description = "Echo to the journal";

     

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

     

       181
       181
       -
             serviceConfig.Type = "oneshot";

     

       182
       182
       -
             serviceConfig.ExecStart = ''

     

       183
       183
       -
               ${echoAll} ${utils.escapeSystemdExecArgs args}

     

       184
       184
       -
             '';

     

       185
       185
       -
           };

     

       193
       193
       +
         args = [

     

       194
       194
       +
           "a%Nything"

     

       195
       195
       +
           "lang=\${LANG}"

     

       196
       196
       +
           ";"

     

       197
       197
       +
           "/bin/sh -c date"

     

       198
       198
       +
         ];

     

       199
       199
       +
       in

     

       200
       200
       +
       {

     

       201
       201
       +
         systemd.services.echo = {

     

       202
       202
       +
           description = "Echo to the journal";

     

       203
       203
       +
           wantedBy = [ "multi-user.target" ];

     

       204
       204
       +
           serviceConfig.Type = "oneshot";

     

       205
       205
       +
           serviceConfig.ExecStart = ''

     

       206
       206
       +
             ${echoAll} ${utils.escapeSystemdExecArgs args}

     

       207
       207
       +
           '';

     

       208
       208
       +
         };

     

       186
       209
        
       }

     

       187
       210
        
       ```

     

       188
       211
        
       :::

+33 -29

nixos/doc/manual/development/writing-nixos-tests.section.md

···

       6
       6
        
       {

     

       7
       7
        
       

     

       8
       8
        
         # One or more machines:

     

       9
       9
       -
         nodes =

     

       10
       10
       -
           { machine =

     

       11
       11
       -
               { config, pkgs, ... }: { /* ... */ };

     

       12
       12
       -
             machine2 =

     

       13
       13
       -
               { config, pkgs, ... }: { /* ... */ };

     

       14
       14
       -
             # …

     

       15
       15
       -
           };

     

       9
       9
       +
         nodes = {

     

       10
       10
       +
           machine =

     

       11
       11
       +
             { config, pkgs, ... }:

     

       12
       12
       +
             {

     

       13
       13
       +
               # ...

     

       14
       14
       +
             };

     

       15
       15
       +
           machine2 =

     

       16
       16
       +
             { config, pkgs, ... }:

     

       17
       17
       +
             {

     

       18
       18
       +
               # ...

     

       19
       19
       +
             };

     

       20
       20
       +
           # …

     

       21
       21
       +
         };

     

       16
       22
        
       

     

       17
       17
       -
         testScript =

     

       18
       18
       -
           ''

     

       19
       19
       -
             Python code…

     

       20
       20
       -
           '';

     

       23
       23
       +
         testScript = ''

     

       24
       24
       +
           Python code…

     

       25
       25
       +
         '';

     

       21
       26
        
       }

     

       22
       27
        
       ```

     

       23
       28
        
       

     
···

       46
       51
        
       Tests that are part of NixOS are added to [`nixos/tests/all-tests.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/all-tests.nix).

     

       47
       52
        
       

     

       48
       53
        
       ```nix

     

       49
       49
       -
       {

     

       50
       50
       -
         hostname = runTest ./hostname.nix;

     

       51
       51
       -
       }

     

       54
       54
       +
       { hostname = runTest ./hostname.nix; }

     

       52
       55
        
       ```

     

       53
       56
        
       

     

       54
       57
        
       Overrides can be added by defining an anonymous module in `all-tests.nix`.

     
···

       75
       78
        
       `pkgs.testers`:

     

       76
       79
        
       

     

       77
       80
        
       ```nix

     

       78
       78
       -
       let pkgs = import <nixpkgs> {};

     

       81
       81
       +
       let

     

       82
       82
       +
         pkgs = import <nixpkgs> { };

     

       83
       83
       +
       

     

       79
       84
        
       in

     

       80
       80
       -
       

     

       81
       85
        
       pkgs.testers.runNixOSTest {

     

       82
       86
        
         imports = [ ./test.nix ];

     

       83
       87
        
         defaults.services.foo.package = mypkg;

     
···

       166
       170
        
         skipLint = true;

     

       167
       171
        
         nodes.machine =

     

       168
       172
        
           { config, pkgs, ... }:

     

       169
       169
       -
           { # configuration…

     

       173
       173
       +
           {

     

       174
       174
       +
             # configuration…

     

       170
       175
        
           };

     

       171
       176
        
       

     

       172
       172
       -
         testScript =

     

       173
       173
       -
           ''

     

       174
       174
       -
             Python code…

     

       175
       175
       -
           '';

     

       177
       177
       +
         testScript = ''

     

       178
       178
       +
           Python code…

     

       179
       179
       +
         '';

     

       176
       180
        
       }

     

       177
       181
        
       ```

     

       178
       182
        
       

     
···

       183
       187
        
       

     

       184
       188
        
       ```nix

     

       185
       189
        
       {

     

       186
       186
       -
         testScript =

     

       187
       187
       -
           ''

     

       188
       188
       -
             # fmt: off

     

       189
       189
       -
             Python code…

     

       190
       190
       -
             # fmt: on

     

       191
       191
       -
           '';

     

       190
       190
       +
         testScript = ''

     

       191
       191
       +
           # fmt: off

     

       192
       192
       +
           Python code…

     

       193
       193
       +
           # fmt: on

     

       194
       194
       +
         '';

     

       192
       195
        
       }

     

       193
       196
        
       ```

     

       194
       197
        
       

     
···

       200
       203
        
         skipTypeCheck = true;

     

       201
       204
        
         nodes.machine =

     

       202
       205
        
           { config, pkgs, ... }:

     

       203
       203
       -
           { # configuration…

     

       206
       206
       +
           {

     

       207
       207
       +
             # configuration…

     

       204
       208
        
           };

     

       205
       209
        
       }

     

       206
       210
        
       ```

     
···

       360
       364
        
       

     

       361
       365
        
       ```nix

     

       362
       366
        
       {

     

       363
       363
       -
         nodes.machine = {};

     

       367
       367
       +
         nodes.machine = { };

     

       364
       368
        
       

     

       365
       369
        
         sshBackdoor.enable = true;

     

       366
       370
        
         enableDebugHook = true;

+39 -29

nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md

···

       9
       9
        
       An example of how to build an image:

     

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
       -
       { config, modulesPath, ... }: {

     

       12
       12
       +
       { config, modulesPath, ... }:

     

       13
       13
       +
       {

     

       13
       14
        
       

     

       14
       15
        
         imports = [ "${modulesPath}/image/repart.nix" ];

     

       15
       16
        
       

     
···

       88
       89
        
         efiArch = pkgs.stdenv.hostPlatform.efiArch;

     

       89
       90
        
       in

     

       90
       91
        
       (pkgs.nixos [

     

       91
       91
       -
         ({ config, lib, pkgs, modulesPath, ... }: {

     

       92
       92
       +
         (

     

       93
       93
       +
           {

     

       94
       94
       +
             config,

     

       95
       95
       +
             lib,

     

       96
       96
       +
             pkgs,

     

       97
       97
       +
             modulesPath,

     

       98
       98
       +
             ...

     

       99
       99
       +
           }:

     

       100
       100
       +
           {

     

       92
       101
        
       

     

       93
       93
       -
           imports = [ "${modulesPath}/image/repart.nix" ];

     

       102
       102
       +
             imports = [ "${modulesPath}/image/repart.nix" ];

     

       94
       103
        
       

     

       95
       95
       -
           boot.loader.grub.enable = false;

     

       104
       104
       +
             boot.loader.grub.enable = false;

     

       96
       105
        
       

     

       97
       97
       -
           fileSystems."/".device = "/dev/disk/by-label/nixos";

     

       106
       106
       +
             fileSystems."/".device = "/dev/disk/by-label/nixos";

     

       98
       107
        
       

     

       99
       99
       -
           image.repart = {

     

       100
       100
       -
             name = "image";

     

       101
       101
       -
             partitions = {

     

       102
       102
       -
               "esp" = {

     

       103
       103
       -
                 contents = {

     

       104
       104
       -
                   "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =

     

       105
       105
       -
                     "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";

     

       108
       108
       +
             image.repart = {

     

       109
       109
       +
               name = "image";

     

       110
       110
       +
               partitions = {

     

       111
       111
       +
                 "esp" = {

     

       112
       112
       +
                   contents = {

     

       113
       113
       +
                     "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =

     

       114
       114
       +
                       "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";

     

       106
       115
        
       

     

       107
       107
       -
                   "/EFI/Linux/${config.system.boot.loader.ukiFile}".source =

     

       108
       108
       -
                     "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";

     

       109
       109
       -
                 };

     

       110
       110
       -
                 repartConfig = {

     

       111
       111
       -
                   Type = "esp";

     

       112
       112
       -
                   Format = "vfat";

     

       113
       113
       -
                   SizeMinBytes = "96M";

     

       116
       116
       +
                     "/EFI/Linux/${config.system.boot.loader.ukiFile}".source =

     

       117
       117
       +
                       "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";

     

       118
       118
       +
                   };

     

       119
       119
       +
                   repartConfig = {

     

       120
       120
       +
                     Type = "esp";

     

       121
       121
       +
                     Format = "vfat";

     

       122
       122
       +
                     SizeMinBytes = "96M";

     

       123
       123
       +
                   };

     

       114
       124
        
                 };

     

       115
       115
       -
               };

     

       116
       116
       -
               "root" = {

     

       117
       117
       -
                 storePaths = [ config.system.build.toplevel ];

     

       118
       118
       -
                 repartConfig = {

     

       119
       119
       -
                   Type = "root";

     

       120
       120
       -
                   Format = "ext4";

     

       121
       121
       -
                   Label = "nixos";

     

       122
       122
       -
                   Minimize = "guess";

     

       125
       125
       +
                 "root" = {

     

       126
       126
       +
                   storePaths = [ config.system.build.toplevel ];

     

       127
       127
       +
                   repartConfig = {

     

       128
       128
       +
                     Type = "root";

     

       129
       129
       +
                     Format = "ext4";

     

       130
       130
       +
                     Label = "nixos";

     

       131
       131
       +
                     Minimize = "guess";

     

       132
       132
       +
                   };

     

       123
       133
        
                 };

     

       124
       134
        
               };

     

       125
       135
        
             };

     

       126
       126
       -
           };

     

       127
       136
        
       

     

       128
       128
       -
         })

     

       137
       137
       +
           }

     

       138
       138
       +
         )

     

       129
       139
        
       ]).image

     

       130
       140
        
       ```

+4 -1

nixos/doc/manual/installation/building-nixos.chapter.md

···

       48
       48
        
       

     

       49
       49
        
         boot.initrd.kernelModules = [ "wl" ];

     

       50
       50
        
       

     

       51
       51
       -
         boot.kernelModules = [ "kvm-intel" "wl" ];

     

       51
       51
       +
         boot.kernelModules = [

     

       52
       52
       +
           "kvm-intel"

     

       53
       53
       +
           "wl"

     

       54
       54
       +
         ];

     

       52
       55
        
         boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];

     

       53
       56
        
       }

     

       54
       57
        
       ```

+1 -3

nixos/doc/manual/installation/changing-config.chapter.md

···

       87
       87
        
       following to your configuration:

     

       88
       88
        
       

     

       89
       89
        
       ```nix

     

       90
       90
       -
       {

     

       91
       91
       -
         users.users.your-user.initialHashedPassword = "test";

     

       92
       92
       -
       }

     

       90
       90
       +
       { users.users.your-user.initialHashedPassword = "test"; }

     

       93
       91
        
       ```

     

       94
       92
        
       

     

       95
       93
        
       *Important:* delete the \$hostname.qcow2 file if you have started the

+1 -3

nixos/doc/manual/installation/installing-from-other-distro.section.md

···

       180
       180
        
           `sudo passwd -l root` if you use `sudo`)

     

       181
       181
        
       

     

       182
       182
        
           ```nix

     

       183
       183
       -
           {

     

       184
       184
       -
             users.users.root.initialHashedPassword = "";

     

       185
       185
       -
           }

     

       183
       183
       +
           { users.users.root.initialHashedPassword = ""; }

     

       186
       184
        
           ```

     

       187
       185
        
       

     

       188
       186
        
       1.  Build the NixOS closure and install it in the `system` profile:

+4 -7

nixos/doc/manual/installation/installing-kexec.section.md

···

       41
       41
        
       the default installer image, you can build your own `configuration.nix`:

     

       42
       42
        
       

     

       43
       43
        
       ```nix

     

       44
       44
       -
       { modulesPath, ... }: {

     

       45
       45
       -
         imports = [

     

       46
       46
       -
           (modulesPath + "/installer/netboot/netboot-minimal.nix")

     

       47
       47
       -
         ];

     

       44
       44
       +
       { modulesPath, ... }:

     

       45
       45
       +
       {

     

       46
       46
       +
         imports = [ (modulesPath + "/installer/netboot/netboot-minimal.nix") ];

     

       48
       47
        
       

     

       49
       48
        
         services.openssh.enable = true;

     

       50
       50
       -
         users.users.root.openssh.authorizedKeys.keys = [

     

       51
       51
       -
           "my-ssh-pubkey"

     

       52
       52
       -
         ];

     

       49
       49
       +
         users.users.root.openssh.authorizedKeys.keys = [ "my-ssh-pubkey" ];

     

       53
       50
        
       }

     

       54
       51
        
       ```

     

       55
       52

+7 -8

nixos/doc/manual/installation/installing-virtualbox-guest.section.md

···

       27
       27
        
       Enable booting:

     

       28
       28
        
       

     

       29
       29
        
       ```nix

     

       30
       30
       -
       {

     

       31
       31
       -
         boot.loader.grub.device = "/dev/sda";

     

       32
       32
       -
       }

     

       30
       30
       +
       { boot.loader.grub.device = "/dev/sda"; }

     

       33
       31
        
       ```

     

       34
       32
        
       

     

       35
       33
        
       Also remove the fsck that runs at startup. It will always fail to run,

     

       36
       34
        
       stopping your boot until you press `*`.

     

       37
       35
        
       

     

       38
       36
        
       ```nix

     

       39
       39
       -
       {

     

       40
       40
       -
         boot.initrd.checkJournalingFS = false;

     

       41
       41
       -
       }

     

       37
       37
       +
       { boot.initrd.checkJournalingFS = false; }

     

       42
       38
        
       ```

     

       43
       39
        
       

     

       44
       40
        
       Shared folders can be given a name and a path in the host system in the

     
···

       48
       44
        
       `"nofail"`, the system will not boot properly.

     

       49
       45
        
       

     

       50
       46
        
       ```nix

     

       51
       51
       -
       { config, pkgs, ...} :

     

       47
       47
       +
       { config, pkgs, ... }:

     

       52
       48
        
       {

     

       53
       49
        
         fileSystems."/virtualboxshare" = {

     

       54
       50
        
           fsType = "vboxsf";

     

       55
       51
        
           device = "nameofthesharedfolder";

     

       56
       56
       -
           options = [ "rw" "nofail" ];

     

       52
       52
       +
           options = [

     

       53
       53
       +
             "rw"

     

       54
       54
       +
             "nofail"

     

       55
       55
       +
           ];

     

       57
       56
        
         };

     

       58
       57
        
       }

     

       59
       58
        
       ```

+1 -3

nixos/doc/manual/installation/upgrading.chapter.md

···

       118
       118
        
       modules. You can also specify a channel explicitly, e.g.

     

       119
       119
        
       

     

       120
       120
        
       ```nix

     

       121
       121
       -
       {

     

       122
       122
       -
         system.autoUpgrade.channel = "https://channels.nixos.org/nixos-25.05";

     

       123
       123
       -
       }

     

       121
       121
       +
       { system.autoUpgrade.channel = "https://channels.nixos.org/nixos-25.05"; }

     

       124
       122
        
       ```

+3 -9

nixos/doc/manual/release-notes/rl-1404.section.md

···

       23
       23
        
       - Systemd units provided by packages can now be overridden from the NixOS configuration. For instance, if a package `foo` provides systemd units, you can say:

     

       24
       24
        
       

     

       25
       25
        
         ```nix

     

       26
       26
       -
         {

     

       27
       27
       -
           systemd.packages = [ pkgs.foo ];

     

       28
       28
       -
         }

     

       26
       26
       +
         { systemd.packages = [ pkgs.foo ]; }

     

       29
       27
        
         ```

     

       30
       28
        
       

     

       31
       29
        
         to enable those units. You can then set or override unit options in the usual way, e.g.

     
···

       42
       40
        
       - Nixpkgs no longer exposes unfree packages by default. If your NixOS configuration requires unfree packages from Nixpkgs, you need to enable support for them explicitly by setting:

     

       43
       41
        
       

     

       44
       42
        
         ```nix

     

       45
       45
       -
         {

     

       46
       46
       -
           nixpkgs.config.allowUnfree = true;

     

       47
       47
       -
         }

     

       43
       43
       +
         { nixpkgs.config.allowUnfree = true; }

     

       48
       44
        
         ```

     

       49
       45
        
       

     

       50
       46
        
         Otherwise, you get an error message such as:

     
···

       67
       63
        
       - The firewall is now enabled by default. If you don't want this, you need to disable it explicitly:

     

       68
       64
        
       

     

       69
       65
        
         ```nix

     

       70
       70
       -
         {

     

       71
       71
       -
           networking.firewall.enable = false;

     

       72
       72
       -
         }

     

       66
       66
       +
         { networking.firewall.enable = false; }

     

       73
       67
        
         ```

     

       74
       68
        
       

     

       75
       69
        
       - The option `boot.loader.grub.memtest86` has been renamed to `boot.loader.grub.memtest86.enable`.

+1 -3

nixos/doc/manual/release-notes/rl-1412.section.md

···

       143
       143
        
       - The default version of Apache httpd is now 2.4. If you use the `extraConfig` option to pass literal Apache configuration text, you may need to update it --- see [Apache's documentation](http://httpd.apache.org/docs/2.4/upgrading.html) for details. If you wish to continue to use httpd 2.2, add the following line to your NixOS configuration:

     

       144
       144
        
       

     

       145
       145
        
         ```nix

     

       146
       146
       -
         {

     

       147
       147
       -
           services.httpd.package = pkgs.apacheHttpd_2_2;

     

       148
       148
       -
         }

     

       146
       146
       +
         { services.httpd.package = pkgs.apacheHttpd_2_2; }

     

       149
       147
        
         ```

     

       150
       148
        
       

     

       151
       149
        
       - PHP 5.3 has been removed because it is no longer supported by the PHP project. A [migration guide](http://php.net/migration54) is available.

+23 -14

nixos/doc/manual/release-notes/rl-1509.section.md

···

       9
       9
        
       - You can now keep your NixOS system up to date automatically by setting

     

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
       -
       {

     

       13
       13
       -
         system.autoUpgrade.enable = true;

     

       14
       14
       -
       }

     

       12
       12
       +
       { system.autoUpgrade.enable = true; }

     

       15
       13
        
       ```

     

       16
       14
        
       

     

       17
       15
        
       This will cause the system to periodically check for updates in your current channel and run `nixos-rebuild`.

     
···

       167
       165
        
       - `sshd` no longer supports DSA and ECDSA host keys by default. If you have existing systems with such host keys and want to continue to use them, please set

     

       168
       166
        
       

     

       169
       167
        
       ```nix

     

       170
       170
       -
       {

     

       171
       171
       -
         system.stateVersion = "14.12";

     

       172
       172
       -
       }

     

       168
       168
       +
       { system.stateVersion = "14.12"; }

     

       173
       169
        
       ```

     

       174
       170
        
       

     

       175
       171
        
       The new option `system.stateVersion` ensures that certain configuration changes that could break existing systems (such as the `sshd` host key setting) will maintain compatibility with the specified NixOS release. NixOps sets the state version of existing deployments automatically.

     
···

       253
       249
        
       

     

       254
       250
        
         {

     

       255
       251
        
           options = {

     

       256
       256
       -
             foo = mkOption { /* … */ };

     

       252
       252
       +
             foo = mkOption {

     

       253
       253
       +
               # …

     

       254
       254
       +
             };

     

       257
       255
        
           };

     

       258
       258
       -
           config = mkIf config.foo { /* … */ };

     

       256
       256
       +
           config = mkIf config.foo {

     

       257
       257
       +
             # …

     

       258
       258
       +
           };

     

       259
       259
        
         }

     

       260
       260
        
         ```

     

       261
       261
        
       

     

       262
       262
        
         should be modified to look like:

     

       263
       263
        
       

     

       264
       264
        
         ```nix

     

       265
       265
       -
         { config, pkgs, lib, ... }:

     

       265
       265
       +
         {

     

       266
       266
       +
           config,

     

       267
       267
       +
           pkgs,

     

       268
       268
       +
           lib,

     

       269
       269
       +
           ...

     

       270
       270
       +
         }:

     

       266
       271
        
       

     

       267
       272
        
         with lib;

     

       268
       273
        
       

     

       269
       274
        
         {

     

       270
       275
        
           options = {

     

       271
       271
       -
             foo = mkOption { /* option declaration */ };

     

       276
       276
       +
             foo = mkOption {

     

       277
       277
       +
               # option declaration

     

       278
       278
       +
             };

     

       272
       279
        
           };

     

       273
       273
       -
           config = mkIf config.foo { /* option definition */ };

     

       280
       280
       +
           config = mkIf config.foo {

     

       281
       281
       +
             # option definition

     

       282
       282
       +
           };

     

       274
       283
        
         }

     

       275
       284
        
         ```

     

       276
       285
        
       

     
···

       284
       293
        
             src = url;

     

       285
       294
        
             sha256 = hash;

     

       286
       295
        
           };

     

       287
       287
       -
         in

     

       288
       296
        
       

     

       297
       297
       +
         in

     

       289
       298
        
         {

     

       290
       299
        
           imports = [ "${myProject}/module.nix" ];

     

       291
       300
        
         }

     
···

       297
       306
        
         { config, pkgs, ... }:

     

       298
       307
        
       

     

       299
       308
        
         let

     

       300
       300
       -
           myProject = (import <nixpkgs> {}).fetchurl {

     

       309
       309
       +
           myProject = (import <nixpkgs> { }).fetchurl {

     

       301
       310
        
             src = url;

     

       302
       311
        
             sha256 = hash;

     

       303
       312
        
           };

     

       304
       304
       -
         in

     

       305
       313
        
       

     

       314
       314
       +
         in

     

       306
       315
        
         {

     

       307
       316
        
           imports = [ "${myProject}/module.nix" ];

     

       308
       317
        
         }

+23 -10

nixos/doc/manual/release-notes/rl-1603.section.md

···

       137
       137
        
       - Gitit is no longer automatically added to the module list in NixOS and as such there will not be any manual entries for it. You will need to add an import statement to your NixOS configuration in order to use it, e.g.

     

       138
       138
        
       

     

       139
       139
        
         ```nix

     

       140
       140
       -
         {

     

       141
       141
       -
           imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ];

     

       142
       142
       -
         }

     

       140
       140
       +
         { imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ]; }

     

       143
       141
        
         ```

     

       144
       142
        
       

     

       145
       143
        
         will include the Gitit service configuration options.

     
···

       148
       146
        
       

     

       149
       147
        
         ```nix

     

       150
       148
        
         nginx.override {

     

       151
       151
       -
           modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];

     

       149
       149
       +
           modules = [

     

       150
       150
       +
             nginxModules.rtmp

     

       151
       151
       +
             nginxModules.dav

     

       152
       152
       +
             nginxModules.moreheaders

     

       153
       153
       +
           ];

     

       152
       154
        
         }

     

       153
       155
        
         ```

     

       154
       156
        
       

     
···

       173
       175
        
           fileSystems."/example" = {

     

       174
       176
        
             device = "/dev/sdc";

     

       175
       177
        
             fsType = "btrfs";

     

       176
       176
       -
             options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ];

     

       178
       178
       +
             options = [

     

       179
       179
       +
               "noatime"

     

       180
       180
       +
               "compress=lzo"

     

       181
       181
       +
               "space_cache"

     

       182
       182
       +
               "autodefrag"

     

       183
       183
       +
             ];

     

       177
       184
        
           };

     

       178
       185
        
         }

     

       179
       186
        
         ```

     
···

       189
       196
        
         ```nix

     

       190
       197
        
         {

     

       191
       198
        
           i18n.inputMethod.enabled = "ibus";

     

       192
       192
       -
           i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ];

     

       199
       199
       +
           i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [

     

       200
       200
       +
             anthy

     

       201
       201
       +
             mozc

     

       202
       202
       +
           ];

     

       193
       203
        
         }

     

       194
       204
        
         ```

     

       195
       205
        
       

     
···

       198
       208
        
         ```nix

     

       199
       209
        
         {

     

       200
       210
        
           programs.ibus.enable = true;

     

       201
       201
       -
           programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];

     

       211
       211
       +
           programs.ibus.plugins = with pkgs; [

     

       212
       212
       +
             ibus-anthy

     

       213
       213
       +
             mozc

     

       214
       214
       +
           ];

     

       202
       215
        
         }

     

       203
       216
        
         ```

     

       204
       217
        
       

     
···

       229
       242
        
         ```nix

     

       230
       243
        
         {

     

       231
       244
        
           services.syncthing = {

     

       232
       232
       -
               enable = true;

     

       233
       233
       -
               dataDir = "/home/somebody/.syncthing";

     

       234
       234
       -
               user = "somebody";

     

       245
       245
       +
             enable = true;

     

       246
       246
       +
             dataDir = "/home/somebody/.syncthing";

     

       247
       247
       +
             user = "somebody";

     

       235
       248
        
           };

     

       236
       249
        
         }

     

       237
       250
        
         ```

+1 -3

nixos/doc/manual/release-notes/rl-1609.section.md

···

       49
       49
        
       - Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to set

     

       50
       50
        
       

     

       51
       51
        
         ```nix

     

       52
       52
       -
         {

     

       53
       53
       -
           security.grsecurity.enable = true;

     

       54
       54
       -
         }

     

       52
       52
       +
         { security.grsecurity.enable = true; }

     

       55
       53
        
         ```

     

       56
       54
        
       

     

       57
       55
        
         to get a reasonably secure system without having to sacrifice too much functionality.

+14 -4

nixos/doc/manual/release-notes/rl-1703.section.md

···

       244
       244
        
       

     

       245
       245
        
         ```nix

     

       246
       246
        
         let

     

       247
       247
       -
           pkgs = import <nixpkgs> {};

     

       247
       247
       +
           pkgs = import <nixpkgs> { };

     

       248
       248
        
         in

     

       249
       249
       -
           pkgs.overridePackages (self: super: { /* ... */ })

     

       249
       249
       +
         pkgs.overridePackages (

     

       250
       250
       +
           self: super: {

     

       251
       251
       +
             # ...

     

       252
       252
       +
           }

     

       253
       253
       +
         )

     

       250
       254
        
         ```

     

       251
       255
        
       

     

       252
       256
        
         should be replaced by:

     

       253
       257
        
       

     

       254
       258
        
         ```nix

     

       255
       259
        
         let

     

       256
       256
       -
           pkgs = import <nixpkgs> {};

     

       260
       260
       +
           pkgs = import <nixpkgs> { };

     

       257
       261
        
         in

     

       258
       258
       -
           import pkgs.path { overlays = [(self: super: { /* ... */ })]; }

     

       262
       262
       +
         import pkgs.path {

     

       263
       263
       +
           overlays = [

     

       264
       264
       +
             (self: super: {

     

       265
       265
       +
               # ...

     

       266
       266
       +
             })

     

       267
       267
       +
           ];

     

       268
       268
       +
         }

     

       259
       269
        
         ```

     

       260
       270
        
       

     

       261
       271
        
       - Autoloading connection tracking helpers is now disabled by default. This default was also changed in the Linux kernel and is considered insecure if not configured properly in your firewall. If you need connection tracking helpers (i.e. for active FTP) please enable `networking.firewall.autoLoadConntrackHelpers` and tune `networking.firewall.connectionTrackingModules` to suit your needs.

+2 -1

nixos/doc/manual/release-notes/rl-1709.section.md

···

       11
       11
        
       - The module option `services.xserver.xrandrHeads` now causes the first head specified in this list to be set as the primary head. Apart from that, it's now possible to also set additional options by using an attribute set, for example:

     

       12
       12
        
       

     

       13
       13
        
         ```nix

     

       14
       14
       -
         { services.xserver.xrandrHeads = [

     

       14
       14
       +
         {

     

       15
       15
       +
           services.xserver.xrandrHeads = [

     

       15
       16
        
             "HDMI-0"

     

       16
       17
        
             {

     

       17
       18
        
               output = "DVI-0";

+4 -2

nixos/doc/manual/release-notes/rl-1803.section.md

···

       267
       267
        
         ```nix

     

       268
       268
        
         {

     

       269
       269
        
           services.xserver.displayManager.lightdm.greeters.gtk.indicators = [

     

       270
       270
       -
             "~host" "~spacer"

     

       271
       271
       -
             "~clock" "~spacer"

     

       270
       270
       +
             "~host"

     

       271
       271
       +
             "~spacer"

     

       272
       272
       +
             "~clock"

     

       273
       273
       +
             "~spacer"

     

       272
       274
        
             "~session"

     

       273
       275
        
             "~language"

     

       274
       276
        
             "~a11y"

+11 -5

nixos/doc/manual/release-notes/rl-1809.section.md

···

       248
       248
        
       

     

       249
       249
        
         ```nix

     

       250
       250
        
         {

     

       251
       251
       -
           inherit (pkgs.nixos {

     

       252
       252
       -
             boot.loader.grub.enable = false;

     

       253
       253
       -
             fileSystems."/".device = "/dev/xvda1";

     

       254
       254
       -
           }) toplevel kernel initialRamdisk manual;

     

       251
       251
       +
           inherit

     

       252
       252
       +
             (pkgs.nixos {

     

       253
       253
       +
               boot.loader.grub.enable = false;

     

       254
       254
       +
               fileSystems."/".device = "/dev/xvda1";

     

       255
       255
       +
             })

     

       256
       256
       +
             toplevel

     

       257
       257
       +
             kernel

     

       258
       258
       +
             initialRamdisk

     

       259
       259
       +
             manual

     

       260
       260
       +
             ;

     

       255
       261
        
         }

     

       256
       262
        
         ```

     

       257
       263
        
       

     
···

       290
       296
        
         { config, ... }:

     

       291
       297
        
       

     

       292
       298
        
         {

     

       293
       293
       -
           security.dhparams.params.myservice = {};

     

       299
       299
       +
           security.dhparams.params.myservice = { };

     

       294
       300
        
           environment.etc."myservice.conf".text = ''

     

       295
       301
        
             dhparams = ${config.security.dhparams.params.myservice.path}

     

       296
       302
        
           '';

+26 -27

nixos/doc/manual/release-notes/rl-1903.section.md

···

       97
       97
        
       

     

       98
       98
        
         ```nix

     

       99
       99
        
         {

     

       100
       100
       -
           services.nscd.config =

     

       101
       101
       -
           ''

     

       102
       102
       -
           server-user             nscd

     

       103
       103
       -
           threads                 1

     

       104
       104
       -
           paranoia                no

     

       105
       105
       -
           debug-level             0

     

       100
       100
       +
           services.nscd.config = ''

     

       101
       101
       +
             server-user             nscd

     

       102
       102
       +
             threads                 1

     

       103
       103
       +
             paranoia                no

     

       104
       104
       +
             debug-level             0

     

       106
       105
        
       

     

       107
       107
       -
           enable-cache            passwd          yes

     

       108
       108
       -
           positive-time-to-live   passwd          600

     

       109
       109
       -
           negative-time-to-live   passwd          20

     

       110
       110
       -
           suggested-size          passwd          211

     

       111
       111
       -
           check-files             passwd          yes

     

       112
       112
       -
           persistent              passwd          no

     

       113
       113
       -
           shared                  passwd          yes

     

       106
       106
       +
             enable-cache            passwd          yes

     

       107
       107
       +
             positive-time-to-live   passwd          600

     

       108
       108
       +
             negative-time-to-live   passwd          20

     

       109
       109
       +
             suggested-size          passwd          211

     

       110
       110
       +
             check-files             passwd          yes

     

       111
       111
       +
             persistent              passwd          no

     

       112
       112
       +
             shared                  passwd          yes

     

       114
       113
        
       

     

       115
       115
       -
           enable-cache            group           yes

     

       116
       116
       -
           positive-time-to-live   group           3600

     

       117
       117
       -
           negative-time-to-live   group           60

     

       118
       118
       -
           suggested-size          group           211

     

       119
       119
       -
           check-files             group           yes

     

       120
       120
       -
           persistent              group           no

     

       121
       121
       -
           shared                  group           yes

     

       114
       114
       +
             enable-cache            group           yes

     

       115
       115
       +
             positive-time-to-live   group           3600

     

       116
       116
       +
             negative-time-to-live   group           60

     

       117
       117
       +
             suggested-size          group           211

     

       118
       118
       +
             check-files             group           yes

     

       119
       119
       +
             persistent              group           no

     

       120
       120
       +
             shared                  group           yes

     

       122
       121
        
       

     

       123
       123
       -
           enable-cache            hosts           yes

     

       124
       124
       -
           positive-time-to-live   hosts           600

     

       125
       125
       -
           negative-time-to-live   hosts           5

     

       126
       126
       -
           suggested-size          hosts           211

     

       127
       127
       -
           check-files             hosts           yes

     

       128
       128
       -
           persistent              hosts           no

     

       129
       129
       -
           shared                  hosts           yes

     

       122
       122
       +
             enable-cache            hosts           yes

     

       123
       123
       +
             positive-time-to-live   hosts           600

     

       124
       124
       +
             negative-time-to-live   hosts           5

     

       125
       125
       +
             suggested-size          hosts           211

     

       126
       126
       +
             check-files             hosts           yes

     

       127
       127
       +
             persistent              hosts           no

     

       128
       128
       +
             shared                  hosts           yes

     

       130
       129
        
           '';

     

       131
       130
        
         }

     

       132
       131
        
         ```

+31 -24

nixos/doc/manual/release-notes/rl-2003.section.md

···

       56
       56
        
         you should change it to:

     

       57
       57
        
       

     

       58
       58
        
         ```nix

     

       59
       59
       -
         {

     

       60
       60
       -
           services.xserver.displayManager.defaultSession = "xfce+icewm";

     

       61
       61
       -
         }

     

       59
       59
       +
         { services.xserver.displayManager.defaultSession = "xfce+icewm"; }

     

       62
       60
        
         ```

     

       63
       61
        
       

     

       64
       62
        
       - The testing driver implementation in NixOS is now in Python `make-test-python.nix`. This was done by Jacek Galowicz ([\@tfc](https://github.com/tfc)), and with the collaboration of Julian Stecklina ([\@blitz](https://github.com/blitz)) and Jana Traue ([\@jtraue](https://github.com/jtraue)). All documentation has been updated to use this testing driver, and a vast majority of the 286 tests in NixOS were ported to python driver. In 20.09 the Perl driver implementation, `make-test.nix`, is slated for removal. This should give users of the NixOS integration framework a transitory period to rewrite their tests to use the Python implementation. Users of the Perl driver will see this warning everytime they use it:

     
···

       263
       261
        
       

     

       264
       262
        
         ```nix

     

       265
       263
        
         {

     

       266
       266
       -
           users.users =

     

       267
       267
       -
             [ { name = "me";

     

       268
       268
       -
                 description = "My personal user.";

     

       269
       269
       -
                 isNormalUser = true;

     

       270
       270
       -
               }

     

       271
       271
       -
             ];

     

       264
       264
       +
           users.users = [

     

       265
       265
       +
             {

     

       266
       266
       +
               name = "me";

     

       267
       267
       +
               description = "My personal user.";

     

       268
       268
       +
               isNormalUser = true;

     

       269
       269
       +
             }

     

       270
       270
       +
           ];

     

       272
       271
        
         }

     

       273
       272
        
         ```

     

       274
       273
        
       

     
···

       276
       275
        
       

     

       277
       276
        
         ```nix

     

       278
       277
        
         {

     

       279
       279
       -
           users.users.me =

     

       280
       280
       -
             { description = "My personal user.";

     

       281
       281
       -
               isNormalUser = true;

     

       282
       282
       -
             };

     

       278
       278
       +
           users.users.me = {

     

       279
       279
       +
             description = "My personal user.";

     

       280
       280
       +
             isNormalUser = true;

     

       281
       281
       +
           };

     

       283
       282
        
         }

     

       284
       283
        
         ```

     

       285
       284
        
       

     
···

       306
       305
        
         ```nix

     

       307
       306
        
         {

     

       308
       307
        
           security.pam.services.lightdm-autologin.text = lib.mkForce ''

     

       309
       309
       -
               auth     requisite pam_nologin.so

     

       310
       310
       -
               auth     required  pam_succeed_if.so quiet

     

       311
       311
       -
               auth     required  pam_permit.so

     

       308
       308
       +
             auth     requisite pam_nologin.so

     

       309
       309
       +
             auth     required  pam_succeed_if.so quiet

     

       310
       310
       +
             auth     required  pam_permit.so

     

       312
       311
        
       

     

       313
       313
       -
               account  include   lightdm

     

       312
       312
       +
             account  include   lightdm

     

       314
       313
        
       

     

       315
       315
       -
               password include   lightdm

     

       314
       314
       +
             password include   lightdm

     

       316
       315
        
       

     

       317
       317
       -
               session  include   lightdm

     

       316
       316
       +
             session  include   lightdm

     

       318
       317
        
           '';

     

       319
       318
        
         }

     

       320
       319
        
         ```

     
···

       368
       367
        
           services.dnscrypt-proxy2.settings = {

     

       369
       368
        
             listen_addresses = [ "127.0.0.1:43" ];

     

       370
       369
        
             sources.public-resolvers = {

     

       371
       371
       -
               urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ];

     

       370
       370
       +
               urls = [

     

       371
       371
       +
                 "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md"

     

       372
       372
       +
               ];

     

       372
       373
        
               cache_file = "public-resolvers.md";

     

       373
       374
        
               minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";

     

       374
       375
        
               refresh_delay = 72;

     
···

       417
       418
        
         - At first, an older version of Hydra needs to be deployed which adds those (nullable) columns. When having set [stateVersion ](options.html#opt-system.stateVersion) to a value older than `20.03`, this package will be selected by default from the module when upgrading. Otherwise, the package can be deployed using the following config:

     

       418
       419
        
       

     

       419
       420
        
           ```nix

     

       420
       420
       -
           { pkgs, ... }: {

     

       421
       421
       +
           { pkgs, ... }:

     

       422
       422
       +
           {

     

       421
       423
        
             services.hydra.package = pkgs.hydra-migration;

     

       422
       424
        
           }

     

       423
       425
        
           ```

     
···

       455
       457
        
       

     

       456
       458
        
         ```nix

     

       457
       459
        
         {

     

       458
       458
       -
           services.nginx.appendConfig = let cfg = config.services.nginx; in ''user ${cfg.user} ${cfg.group};'';

     

       460
       460
       +
           services.nginx.appendConfig =

     

       461
       461
       +
             let

     

       462
       462
       +
               cfg = config.services.nginx;

     

       463
       463
       +
             in

     

       464
       464
       +
             "user ${cfg.user} ${cfg.group};";

     

       459
       465
        
           systemd.services.nginx.serviceConfig.User = lib.mkForce "root";

     

       460
       466
        
         }

     

       461
       467
        
         ```

     
···

       485
       491
        
         - If you use `postgresql` and configured your synapse initially on `19.09` or older, you need to enable postgresql-support explicitly:

     

       486
       492
        
       

     

       487
       493
        
           ```nix

     

       488
       488
       -
           { ... }: {

     

       494
       494
       +
           { ... }:

     

       495
       495
       +
           {

     

       489
       496
        
             services.matrix-synapse = {

     

       490
       497
        
               enable = true;

     

       491
       491
       -
               /* and all the other config you've defined here */

     

       498
       498
       +
               # and all the other config you've defined here

     

       492
       499
        
             };

     

       493
       500
        
             services.postgresql.enable = true;

     

       494
       501
        
           }

+17 -26

nixos/doc/manual/release-notes/rl-2009.section.md

···

       222
       222
        
       

     

       223
       223
        
         ```nix

     

       224
       224
        
         {

     

       225
       225
       -
         services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''

     

       226
       226
       -
           ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret");

     

       227
       227
       -
         '';

     

       225
       225
       +
           services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''

     

       226
       226
       +
             ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret");

     

       227
       227
       +
           '';

     

       228
       228
        
         }

     

       229
       229
        
         ```

     

       230
       230
        
       

     
···

       233
       233
        
       - MySQL server is now started with additional systemd sandbox/hardening options for better security. The PrivateTmp, ProtectHome, and ProtectSystem options may be problematic when MySQL is attempting to read from or write to your filesystem anywhere outside of its own state directory, for example when calling `LOAD DATA INFILE or SELECT * INTO OUTFILE`. In this scenario a variant of the following may be required: - allow MySQL to read from /home and /tmp directories when using `LOAD DATA INFILE`

     

       234
       234
        
       

     

       235
       235
        
         ```nix

     

       236
       236
       -
         {

     

       237
       237
       -
           systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only";

     

       238
       238
       -
         }

     

       236
       236
       +
         { systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only"; }

     

       239
       237
        
         ```

     

       240
       238
        
       

     

       241
       239
        
         \- allow MySQL to write to custom folder `/var/data` when using `SELECT * INTO OUTFILE`, assuming the mysql user has write access to `/var/data`

     

       242
       240
        
       

     

       243
       241
        
         ```nix

     

       244
       244
       -
         {

     

       245
       245
       -
           systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];

     

       246
       246
       -
         }

     

       242
       242
       +
         { systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; }

     

       247
       243
        
         ```

     

       248
       244
        
       

     

       249
       245
        
         The MySQL service no longer runs its `systemd` service startup script as `root` anymore. A dedicated non `root` super user account is required for operation. This means users with an existing MySQL or MariaDB database server are required to run the following SQL statements as a super admin user before upgrading:

     
···

       313
       309
        
         ```nix

     

       314
       310
        
         {

     

       315
       311
        
           environment.systemPackages = [

     

       316
       316
       -
             (pkgs.php.withExtensions

     

       317
       317
       -
               ({ all, ... }: with all; [

     

       312
       312
       +
             (pkgs.php.withExtensions (

     

       313
       313
       +
               { all, ... }:

     

       314
       314
       +
               with all;

     

       315
       315
       +
               [

     

       318
       316
        
                 imagick

     

       319
       317
        
                 opcache

     

       320
       318
        
                 pdo

     

       321
       319
        
                 pdo_mysql

     

       322
       322
       -
               ])

     

       323
       323
       -
             )

     

       320
       320
       +
               ]

     

       321
       321
       +
             ))

     

       324
       322
        
           ];

     

       325
       323
        
         }

     

       326
       324
        
         ```

     
···

       358
       356
        
       - Nginx web server now starting with additional sandbox/hardening options. By default, write access to `/var/log/nginx` and `/var/cache/nginx` is allowed. To allow writing to other folders, use `systemd.services.nginx.serviceConfig.ReadWritePaths`

     

       359
       357
        
       

     

       360
       358
        
         ```nix

     

       361
       361
       -
         {

     

       362
       362
       -
           systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];

     

       363
       363
       -
         }

     

       359
       359
       +
         { systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; }

     

       364
       360
        
         ```

     

       365
       361
        
       

     

       366
       362
        
         Nginx is also started with the systemd option `ProtectHome = mkDefault true;` which forbids it to read anything from `/home`, `/root` and `/run/user` (see [ProtectHome docs](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ProtectHome=) for details). If you require serving files from home directories, you may choose to set e.g.

     

       367
       363
        
       

     

       368
       364
        
         ```nix

     

       369
       369
       -
         {

     

       370
       370
       -
           systemd.services.nginx.serviceConfig.ProtectHome = "read-only";

     

       371
       371
       -
         }

     

       365
       365
       +
         { systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; }

     

       372
       366
        
         ```

     

       373
       367
        
       

     

       374
       368
        
       - The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named [specialisation](options.html#opt-specialisation) configurations.

     
···

       525
       519
        
       - The [services.postgresql.dataDir](options.html#opt-services.postgresql.dataDir) option is now set to `"/var/lib/postgresql/${cfg.package.psqlSchema}"` regardless of your [system.stateVersion](options.html#opt-system.stateVersion). Users with an existing postgresql install that have a [system.stateVersion](options.html#opt-system.stateVersion) of `17.03` or below should double check what the value of their [services.postgresql.dataDir](options.html#opt-services.postgresql.dataDir) option is (`/var/db/postgresql`) and then explicitly set this value to maintain compatibility:

     

       526
       520
        
       

     

       527
       521
        
         ```nix

     

       528
       528
       -
         {

     

       529
       529
       -
           services.postgresql.dataDir = "/var/db/postgresql";

     

       530
       530
       -
         }

     

       522
       522
       +
         { services.postgresql.dataDir = "/var/db/postgresql"; }

     

       531
       523
        
         ```

     

       532
       524
        
       

     

       533
       525
        
         The postgresql module now expects there to be a database super user account called `postgres` regardless of your [system.stateVersion](options.html#opt-system.stateVersion). Users with an existing postgresql install that have a [system.stateVersion](options.html#opt-system.stateVersion) of `17.03` or below should run the following SQL statements as a database super admin user before upgrading:

     
···

       615
       607
        
         Also, connection to the RPC (Remote Procedure Call) of `transmission-daemon` is now only available on the local network interface by default. Use:

     

       616
       608
        
       

     

       617
       609
        
         ```nix

     

       618
       618
       -
         {

     

       619
       619
       -
           services.transmission.settings.rpc-bind-address = "0.0.0.0";

     

       620
       620
       -
         }

     

       610
       610
       +
         { services.transmission.settings.rpc-bind-address = "0.0.0.0"; }

     

       621
       611
        
         ```

     

       622
       612
        
       

     

       623
       613
        
         to get the previous behavior of listening on all network interfaces.

     
···

       639
       629
        
         ```nix

     

       640
       630
        
         {

     

       641
       631
        
           services.dovecot2.mailboxes = [

     

       642
       642
       -
             { name = "Junk";

     

       632
       632
       +
             {

     

       633
       633
       +
               name = "Junk";

     

       643
       634
        
               auto = "create";

     

       644
       635
        
             }

     

       645
       636
        
           ];

+25 -27

nixos/doc/manual/release-notes/rl-2105.section.md

···

       87
       87
        
       - The `mediatomb` service is now using by default the new and maintained fork `gerbera` package instead of the unmaintained `mediatomb` package. If you want to keep the old behavior, you must declare it with:

     

       88
       88
        
       

     

       89
       89
        
         ```nix

     

       90
       90
       -
         {

     

       91
       91
       -
           services.mediatomb.package = pkgs.mediatomb;

     

       92
       92
       -
         }

     

       90
       90
       +
         { services.mediatomb.package = pkgs.mediatomb; }

     

       93
       91
        
         ```

     

       94
       92
        
       

     

       95
       93
        
         One new option `openFirewall` has been introduced which defaults to false. If you relied on the service declaration to add the firewall rules itself before, you should now declare it with:

     

       96
       94
        
       

     

       97
       95
        
         ```nix

     

       98
       98
       -
         {

     

       99
       99
       -
           services.mediatomb.openFirewall = true;

     

       100
       100
       -
         }

     

       96
       96
       +
         { services.mediatomb.openFirewall = true; }

     

       101
       97
        
         ```

     

       102
       98
        
       

     

       103
       99
        
       - xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation. Support for reflinks was added with an experimental status to kernel 4.9 and deemed stable in kernel 4.16. If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than those, you need to format them with `mkfs.xfs -m reflink=0`.

     
···

       108
       104
        
         {

     

       109
       105
        
           services.uwsgi.user = "root";

     

       110
       106
        
           services.uwsgi.group = "root";

     

       111
       111
       -
           services.uwsgi.instance =

     

       112
       112
       -
             {

     

       113
       113
       -
               uid = "uwsgi";

     

       114
       114
       -
               gid = "uwsgi";

     

       115
       115
       -
             };

     

       107
       107
       +
           services.uwsgi.instance = {

     

       108
       108
       +
             uid = "uwsgi";

     

       109
       109
       +
             gid = "uwsgi";

     

       110
       110
       +
           };

     

       116
       111
        
         }

     

       117
       112
        
         ```

     

       118
       113
        
       

     
···

       200
       195
        
       - The attribute `mpi` is now consistently used to provide a default, system-wide MPI implementation. The default implementation is openmpi, which has been used before by all derivations affects by this change. Note that all packages that have used `mpi ? null` in the input for optional MPI builds, have been changed to the boolean input parameter `useMpi` to enable building with MPI. Building all packages with `mpich` instead of the default `openmpi` can now be achieved like this:

     

       201
       196
        
       

     

       202
       197
        
         ```nix

     

       203
       203
       -
         self: super:

     

       204
       204
       -
         {

     

       205
       205
       -
           mpi = super.mpich;

     

       206
       206
       -
         }

     

       198
       198
       +
         self: super: { mpi = super.mpich; }

     

       207
       199
        
         ```

     

       208
       200
        
       

     

       209
       201
        
       - The Searx module has been updated with the ability to configure the service declaratively and uWSGI integration. The option `services.searx.configFile` has been renamed to [services.searx.settingsFile](options.html#opt-services.searx.settingsFile) for consistency with the new [services.searx.settings](options.html#opt-services.searx.settings). In addition, the `searx` uid and gid reservations have been removed since they were not necessary: the service is now running with a dynamically allocated uid.

     
···

       246
       238
        
       

     

       247
       239
        
         ```nix

     

       248
       240
        
         {

     

       249
       249
       -
           environment.systemPackages = [

     

       250
       250
       -
             pkgs.kodi

     

       251
       251
       -
           ];

     

       241
       241
       +
           environment.systemPackages = [ pkgs.kodi ];

     

       252
       242
        
       

     

       253
       243
        
           nixpkgs.config.kodi = {

     

       254
       244
        
             enableInputStreamAdaptive = true;

     
···

       262
       252
        
         ```nix

     

       263
       253
        
         {

     

       264
       254
        
           environment.systemPackages = [

     

       265
       265
       -
             (pkgs.kodi.withPackages (p: with p; [

     

       266
       266
       -
               inputstream-adaptive

     

       267
       267
       -
               vfs-sftp

     

       268
       268
       -
             ]))

     

       255
       255
       +
             (pkgs.kodi.withPackages (

     

       256
       256
       +
               p: with p; [

     

       257
       257
       +
                 inputstream-adaptive

     

       258
       258
       +
                 vfs-sftp

     

       259
       259
       +
               ]

     

       260
       260
       +
             ))

     

       269
       261
        
           ];

     

       270
       262
        
         }

     

       271
       263
        
         ```

     
···

       331
       323
        
         ```nix

     

       332
       324
        
         {

     

       333
       325
        
           services.mediatomb.mediaDirectories = [

     

       334
       334
       -
             { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; }

     

       335
       335
       -
             { path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; }

     

       326
       326
       +
             {

     

       327
       327
       +
               path = "/var/lib/mediatomb/pictures";

     

       328
       328
       +
               recursive = false;

     

       329
       329
       +
               hidden-files = false;

     

       330
       330
       +
             }

     

       331
       331
       +
             {

     

       332
       332
       +
               path = "/var/lib/mediatomb/audio";

     

       333
       333
       +
               recursive = true;

     

       334
       334
       +
               hidden-files = false;

     

       335
       335
       +
             }

     

       336
       336
        
           ];

     

       337
       337
        
         }

     

       338
       338
        
         ```

     
···

       416
       416
        
       - [Xfce4](https://www.xfce.org/) relies on GIO/GVfs for userspace virtual filesystem access in applications like [thunar](https://docs.xfce.org/xfce/thunar/) and [gigolo](https://docs.xfce.org/apps/gigolo/). For that to work, the gvfs nixos service is enabled by default, and it can be configured with the specific package that provides GVfs. Until now Xfce4 was setting it to use a lighter version of GVfs (without support for samba). To avoid conflicts with other desktop environments this setting has been dropped. Users that still want it should add the following to their system configuration:

     

       417
       417
        
       

     

       418
       418
        
         ```nix

     

       419
       419
       -
         {

     

       420
       420
       -
           services.gvfs.package = pkgs.gvfs.override { samba = null; };

     

       421
       421
       -
         }

     

       419
       419
       +
         { services.gvfs.package = pkgs.gvfs.override { samba = null; }; }

     

       422
       420
        
         ```

     

       423
       421
        
       

     

       424
       422
        
       - The newly enabled `systemd-pstore.service` now automatically evacuates crashdumps and panic logs from the persistent storage to `/var/lib/systemd/pstore`. This prevents NVRAM from filling up, which ensures the latest diagnostic data is always stored and alleviates problems with writing new boot configurations.

+1 -1

nixos/doc/manual/release-notes/rl-2111.section.md

···

       252
       252
        
             isSystemUser = true;

     

       253
       253
        
             group = "foo";

     

       254
       254
        
           };

     

       255
       255
       -
           users.groups.foo = {};

     

       255
       255
       +
           users.groups.foo = { };

     

       256
       256
        
         }

     

       257
       257
        
         ```

     

       258
       258

+42 -33

nixos/doc/manual/release-notes/rl-2205.section.md

···

       342
       342
        
             tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";

     

       343
       343
        
             tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";

     

       344
       344
        
       

     

       345
       345
       -
             listeners = [ {

     

       346
       346
       -
               port = 8448;

     

       347
       347
       -
               bind_address = "";

     

       348
       348
       -
               type = "http";

     

       349
       349
       -
               tls = true;

     

       350
       350
       -
               resources = [ {

     

       351
       351
       -
                 names = [ "client" ];

     

       352
       352
       -
                 compress = true;

     

       353
       353
       -
               } {

     

       354
       354
       -
                 names = [ "federation" ];

     

       355
       355
       -
                 compress = false;

     

       356
       356
       -
               } ];

     

       357
       357
       -
             } ];

     

       345
       345
       +
             listeners = [

     

       346
       346
       +
               {

     

       347
       347
       +
                 port = 8448;

     

       348
       348
       +
                 bind_address = "";

     

       349
       349
       +
                 type = "http";

     

       350
       350
       +
                 tls = true;

     

       351
       351
       +
                 resources = [

     

       352
       352
       +
                   {

     

       353
       353
       +
                     names = [ "client" ];

     

       354
       354
       +
                     compress = true;

     

       355
       355
       +
                   }

     

       356
       356
       +
                   {

     

       357
       357
       +
                     names = [ "federation" ];

     

       358
       358
       +
                     compress = false;

     

       359
       359
       +
                   }

     

       360
       360
       +
                 ];

     

       361
       361
       +
               }

     

       362
       362
       +
             ];

     

       358
       363
        
       

     

       359
       364
        
           };

     

       360
       365
        
         }

     
···

       379
       384
        
               tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";

     

       380
       385
        
               tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";

     

       381
       386
        
       

     

       382
       382
       -
               listeners = [ {

     

       383
       383
       -
                 port = 8448;

     

       384
       384
       -
                 bind_addresses = [

     

       385
       385
       -
                   "::"

     

       386
       386
       -
                   "0.0.0.0"

     

       387
       387
       -
                 ];

     

       388
       388
       -
                 type = "http";

     

       389
       389
       -
                 tls = true;

     

       390
       390
       -
                 resources = [ {

     

       391
       391
       -
                   names = [ "client" ];

     

       392
       392
       -
                   compress = true;

     

       393
       393
       -
                 } {

     

       394
       394
       -
                   names = [ "federation" ];

     

       395
       395
       -
                   compress = false;

     

       396
       396
       -
                 } ];

     

       397
       397
       -
               } ];

     

       387
       387
       +
               listeners = [

     

       388
       388
       +
                 {

     

       389
       389
       +
                   port = 8448;

     

       390
       390
       +
                   bind_addresses = [

     

       391
       391
       +
                     "::"

     

       392
       392
       +
                     "0.0.0.0"

     

       393
       393
       +
                   ];

     

       394
       394
       +
                   type = "http";

     

       395
       395
       +
                   tls = true;

     

       396
       396
       +
                   resources = [

     

       397
       397
       +
                     {

     

       398
       398
       +
                       names = [ "client" ];

     

       399
       399
       +
                       compress = true;

     

       400
       400
       +
                     }

     

       401
       401
       +
                     {

     

       402
       402
       +
                       names = [ "federation" ];

     

       403
       403
       +
                       compress = false;

     

       404
       404
       +
                     }

     

       405
       405
       +
                   ];

     

       406
       406
       +
                 }

     

       407
       407
       +
               ];

     

       398
       408
        
             };

     

       399
       409
        
       

     

       400
       400
       -
             extraConfigFiles = [

     

       401
       401
       -
               "/run/keys/matrix-synapse/secrets.yaml"

     

       402
       402
       -
             ];

     

       410
       410
       +
             extraConfigFiles = [ "/run/keys/matrix-synapse/secrets.yaml" ];

     

       403
       411
        
           };

     

       404
       412
        
         }

     

       405
       413
        
         ```

     
···

       469
       477
        
             frontendUrl = "https://keycloak.example.com/auth";

     

       470
       478
        
             database.passwordFile = "/run/keys/db_password";

     

       471
       479
        
             extraConfig = {

     

       472
       472
       -
               "subsystem=undertow"."server=default-server"."http-listener=default".proxy-address-forwarding = true;

     

       480
       480
       +
               "subsystem=undertow"."server=default-server"."http-listener=default".proxy-address-forwarding =

     

       481
       481
       +
                 true;

     

       473
       482
        
             };

     

       474
       483
        
           };

     

       475
       484
        
         }

+3 -11

nixos/doc/manual/release-notes/rl-2211.section.md

···

       255
       255
        
       - `services.github-runner` and `services.github-runners.<name>` gained the option `serviceOverrides` which allows overriding the systemd `serviceConfig`. If you have been overriding the systemd service configuration (i.e., by defining `systemd.services.github-runner.serviceConfig`), you have to use the `serviceOverrides` option now. Example:

     

       256
       256
        
       

     

       257
       257
        
         ```nix

     

       258
       258
       -
         {

     

       259
       259
       -
           services.github-runner.serviceOverrides.SupplementaryGroups = [

     

       260
       260
       -
             "docker"

     

       261
       261
       -
           ];

     

       262
       262
       -
         }

     

       258
       258
       +
         { services.github-runner.serviceOverrides.SupplementaryGroups = [ "docker" ]; }

     

       263
       259
        
         ```

     

       264
       260
        
       

     

       265
       261
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     
···

       318
       314
        
           of environment variables for Grafana. If you had an expression like

     

       319
       315
        
       

     

       320
       316
        
           ```nix

     

       321
       321
       -
           {

     

       322
       322
       -
             services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar";

     

       323
       323
       -
           }

     

       317
       317
       +
           { services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar"; }

     

       324
       318
        
           ```

     

       325
       319
        
       

     

       326
       320
        
           your Grafana instance was running with `GF_SECURITY_ADMIN_USER=foobar` in its environment.

     
···

       329
       323
        
           to declare

     

       330
       324
        
       

     

       331
       325
        
           ```nix

     

       332
       332
       -
           {

     

       333
       333
       -
             services.grafana.settings.security.admin_user = "foobar";

     

       334
       334
       -
           }

     

       326
       326
       +
           { services.grafana.settings.security.admin_user = "foobar"; }

     

       335
       327
        
           ```

     

       336
       328
        
       

     

       337
       329
        
           instead.

+13 -15

nixos/doc/manual/release-notes/rl-2305.section.md

···

       25
       25
        
       

     

       26
       26
        
       - NixOS now defaults to using [nsncd](https://github.com/twosigma/nsncd), a non-caching reimplementation of nscd in Rust, as its NSS lookup dispatcher. This replaces the buggy and deprecated nscd implementation provided through glibc. When you find problems, you can switch back by disabling it:

     

       27
       27
        
         ```nix

     

       28
       28
       -
         {

     

       29
       29
       -
           services.nscd.enableNsncd = false;

     

       30
       30
       -
         }

     

       28
       28
       +
         { services.nscd.enableNsncd = false; }

     

       31
       29
        
         ```

     

       32
       30
        
       

     

       33
       31
        
       - The internal option `boot.bootspec.enable` is now enabled by default because [RFC 0125](https://github.com/NixOS/rfcs/pull/125) was merged. This means you will have a bootspec document called `boot.json` generated for each system and specialisation in the top-level. This is useful to enable advanced boot use cases in NixOS, such as Secure Boot.

     
···

       455
       453
        
       

     

       456
       454
        
         ```nix

     

       457
       455
        
         {

     

       458
       458
       -
           swapDevices = [ {

     

       459
       459
       -
             device = "/dev/disk/by-partlabel/swapspace";

     

       460
       460
       -
             randomEncryption = {

     

       461
       461
       -
               enable = true;

     

       462
       462
       -
               cipher = "aes-xts-plain64";

     

       463
       463
       -
               keySize = 512;

     

       464
       464
       -
               sectorSize = 4096;

     

       465
       465
       -
             };

     

       466
       466
       -
           } ];

     

       456
       456
       +
           swapDevices = [

     

       457
       457
       +
             {

     

       458
       458
       +
               device = "/dev/disk/by-partlabel/swapspace";

     

       459
       459
       +
               randomEncryption = {

     

       460
       460
       +
                 enable = true;

     

       461
       461
       +
                 cipher = "aes-xts-plain64";

     

       462
       462
       +
                 keySize = 512;

     

       463
       463
       +
                 sectorSize = 4096;

     

       464
       464
       +
               };

     

       465
       465
       +
             }

     

       466
       466
       +
           ];

     

       467
       467
        
         }

     

       468
       468
        
         ```

     

       469
       469
        
       

     
···

       475
       475
        
       

     

       476
       476
        
       - PostgreSQL has added opt-in support for [JIT compilation](https://www.postgresql.org/docs/current/jit-reason.html). It can be enabled like this:

     

       477
       477
        
         ```nix

     

       478
       478
       -
         {

     

       479
       479
       -
           services.postgresql.enableJIT = true;

     

       480
       480
       -
         }

     

       478
       478
       +
         { services.postgresql.enableJIT = true; }

     

       481
       479
        
         ```

     

       482
       480
        
       

     

       483
       481
        
       - `services.netdata` offers a [`services.netdata.deadlineBeforeStopSec`](#opt-services.netdata.deadlineBeforeStopSec) option which will control the deadline (in seconds) after which systemd will consider your netdata instance as dead if it didn't start in the elapsed time. It is helpful when your netdata instance takes longer to start because of a large amount of state or upgrades.

+7 -5

nixos/doc/manual/release-notes/rl-2311.section.md

···

       256
       256
        
         ```nix

     

       257
       257
        
         {

     

       258
       258
        
           services.nextcloud.phpOptions = lib.mkForce {

     

       259
       259
       -
             /* ... */

     

       259
       259
       +
             # ...

     

       260
       260
        
           };

     

       261
       261
        
         }

     

       262
       262
        
         ```

     
···

       888
       888
        
         ```nix

     

       889
       889
        
         {

     

       890
       890
        
           python = python3.override {

     

       891
       891
       -
             packageOverrides = self: super: {

     

       892
       892
       -
               django = super.django_3;

     

       893
       893
       -
             };

     

       891
       891
       +
             packageOverrides = self: super: { django = super.django_3; };

     

       894
       892
        
           };

     

       895
       893
        
         }

     

       896
       894
        
         ```

     
···

       1237
       1235
        
             enable = true;

     

       1238
       1236
        
             package = pkgs.coredns.override {

     

       1239
       1237
        
               externalPlugins = [

     

       1240
       1240
       -
                 {name = "fanout"; repo = "github.com/networkservicemesh/fanout"; version = "v1.9.1";}

     

       1238
       1238
       +
                 {

     

       1239
       1239
       +
                   name = "fanout";

     

       1240
       1240
       +
                   repo = "github.com/networkservicemesh/fanout";

     

       1241
       1241
       +
                   version = "v1.9.1";

     

       1242
       1242
       +
                 }

     

       1241
       1243
        
               ];

     

       1242
       1244
        
               vendorHash = "<SRI hash>";

     

       1243
       1245
        
             };

+3 -4

nixos/doc/manual/release-notes/rl-2405.section.md

···

       37
       37
        
         which can now be replaced via an opt-in mechanism. To make your system

     

       38
       38
        
         perlless, you can use the new perlless profile:

     

       39
       39
        
         ```nix

     

       40
       40
       -
         { modulesPath, ... }: {

     

       40
       40
       +
         { modulesPath, ... }:

     

       41
       41
       +
         {

     

       41
       42
        
           imports = [ "${modulesPath}/profiles/perlless.nix" ];

     

       42
       43
        
         }

     

       43
       44
        
         ```

     
···

       244
       245
        
       

     

       245
       246
        
         ```nix

     

       246
       247
        
         {

     

       247
       247
       -
           environment.systemPackages = [

     

       248
       248
       -
             (azure-cli.withExtensions [ azure-cli.extensions.aks-preview ])

     

       249
       249
       -
           ];

     

       248
       248
       +
           environment.systemPackages = [ (azure-cli.withExtensions [ azure-cli.extensions.aks-preview ]) ];

     

       250
       249
        
         }

     

       251
       250
        
         ```

     

       252
       251
        
         To make the `azure-cli` immutable and prevent clashes in case `azure-cli` is also installed via other package managers, some configuration files were moved into the derivation.

+42 -22

nixos/doc/manual/release-notes/rl-2411.section.md

···

       413
       413
        
         ```nix

     

       414
       414
        
         {

     

       415
       415
        
           featureGates = [ "EphemeralContainers" ];

     

       416
       416
       -
           extraOpts = pkgs.lib.concatStringsSep " " (

     

       417
       417
       -
             [

     

       418
       418
       -
               ''--feature-gates="CSIMigration=false"''

     

       419
       419
       -
             ]

     

       420
       420
       -
           );

     

       416
       416
       +
           extraOpts = pkgs.lib.concatStringsSep " " ([ ''--feature-gates="CSIMigration=false"'' ]);

     

       421
       417
        
         }

     

       422
       418
        
         ```

     

       423
       419
        
       

     
···

       427
       423
        
         {

     

       428
       424
        
           featureGates = {

     

       429
       425
        
             EphemeralContainers = true;

     

       430
       430
       -
             CSIMigration=false;

     

       426
       426
       +
             CSIMigration = false;

     

       431
       427
        
           };

     

       432
       428
        
         }

     

       433
       429
        
         ```

     
···

       616
       612
        
         If you need to upgrade to 24.11 without having completed the migration, consider the security implications of weak password hashes on your user accounts, and add the following to your configuration:

     

       617
       613
        
         ```nix

     

       618
       614
        
         {

     

       619
       619
       -
           services.portunus.package      = pkgs.portunus.override { libxcrypt = pkgs.libxcrypt-legacy; };

     

       615
       615
       +
           services.portunus.package = pkgs.portunus.override { libxcrypt = pkgs.libxcrypt-legacy; };

     

       620
       616
        
           services.portunus.ldap.package = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; };

     

       621
       617
        
         }

     

       622
       618
        
         ```

     
···

       959
       955
        
       

     

       960
       956
        
       ```nix

     

       961
       957
        
       {

     

       962
       962
       -
         services.actkbd = let

     

       963
       963
       -
           volumeStep = "1%";

     

       964
       964
       -
         in {

     

       965
       965
       -
           enable = true;

     

       966
       966
       -
           bindings = [

     

       967
       967
       -
             # "Mute" media key

     

       968
       968
       -
             { keys = [ 113 ]; events = [ "key" ];       command = "${alsa-utils}/bin/amixer -q set Master toggle"; }

     

       958
       958
       +
         services.actkbd =

     

       959
       959
       +
           let

     

       960
       960
       +
             volumeStep = "1%";

     

       961
       961
       +
           in

     

       962
       962
       +
           {

     

       963
       963
       +
             enable = true;

     

       964
       964
       +
             bindings = [

     

       965
       965
       +
               # "Mute" media key

     

       966
       966
       +
               {

     

       967
       967
       +
                 keys = [ 113 ];

     

       968
       968
       +
                 events = [ "key" ];

     

       969
       969
       +
                 command = "${alsa-utils}/bin/amixer -q set Master toggle";

     

       970
       970
       +
               }

     

       969
       971
        
       

     

       970
       970
       -
             # "Lower Volume" media key

     

       971
       971
       -
             { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}- unmute"; }

     

       972
       972
       +
               # "Lower Volume" media key

     

       973
       973
       +
               {

     

       974
       974
       +
                 keys = [ 114 ];

     

       975
       975
       +
                 events = [

     

       976
       976
       +
                   "key"

     

       977
       977
       +
                   "rep"

     

       978
       978
       +
                 ];

     

       979
       979
       +
                 command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}- unmute";

     

       980
       980
       +
               }

     

       972
       981
        
       

     

       973
       973
       -
             # "Raise Volume" media key

     

       974
       974
       -
             { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}+ unmute"; }

     

       982
       982
       +
               # "Raise Volume" media key

     

       983
       983
       +
               {

     

       984
       984
       +
                 keys = [ 115 ];

     

       985
       985
       +
                 events = [

     

       986
       986
       +
                   "key"

     

       987
       987
       +
                   "rep"

     

       988
       988
       +
                 ];

     

       989
       989
       +
                 command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}+ unmute";

     

       990
       990
       +
               }

     

       975
       991
        
       

     

       976
       976
       -
             # "Mic Mute" media key

     

       977
       977
       -
             { keys = [ 190 ]; events = [ "key" ];       command = "${alsa-utils}/bin/amixer -q set Capture toggle"; }

     

       978
       978
       -
           ];

     

       979
       979
       -
         };

     

       992
       992
       +
               # "Mic Mute" media key

     

       993
       993
       +
               {

     

       994
       994
       +
                 keys = [ 190 ];

     

       995
       995
       +
                 events = [ "key" ];

     

       996
       996
       +
                 command = "${alsa-utils}/bin/amixer -q set Capture toggle";

     

       997
       997
       +
               }

     

       998
       998
       +
             ];

     

       999
       999
       +
           };

     

       980
       1000
        
       }

     

       981
       1001
        
       ```

     

       982
       1002

+5 -1

nixos/doc/manual/release-notes/rl-2505.section.md

···

       466
       466
        
               enable = true;

     

       467
       467
        
               localName = "Node 1";

     

       468
       468
        
               localAddress = "galera_01";

     

       469
       469
       -
               nodeAddresses = [ "galera_01" "galera_02" "galera_03"];

     

       469
       469
       +
               nodeAddresses = [

     

       470
       470
       +
                 "galera_01"

     

       471
       471
       +
                 "galera_02"

     

       472
       472
       +
                 "galera_03"

     

       473
       473
       +
               ];

     

       470
       474
        
             };

     

       471
       475
        
           };

     

       472
       476
        
         }

+14 -3

nixos/modules/i18n/input-method/default.md

···

       27
       27
        
         i18n.inputMethod = {

     

       28
       28
        
           enable = true;

     

       29
       29
        
           type = "ibus";

     

       30
       30
       -
           ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ];

     

       30
       30
       +
           ibus.engines = with pkgs.ibus-engines; [

     

       31
       31
       +
             anthy

     

       32
       32
       +
             hangul

     

       33
       33
       +
             mozc

     

       34
       34
       +
           ];

     

       31
       35
        
         };

     

       32
       36
        
       }

     

       33
       37
        
       ```

     
···

       54
       58
        
       

     

       55
       59
        
           ```nix

     

       56
       60
        
           {

     

       57
       57
       -
             ibus.engines = with pkgs.ibus-engines; [ table table-others ];

     

       61
       61
       +
             ibus.engines = with pkgs.ibus-engines; [

     

       62
       62
       +
               table

     

       63
       63
       +
               table-others

     

       64
       64
       +
             ];

     

       58
       65
        
           }

     

       59
       66
        
           ```

     

       60
       67
        
       

     
···

       85
       92
        
         i18n.inputMethod = {

     

       86
       93
        
           enable = true;

     

       87
       94
        
           type = "fcitx5";

     

       88
       88
       -
           fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-hangul fcitx5-m17n ];

     

       95
       95
       +
           fcitx5.addons = with pkgs; [

     

       96
       96
       +
             fcitx5-mozc

     

       97
       97
       +
             fcitx5-hangul

     

       98
       98
       +
             fcitx5-m17n

     

       99
       99
       +
           ];

     

       89
       100
        
         };

     

       90
       101
        
       }

     

       91
       102
        
       ```

+4 -14

nixos/modules/programs/digitalbitbox/default.md

···

       5
       5
        
       The `digitalbitbox` programs module may be installed by setting

     

       6
       6
        
       `programs.digitalbitbox` to `true` in a manner similar to

     

       7
       7
        
       ```nix

     

       8
       8
       -
       {

     

       9
       9
       -
         programs.digitalbitbox.enable = true;

     

       10
       10
       -
       }

     

       8
       8
       +
       { programs.digitalbitbox.enable = true; }

     

       11
       9
        
       ```

     

       12
       10
        
       and bundles the `digitalbitbox` package (see [](#sec-digitalbitbox-package)),

     

       13
       11
        
       which contains the `dbb-app` and `dbb-cli` binaries, along with the hardware

     
···

       24
       22
        
       The binaries, `dbb-app` (a GUI tool) and `dbb-cli` (a CLI tool), are available

     

       25
       23
        
       through the `digitalbitbox` package which could be installed as follows:

     

       26
       24
        
       ```nix

     

       27
       27
       -
       {

     

       28
       28
       -
         environment.systemPackages = [

     

       29
       29
       -
           pkgs.digitalbitbox

     

       30
       30
       -
         ];

     

       31
       31
       -
       }

     

       25
       25
       +
       { environment.systemPackages = [ pkgs.digitalbitbox ]; }

     

       32
       26
        
       ```

     

       33
       27
        
       

     

       34
       28
        
       ## Hardware {#sec-digitalbitbox-hardware-module}

     
···

       36
       30
        
       The digitalbitbox hardware package enables the udev rules for Digital Bitbox

     

       37
       31
        
       devices and may be installed as follows:

     

       38
       32
        
       ```nix

     

       39
       39
       -
       {

     

       40
       40
       -
         hardware.digitalbitbox.enable = true;

     

       41
       41
       -
       }

     

       33
       33
       +
       { hardware.digitalbitbox.enable = true; }

     

       42
       34
        
       ```

     

       43
       35
        
       

     

       44
       36
        
       In order to alter the udev rules, one may provide different values for the

     
···

       47
       39
        
       {

     

       48
       40
        
         programs.digitalbitbox = {

     

       49
       41
        
           enable = true;

     

       50
       50
       -
           package = pkgs.digitalbitbox.override {

     

       51
       51
       -
             udevRule51 = "something else";

     

       52
       52
       -
           };

     

       42
       42
       +
           package = pkgs.digitalbitbox.override { udevRule51 = "something else"; };

     

       53
       43
        
         };

     

       54
       44
        
       }

     

       55
       45
        
       ```

+1 -3

nixos/modules/programs/plotinus.md

···

       13
       13
        
       To enable Plotinus, add the following to your

     

       14
       14
        
       {file}`configuration.nix`:

     

       15
       15
        
       ```nix

     

       16
       16
       -
       {

     

       17
       17
       -
         programs.plotinus.enable = true;

     

       18
       18
       -
       }

     

       16
       16
       +
       { programs.plotinus.enable = true; }

     

       19
       17
        
       ```

+6 -4

nixos/modules/programs/zsh/oh-my-zsh.md

···

       13
       13
        
       {

     

       14
       14
        
         programs.zsh.ohMyZsh = {

     

       15
       15
        
           enable = true;

     

       16
       16
       -
           plugins = [ "git" "python" "man" ];

     

       16
       16
       +
           plugins = [

     

       17
       17
       +
             "git"

     

       18
       18
       +
             "python"

     

       19
       19
       +
             "man"

     

       20
       20
       +
           ];

     

       17
       21
        
           theme = "agnoster";

     

       18
       22
        
         };

     

       19
       23
        
       }

     
···

       34
       38
        
       

     

       35
       39
        
       The module can do this as well:

     

       36
       40
        
       ```nix

     

       37
       37
       -
       {

     

       38
       38
       -
         programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts";

     

       39
       39
       -
       }

     

       41
       41
       +
       { programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; }

     

       40
       42
        
       ```

     

       41
       43
        
       

     

       42
       44
        
       ## Custom environments {#module-programs-oh-my-zsh-environments}

+33 -23

nixos/modules/security/acme/default.md

···

       210
       210
        
       ```nix

     

       211
       211
        
       {

     

       212
       212
        
         systemd.services.dns-rfc2136-conf = {

     

       213
       213
       -
           requiredBy = ["acme-example.com.service" "bind.service"];

     

       214
       214
       -
           before = ["acme-example.com.service" "bind.service"];

     

       213
       213
       +
           requiredBy = [

     

       214
       214
       +
             "acme-example.com.service"

     

       215
       215
       +
             "bind.service"

     

       216
       216
       +
           ];

     

       217
       217
       +
           before = [

     

       218
       218
       +
             "acme-example.com.service"

     

       219
       219
       +
             "bind.service"

     

       220
       220
       +
           ];

     

       215
       221
        
           unitConfig = {

     

       216
       222
        
             ConditionPathExists = "!/var/lib/secrets/dnskeys.conf";

     

       217
       223
        
           };

     

       218
       224
        
           serviceConfig = {

     

       219
       225
        
             Type = "oneshot";

     

       220
       220
       -
             UMask = 0077;

     

       226
       226
       +
             UMask = 77;

     

       221
       227
        
           };

     

       222
       228
        
           path = [ pkgs.bind ];

     

       223
       229
        
           script = ''

     
···

       312
       318
        
       

     

       313
       319
        
         # Now you must augment OpenSMTPD's systemd service to load

     

       314
       320
        
         # the certificate files.

     

       315
       315
       -
         systemd.services.opensmtpd.requires = ["acme-finished-mail.example.com.target"];

     

       316
       316
       -
         systemd.services.opensmtpd.serviceConfig.LoadCredential = let

     

       317
       317
       -
           certDir = config.security.acme.certs."mail.example.com".directory;

     

       318
       318
       -
         in [

     

       319
       319
       -
           "cert.pem:${certDir}/cert.pem"

     

       320
       320
       -
           "key.pem:${certDir}/key.pem"

     

       321
       321
       -
         ];

     

       321
       321
       +
         systemd.services.opensmtpd.requires = [ "acme-finished-mail.example.com.target" ];

     

       322
       322
       +
         systemd.services.opensmtpd.serviceConfig.LoadCredential =

     

       323
       323
       +
           let

     

       324
       324
       +
             certDir = config.security.acme.certs."mail.example.com".directory;

     

       325
       325
       +
           in

     

       326
       326
       +
           [

     

       327
       327
       +
             "cert.pem:${certDir}/cert.pem"

     

       328
       328
       +
             "key.pem:${certDir}/key.pem"

     

       329
       329
       +
           ];

     

       322
       330
        
       

     

       323
       331
        
         # Finally, configure OpenSMTPD to use these certs.

     

       324
       324
       -
         services.opensmtpd = let

     

       325
       325
       -
           credsDir = "/run/credentials/opensmtpd.service";

     

       326
       326
       -
         in {

     

       327
       327
       -
           enable = true;

     

       328
       328
       -
           setSendmail = false;

     

       329
       329
       -
           serverConfiguration = ''

     

       330
       330
       -
             pki mail.example.com cert "${credsDir}/cert.pem"

     

       331
       331
       -
             pki mail.example.com key "${credsDir}/key.pem"

     

       332
       332
       -
             listen on localhost tls pki mail.example.com

     

       333
       333
       -
             action act1 relay host smtp://127.0.0.1:10027

     

       334
       334
       -
             match for local action act1

     

       335
       335
       -
           '';

     

       336
       336
       -
         };

     

       332
       332
       +
         services.opensmtpd =

     

       333
       333
       +
           let

     

       334
       334
       +
             credsDir = "/run/credentials/opensmtpd.service";

     

       335
       335
       +
           in

     

       336
       336
       +
           {

     

       337
       337
       +
             enable = true;

     

       338
       338
       +
             setSendmail = false;

     

       339
       339
       +
             serverConfiguration = ''

     

       340
       340
       +
               pki mail.example.com cert "${credsDir}/cert.pem"

     

       341
       341
       +
               pki mail.example.com key "${credsDir}/key.pem"

     

       342
       342
       +
               listen on localhost tls pki mail.example.com

     

       343
       343
       +
               action act1 relay host smtp://127.0.0.1:10027

     

       344
       344
       +
               match for local action act1

     

       345
       345
       +
             '';

     

       346
       346
       +
           };

     

       337
       347
        
       }

     

       338
       348
        
       ```

     

       339
       349

+21 -16

nixos/modules/services/backup/borgbackup.md

···

       23
       23
        
       A very basic configuration for backing up to a locally accessible directory is:

     

       24
       24
        
       ```nix

     

       25
       25
        
       {

     

       26
       26
       -
           services.borgbackup.jobs = {

     

       27
       27
       -
             rootBackup = {

     

       28
       28
       -
               paths = "/";

     

       29
       29
       -
               exclude = [ "/nix" "/path/to/local/repo" ];

     

       30
       30
       -
               repo = "/path/to/local/repo";

     

       31
       31
       -
               doInit = true;

     

       32
       32
       -
               encryption = {

     

       33
       33
       -
                 mode = "repokey";

     

       34
       34
       -
                 passphrase = "secret";

     

       35
       35
       -
               };

     

       36
       36
       -
               compression = "auto,lzma";

     

       37
       37
       -
               startAt = "weekly";

     

       26
       26
       +
         services.borgbackup.jobs = {

     

       27
       27
       +
           rootBackup = {

     

       28
       28
       +
             paths = "/";

     

       29
       29
       +
             exclude = [

     

       30
       30
       +
               "/nix"

     

       31
       31
       +
               "/path/to/local/repo"

     

       32
       32
       +
             ];

     

       33
       33
       +
             repo = "/path/to/local/repo";

     

       34
       34
       +
             doInit = true;

     

       35
       35
       +
             encryption = {

     

       36
       36
       +
               mode = "repokey";

     

       37
       37
       +
               passphrase = "secret";

     

       38
       38
        
             };

     

       39
       39
       +
             compression = "auto,lzma";

     

       40
       40
       +
             startAt = "weekly";

     

       39
       41
        
           };

     

       42
       42
       +
         };

     

       40
       43
        
       }

     

       41
       44
        
       ```

     

       42
       45
        
       

     
···

       64
       67
        
           my_borg_repo = {

     

       65
       68
        
             authorizedKeys = [

     

       66
       69
        
               "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos"

     

       67
       67
       -
             ] ;

     

       68
       68
       -
             path = "/var/lib/my_borg_repo" ;

     

       70
       70
       +
             ];

     

       71
       71
       +
             path = "/var/lib/my_borg_repo";

     

       69
       72
        
           };

     

       70
       73
        
         };

     

       71
       74
        
       }

     
···

       85
       88
        
           backupToLocalServer = {

     

       86
       89
        
             paths = [ "/etc/nixos" ];

     

       87
       90
        
             doInit = true;

     

       88
       88
       -
             repo =  "borg@nixos:." ;

     

       91
       91
       +
             repo = "borg@nixos:.";

     

       89
       92
        
             encryption = {

     

       90
       93
        
               mode = "repokey-blake2";

     

       91
       94
        
               passCommand = "cat /run/keys/borgbackup_passphrase";

     

       92
       95
        
             };

     

       93
       93
       -
             environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo"; };

     

       96
       96
       +
             environment = {

     

       97
       97
       +
               BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo";

     

       98
       98
       +
             };

     

       94
       99
        
             compression = "auto,lzma";

     

       95
       100
        
             startAt = "hourly";

     

       96
       101
        
           };

+2 -6

nixos/modules/services/databases/foundationdb.md

···

       112
       112
        
       {file}`/var/lib/foundationdb`. You can override this using

     

       113
       113
        
       {option}`services.foundationdb.dataDir`, e.g.

     

       114
       114
        
       ```nix

     

       115
       115
       -
       {

     

       116
       116
       -
         services.foundationdb.dataDir = "/data/fdb";

     

       117
       117
       -
       }

     

       115
       115
       +
       { services.foundationdb.dataDir = "/data/fdb"; }

     

       118
       116
        
       ```

     

       119
       117
        
       

     

       120
       118
        
       Similarly, logs are stored under {file}`/var/log/foundationdb`

     
···

       270
       268
        
       set up the paths in the module options:

     

       271
       269
        
       

     

       272
       270
        
       ```nix

     

       273
       273
       -
       {

     

       274
       274
       -
         services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];

     

       275
       275
       -
       }

     

       271
       271
       +
       { services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; }

     

       276
       272
        
       ```

     

       277
       273
        
       

     

       278
       274
        
       Restart the FoundationDB service, and it will now be able to write to this

+52 -47

nixos/modules/services/databases/postgresql.md

···

       41
       41
        
       

     

       42
       42
        
       By default, PostgreSQL stores its databases in {file}`/var/lib/postgresql/$psqlSchema`. You can override this using [](#opt-services.postgresql.dataDir), e.g.

     

       43
       43
        
       ```nix

     

       44
       44
       -
       {

     

       45
       45
       -
         services.postgresql.dataDir = "/data/postgresql";

     

       46
       46
       -
       }

     

       44
       44
       +
       { services.postgresql.dataDir = "/data/postgresql"; }

     

       47
       45
        
       ```

     

       48
       46
        
       

     

       49
       47
        
       ## Initializing {#module-services-postgres-initializing}

     
···

       183
       181
        
       ```

     

       184
       182
        
       For an upgrade, a script like this can be used to simplify the process:

     

       185
       183
        
       ```nix

     

       186
       186
       -
       { config, lib, pkgs, ... }:

     

       184
       184
       +
       {

     

       185
       185
       +
         config,

     

       186
       186
       +
         lib,

     

       187
       187
       +
         pkgs,

     

       188
       188
       +
         ...

     

       189
       189
       +
       }:

     

       187
       190
        
       {

     

       188
       191
        
         environment.systemPackages = [

     

       189
       189
       -
           (let

     

       190
       190
       -
             # XXX specify the postgresql package you'd like to upgrade to.

     

       191
       191
       -
             # Do not forget to list the extensions you need.

     

       192
       192
       -
             newPostgres = pkgs.postgresql_13.withPackages (pp: [

     

       193
       193
       -
               # pp.plv8

     

       194
       194
       -
             ]);

     

       195
       195
       -
             cfg = config.services.postgresql;

     

       196
       196
       -
           in pkgs.writeScriptBin "upgrade-pg-cluster" ''

     

       197
       197
       -
             set -eux

     

       198
       198
       -
             # XXX it's perhaps advisable to stop all services that depend on postgresql

     

       199
       199
       -
             systemctl stop postgresql

     

       192
       192
       +
           (

     

       193
       193
       +
             let

     

       194
       194
       +
               # XXX specify the postgresql package you'd like to upgrade to.

     

       195
       195
       +
               # Do not forget to list the extensions you need.

     

       196
       196
       +
               newPostgres = pkgs.postgresql_13.withPackages (pp: [

     

       197
       197
       +
                 # pp.plv8

     

       198
       198
       +
               ]);

     

       199
       199
       +
               cfg = config.services.postgresql;

     

       200
       200
       +
             in

     

       201
       201
       +
             pkgs.writeScriptBin "upgrade-pg-cluster" ''

     

       202
       202
       +
               set -eux

     

       203
       203
       +
               # XXX it's perhaps advisable to stop all services that depend on postgresql

     

       204
       204
       +
               systemctl stop postgresql

     

       200
       205
        
       

     

       201
       201
       -
             export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}"

     

       202
       202
       -
             export NEWBIN="${newPostgres}/bin"

     

       206
       206
       +
               export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}"

     

       207
       207
       +
               export NEWBIN="${newPostgres}/bin"

     

       203
       208
        
       

     

       204
       204
       -
             export OLDDATA="${cfg.dataDir}"

     

       205
       205
       -
             export OLDBIN="${cfg.finalPackage}/bin"

     

       209
       209
       +
               export OLDDATA="${cfg.dataDir}"

     

       210
       210
       +
               export OLDBIN="${cfg.finalPackage}/bin"

     

       206
       211
        
       

     

       207
       207
       -
             install -d -m 0700 -o postgres -g postgres "$NEWDATA"

     

       208
       208
       -
             cd "$NEWDATA"

     

       209
       209
       -
             sudo -u postgres "$NEWBIN/initdb" -D "$NEWDATA" ${lib.escapeShellArgs cfg.initdbArgs}

     

       212
       212
       +
               install -d -m 0700 -o postgres -g postgres "$NEWDATA"

     

       213
       213
       +
               cd "$NEWDATA"

     

       214
       214
       +
               sudo -u postgres "$NEWBIN/initdb" -D "$NEWDATA" ${lib.escapeShellArgs cfg.initdbArgs}

     

       210
       215
        
       

     

       211
       211
       -
             sudo -u postgres "$NEWBIN/pg_upgrade" \

     

       212
       212
       -
               --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \

     

       213
       213
       -
               --old-bindir "$OLDBIN" --new-bindir "$NEWBIN" \

     

       214
       214
       -
               "$@"

     

       215
       215
       -
           '')

     

       216
       216
       +
               sudo -u postgres "$NEWBIN/pg_upgrade" \

     

       217
       217
       +
                 --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \

     

       218
       218
       +
                 --old-bindir "$OLDBIN" --new-bindir "$NEWBIN" \

     

       219
       219
       +
                 "$@"

     

       220
       220
       +
             ''

     

       221
       221
       +
           )

     

       216
       222
        
         ];

     

       217
       223
        
       }

     

       218
       224
        
       ```

     
···

       313
       319
        
       ```nix

     

       314
       320
        
       {

     

       315
       321
        
         services.postgresql.package = pkgs.postgresql_17;

     

       316
       316
       -
         services.postgresql.extensions = ps: with ps; [

     

       317
       317
       -
           pg_repack

     

       318
       318
       -
           postgis

     

       319
       319
       -
         ];

     

       322
       322
       +
         services.postgresql.extensions =

     

       323
       323
       +
           ps: with ps; [

     

       324
       324
       +
             pg_repack

     

       325
       325
       +
             postgis

     

       326
       326
       +
           ];

     

       320
       327
        
       }

     

       321
       328
        
       ```

     

       322
       329
        
       

     
···

       333
       340
        
       Here's a recipe on how to override a particular plugin through an overlay:

     

       334
       341
        
       ```nix

     

       335
       342
        
       self: super: {

     

       336
       336
       -
         postgresql_15 = super.postgresql_15// {

     

       343
       343
       +
         postgresql_15 = super.postgresql_15 // {

     

       337
       344
        
           pkgs = super.postgresql_15.pkgs // {

     

       338
       345
        
             pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: {

     

       339
       346
        
               name = "pg_repack-v20181024";

     
···

       353
       360
        
       They are packaged as plugins and can be made available in the same way as external extensions:

     

       354
       361
        
       ```nix

     

       355
       362
        
       {

     

       356
       356
       -
         services.postgresql.extensions = ps: with ps; [

     

       357
       357
       -
           plperl

     

       358
       358
       -
           plpython3

     

       359
       359
       -
           pltcl

     

       360
       360
       -
         ];

     

       363
       363
       +
         services.postgresql.extensions =

     

       364
       364
       +
           ps: with ps; [

     

       365
       365
       +
             plperl

     

       366
       366
       +
             plpython3

     

       367
       367
       +
             pltcl

     

       368
       368
       +
           ];

     

       361
       369
        
       }

     

       362
       370
        
       ```

     

       363
       371
        
       

     
···

       366
       374
        
       For example, to make `python3Packages.base58` available:

     

       367
       375
        
       ```nix

     

       368
       376
        
       {

     

       369
       369
       -
         services.postgresql.extensions = pgps: with pgps; [

     

       370
       370
       -
           (plpython3.withPackages (pyps: with pyps; [ base58 ]))

     

       371
       371
       -
         ];

     

       377
       377
       +
         services.postgresql.extensions =

     

       378
       378
       +
           pgps: with pgps; [ (plpython3.withPackages (pyps: with pyps; [ base58 ])) ];

     

       372
       379
        
       }

     

       373
       380
        
       ```

     

       374
       381
        
       

     
···

       385
       392
        
       can be optionally enabled in PostgreSQL with the following config option:

     

       386
       393
        
       

     

       387
       394
        
       ```nix

     

       388
       388
       -
       {

     

       389
       389
       -
         services.postgresql.enableJIT = true;

     

       390
       390
       -
       }

     

       395
       395
       +
       { services.postgresql.enableJIT = true; }

     

       391
       396
        
       ```

     

       392
       397
        
       

     

       393
       398
        
       This makes sure that the [`jit`](https://www.postgresql.org/docs/current/runtime-config-query.html#GUC-JIT)-setting

     
···

       406
       411
        
       with import <nixpkgs> {

     

       407
       412
        
         overlays = [

     

       408
       413
        
           (self: super: {

     

       409
       409
       -
             postgresql = super.postgresql.overrideAttrs (_: { pname = "foobar"; });

     

       414
       414
       +
             postgresql = super.postgresql.overrideAttrs (_: {

     

       415
       415
       +
               pname = "foobar";

     

       416
       416
       +
             });

     

       410
       417
        
           })

     

       411
       418
        
         ];

     

       412
       419
        
       };

     
···

       428
       435
        
         * When using [`TABLESPACE`](https://www.postgresql.org/docs/current/manage-ag-tablespaces.html)s, make sure to add the filesystem paths to `ReadWritePaths` like this:

     

       429
       436
        
           ```nix

     

       430
       437
        
           {

     

       431
       431
       -
             systemd.services.postgresql.serviceConfig.ReadWritePaths = [

     

       432
       432
       -
               "/path/to/tablespace/location"

     

       433
       433
       -
             ];

     

       438
       438
       +
             systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/path/to/tablespace/location" ];

     

       434
       439
        
           }

     

       435
       440
        
           ```

     

       436
       441

+1 -3

nixos/modules/services/databases/tigerbeetle.md

···

       8
       8
        
       

     

       9
       9
        
       To enable TigerBeetle, add the following to your {file}`configuration.nix`:

     

       10
       10
        
       ```nix

     

       11
       11
       -
       {

     

       12
       12
       -
         services.tigerbeetle.enable = true;

     

       13
       13
       -
       }

     

       11
       11
       +
       { services.tigerbeetle.enable = true; }

     

       14
       12
        
       ```

     

       15
       13
        
       

     

       16
       14
        
       When first started, the TigerBeetle service will create its data file at {file}`/var/lib/tigerbeetle` unless the file already exists, in which case it will just use the existing file.

+4 -12

nixos/modules/services/desktop-managers/gnome.md

···

       26
       26
        
       If you’d like to only use the GNOME desktop and not the apps, you can disable them with:

     

       27
       27
        
       

     

       28
       28
        
       ```nix

     

       29
       29
       -
       {

     

       30
       30
       -
         services.gnome.core-apps.enable = false;

     

       31
       31
       -
       }

     

       29
       29
       +
       { services.gnome.core-apps.enable = false; }

     

       32
       30
        
       ```

     

       33
       31
        
       

     

       34
       32
        
       and none of them will be installed.

     
···

       55
       53
        
       You can install all of the GNOME games with:

     

       56
       54
        
       

     

       57
       55
        
       ```nix

     

       58
       58
       -
       {

     

       59
       59
       -
         services.gnome.games.enable = true;

     

       60
       60
       -
       }

     

       56
       56
       +
       { services.gnome.games.enable = true; }

     

       61
       57
        
       ```

     

       62
       58
        
       

     

       63
       59
        
       ### GNOME core developer tools {#sec-gnome-core-developer-tools}

     
···

       65
       61
        
       You can install GNOME core developer tools with:

     

       66
       62
        
       

     

       67
       63
        
       ```nix

     

       68
       68
       -
       {

     

       69
       69
       -
         services.gnome.core-developer-tools.enable = true;

     

       70
       70
       -
       }

     

       64
       64
       +
       { services.gnome.core-developer-tools.enable = true; }

     

       71
       65
        
       ```

     

       72
       66
        
       

     

       73
       67
        
       ## Enabling GNOME Flashback {#sec-gnome-enable-flashback}

     
···

       75
       69
        
       GNOME Flashback provides a desktop environment based on the classic GNOME 2 architecture. You can enable the default GNOME Flashback session, which uses the Metacity window manager, with:

     

       76
       70
        
       

     

       77
       71
        
       ```nix

     

       78
       78
       -
       {

     

       79
       79
       -
         services.desktopManager.gnome.flashback.enableMetacity = true;

     

       80
       80
       -
       }

     

       72
       72
       +
       { services.desktopManager.gnome.flashback.enableMetacity = true; }

     

       81
       73
        
       ```

     

       82
       74
        
       

     

       83
       75
        
       It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.desktopManager.gnome.flashback.customSessions).

+1 -3

nixos/modules/services/desktops/flatpak.md

···

       9
       9
        
       

     

       10
       10
        
       To enable Flatpak, add the following to your {file}`configuration.nix`:

     

       11
       11
        
       ```nix

     

       12
       12
       -
       {

     

       13
       13
       -
         services.flatpak.enable = true;

     

       14
       14
       -
       }

     

       12
       12
       +
       { services.flatpak.enable = true; }

     

       15
       13
        
       ```

     

       16
       14
        
       

     

       17
       15
        
       For the sandboxed apps to work correctly, desktop integration portals need to

+8 -10

nixos/modules/services/development/athens.md

···

       20
       20
        
       A very basic configuration for Athens that acts as a caching and forwarding HTTP proxy is:

     

       21
       21
        
       ```nix

     

       22
       22
        
       {

     

       23
       23
       -
           services.athens = {

     

       24
       24
       -
             enable = true;

     

       25
       25
       -
           };

     

       23
       23
       +
         services.athens = {

     

       24
       24
       +
           enable = true;

     

       25
       25
       +
         };

     

       26
       26
        
       }

     

       27
       27
        
       ```

     

       28
       28
        
       

     
···

       30
       30
        
       

     

       31
       31
        
       ```nix

     

       32
       32
        
       {

     

       33
       33
       -
           services.athens = {

     

       34
       34
       -
             enable = true;

     

       35
       35
       -
             storageType = "memory";

     

       36
       36
       -
           };

     

       33
       33
       +
         services.athens = {

     

       34
       34
       +
           enable = true;

     

       35
       35
       +
           storageType = "memory";

     

       36
       36
       +
         };

     

       37
       37
        
       }

     

       38
       38
        
       ```

     

       39
       39
        
       

     
···

       52
       52
        
       This can either be done via the nix-daemon systemd unit:

     

       53
       53
        
       

     

       54
       54
        
       ```nix

     

       55
       55
       -
       {

     

       56
       56
       -
         systemd.services.nix-daemon.environment.GOPROXY = "http://localhost:3000";

     

       57
       57
       -
       }

     

       55
       55
       +
       { systemd.services.nix-daemon.environment.GOPROXY = "http://localhost:3000"; }

     

       58
       56
        
       ```

     

       59
       57
        
       

     

       60
       58
        
       or via the [impure-env experimental feature](https://nix.dev/manual/nix/2.24/command-ref/conf-file#conf-impure-env):

+3 -4

nixos/modules/services/development/blackfire.md

···

       9
       9
        
       To use it, you will need to enable the agent and the probe on your server. The exact method will depend on the way you use PHP but here is an example of NixOS configuration for PHP-FPM:

     

       10
       10
        
       ```nix

     

       11
       11
        
       let

     

       12
       12
       -
         php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [

     

       13
       13
       -
           blackfire

     

       14
       14
       -
         ]));

     

       15
       15
       -
       in {

     

       12
       12
       +
         php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [ blackfire ]));

     

       13
       13
       +
       in

     

       14
       14
       +
       {

     

       16
       15
        
         # Enable the probe extension for PHP-FPM.

     

       17
       16
        
         services.phpfpm = {

     

       18
       17
        
           phpPackage = php;

+4 -1

nixos/modules/services/development/livebook.md

···

       53
       53
        
       

     

       54
       54
        
       ```nix

     

       55
       55
        
       {

     

       56
       56
       -
         services.livebook.extraPackages = with pkgs; [ gcc gnumake ];

     

       56
       56
       +
         services.livebook.extraPackages = with pkgs; [

     

       57
       57
       +
           gcc

     

       58
       58
       +
           gnumake

     

       59
       59
       +
         ];

     

       57
       60
        
       }

     

       58
       61
        
       ```

+58 -41

nixos/modules/services/editors/emacs.md

···

       85
       85
        
       

     

       86
       86
        
       ```nix

     

       87
       87
        
       /*

     

       88
       88
       -
       This is a nix expression to build Emacs and some Emacs packages I like

     

       89
       89
       -
       from source on any distribution where Nix is installed. This will install

     

       90
       90
       -
       all the dependencies from the nixpkgs repository and build the binary files

     

       91
       91
       -
       without interfering with the host distribution.

     

       88
       88
       +
         This is a nix expression to build Emacs and some Emacs packages I like

     

       89
       89
       +
         from source on any distribution where Nix is installed. This will install

     

       90
       90
       +
         all the dependencies from the nixpkgs repository and build the binary files

     

       91
       91
       +
         without interfering with the host distribution.

     

       92
       92
        
       

     

       93
       93
       -
       To build the project, type the following from the current directory:

     

       93
       93
       +
         To build the project, type the following from the current directory:

     

       94
       94
        
       

     

       95
       95
       -
       $ nix-build emacs.nix

     

       95
       95
       +
         $ nix-build emacs.nix

     

       96
       96
        
       

     

       97
       97
       -
       To run the newly compiled executable:

     

       97
       97
       +
         To run the newly compiled executable:

     

       98
       98
        
       

     

       99
       99
       -
       $ ./result/bin/emacs

     

       99
       99
       +
         $ ./result/bin/emacs

     

       100
       100
        
       */

     

       101
       101
        
       

     

       102
       102
        
       # The first non-comment line in this file indicates that

     

       103
       103
        
       # the whole file represents a function.

     

       104
       104
       -
       { pkgs ? import <nixpkgs> {} }:

     

       104
       104
       +
       {

     

       105
       105
       +
         pkgs ? import <nixpkgs> { },

     

       106
       106
       +
       }:

     

       105
       107
        
       

     

       106
       108
        
       let

     

       107
       109
        
         # The let expression below defines a myEmacs binding pointing to the

     
···

       113
       115
        
         # argument: a function from a package set to a list of packages

     

       114
       116
        
         # (the packages that will be available in Emacs).

     

       115
       117
        
         emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages;

     

       116
       116
       -
       in

     

       117
       118
        
         # The rest of the file specifies the list of packages to install. In the

     

       118
       119
        
         # example, two packages (magit and zerodark-theme) are taken from

     

       119
       120
        
         # MELPA stable.

     

       120
       120
       -
         emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [

     

       121
       121
       -
           magit          # ; Integrate git <C-x g>

     

       121
       121
       +
       in

     

       122
       122
       +
       emacsWithPackages (

     

       123
       123
       +
         epkgs:

     

       124
       124
       +
         (with epkgs.melpaStablePackages; [

     

       125
       125
       +
           magit # ; Integrate git <C-x g>

     

       122
       126
        
           zerodark-theme # ; Nicolas' theme

     

       123
       127
        
         ])

     

       124
       128
        
         # Two packages (undo-tree and zoom-frm) are taken from MELPA.

     

       125
       129
        
         ++ (with epkgs.melpaPackages; [

     

       126
       126
       -
           undo-tree      # ; <C-x u> to show the undo tree

     

       127
       127
       -
           zoom-frm       # ; increase/decrease font size for all buffers %lt;C-x C-+>

     

       130
       130
       +
           undo-tree # ; <C-x u> to show the undo tree

     

       131
       131
       +
           zoom-frm # ; increase/decrease font size for all buffers %lt;C-x C-+>

     

       128
       132
        
         ])

     

       129
       133
        
         # Three packages are taken from GNU ELPA.

     

       130
       134
        
         ++ (with epkgs.elpaPackages; [

     

       131
       131
       -
           auctex         # ; LaTeX mode

     

       132
       132
       -
           beacon         # ; highlight my cursor when scrolling

     

       133
       133
       -
           nameless       # ; hide current package name everywhere in elisp code

     

       135
       135
       +
           auctex # ; LaTeX mode

     

       136
       136
       +
           beacon # ; highlight my cursor when scrolling

     

       137
       137
       +
           nameless # ; hide current package name everywhere in elisp code

     

       134
       138
        
         ])

     

       135
       139
        
         # notmuch is taken from a nixpkgs derivation which contains an Emacs mode.

     

       136
       140
        
         ++ [

     

       137
       137
       -
           pkgs.notmuch   # From main packages set

     

       138
       138
       -
         ])

     

       141
       141
       +
           pkgs.notmuch # From main packages set

     

       142
       142
       +
         ]

     

       143
       143
       +
       )

     

       139
       144
        
       ```

     

       140
       145
        
       :::

     

       141
       146
        
       

     
···

       180
       185
        
       

     

       181
       186
        
       ```nix

     

       182
       187
        
       {

     

       183
       183
       -
        environment.systemPackages = [

     

       184
       184
       -
          # [...]

     

       185
       185
       -
          (import ./emacs.nix { inherit pkgs; })

     

       188
       188
       +
         environment.systemPackages = [

     

       189
       189
       +
           # [...]

     

       190
       190
       +
           (import ./emacs.nix { inherit pkgs; })

     

       186
       191
        
         ];

     

       187
       192
        
       }

     

       188
       193
        
       ```

     
···

       205
       210
        
       

     

       206
       211
        
       ```nix

     

       207
       212
        
       {

     

       208
       208
       -
         packageOverrides = super: let self = super.pkgs; in {

     

       209
       209
       -
           myemacs = import ./emacs.nix { pkgs = self; };

     

       210
       210
       -
         };

     

       213
       213
       +
         packageOverrides =

     

       214
       214
       +
           super:

     

       215
       215
       +
           let

     

       216
       216
       +
             self = super.pkgs;

     

       217
       217
       +
           in

     

       218
       218
       +
           {

     

       219
       219
       +
             myemacs = import ./emacs.nix { pkgs = self; };

     

       220
       220
       +
           };

     

       211
       221
        
       }

     

       212
       222
        
       ```

     

       213
       223
        
       :::

     
···

       229
       239
        
       ### Custom Emacs build

     

       230
       240
        
       

     

       231
       241
        
       ```nix

     

       232
       232
       -
       { pkgs ? import <nixpkgs> {} }:

     

       242
       242
       +
       {

     

       243
       243
       +
         pkgs ? import <nixpkgs> { },

     

       244
       244
       +
       }:

     

       233
       245
        
       let

     

       234
       234
       -
         myEmacs = (pkgs.emacs.override {

     

       235
       235
       -
           # Use gtk3 instead of the default gtk2

     

       236
       236
       -
           withGTK3 = true;

     

       237
       237
       -
           withGTK2 = false;

     

       238
       238
       -
         }).overrideAttrs (attrs: {

     

       239
       239
       -
           # I don't want emacs.desktop file because I only use

     

       240
       240
       -
           # emacsclient.

     

       241
       241
       -
           postInstall = (attrs.postInstall or "") + ''

     

       242
       242
       -
             rm $out/share/applications/emacs.desktop

     

       243
       243
       -
           '';

     

       244
       244
       -
         });

     

       245
       245
       -
       in [ /* ... */ ]

     

       246
       246
       +
         myEmacs =

     

       247
       247
       +
           (pkgs.emacs.override {

     

       248
       248
       +
             # Use gtk3 instead of the default gtk2

     

       249
       249
       +
             withGTK3 = true;

     

       250
       250
       +
             withGTK2 = false;

     

       251
       251
       +
           }).overrideAttrs

     

       252
       252
       +
             (attrs: {

     

       253
       253
       +
               # I don't want emacs.desktop file because I only use

     

       254
       254
       +
               # emacsclient.

     

       255
       255
       +
               postInstall =

     

       256
       256
       +
                 (attrs.postInstall or "")

     

       257
       257
       +
                 + ''

     

       258
       258
       +
                   rm $out/share/applications/emacs.desktop

     

       259
       259
       +
                 '';

     

       260
       260
       +
             });

     

       261
       261
       +
       in

     

       262
       262
       +
       [

     

       263
       263
       +
         # ...

     

       264
       264
       +
       ]

     

       246
       265
        
       ```

     

       247
       266
        
       :::

     

       248
       267
        
       

     
···

       263
       282
        
       To install and enable the {command}`systemd` user service for Emacs

     

       264
       283
        
       daemon, add the following to your {file}`configuration.nix`:

     

       265
       284
        
       ```nix

     

       266
       266
       -
       {

     

       267
       267
       -
         services.emacs.enable = true;

     

       268
       268
       -
       }

     

       285
       285
       +
       { services.emacs.enable = true; }

     

       269
       286
        
       ```

     

       270
       287
        
       

     

       271
       288
        
       The {var}`services.emacs.package` option allows a custom

+46 -35

nixos/modules/services/hardware/display.md

···

       23
       23
        
         # completely disable output no matter what is connected to it

     

       24
       24
        
         hardware.display.outputs."VGA-2".mode = "d";

     

       25
       25
        
       

     

       26
       26
       -
         /* equals

     

       27
       27
       -
         boot.kernelParams = [ "video=DP-1:e" "video=VGA-2:d" ];

     

       26
       26
       +
         /*

     

       27
       27
       +
           equals

     

       28
       28
       +
           boot.kernelParams = [ "video=DP-1:e" "video=VGA-2:d" ];

     

       28
       29
        
         */

     

       29
       30
        
       }

     

       30
       31
        
       ```

     
···

       37
       38
        
       ```nix

     

       38
       39
        
       {

     

       39
       40
        
         hardware.display.edid.packages = [

     

       40
       40
       -
           (pkgs.runCommand "edid-custom" {} ''

     

       41
       41
       -
              mkdir -p $out/lib/firmware/edid

     

       42
       42
       -
              base64 -d > "$out/lib/firmware/edid/custom1.bin" <<'EOF'

     

       43
       43
       -
              <insert your base64 encoded EDID file here `base64 < /sys/class/drm/card0-.../edid`>

     

       44
       44
       -
              EOF

     

       45
       45
       -
              base64 -d > "$out/lib/firmware/edid/custom2.bin" <<'EOF'

     

       46
       46
       -
              <insert your base64 encoded EDID file here `base64 < /sys/class/drm/card1-.../edid`>

     

       47
       47
       -
              EOF

     

       41
       41
       +
           (pkgs.runCommand "edid-custom" { } ''

     

       42
       42
       +
             mkdir -p $out/lib/firmware/edid

     

       43
       43
       +
             base64 -d > "$out/lib/firmware/edid/custom1.bin" <<'EOF'

     

       44
       44
       +
             <insert your base64 encoded EDID file here `base64 < /sys/class/drm/card0-.../edid`>

     

       45
       45
       +
             EOF

     

       46
       46
       +
             base64 -d > "$out/lib/firmware/edid/custom2.bin" <<'EOF'

     

       47
       47
       +
             <insert your base64 encoded EDID file here `base64 < /sys/class/drm/card1-.../edid`>

     

       48
       48
       +
             EOF

     

       48
       49
        
           '')

     

       49
       50
        
         ];

     

       50
       51
        
       }

     
···

       63
       64
        
       {

     

       64
       65
        
         hardware.display.outputs."VGA-1".edid = "custom1.bin";

     

       65
       66
        
         hardware.display.outputs."VGA-2".edid = "custom2.bin";

     

       66
       66
       -
         /* equals:

     

       67
       67
       -
         boot.kernelParams = [ "drm.edid_firmware=VGA-1:edid/custom1.bin,VGA-2:edid/custom2.bin" ];

     

       67
       67
       +
         /*

     

       68
       68
       +
           equals:

     

       69
       69
       +
           boot.kernelParams = [ "drm.edid_firmware=VGA-1:edid/custom1.bin,VGA-2:edid/custom2.bin" ];

     

       68
       70
        
         */

     

       69
       71
        
       }

     

       70
       72
        
       ```

     
···

       76
       78
        
       

     

       77
       79
        
       ```nix

     

       78
       80
        
       {

     

       79
       79
       -
         hardware.display.edid.linuxhw."PG278Q_2014" = [ "PG278Q" "2014" ];

     

       81
       81
       +
         hardware.display.edid.linuxhw."PG278Q_2014" = [

     

       82
       82
       +
           "PG278Q"

     

       83
       83
       +
           "2014"

     

       84
       84
       +
         ];

     

       80
       85
        
       

     

       81
       81
       -
         /* equals:

     

       82
       82
       -
         hardware.display.edid.packages = [

     

       83
       83
       -
           (pkgs.linuxhw-edid-fetcher.override {

     

       84
       84
       -
             displays = {

     

       85
       85
       -
               "PG278Q_2014" = [ "PG278Q" "2014" ];

     

       86
       86
       -
             };

     

       87
       87
       -
           })

     

       88
       88
       -
         ];

     

       86
       86
       +
         /*

     

       87
       87
       +
           equals:

     

       88
       88
       +
           hardware.display.edid.packages = [

     

       89
       89
       +
             (pkgs.linuxhw-edid-fetcher.override {

     

       90
       90
       +
               displays = {

     

       91
       91
       +
                 "PG278Q_2014" = [ "PG278Q" "2014" ];

     

       92
       92
       +
               };

     

       93
       93
       +
             })

     

       94
       94
       +
           ];

     

       89
       95
        
         */

     

       90
       96
        
       }

     

       91
       97
        
       ```

     
···

       98
       104
        
       

     

       99
       105
        
       ```nix

     

       100
       106
        
       {

     

       101
       101
       -
         hardware.display.edid.modelines."PG278Q_60" = "    241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync";

     

       102
       102
       -
         hardware.display.edid.modelines."PG278Q_120" = "   497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync";

     

       107
       107
       +
         hardware.display.edid.modelines."PG278Q_60" =

     

       108
       108
       +
           "    241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync";

     

       109
       109
       +
         hardware.display.edid.modelines."PG278Q_120" =

     

       110
       110
       +
           "   497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync";

     

       103
       111
        
       

     

       104
       104
       -
         /* equals:

     

       105
       105
       -
         hardware.display.edid.packages = [

     

       106
       106
       -
           (pkgs.edid-generator.overrideAttrs {

     

       107
       107
       -
             clean = true;

     

       108
       108
       -
             modelines = ''

     

       109
       109
       -
               Modeline "PG278Q_60"      241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync

     

       110
       110
       -
               Modeline "PG278Q_120"     497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync

     

       111
       111
       -
             '';

     

       112
       112
       -
           })

     

       113
       113
       -
         ];

     

       112
       112
       +
         /*

     

       113
       113
       +
           equals:

     

       114
       114
       +
           hardware.display.edid.packages = [

     

       115
       115
       +
             (pkgs.edid-generator.overrideAttrs {

     

       116
       116
       +
               clean = true;

     

       117
       117
       +
               modelines = ''

     

       118
       118
       +
                 Modeline "PG278Q_60"      241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync

     

       119
       119
       +
                 Modeline "PG278Q_120"     497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync

     

       120
       120
       +
               '';

     

       121
       121
       +
             })

     

       122
       122
       +
           ];

     

       114
       123
        
         */

     

       115
       124
        
       }

     

       116
       125
        
       ```

     
···

       121
       130
        
       

     

       122
       131
        
       ```nix

     

       123
       132
        
       {

     

       124
       124
       -
         hardware.display.edid.modelines."PG278Q_60" = "   241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync";

     

       125
       125
       -
         hardware.display.edid.modelines."PG278Q_120" = "  497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync";

     

       133
       133
       +
         hardware.display.edid.modelines."PG278Q_60" =

     

       134
       134
       +
           "   241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync";

     

       135
       135
       +
         hardware.display.edid.modelines."PG278Q_120" =

     

       136
       136
       +
           "  497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync";

     

       126
       137
        
       

     

       127
       138
        
         hardware.display.outputs."DP-1".edid = "PG278Q_60.bin";

     

       128
       139
        
         hardware.display.outputs."DP-1".mode = "e";

+13 -7

nixos/modules/services/mail/mailman.md

···

       10
       10
        
       

     

       11
       11
        
       For a basic configuration with Postfix as the MTA, the following settings are suggested:

     

       12
       12
        
       ```nix

     

       13
       13
       -
       { config, ... }: {

     

       13
       13
       +
       { config, ... }:

     

       14
       14
       +
       {

     

       14
       15
        
         services.postfix = {

     

       15
       16
        
           enable = true;

     

       16
       16
       -
           relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"];

     

       17
       17
       +
           relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ];

     

       17
       18
        
           sslCert = config.security.acme.certs."lists.example.org".directory + "/full.pem";

     

       18
       19
        
           sslKey = config.security.acme.certs."lists.example.org".directory + "/key.pem";

     

       19
       20
        
           config = {

     

       20
       20
       -
             transport_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"];

     

       21
       21
       -
             local_recipient_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"];

     

       21
       21
       +
             transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];

     

       22
       22
       +
             local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];

     

       22
       23
        
           };

     

       23
       24
        
         };

     

       24
       25
        
         services.mailman = {

     

       25
       26
        
           enable = true;

     

       26
       27
        
           serve.enable = true;

     

       27
       28
        
           hyperkitty.enable = true;

     

       28
       28
       -
           webHosts = ["lists.example.org"];

     

       29
       29
       +
           webHosts = [ "lists.example.org" ];

     

       29
       30
        
           siteOwner = "mailman@example.org";

     

       30
       31
        
         };

     

       31
       32
        
         services.nginx.virtualHosts."lists.example.org".enableACME = true;

     

       32
       32
       -
         networking.firewall.allowedTCPPorts = [ 25 80 443 ];

     

       33
       33
       +
         networking.firewall.allowedTCPPorts = [

     

       34
       34
       +
           25

     

       35
       35
       +
           80

     

       36
       36
       +
           443

     

       37
       37
       +
         ];

     

       33
       38
        
       }

     

       34
       39
        
       ```

     

       35
       40
        
       

     
···

       51
       56
        
       

     

       52
       57
        
       Mailman also supports other MTA, though with a little bit more configuration. For example, to use Mailman with Exim, you can use the following settings:

     

       53
       58
        
       ```nix

     

       54
       54
       -
       { config, ... }: {

     

       59
       59
       +
       { config, ... }:

     

       60
       60
       +
       {

     

       55
       61
        
         services = {

     

       56
       62
        
           mailman = {

     

       57
       63
        
             enable = true;

+1 -3

nixos/modules/services/matrix/maubot.md

···

       10
       10
        
       2. If you want to use PostgreSQL instead of SQLite, do this:

     

       11
       11
        
       

     

       12
       12
        
          ```nix

     

       13
       13
       -
          {

     

       14
       14
       -
            services.maubot.settings.database = "postgresql://maubot@localhost/maubot";

     

       15
       15
       -
          }

     

       13
       13
       +
          { services.maubot.settings.database = "postgresql://maubot@localhost/maubot"; }

     

       16
       14
        
          ```

     

       17
       15
        
       

     

       18
       16
        
          If the PostgreSQL connection requires a password, you will have to

+5 -9

nixos/modules/services/matrix/mjolnir.md

···

       52
       52
        
           enable = true;

     

       53
       53
        
           homeserverUrl = "https://matrix.domain.tld";

     

       54
       54
        
           pantalaimon = {

     

       55
       55
       -
              enable = true;

     

       56
       56
       -
              username = "mjolnir";

     

       57
       57
       -
              passwordFile = "/run/secrets/mjolnir-password";

     

       55
       55
       +
             enable = true;

     

       56
       56
       +
             username = "mjolnir";

     

       57
       57
       +
             passwordFile = "/run/secrets/mjolnir-password";

     

       58
       58
        
           };

     

       59
       59
       -
           protectedRooms = [

     

       60
       60
       -
             "https://matrix.to/#/!xxx:domain.tld"

     

       61
       61
       -
           ];

     

       59
       59
       +
           protectedRooms = [ "https://matrix.to/#/!xxx:domain.tld" ];

     

       62
       60
        
           managementRoom = "!yyy:domain.tld";

     

       63
       61
        
         };

     

       64
       62
        
       }

     
···

       81
       79
        
       ```nix

     

       82
       80
        
       {

     

       83
       81
        
         services.matrix-synapse = {

     

       84
       84
       -
           plugins = with pkgs; [

     

       85
       85
       -
             matrix-synapse-plugins.matrix-synapse-mjolnir-antispam

     

       86
       86
       -
           ];

     

       82
       82
       +
           plugins = with pkgs; [ matrix-synapse-plugins.matrix-synapse-mjolnir-antispam ];

     

       87
       83
        
           extraConfig = ''

     

       88
       84
        
             modules:

     

       89
       85
        
               - module: mjolnir.Module

+25 -14

nixos/modules/services/matrix/synapse.md

···

       44
       44
        
       please refer to the

     

       45
       45
        
       [installation instructions of Synapse](https://element-hq.github.io/synapse/latest/setup/installation.html) .

     

       46
       46
        
       ```nix

     

       47
       47
       -
       { pkgs, lib, config, ... }:

     

       47
       47
       +
       {

     

       48
       48
       +
         pkgs,

     

       49
       49
       +
         lib,

     

       50
       50
       +
         config,

     

       51
       51
       +
         ...

     

       52
       52
       +
       }:

     

       48
       53
        
       let

     

       49
       54
        
         fqdn = "${config.networking.hostName}.${config.networking.domain}";

     

       50
       55
        
         baseUrl = "https://${fqdn}";

     
···

       55
       60
        
           add_header Access-Control-Allow-Origin *;

     

       56
       61
        
           return 200 '${builtins.toJSON data}';

     

       57
       62
        
         '';

     

       58
       58
       -
       in {

     

       63
       63
       +
       in

     

       64
       64
       +
       {

     

       59
       65
        
         networking.hostName = "myhostname";

     

       60
       66
        
         networking.domain = "example.org";

     

       61
       61
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       67
       67
       +
         networking.firewall.allowedTCPPorts = [

     

       68
       68
       +
           80

     

       69
       69
       +
           443

     

       70
       70
       +
         ];

     

       62
       71
        
       

     

       63
       72
        
         services.postgresql.enable = true;

     

       64
       73
        
       

     
···

       117
       126
        
           # in client applications.

     

       118
       127
        
           settings.public_baseurl = baseUrl;

     

       119
       128
        
           settings.listeners = [

     

       120
       120
       -
             { port = 8008;

     

       129
       129
       +
             {

     

       130
       130
       +
               port = 8008;

     

       121
       131
        
               bind_addresses = [ "::1" ];

     

       122
       132
        
               type = "http";

     

       123
       133
        
               tls = false;

     

       124
       134
        
               x_forwarded = true;

     

       125
       125
       -
               resources = [ {

     

       126
       126
       -
                 names = [ "client" "federation" ];

     

       127
       127
       -
                 compress = true;

     

       128
       128
       -
               } ];

     

       135
       135
       +
               resources = [

     

       136
       136
       +
                 {

     

       137
       137
       +
                   names = [

     

       138
       138
       +
                     "client"

     

       139
       139
       +
                     "federation"

     

       140
       140
       +
                   ];

     

       141
       141
       +
                   compress = true;

     

       142
       142
       +
                 }

     

       143
       143
       +
               ];

     

       129
       144
        
             }

     

       130
       145
        
           ];

     

       131
       146
        
         };

     
···

       173
       188
        
       

     

       174
       189
        
           ```nix

     

       175
       190
        
           {

     

       176
       176
       -
             services.matrix-synapse.extraConfigFiles = [

     

       177
       177
       -
               "/run/secrets/matrix-shared-secret"

     

       178
       178
       -
             ];

     

       191
       191
       +
             services.matrix-synapse.extraConfigFiles = [ "/run/secrets/matrix-shared-secret" ];

     

       179
       192
        
           }

     

       180
       193
        
           ```

     

       181
       194
        
       :::

     
···

       208
       221
        
         services.nginx.virtualHosts."element.${fqdn}" = {

     

       209
       222
        
           enableACME = true;

     

       210
       223
        
           forceSSL = true;

     

       211
       211
       -
           serverAliases = [

     

       212
       212
       -
             "element.${config.networking.domain}"

     

       213
       213
       -
           ];

     

       224
       224
       +
           serverAliases = [ "element.${config.networking.domain}" ];

     

       214
       225
        
       

     

       215
       226
        
           root = pkgs.element-web.override {

     

       216
       227
        
             conf = {

+1 -3

nixos/modules/services/misc/anki-sync-server.md

···

       46
       46
        
       You can change the directory by using `services.anki-sync-server.baseDirectory`

     

       47
       47
        
       

     

       48
       48
        
       ```nix

     

       49
       49
       -
       {

     

       50
       50
       -
         services.anki-sync-server.baseDirectory = "/home/anki/data";

     

       51
       51
       -
       }

     

       49
       49
       +
       { services.anki-sync-server.baseDirectory = "/home/anki/data"; }

     

       52
       50
        
       ```

     

       53
       51
        
       

     

       54
       52
        
       By default, the server listen address {option}`services.anki-sync-server.host`

+2 -2

nixos/modules/services/misc/dump1090-fa.md

···

       9
       9
        
       Exposing the integrated web interface is left to the user's configuration. Below is a minimal example demonstrating how to serve it using Nginx:

     

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
       -
       { pkgs, ... }: {

     

       12
       12
       +
       { pkgs, ... }:

     

       13
       13
       +
       {

     

       13
       14
        
         services.dump1090-fa.enable = true;

     

       14
       15
        
       

     

       15
       16
        
         services.nginx = {

     
···

       22
       23
        
           };

     

       23
       24
        
         };

     

       24
       25
        
       }

     

       25
       25
       -
       

     

       26
       26
        
       ```

+2 -2

nixos/modules/services/misc/forgejo.md

···

       53
       53
        
           repo = "nixpkgs";

     

       54
       54
        
           rev = "3bb45b041e7147e2fd2daf689e26a1f970a55d65";

     

       55
       55
        
           hash = "sha256-8JL5NI9eUcGzzbR/ARkrG81WLwndoxqI650mA/4rUGI=";

     

       56
       56
       -
         }) {};

     

       56
       56
       +
         }) { };

     

       57
       57
        
       in

     

       58
       58
        
       {

     

       59
       59
        
         services.forgejo.package = nixpkgs-forgejo-10.forgejo;

     
···

       114
       114
        
           isSystemUser = true;

     

       115
       115
        
         };

     

       116
       116
        
       

     

       117
       117
       -
         users.groups.gitea = {};

     

       117
       117
       +
         users.groups.gitea = { };

     

       118
       118
        
       }

     

       119
       119
        
       ```

+3 -1

nixos/modules/services/misc/gitlab.md

···

       64
       64
        
               email_from = "gitlab-no-reply@example.com";

     

       65
       65
        
               email_display_name = "Example GitLab";

     

       66
       66
        
               email_reply_to = "gitlab-no-reply@example.com";

     

       67
       67
       -
               default_projects_features = { builds = false; };

     

       67
       67
       +
               default_projects_features = {

     

       68
       68
       +
                 builds = false;

     

       69
       69
       +
               };

     

       68
       70
        
             };

     

       69
       71
        
           };

     

       70
       72
        
         };

+1 -3

nixos/modules/services/misc/paisa.md

···

       21
       21
        
       access to the command at runtime.

     

       22
       22
        
       

     

       23
       23
        
       ```nix

     

       24
       24
       -
       {

     

       25
       25
       -
         systemd.services.paisa.path = [ pkgs.hledger ];

     

       26
       26
       -
       }

     

       24
       24
       +
       { systemd.services.paisa.path = [ pkgs.hledger ]; }

     

       27
       25
        
       ```

     

       28
       26
        
       

     

       29
       27
        
       ::: {.note}

+2 -2

nixos/modules/services/monitoring/parsedmarc.md

···

       80
       80
        
         # Not required, but recommended for full functionality

     

       81
       81
        
         services.geoipupdate = {

     

       82
       82
        
           settings = {

     

       83
       83
       -
             AccountID = 000000;

     

       83
       83
       +
             AccountID = 0;

     

       84
       84
        
             LicenseKey = "/path/to/license_key_file";

     

       85
       85
        
           };

     

       86
       86
        
         };

     
···

       104
       104
        
           recommendedOptimisation = true;

     

       105
       105
        
           recommendedGzipSettings = true;

     

       106
       106
        
           recommendedProxySettings = true;

     

       107
       107
       -
           upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = {};

     

       107
       107
       +
           upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = { };

     

       108
       108
        
           virtualHosts.${url} = {

     

       109
       109
        
             root = config.services.grafana.staticRootPath;

     

       110
       110
        
             enableACME = true;

+29 -17

nixos/modules/services/monitoring/prometheus/exporters.md

···

       18
       18
        
             "logind"

     

       19
       19
        
             "systemd"

     

       20
       20
        
           ];

     

       21
       21
       -
           disabledCollectors = [

     

       22
       22
       -
             "textfile"

     

       23
       23
       -
           ];

     

       21
       21
       +
           disabledCollectors = [ "textfile" ];

     

       24
       22
        
           openFirewall = true;

     

       25
       23
        
           firewallFilter = "-i br0 -p tcp -m tcp --dport 9100";

     

       26
       24
        
         };

     
···

       39
       37
        
       Prometheus can now be configured to consume the metrics produced by the exporter:

     

       40
       38
        
       ```nix

     

       41
       39
        
       {

     

       42
       42
       -
           services.prometheus = {

     

       43
       43
       -
             # ...

     

       40
       40
       +
         services.prometheus = {

     

       41
       41
       +
           # ...

     

       44
       42
        
       

     

       45
       45
       -
             scrapeConfigs = [

     

       46
       46
       -
               {

     

       47
       47
       -
                 job_name = "node";

     

       48
       48
       -
                 static_configs = [{

     

       49
       49
       -
                   targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ];

     

       50
       50
       -
                 }];

     

       51
       51
       -
               }

     

       52
       52
       -
             ];

     

       43
       43
       +
           scrapeConfigs = [

     

       44
       44
       +
             {

     

       45
       45
       +
               job_name = "node";

     

       46
       46
       +
               static_configs = [

     

       47
       47
       +
                 {

     

       48
       48
       +
                   targets = [

     

       49
       49
       +
                     "localhost:${toString config.services.prometheus.exporters.node.port}"

     

       50
       50
       +
                   ];

     

       51
       51
       +
                 }

     

       52
       52
       +
               ];

     

       53
       53
       +
             }

     

       54
       54
       +
           ];

     

       53
       55
        
       

     

       54
       54
       -
             # ...

     

       55
       55
       -
           };

     

       56
       56
       +
           # ...

     

       57
       57
       +
         };

     

       56
       58
        
       }

     

       57
       59
        
       ```

     

       58
       60
        
       

     
···

       82
       84
        
           specific options and configuration:

     

       83
       85
        
           ```nix

     

       84
       86
        
           # nixpkgs/nixos/modules/services/prometheus/exporters/postfix.nix

     

       85
       85
       -
           { config, lib, pkgs, options }:

     

       87
       87
       +
           {

     

       88
       88
       +
             config,

     

       89
       89
       +
             lib,

     

       90
       90
       +
             pkgs,

     

       91
       91
       +
             options,

     

       92
       92
       +
           }:

     

       86
       93
        
           let

     

       87
       94
        
             # for convenience we define cfg here

     

       88
       95
        
             cfg = config.services.prometheus.exporters.postfix;

     
···

       151
       158
        
       information about the change to the exporter definition similar to

     

       152
       159
        
       `nixpkgs/nixos/modules/rename.nix`:

     

       153
       160
        
       ```nix

     

       154
       154
       -
       { config, lib, pkgs, options }:

     

       161
       161
       +
       {

     

       162
       162
       +
         config,

     

       163
       163
       +
         lib,

     

       164
       164
       +
         pkgs,

     

       165
       165
       +
         options,

     

       166
       166
       +
       }:

     

       155
       167
        
       

     

       156
       168
        
       let

     

       157
       169
        
         cfg = config.services.prometheus.exporters.nginx;

+17 -17

nixos/modules/services/network-filesystems/litestream/default.md

···

       13
       13
        
       {

     

       14
       14
        
         users.users.litestream.extraGroups = [ "grafana" ];

     

       15
       15
        
       

     

       16
       16
       -
         systemd.services.grafana.serviceConfig.ExecStartPost = "+" + pkgs.writeShellScript "grant-grafana-permissions" ''

     

       17
       17
       -
           timeout=10

     

       16
       16
       +
         systemd.services.grafana.serviceConfig.ExecStartPost =

     

       17
       17
       +
           "+"

     

       18
       18
       +
           + pkgs.writeShellScript "grant-grafana-permissions" ''

     

       19
       19
       +
             timeout=10

     

       18
       20
        
       

     

       19
       19
       -
           while [ ! -f /var/lib/grafana/data/grafana.db ];

     

       20
       20
       -
           do

     

       21
       21
       -
             if [ "$timeout" == 0 ]; then

     

       22
       22
       -
               echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db."

     

       23
       23
       -
               exit 1

     

       24
       24
       -
             fi

     

       21
       21
       +
             while [ ! -f /var/lib/grafana/data/grafana.db ];

     

       22
       22
       +
             do

     

       23
       23
       +
               if [ "$timeout" == 0 ]; then

     

       24
       24
       +
                 echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db."

     

       25
       25
       +
                 exit 1

     

       26
       26
       +
               fi

     

       25
       27
        
       

     

       26
       26
       -
             sleep 1

     

       28
       28
       +
               sleep 1

     

       27
       29
        
       

     

       28
       28
       -
             ((timeout--))

     

       29
       29
       -
           done

     

       30
       30
       +
               ((timeout--))

     

       31
       31
       +
             done

     

       30
       32
        
       

     

       31
       31
       -
           find /var/lib/grafana -type d -exec chmod -v 775 {} \;

     

       32
       32
       -
           find /var/lib/grafana -type f -exec chmod -v 660 {} \;

     

       33
       33
       -
         '';

     

       33
       33
       +
             find /var/lib/grafana -type d -exec chmod -v 775 {} \;

     

       34
       34
       +
             find /var/lib/grafana -type f -exec chmod -v 660 {} \;

     

       35
       35
       +
           '';

     

       34
       36
        
       

     

       35
       37
        
         services.litestream = {

     

       36
       38
        
           enable = true;

     
···

       41
       43
        
             dbs = [

     

       42
       44
        
               {

     

       43
       45
        
                 path = "/var/lib/grafana/data/grafana.db";

     

       44
       44
       -
                 replicas = [{

     

       45
       45
       -
                   url = "s3://mybkt.litestream.io/grafana";

     

       46
       46
       -
                 }];

     

       46
       46
       +
                 replicas = [ { url = "s3://mybkt.litestream.io/grafana"; } ];

     

       47
       47
        
               }

     

       48
       48
        
             ];

     

       49
       49
        
           };

+1 -3

nixos/modules/services/network-filesystems/samba.md

···

       7
       7
        
       A minimal configuration looks like this:

     

       8
       8
        
       

     

       9
       9
        
       ```nix

     

       10
       10
       -
       {

     

       11
       11
       -
         services.samba.enable = true;

     

       12
       12
       -
       }

     

       10
       10
       +
       { services.samba.enable = true; }

     

       13
       11
        
       ```

     

       14
       12
        
       

     

       15
       13
        
       This configuration automatically enables `smbd`, `nmbd` and `winbindd` services by default.

+5 -2

nixos/modules/services/networking/anubis.md

···

       11
       11
        
       A minimal configuration with [nginx](#opt-services.nginx.enable) may look like the following:

     

       12
       12
        
       

     

       13
       13
        
       ```nix

     

       14
       14
       -
       { config, ... }: {

     

       14
       14
       +
       { config, ... }:

     

       15
       15
       +
       {

     

       15
       16
        
         services.anubis.instances.default.settings.TARGET = "http://localhost:8000";

     

       16
       17
        
       

     

       17
       18
        
         # required due to unix socket permissions

     
···

       49
       50
        
       ```nix

     

       50
       51
        
       {

     

       51
       52
        
         services.anubis.defaultOptions = {

     

       52
       52
       -
           botPolicy = { dnsbl = false; };

     

       53
       53
       +
           botPolicy = {

     

       54
       54
       +
             dnsbl = false;

     

       55
       55
       +
           };

     

       53
       56
        
           settings.DIFFICULTY = 3;

     

       54
       57
        
         };

     

       55
       58
        
       }

+1 -1

nixos/modules/services/networking/atalkd.md

···

       10
       10
        
       {

     

       11
       11
        
         services.atalkd = {

     

       12
       12
        
           enable = true;

     

       13
       13
       -
           interfaces.wlan0.config = "-router -phase 2 -net 1 -addr 1.48 -zone \"Default\"";

     

       13
       13
       +
           interfaces.wlan0.config = ''-router -phase 2 -net 1 -addr 1.48 -zone "Default"'';

     

       14
       14
        
         };

     

       15
       15
        
       }

     

       16
       16
        
       ```

+1 -3

nixos/modules/services/networking/crab-hole.md

···

       209
       209
        
       To give the crab-hole service access to these files, the group which owns the certificate can be added as a supplementary group to the service.

     

       210
       210
        
       For ACME for example:

     

       211
       211
        
       ```nix

     

       212
       212
       -
       {

     

       213
       213
       -
         services.crab-hole.supplementaryGroups = [ "acme" ];

     

       214
       214
       -
       }

     

       212
       212
       +
       { services.crab-hole.supplementaryGroups = [ "acme" ]; }

     

       215
       213
        
       ```

+4 -1

nixos/modules/services/networking/doh-server.md

···

       35
       35
        
           defaults.email = "you@example.com";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       38
       38
       +
         networking.firewall.allowedTCPPorts = [

     

       39
       39
       +
           80

     

       40
       40
       +
           443

     

       41
       41
       +
         ];

     

       39
       42
        
       }

     

       40
       43
        
       ```

     

       41
       44

+1 -3

nixos/modules/services/networking/jotta-cli.md

···

       5
       5
        
       ## Quick Start {#module-services-jotta-cli-quick-start}

     

       6
       6
        
       

     

       7
       7
        
       ```nix

     

       8
       8
       -
       {

     

       9
       9
       -
         services.jotta-cli.enable = true;

     

       10
       10
       -
       }

     

       8
       8
       +
       { services.jotta-cli.enable = true; }

     

       11
       9
        
       ```

     

       12
       10
        
       

     

       13
       11
        
       This adds `jotta-cli` to `environment.systemPackages` and starts a user service that runs `jottad` with the default options.

+31 -25

nixos/modules/services/networking/mosquitto.md

···

       10
       10
        
       {

     

       11
       11
        
         services.mosquitto = {

     

       12
       12
        
           enable = true;

     

       13
       13
       -
           listeners = [ {

     

       14
       14
       -
             acl = [ "pattern readwrite #" ];

     

       15
       15
       -
             omitPasswordAuth = true;

     

       16
       16
       -
             settings.allow_anonymous = true;

     

       17
       17
       -
           } ];

     

       13
       13
       +
           listeners = [

     

       14
       14
       +
             {

     

       15
       15
       +
               acl = [ "pattern readwrite #" ];

     

       16
       16
       +
               omitPasswordAuth = true;

     

       17
       17
       +
               settings.allow_anonymous = true;

     

       18
       18
       +
             }

     

       19
       19
       +
           ];

     

       18
       20
        
         };

     

       19
       21
        
       }

     

       20
       22
        
       ```

     
···

       30
       32
        
       {

     

       31
       33
        
         services.mosquitto = {

     

       32
       34
        
           enable = true;

     

       33
       33
       -
           listeners = [ {

     

       34
       34
       -
             users = {

     

       35
       35
       -
               monitor = {

     

       36
       36
       -
                 acl = [ "read #" ];

     

       37
       37
       -
                 password = "monitor";

     

       38
       38
       -
               };

     

       39
       39
       -
               service = {

     

       40
       40
       -
                 acl = [ "write service/#" ];

     

       41
       41
       -
                 password = "service";

     

       35
       35
       +
           listeners = [

     

       36
       36
       +
             {

     

       37
       37
       +
               users = {

     

       38
       38
       +
                 monitor = {

     

       39
       39
       +
                   acl = [ "read #" ];

     

       40
       40
       +
                   password = "monitor";

     

       41
       41
       +
                 };

     

       42
       42
       +
                 service = {

     

       43
       43
       +
                   acl = [ "write service/#" ];

     

       44
       44
       +
                   password = "service";

     

       45
       45
       +
                 };

     

       42
       46
        
               };

     

       43
       43
       -
             };

     

       44
       44
       -
           } ];

     

       47
       47
       +
             }

     

       48
       48
       +
           ];

     

       45
       49
        
         };

     

       46
       50
        
       }

     

       47
       51
        
       ```

     
···

       52
       56
        
       {

     

       53
       57
        
         services.mosquitto = {

     

       54
       58
        
           enable = true;

     

       55
       55
       -
           listeners = [ {

     

       56
       56
       -
             port = 8883; # port change is not required, but helpful to avoid mistakes

     

       57
       57
       -
             # ...

     

       58
       58
       -
             settings = {

     

       59
       59
       -
               cafile = "/path/to/mqtt.ca.pem";

     

       60
       60
       -
               certfile = "/path/to/mqtt.pem";

     

       61
       61
       -
               keyfile = "/path/to/mqtt.key";

     

       62
       62
       -
             };

     

       63
       63
       -
           } ];

     

       59
       59
       +
           listeners = [

     

       60
       60
       +
             {

     

       61
       61
       +
               port = 8883; # port change is not required, but helpful to avoid mistakes

     

       62
       62
       +
               # ...

     

       63
       63
       +
               settings = {

     

       64
       64
       +
                 cafile = "/path/to/mqtt.ca.pem";

     

       65
       65
       +
                 certfile = "/path/to/mqtt.pem";

     

       66
       66
       +
                 keyfile = "/path/to/mqtt.key";

     

       67
       67
       +
               };

     

       68
       68
       +
             }

     

       69
       69
       +
           ];

     

       64
       70
        
         };

     

       65
       71
        
       }

     

       66
       72
        
       ```

+1 -3

nixos/modules/services/networking/netbird.md

···

       5
       5
        
       The absolute minimal configuration for the Netbird client daemon looks like this:

     

       6
       6
        
       

     

       7
       7
        
       ```nix

     

       8
       8
       -
       {

     

       9
       9
       -
         services.netbird.enable = true;

     

       10
       10
       -
       }

     

       8
       8
       +
       { services.netbird.enable = true; }

     

       11
       9
        
       ```

     

       12
       10
        
       

     

       13
       11
        
       This will set up a netbird service listening on the port `51820` associated to the

+22 -22

nixos/modules/services/networking/pleroma.md

···

       47
       47
        
           secretConfigFile = "/var/lib/pleroma/secrets.exs";

     

       48
       48
        
           configs = [

     

       49
       49
        
             ''

     

       50
       50
       -
             import Config

     

       50
       50
       +
               import Config

     

       51
       51
        
       

     

       52
       52
       -
             config :pleroma, Pleroma.Web.Endpoint,

     

       53
       53
       -
               url: [host: "pleroma.example.net", scheme: "https", port: 443],

     

       54
       54
       -
               http: [ip: {127, 0, 0, 1}, port: 4000]

     

       52
       52
       +
               config :pleroma, Pleroma.Web.Endpoint,

     

       53
       53
       +
                 url: [host: "pleroma.example.net", scheme: "https", port: 443],

     

       54
       54
       +
                 http: [ip: {127, 0, 0, 1}, port: 4000]

     

       55
       55
        
       

     

       56
       56
       -
             config :pleroma, :instance,

     

       57
       57
       -
               name: "Test",

     

       58
       58
       -
               email: "admin@example.net",

     

       59
       59
       -
               notify_email: "admin@example.net",

     

       60
       60
       -
               limit: 5000,

     

       61
       61
       -
               registrations_open: true

     

       56
       56
       +
               config :pleroma, :instance,

     

       57
       57
       +
                 name: "Test",

     

       58
       58
       +
                 email: "admin@example.net",

     

       59
       59
       +
                 notify_email: "admin@example.net",

     

       60
       60
       +
                 limit: 5000,

     

       61
       61
       +
                 registrations_open: true

     

       62
       62
        
       

     

       63
       63
       -
             config :pleroma, :media_proxy,

     

       64
       64
       -
               enabled: false,

     

       65
       65
       -
               redirect_on_failure: true

     

       63
       63
       +
               config :pleroma, :media_proxy,

     

       64
       64
       +
                 enabled: false,

     

       65
       65
       +
                 redirect_on_failure: true

     

       66
       66
        
       

     

       67
       67
       -
             config :pleroma, Pleroma.Repo,

     

       68
       68
       -
               adapter: Ecto.Adapters.Postgres,

     

       69
       69
       -
               username: "pleroma",

     

       70
       70
       -
               database: "pleroma",

     

       71
       71
       -
               hostname: "localhost"

     

       67
       67
       +
               config :pleroma, Pleroma.Repo,

     

       68
       68
       +
                 adapter: Ecto.Adapters.Postgres,

     

       69
       69
       +
                 username: "pleroma",

     

       70
       70
       +
                 database: "pleroma",

     

       71
       71
       +
                 hostname: "localhost"

     

       72
       72
        
       

     

       73
       73
       -
             # Configure web push notifications

     

       74
       74
       -
             config :web_push_encryption, :vapid_details,

     

       75
       75
       -
               subject: "mailto:admin@example.net"

     

       73
       73
       +
               # Configure web push notifications

     

       74
       74
       +
               config :web_push_encryption, :vapid_details,

     

       75
       75
       +
                 subject: "mailto:admin@example.net"

     

       76
       76
        
       

     

       77
       77
       -
             # ... TO CONTINUE ...

     

       77
       77
       +
               # ... TO CONTINUE ...

     

       78
       78
        
             ''

     

       79
       79
        
           ];

     

       80
       80
        
         };

+10 -9

nixos/modules/services/networking/prosody.md

···

       33
       33
        
           ssl.cert = "/var/lib/acme/example.org/fullchain.pem";

     

       34
       34
        
           ssl.key = "/var/lib/acme/example.org/key.pem";

     

       35
       35
        
           virtualHosts."example.org" = {

     

       36
       36
       -
               enabled = true;

     

       37
       37
       -
               domain = "example.org";

     

       38
       38
       -
               ssl.cert = "/var/lib/acme/example.org/fullchain.pem";

     

       39
       39
       -
               ssl.key = "/var/lib/acme/example.org/key.pem";

     

       36
       36
       +
             enabled = true;

     

       37
       37
       +
             domain = "example.org";

     

       38
       38
       +
             ssl.cert = "/var/lib/acme/example.org/fullchain.pem";

     

       39
       39
       +
             ssl.key = "/var/lib/acme/example.org/key.pem";

     

       40
       40
        
           };

     

       41
       41
       -
           muc = [ {

     

       42
       42
       -
               domain = "conference.example.org";

     

       43
       43
       -
           } ];

     

       41
       41
       +
           muc = [ { domain = "conference.example.org"; } ];

     

       44
       42
        
           uploadHttp = {

     

       45
       45
       -
               domain = "upload.example.org";

     

       43
       43
       +
             domain = "upload.example.org";

     

       46
       44
        
           };

     

       47
       45
        
         };

     

       48
       46
        
       }

     
···

       68
       66
        
             "example.org" = {

     

       69
       67
        
               webroot = "/var/www/example.org";

     

       70
       68
        
               email = "root@example.org";

     

       71
       71
       -
               extraDomainNames = [ "conference.example.org" "upload.example.org" ];

     

       69
       69
       +
               extraDomainNames = [

     

       70
       70
       +
                 "conference.example.org"

     

       71
       71
       +
                 "upload.example.org"

     

       72
       72
       +
               ];

     

       72
       73
        
             };

     

       73
       74
        
           };

     

       74
       75
        
         };

+46 -32

nixos/modules/services/networking/yggdrasil.md

···

       17
       17
        
         services.yggdrasil = {

     

       18
       18
        
           enable = true;

     

       19
       19
        
           persistentKeys = false;

     

       20
       20
       -
             # The NixOS module will generate new keys and a new IPv6 address each time

     

       21
       21
       -
             # it is started if persistentKeys is not enabled.

     

       20
       20
       +
           # The NixOS module will generate new keys and a new IPv6 address each time

     

       21
       21
       +
           # it is started if persistentKeys is not enabled.

     

       22
       22
        
       

     

       23
       23
        
           settings = {

     

       24
       24
        
             Peers = [

     
···

       44
       44
        
         address = "210:5217:69c0:9afc:1b95:b9f:8718:c3d2";

     

       45
       45
        
         prefix = "310:5217:69c0:9afc";

     

       46
       46
        
         # taken from the output of "yggdrasilctl getself".

     

       47
       47
       -
       in {

     

       47
       47
       +
       in

     

       48
       48
       +
       {

     

       48
       49
        
       

     

       49
       50
        
         services.yggdrasil = {

     

       50
       51
        
           enable = true;

     

       51
       52
        
           persistentKeys = true; # Maintain a fixed public key and IPv6 address.

     

       52
       53
        
           settings = {

     

       53
       53
       -
             Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ];

     

       54
       54
       +
             Peers = [

     

       55
       55
       +
               "tcp://1.2.3.4:1024"

     

       56
       56
       +
               "tcp://1.2.3.5:1024"

     

       57
       57
       +
             ];

     

       54
       58
        
             NodeInfo = {

     

       55
       59
        
               # This information is visible to the network.

     

       56
       60
        
               name = config.networking.hostName;

     
···

       60
       64
        
         };

     

       61
       65
        
       

     

       62
       66
        
         boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;

     

       63
       63
       -
           # Forward traffic under the prefix.

     

       67
       67
       +
         # Forward traffic under the prefix.

     

       64
       68
        
       

     

       65
       65
       -
         networking.interfaces.${eth0}.ipv6.addresses = [{

     

       66
       66
       -
           # Set a 300::/8 address on the local physical device.

     

       67
       67
       -
           address = prefix + "::1";

     

       68
       68
       -
           prefixLength = 64;

     

       69
       69
       -
         }];

     

       69
       69
       +
         networking.interfaces.${eth0}.ipv6.addresses = [

     

       70
       70
       +
           {

     

       71
       71
       +
             # Set a 300::/8 address on the local physical device.

     

       72
       72
       +
             address = prefix + "::1";

     

       73
       73
       +
             prefixLength = 64;

     

       74
       74
       +
           }

     

       75
       75
       +
         ];

     

       70
       76
        
       

     

       71
       77
        
         services.radvd = {

     

       72
       78
        
           # Announce the 300::/8 prefix to eth0.

     
···

       93
       99
        
       ```nix

     

       94
       100
        
       let

     

       95
       101
        
         yggPrefix64 = "310:5217:69c0:9afc";

     

       96
       96
       -
           # Again, taken from the output of "yggdrasilctl getself".

     

       102
       102
       +
         # Again, taken from the output of "yggdrasilctl getself".

     

       97
       103
        
       in

     

       98
       104
        
       {

     

       99
       105
        
         boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;

     
···

       105
       111
        
       

     

       106
       112
        
           interfaces.br0 = {

     

       107
       113
        
             # … configured with a prefix address.

     

       108
       108
       -
             ipv6.addresses = [{

     

       109
       109
       -
               address = "${yggPrefix64}::1";

     

       110
       110
       -
               prefixLength = 64;

     

       111
       111
       -
             }];

     

       114
       114
       +
             ipv6.addresses = [

     

       115
       115
       +
               {

     

       116
       116
       +
                 address = "${yggPrefix64}::1";

     

       117
       117
       +
                 prefixLength = 64;

     

       118
       118
       +
               }

     

       119
       119
       +
             ];

     

       112
       120
        
           };

     

       113
       121
        
         };

     

       114
       122
        
       

     
···

       117
       125
        
           privateNetwork = true;

     

       118
       126
        
           hostBridge = "br0";

     

       119
       127
        
           # Attach the container to the bridge only.

     

       120
       120
       -
           config = { config, pkgs, ... }: {

     

       121
       121
       -
             networking.interfaces.eth0.ipv6 = {

     

       122
       122
       -
               addresses = [{

     

       123
       123
       -
                 # Configure a prefix address.

     

       124
       124
       -
                 address = "${yggPrefix64}::2";

     

       125
       125
       -
                 prefixLength = 64;

     

       126
       126
       -
               }];

     

       127
       127
       -
               routes = [{

     

       128
       128
       -
                 # Configure the prefix route.

     

       129
       129
       -
                 address = "200::";

     

       130
       130
       -
                 prefixLength = 7;

     

       131
       131
       -
                 via = "${yggPrefix64}::1";

     

       132
       132
       -
               }];

     

       128
       128
       +
           config =

     

       129
       129
       +
             { config, pkgs, ... }:

     

       130
       130
       +
             {

     

       131
       131
       +
               networking.interfaces.eth0.ipv6 = {

     

       132
       132
       +
                 addresses = [

     

       133
       133
       +
                   {

     

       134
       134
       +
                     # Configure a prefix address.

     

       135
       135
       +
                     address = "${yggPrefix64}::2";

     

       136
       136
       +
                     prefixLength = 64;

     

       137
       137
       +
                   }

     

       138
       138
       +
                 ];

     

       139
       139
       +
                 routes = [

     

       140
       140
       +
                   {

     

       141
       141
       +
                     # Configure the prefix route.

     

       142
       142
       +
                     address = "200::";

     

       143
       143
       +
                     prefixLength = 7;

     

       144
       144
       +
                     via = "${yggPrefix64}::1";

     

       145
       145
       +
                   }

     

       146
       146
       +
                 ];

     

       147
       147
       +
               };

     

       148
       148
       +
       

     

       149
       149
       +
               services.httpd.enable = true;

     

       150
       150
       +
               networking.firewall.allowedTCPPorts = [ 80 ];

     

       133
       151
        
             };

     

       134
       134
       -
       

     

       135
       135
       -
             services.httpd.enable = true;

     

       136
       136
       -
             networking.firewall.allowedTCPPorts = [ 80 ];

     

       137
       137
       -
           };

     

       138
       152
        
         };

     

       139
       153
        
       

     

       140
       154
        
       }

+1 -3

nixos/modules/services/search/meilisearch.md

···

       7
       7
        
       the minimum to start meilisearch is

     

       8
       8
        
       

     

       9
       9
        
       ```nix

     

       10
       10
       -
       {

     

       11
       11
       -
         services.meilisearch.enable = true;

     

       12
       12
       -
       }

     

       10
       10
       +
       { services.meilisearch.enable = true; }

     

       13
       11
        
       ```

     

       14
       12
        
       

     

       15
       13
        
       this will start the http server included with meilisearch on port 7700.

+9 -1

nixos/modules/services/system/kerberos/kerberos-server.md

···

       30
       30
        
           enable = true;

     

       31
       31
        
           settings = {

     

       32
       32
        
             realms."EXAMPLE.COM" = {

     

       33
       33
       -
               acl = [{ principal = "adminuser"; access=  ["add" "cpw"]; }];

     

       33
       33
       +
               acl = [

     

       34
       34
       +
                 {

     

       35
       35
       +
                   principal = "adminuser";

     

       36
       36
       +
                   access = [

     

       37
       37
       +
                     "add"

     

       38
       38
       +
                     "cpw"

     

       39
       39
       +
                   ];

     

       40
       40
       +
                 }

     

       41
       41
       +
               ];

     

       34
       42
        
             };

     

       35
       43
        
           };

     

       36
       44
        
         };

+5 -5

nixos/modules/services/system/systemd-lock-handler.md

···

       17
       17
        
       

     

       18
       18
        
         systemd.user.services.swaylock = {

     

       19
       19
        
           description = "Screen locker for Wayland";

     

       20
       20
       -
           documentation = ["man:swaylock(1)"];

     

       20
       20
       +
           documentation = [ "man:swaylock(1)" ];

     

       21
       21
        
       

     

       22
       22
        
           # If swaylock exits cleanly, unlock the session:

     

       23
       23
       -
           onSuccess = ["unlock.target"];

     

       23
       23
       +
           onSuccess = [ "unlock.target" ];

     

       24
       24
        
       

     

       25
       25
        
           # When lock.target is stopped, stops this too:

     

       26
       26
       -
           partOf = ["lock.target"];

     

       26
       26
       +
           partOf = [ "lock.target" ];

     

       27
       27
        
       

     

       28
       28
        
           # Delay lock.target until this service is ready:

     

       29
       29
       -
           before = ["lock.target"];

     

       30
       30
       -
           wantedBy = ["lock.target"];

     

       29
       29
       +
           before = [ "lock.target" ];

     

       30
       30
       +
           wantedBy = [ "lock.target" ];

     

       31
       31
        
       

     

       32
       32
        
           serviceConfig = {

     

       33
       33
        
             # systemd will consider this service started when swaylock forks...

+39 -39

nixos/modules/services/web-apps/akkoma.md

···

       139
       139
        
       

     

       140
       140
        
       ```nix

     

       141
       141
        
       {

     

       142
       142
       -
         services.akkoma.config.":pleroma".":mrf".policies =

     

       143
       143
       -
           map (pkgs.formats.elixirConf { }).lib.mkRaw [

     

       144
       144
       -
             "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy"

     

       142
       142
       +
         services.akkoma.config.":pleroma".":mrf".policies = map (pkgs.formats.elixirConf { }).lib.mkRaw [

     

       143
       143
       +
           "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy"

     

       145
       144
        
         ];

     

       146
       145
        
       }

     

       147
       146
        
       ```

     
···

       171
       170
        
       

     

       172
       171
        
       ```nix

     

       173
       172
        
       {

     

       174
       174
       -
         services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" {

     

       175
       175
       -
           config = builtins.toJSON {

     

       176
       176
       -
             expertLevel = 1;

     

       177
       177
       -
             collapseMessageWithSubject = false;

     

       178
       178
       -
             stopGifs = false;

     

       179
       179
       -
             replyVisibility = "following";

     

       180
       180
       -
             webPushHideIfCW = true;

     

       181
       181
       -
             hideScopeNotice = true;

     

       182
       182
       -
             renderMisskeyMarkdown = false;

     

       183
       183
       -
             hideSiteFavicon = true;

     

       184
       184
       -
             postContentType = "text/markdown";

     

       185
       185
       -
             showNavShortcuts = false;

     

       186
       186
       -
           };

     

       187
       187
       -
           nativeBuildInputs = with pkgs; [ jq xorg.lndir ];

     

       188
       188
       -
           passAsFile = [ "config" ];

     

       189
       189
       -
         } ''

     

       190
       190
       -
           mkdir $out

     

       191
       191
       -
           lndir ${pkgs.akkoma-frontends.akkoma-fe} $out

     

       173
       173
       +
         services.akkoma.frontends.primary.package =

     

       174
       174
       +
           pkgs.runCommand "akkoma-fe"

     

       175
       175
       +
             {

     

       176
       176
       +
               config = builtins.toJSON {

     

       177
       177
       +
                 expertLevel = 1;

     

       178
       178
       +
                 collapseMessageWithSubject = false;

     

       179
       179
       +
                 stopGifs = false;

     

       180
       180
       +
                 replyVisibility = "following";

     

       181
       181
       +
                 webPushHideIfCW = true;

     

       182
       182
       +
                 hideScopeNotice = true;

     

       183
       183
       +
                 renderMisskeyMarkdown = false;

     

       184
       184
       +
                 hideSiteFavicon = true;

     

       185
       185
       +
                 postContentType = "text/markdown";

     

       186
       186
       +
                 showNavShortcuts = false;

     

       187
       187
       +
               };

     

       188
       188
       +
               nativeBuildInputs = with pkgs; [

     

       189
       189
       +
                 jq

     

       190
       190
       +
                 xorg.lndir

     

       191
       191
       +
               ];

     

       192
       192
       +
               passAsFile = [ "config" ];

     

       193
       193
       +
             }

     

       194
       194
       +
             ''

     

       195
       195
       +
               mkdir $out

     

       196
       196
       +
               lndir ${pkgs.akkoma-frontends.akkoma-fe} $out

     

       192
       197
        
       

     

       193
       193
       -
           rm $out/static/config.json

     

       194
       194
       -
           jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \

     

       195
       195
       -
             >$out/static/config.json

     

       196
       196
       -
         '';

     

       198
       198
       +
               rm $out/static/config.json

     

       199
       199
       +
               jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \

     

       200
       200
       +
                 >$out/static/config.json

     

       201
       201
       +
             '';

     

       197
       202
        
       }

     

       198
       203
        
       ```

     

       199
       204
        
       

     
···

       212
       217
        
       ```nix

     

       213
       218
        
       {

     

       214
       219
        
         services.akkoma.config.":pleroma" = with (pkgs.formats.elixirConf { }).lib; {

     

       215
       215
       -
           ":mrf".policies = map mkRaw [

     

       216
       216
       -
             "Pleroma.Web.ActivityPub.MRF.SimplePolicy"

     

       217
       217
       -
           ];

     

       220
       220
       +
           ":mrf".policies = map mkRaw [ "Pleroma.Web.ActivityPub.MRF.SimplePolicy" ];

     

       218
       221
        
       

     

       219
       222
        
           ":mrf_simple" = {

     

       220
       223
        
             # Tag all media as sensitive

     

       221
       221
       -
             media_nsfw = mkMap {

     

       222
       222
       -
               "nsfw.weird.kinky" = "Untagged NSFW content";

     

       223
       223
       -
             };

     

       224
       224
       +
             media_nsfw = mkMap { "nsfw.weird.kinky" = "Untagged NSFW content"; };

     

       224
       225
        
       

     

       225
       226
        
             # Reject all activities except deletes

     

       226
       227
        
             reject = mkMap {

     
···

       244
       245
        
       ```nix

     

       245
       246
        
       {

     

       246
       247
        
         services.akkoma.config.":pleroma"."Pleroma.Upload".filters =

     

       247
       247
       -
           map (pkgs.formats.elixirConf { }).lib.mkRaw [

     

       248
       248
       -
             "Pleroma.Upload.Filter.Exiftool"

     

       249
       249
       -
             "Pleroma.Upload.Filter.Dedupe"

     

       250
       250
       -
             "Pleroma.Upload.Filter.AnonymizeFilename"

     

       251
       251
       -
           ];

     

       248
       248
       +
           map (pkgs.formats.elixirConf { }).lib.mkRaw

     

       249
       249
       +
             [

     

       250
       250
       +
               "Pleroma.Upload.Filter.Exiftool"

     

       251
       251
       +
               "Pleroma.Upload.Filter.Dedupe"

     

       252
       252
       +
               "Pleroma.Upload.Filter.AnonymizeFilename"

     

       253
       253
       +
             ];

     

       252
       254
        
       }

     

       253
       255
        
       ```

     

       254
       256
        
       

     
···

       322
       324
        
       The Akkoma systemd service may be confined to a chroot with

     

       323
       325
        
       

     

       324
       326
        
       ```nix

     

       325
       325
       -
       {

     

       326
       326
       -
         services.systemd.akkoma.confinement.enable = true;

     

       327
       327
       -
       }

     

       327
       327
       +
       { services.systemd.akkoma.confinement.enable = true; }

     

       328
       328
        
       ```

     

       329
       329
        
       

     

       330
       330
        
       Confinement of services is not generally supported in NixOS and therefore disabled by default.

+1 -3

nixos/modules/services/web-apps/c2fmzq-server.md

···

       5
       5
        
       

     

       6
       6
        
       The service `c2fmzq-server` can be enabled by setting

     

       7
       7
        
       ```nix

     

       8
       8
       -
       {

     

       9
       9
       -
         services.c2fmzq-server.enable = true;

     

       10
       10
       -
       }

     

       8
       8
       +
       { services.c2fmzq-server.enable = true; }

     

       11
       9
        
       ```

     

       12
       10
        
       This will spin up an instance of the server which is API-compatible with

     

       13
       11
        
       [Stingle Photos](https://stingle.org) and an experimental Progressive Web App

+4 -1

nixos/modules/services/web-apps/castopod.md

···

       9
       9
        
       

     

       10
       10
        
       ```nix

     

       11
       11
        
       {

     

       12
       12
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       12
       12
       +
         networking.firewall.allowedTCPPorts = [

     

       13
       13
       +
           80

     

       14
       14
       +
           443

     

       15
       15
       +
         ];

     

       13
       16
        
         services.castopod = {

     

       14
       17
        
           enable = true;

     

       15
       18
        
           database.createLocally = true;

+5 -2

nixos/modules/services/web-apps/filesender.md

···

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
        
       let

     

       13
       13
       -
         format = pkgs.formats.php {};

     

       13
       13
       +
         format = pkgs.formats.php { };

     

       14
       14
        
       in

     

       15
       15
        
       {

     

       16
       16
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       16
       16
       +
         networking.firewall.allowedTCPPorts = [

     

       17
       17
       +
           80

     

       18
       18
       +
           443

     

       19
       19
       +
         ];

     

       17
       20
        
         services.filesender = {

     

       18
       21
        
           enable = true;

     

       19
       22
        
           localDomain = "filesender.example.com";

+4 -1

nixos/modules/services/web-apps/gotosocial.md

···

       33
       33
        
       

     

       34
       34
        
       ```nix

     

       35
       35
        
       {

     

       36
       36
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       36
       36
       +
         networking.firewall.allowedTCPPorts = [

     

       37
       37
       +
           80

     

       38
       38
       +
           443

     

       39
       39
       +
         ];

     

       37
       40
        
         services.nginx = {

     

       38
       41
        
           enable = true;

     

       39
       42
        
           clientMaxBodySize = "40M";

+8 -2

nixos/modules/services/web-apps/jitsi-meet.md

···

       13
       13
        
           hostName = "jitsi.example.com";

     

       14
       14
        
         };

     

       15
       15
        
         services.jitsi-videobridge.openFirewall = true;

     

       16
       16
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       16
       16
       +
         networking.firewall.allowedTCPPorts = [

     

       17
       17
       +
           80

     

       18
       18
       +
           443

     

       19
       19
       +
         ];

     

       17
       20
        
         security.acme.email = "me@example.com";

     

       18
       21
        
         security.acme.acceptTerms = true;

     

       19
       22
        
       }

     
···

       46
       49
        
           };

     

       47
       50
        
         };

     

       48
       51
        
         services.jitsi-videobridge.openFirewall = true;

     

       49
       49
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       52
       52
       +
         networking.firewall.allowedTCPPorts = [

     

       53
       53
       +
           80

     

       54
       54
       +
           443

     

       55
       55
       +
         ];

     

       50
       56
        
         security.acme.email = "me@example.com";

     

       51
       57
        
         security.acme.acceptTerms = true;

     

       52
       58
        
       }

+1 -1

nixos/modules/services/web-apps/keycloak.md

···

       132
       132
        
             hostname = "keycloak.example.com";

     

       133
       133
        
             hostname-strict-backchannel = true;

     

       134
       134
        
           };

     

       135
       135
       -
           initialAdminPassword = "e6Wcm0RrtegMEHl";  # change on first login

     

       135
       135
       +
           initialAdminPassword = "e6Wcm0RrtegMEHl"; # change on first login

     

       136
       136
        
           sslCertificate = "/run/keys/ssl_cert";

     

       137
       137
        
           sslCertificateKey = "/run/keys/ssl_key";

     

       138
       138
        
           database.passwordFile = "/run/keys/db_password";

+20 -10

nixos/modules/services/web-apps/nextcloud.md

···

       38
       38
        
           };

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
       -
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       41
       41
       +
         networking.firewall.allowedTCPPorts = [

     

       42
       42
       +
           80

     

       43
       43
       +
           443

     

       44
       44
       +
         ];

     

       42
       45
        
       }

     

       43
       46
        
       ```

     

       44
       47
        
       

     
···

       69
       72
        
       or the systemd configuration from `nextcloud-setup.service` (recommended):

     

       70
       73
        
       

     

       71
       74
        
       ```nix

     

       72
       72
       -
       { config, ... }: {

     

       75
       75
       +
       { config, ... }:

     

       76
       76
       +
       {

     

       73
       77
        
         systemd.services.my-custom-service = {

     

       74
       78
        
           script = ''

     

       75
       79
        
             nextcloud-occ …

     
···

       78
       82
        
             inherit (config.systemd.services.nextcloud-cron.serviceConfig)

     

       79
       83
        
               User

     

       80
       84
        
               LoadCredential

     

       81
       81
       -
               KillMode;

     

       85
       85
       +
               KillMode

     

       86
       86
       +
               ;

     

       82
       87
        
           };

     

       83
       88
        
         };

     

       84
       89
        
       }

     
···

       208
       213
        
           the cache size to zero:

     

       209
       214
        
       

     

       210
       215
        
           ```nix

     

       211
       211
       -
           {

     

       212
       212
       -
             services.nextcloud.phpOptions."realpath_cache_size" = "0";

     

       213
       213
       -
           }

     

       216
       216
       +
           { services.nextcloud.phpOptions."realpath_cache_size" = "0"; }

     

       214
       217
        
           ```

     

       215
       218
        
       

     

       216
       219
        
         - **Empty Files on chunked uploads**

     
···

       233
       236
        
       

     

       234
       237
        
       An exemplary configuration may look like this:

     

       235
       238
        
       ```nix

     

       236
       236
       -
       { config, lib, pkgs, ... }: {

     

       239
       239
       +
       {

     

       240
       240
       +
         config,

     

       241
       241
       +
         lib,

     

       242
       242
       +
         pkgs,

     

       243
       243
       +
         ...

     

       244
       244
       +
       }:

     

       245
       245
       +
       {

     

       237
       246
        
         services.nginx.enable = false;

     

       238
       247
        
         services.nextcloud = {

     

       239
       248
        
           enable = true;

     

       240
       249
        
           hostName = "localhost";

     

       241
       250
        
       

     

       242
       242
       -
           /* further, required options */

     

       251
       251
       +
           # further, required options

     

       243
       252
        
         };

     

       244
       253
        
         services.phpfpm.pools.nextcloud.settings = {

     

       245
       254
        
           "listen.owner" = config.services.httpd.user;

     
···

       287
       296
        
       that are managed by Nix:

     

       288
       297
        
       

     

       289
       298
        
       ```nix

     

       290
       290
       -
       { config, pkgs, ... }: {

     

       299
       299
       +
       { config, pkgs, ... }:

     

       300
       300
       +
       {

     

       291
       301
        
         services.nextcloud.extraApps = with config.services.nextcloud.package.packages.apps; {

     

       292
       302
        
           inherit user_oidc calendar contacts;

     

       293
       303
        
         };

     
···

       338
       348
        
       packages, but mark them as insecure in an expression like this (in

     

       339
       349
        
       `<nixpkgs/pkgs/servers/nextcloud/default.nix>`):

     

       340
       350
        
       ```nix

     

       341
       341
       -
       /* ... */

     

       351
       351
       +
       # ...

     

       342
       352
        
       {

     

       343
       353
        
         nextcloud17 = generic {

     

       344
       354
        
           version = "17.0.x";

+1 -3

nixos/modules/services/web-apps/pict-rs.md

···

       7
       7
        
       the minimum to start pict-rs is

     

       8
       8
        
       

     

       9
       9
        
       ```nix

     

       10
       10
       -
       {

     

       11
       11
       -
         services.pict-rs.enable = true;

     

       12
       12
       -
       }

     

       10
       10
       +
       { services.pict-rs.enable = true; }

     

       13
       11
        
       ```

     

       14
       12
        
       

     

       15
       13
        
       this will start the http server on port 8080 by default.

+1 -1

nixos/modules/services/web-servers/garage.md

···

       72
       72
        
       packages, but mark them as insecure in an expression like this (in

     

       73
       73
        
       `<nixpkgs/pkgs/tools/filesystem/garage/default.nix>`):

     

       74
       74
        
       ```nix

     

       75
       75
       -
       /* ... */

     

       75
       75
       +
       # ...

     

       76
       76
        
       {

     

       77
       77
        
         garage_1_2_0 = generic {

     

       78
       78
        
           version = "1.2.0";

+4 -15

nixos/modules/services/x11/desktop-managers/pantheon.md

···

       6
       6
        
       

     

       7
       7
        
       All of Pantheon is working in NixOS and the applications should be available, aside from a few [exceptions](https://github.com/NixOS/nixpkgs/issues/58161). To enable Pantheon, set

     

       8
       8
        
       ```nix

     

       9
       9
       -
       {

     

       10
       10
       -
         services.xserver.desktopManager.pantheon.enable = true;

     

       11
       11
       -
       }

     

       9
       9
       +
       { services.xserver.desktopManager.pantheon.enable = true; }

     

       12
       10
        
       ```

     

       13
       11
        
       This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like to disable this, set

     

       14
       12
        
       ```nix

     
···

       19
       17
        
       ```

     

       20
       18
        
       but please be aware using Pantheon without LightDM as a display manager will break screenlocking from the UI. The NixOS module for Pantheon installs all of Pantheon's default applications. If you'd like to not install Pantheon's apps, set

     

       21
       19
        
       ```nix

     

       22
       22
       -
       {

     

       23
       23
       -
         services.pantheon.apps.enable = false;

     

       24
       24
       -
       }

     

       20
       20
       +
       { services.pantheon.apps.enable = false; }

     

       25
       21
        
       ```

     

       26
       22
        
       You can also use [](#opt-environment.pantheon.excludePackages) to remove any other app (like `elementary-mail`).

     

       27
       23
        
       

     
···

       37
       33
        
       The difference in NixOS is both these programs are patched to load plugins from a directory that is the value of an environment variable. All of which is controlled in Nix. If you need to configure the particular packages manually you can override the packages like:

     

       38
       34
        
       ```nix

     

       39
       35
        
       wingpanel-with-indicators.override {

     

       40
       40
       -
         indicators = [

     

       41
       41
       -
           pkgs.some-special-indicator

     

       42
       42
       -
         ];

     

       36
       36
       +
         indicators = [ pkgs.some-special-indicator ];

     

       43
       37
        
       }

     

       44
       44
       -
       

     

       45
       38
        
       ```

     

       46
       39
        
       ```nix

     

       47
       47
       -
       switchboard-with-plugs.override {

     

       48
       48
       -
         plugs = [

     

       49
       49
       -
           pkgs.some-special-plug

     

       50
       50
       -
         ];

     

       51
       51
       -
       }

     

       40
       40
       +
       switchboard-with-plugs.override { plugs = [ pkgs.some-special-plug ]; }

     

       52
       41
        
       ```

     

       53
       42
        
       please note that, like how the NixOS options describe these as extra plugins, this would only add to the default plugins included with the programs. If for some reason you'd like to configure which plugins to use exactly, both packages have an argument for this:

     

       54
       43
        
       ```nix

+2 -6

nixos/modules/system/boot/clevis.md

···

       40
       40
        
       In order to activate unattended decryption of a resource at boot, enable the `clevis` module:

     

       41
       41
        
       

     

       42
       42
        
       ```nix

     

       43
       43
       -
       {

     

       44
       44
       -
         boot.initrd.clevis.enable = true;

     

       45
       45
       -
       }

     

       43
       43
       +
       { boot.initrd.clevis.enable = true; }

     

       46
       44
        
       ```

     

       47
       45
        
       

     

       48
       46
        
       Then, specify the device you want to decrypt using a given clevis secret. Clevis will automatically try to decrypt the device at boot and will fallback to interactive unlocking if the decryption policy is not fulfilled.

     

       49
       47
        
       ```nix

     

       50
       50
       -
       {

     

       51
       51
       -
         boot.initrd.clevis.devices."/dev/nvme0n1p1".secretFile = ./nvme0n1p1.jwe;

     

       52
       52
       -
       }

     

       48
       48
       +
       { boot.initrd.clevis.devices."/dev/nvme0n1p1".secretFile = ./nvme0n1p1.jwe; }

     

       53
       49
        
       ```

     

       54
       50
        
       

     

       55
       51
        
       Only `bcachefs`, `zfs` and `luks` encrypted devices are supported at this time.

+2 -1

nixos/modules/system/boot/loader/external/external.md

···

       12
       12
        
       You can enable FooBoot like this:

     

       13
       13
        
       

     

       14
       14
        
       ```nix

     

       15
       15
       -
       { pkgs, ... }: {

     

       15
       15
       +
       { pkgs, ... }:

     

       16
       16
       +
       {

     

       16
       17
        
         boot.loader.external = {

     

       17
       18
        
           enable = true;

     

       18
       19
        
           installHook = "${pkgs.fooboot}/bin/fooboot-install";

+64 -36

pkgs/README.md

···

       610
       610
        
       The latter avoids link rot when the upstream abandons, squashes or rebases their change, in which case the commit may get garbage-collected.

     

       611
       611
        
       

     

       612
       612
        
       ```nix

     

       613
       613
       -
       {

     

       614
       614
       -
         patches = [ ./0001-add-missing-include.patch ];

     

       615
       615
       -
       }

     

       613
       613
       +
       { patches = [ ./0001-add-missing-include.patch ]; }

     

       616
       614
        
       ```

     

       617
       615
        
       

     

       618
       616
        
       If you do need to do create this sort of patch file, one way to do so is with git:

     
···

       719
       717
        
       For very simple tests, they can be written inline:

     

       720
       718
        
       

     

       721
       719
        
       ```nix

     

       722
       722
       -
       { /* ... , */ yq-go }:

     

       720
       720
       +
       # ... ,

     

       721
       721
       +
       { yq-go }:

     

       723
       722
        
       

     

       724
       723
        
       buildGoModule rec {

     

       725
       724
        
         # …

     

       726
       725
        
       

     

       727
       726
        
         passthru.tests = {

     

       728
       728
       -
           simple = runCommand "${pname}-test" {} ''

     

       727
       727
       +
           simple = runCommand "${pname}-test" { } ''

     

       729
       728
        
             echo "test: 1" | ${yq-go}/bin/yq eval -j > $out

     

       730
       729
        
             [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ]

     

       731
       730
        
           '';

     
···

       749
       748
        
       

     

       750
       749
        
       ```nix

     

       751
       750
        
       # my-package/example.nix

     

       752
       752
       -
       { runCommand, lib, my-package, ... }:

     

       753
       753
       -
       runCommand "my-package-test" {

     

       754
       754
       -
         nativeBuildInputs = [ my-package ];

     

       755
       755
       -
         src = lib.sources.sourcesByRegex ./. [ ".*.in" ".*.expected" ];

     

       756
       756
       -
       } ''

     

       757
       757
       -
         my-package --help

     

       758
       758
       -
         my-package <example.in >example.actual

     

       759
       759
       -
         diff -U3 --color=auto example.expected example.actual

     

       760
       760
       -
         mkdir $out

     

       761
       761
       -
       ''

     

       751
       751
       +
       {

     

       752
       752
       +
         runCommand,

     

       753
       753
       +
         lib,

     

       754
       754
       +
         my-package,

     

       755
       755
       +
         ...

     

       756
       756
       +
       }:

     

       757
       757
       +
       runCommand "my-package-test"

     

       758
       758
       +
         {

     

       759
       759
       +
           nativeBuildInputs = [ my-package ];

     

       760
       760
       +
           src = lib.sources.sourcesByRegex ./. [

     

       761
       761
       +
             ".*.in"

     

       762
       762
       +
             ".*.expected"

     

       763
       763
       +
           ];

     

       764
       764
       +
         }

     

       765
       765
       +
         ''

     

       766
       766
       +
           my-package --help

     

       767
       767
       +
           my-package <example.in >example.actual

     

       768
       768
       +
           diff -U3 --color=auto example.expected example.actual

     

       769
       769
       +
           mkdir $out

     

       770
       770
       +
         ''

     

       762
       771
        
       ```

     

       763
       772
        
       

     

       764
       773
        
       ### Writing larger package tests

     
···

       769
       778
        
       Add the tests in `passthru.tests` to the package definition like this:

     

       770
       779
        
       

     

       771
       780
        
       ```nix

     

       772
       772
       -
       { stdenv, lib, fetchurl, callPackage }:

     

       781
       781
       +
       {

     

       782
       782
       +
         stdenv,

     

       783
       783
       +
         lib,

     

       784
       784
       +
         fetchurl,

     

       785
       785
       +
         callPackage,

     

       786
       786
       +
       }:

     

       773
       787
        
       

     

       774
       788
        
       stdenv.mkDerivation {

     

       775
       789
        
         # …

     
···

       778
       792
        
           simple-execution = callPackage ./tests.nix { };

     

       779
       793
        
         };

     

       780
       794
        
       

     

       781
       781
       -
         meta = { /* … */ };

     

       795
       795
       +
         meta = {

     

       796
       796
       +
           # …

     

       797
       797
       +
         };

     

       782
       798
        
       }

     

       783
       799
        
       ```

     

       784
       800
        
       

     
···

       789
       805
        
       

     

       790
       806
        
       let

     

       791
       807
        
         inherit (phoronix-test-suite) pname version;

     

       808
       808
       +
       

     

       792
       809
        
       in

     

       793
       793
       -
       

     

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

     

       795
       795
       -
         ''

     

       796
       796
       -
           # automatic initial setup to prevent interactive questions

     

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

     

       798
       798
       -
           # get version of installed program and compare with package version

     

       799
       799
       -
           if [[ `${phoronix-test-suite}/bin/phoronix-test-suite version` != *"${version}"*  ]]; then

     

       800
       800
       -
             echo "Error: program version does not match package version"

     

       801
       801
       -
             exit 1

     

       802
       802
       -
           fi

     

       803
       803
       -
           # run dummy command

     

       804
       804
       -
           ${phoronix-test-suite}/bin/phoronix-test-suite dummy_module.dummy-command >/dev/null

     

       805
       805
       -
           # needed for Nix to register the command as successful

     

       806
       806
       -
           touch $out

     

       807
       807
       -
         ''

     

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

     

       811
       811
       +
         # automatic initial setup to prevent interactive questions

     

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

     

       813
       813
       +
         # get version of installed program and compare with package version

     

       814
       814
       +
         if [[ `${phoronix-test-suite}/bin/phoronix-test-suite version` != *"${version}"*  ]]; then

     

       815
       815
       +
           echo "Error: program version does not match package version"

     

       816
       816
       +
           exit 1

     

       817
       817
       +
         fi

     

       818
       818
       +
         # run dummy command

     

       819
       819
       +
         ${phoronix-test-suite}/bin/phoronix-test-suite dummy_module.dummy-command >/dev/null

     

       820
       820
       +
         # needed for Nix to register the command as successful

     

       821
       821
       +
         touch $out

     

       822
       822
       +
       ''

     

       808
       823
        
       ```

     

       809
       824
        
       

     

       810
       825
        
       ### Running package tests

     
···

       833
       848
        
       For example, assuming we're packaging `nginx`, we can link its module test via `passthru.tests`:

     

       834
       849
        
       

     

       835
       850
        
       ```nix

     

       836
       836
       -
       { stdenv, lib, nixosTests }:

     

       851
       851
       +
       {

     

       852
       852
       +
         stdenv,

     

       853
       853
       +
         lib,

     

       854
       854
       +
         nixosTests,

     

       855
       855
       +
       }:

     

       837
       856
        
       

     

       838
       857
        
       stdenv.mkDerivation {

     

       839
       858
        
         # ...

     
···

       902
       921
        
         { stdenv }:

     

       903
       922
        
         stdenv.mkDerivation {

     

       904
       923
        
           # ...

     

       905
       905
       -
           passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];

     

       924
       924
       +
           passthru.updateScript = [

     

       925
       925
       +
             ../../update.sh

     

       926
       926
       +
             pname

     

       927
       927
       +
             "--requested-release=unstable"

     

       928
       928
       +
           ];

     

       906
       929
        
         }

     

       907
       930
        
         ```

     

       908
       931
        
       

     
···

       927
       950
        
             pname = "my-package";

     

       928
       951
        
             # ...

     

       929
       952
        
             passthru.updateScript = {

     

       930
       930
       -
               command = [ ../../update.sh pname ];

     

       953
       953
       +
               command = [

     

       954
       954
       +
                 ../../update.sh

     

       955
       955
       +
                 pname

     

       956
       956
       +
               ];

     

       931
       957
        
               attrPath = pname;

     

       932
       932
       -
               supportedFeatures = [ /* ... */ ];

     

       958
       958
       +
               supportedFeatures = [

     

       959
       959
       +
                 # ...

     

       960
       960
       +
               ];

     

       933
       961
        
             };

     

       934
       962
        
           }

     

       935
       963
        
           ```

+10 -8

pkgs/applications/emulators/libretro/README.md

···

       22
       22
        
       { pkgs, ... }:

     

       23
       23
        
       

     

       24
       24
        
       let

     

       25
       25
       -
         retroarchWithCores = (pkgs.retroarch.withCores (cores: with cores; [

     

       26
       26
       -
           bsnes

     

       27
       27
       -
           mgba

     

       28
       28
       -
           quicknes

     

       29
       29
       -
         ]));

     

       25
       25
       +
         retroarchWithCores = (

     

       26
       26
       +
           pkgs.retroarch.withCores (

     

       27
       27
       +
             cores: with cores; [

     

       28
       28
       +
               bsnes

     

       29
       29
       +
               mgba

     

       30
       30
       +
               quicknes

     

       31
       31
       +
             ]

     

       32
       32
       +
           )

     

       33
       33
       +
         );

     

       30
       34
        
       in

     

       31
       35
        
       {

     

       32
       32
       -
         environment.systemPackages = [

     

       33
       33
       -
           retroarchWithCores

     

       34
       34
       -
         ];

     

       36
       36
       +
         environment.systemPackages = [ retroarchWithCores ];

     

       35
       37
        
       }

     

       36
       38
        
       ```

     

       37
       39

+14 -27

pkgs/by-name/README.md

···

       37
       37
        
       # The return value must be a derivation

     

       38
       38
        
       stdenv.mkDerivation {

     

       39
       39
        
         # ...

     

       40
       40
       -
         buildInputs =

     

       41
       41
       -
           lib.optional enableBar libbar;

     

       40
       40
       +
         buildInputs = lib.optional enableBar libbar;

     

       42
       41
        
       }

     

       43
       42
        
       ```

     

       44
       43
        
       

     
···

       70
       69
        
       

     

       71
       70
        
       ```nix

     

       72
       71
        
       {

     

       73
       73
       -
         libfoo = callPackage ../by-name/so/some-package/package.nix {

     

       74
       74
       -
           libbar = libbar_2;

     

       75
       75
       -
         };

     

       72
       72
       +
         libfoo = callPackage ../by-name/so/some-package/package.nix { libbar = libbar_2; };

     

       76
       73
        
       }

     

       77
       74
        
       ```

     

       78
       75
        
       

     
···

       100
       97
        
       ```nix

     

       101
       98
        
       # all-packages.nix

     

       102
       99
        
       {

     

       103
       103
       -
         fooWithBaz = foo.override {

     

       104
       104
       -
           bar = baz;

     

       105
       105
       -
         };

     

       100
       100
       +
         fooWithBaz = foo.override { bar = baz; };

     

       106
       101
        
       }

     

       107
       102
        
       ```

     

       108
       103
        
       

     

       109
       104
        
       ```nix

     

       110
       105
        
       # turned into pkgs/by-name/fo/fooWithBaz/package.nix with:

     

       111
       111
       -
       {

     

       112
       112
       -
         foo,

     

       113
       113
       -
         baz,

     

       114
       114
       -
       }:

     

       106
       106
       +
       { foo, baz }:

     

       115
       107
        
       

     

       116
       116
       -
       foo.override {

     

       117
       117
       -
         bar = baz;

     

       118
       118
       -
       }

     

       108
       108
       +
       foo.override { bar = baz; }

     

       119
       109
        
       ```

     

       120
       110
        
       

     

       121
       111
        
       ## Limitations

     
···

       187
       177
        
       This is not required, but the above solution also allows refactoring the definitions into a separate file:

     

       188
       178
        
       

     

       189
       179
        
       ```nix

     

       190
       190
       -
       {

     

       191
       191
       -
         inherit (import ../tools/foo pkgs)

     

       192
       192
       -
           foo_1 foo_2;

     

       193
       193
       -
       }

     

       180
       180
       +
       { inherit (import ../tools/foo pkgs) foo_1 foo_2; }

     

       194
       181
        
       ```

     

       195
       182
        
       

     

       196
       183
        
       ```nix

     
···

       205
       192
        
       if `callPackage` isn't used underneath and you want the same `.override` arguments for all attributes:

     

       206
       193
        
       

     

       207
       194
        
       ```nix

     

       208
       208
       -
       {

     

       209
       209
       -
         inherit (callPackages ../tools/foo { })

     

       210
       210
       -
           foo_1 foo_2;

     

       211
       211
       -
       }

     

       195
       195
       +
       { inherit (callPackages ../tools/foo { }) foo_1 foo_2; }

     

       212
       196
        
       ```

     

       213
       197
        
       

     

       214
       198
        
       ```nix

     

       215
       199
        
       # pkgs/tools/foo/default.nix

     

       200
       200
       +
       { stdenv }:

     

       216
       201
        
       {

     

       217
       217
       -
         stdenv

     

       218
       218
       -
       }: {

     

       219
       219
       -
         foo_1 = stdenv.mkDerivation { /* ... */ };

     

       220
       220
       -
         foo_2 = stdenv.mkDerivation { /* ... */ };

     

       202
       202
       +
         foo_1 = stdenv.mkDerivation {

     

       203
       203
       +
           # ...

     

       204
       204
       +
         };

     

       205
       205
       +
         foo_2 = stdenv.mkDerivation {

     

       206
       206
       +
           # ...

     

       207
       207
       +
         };

     

       221
       208
        
       }

     

       222
       209
        
       ```

     

       223
       210

+1 -3

pkgs/by-name/az/azure-cli/README.md

···

       63
       63
        
           url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl";

     

       64
       64
        
           sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a";

     

       65
       65
        
           description = "Tools for managing Azure DevOps";

     

       66
       66
       -
           propagatedBuildInputs = with python3Packages; [

     

       67
       67
       -
             distro

     

       68
       68
       -
           ];

     

       66
       66
       +
           propagatedBuildInputs = with python3Packages; [ distro ];

     

       69
       67
        
           meta.maintainers = with lib.maintainers; [ katexochen ];

     

       70
       68
        
         };

     

       71
       69
        
       }

+5 -4

pkgs/development/tcl-modules/by-name/README.md

···

       5
       5
        
       The only difference is the scope:

     

       6
       6
        
       

     

       7
       7
        
       ```nix

     

       8
       8
       -
       { lib

     

       9
       9
       -
       # You can get tclPackages attributes directly

     

       10
       10
       -
       , mkTclDerivation

     

       11
       11
       -
       , tcllib

     

       8
       8
       +
       {

     

       9
       9
       +
         lib,

     

       10
       10
       +
         # You can get tclPackages attributes directly

     

       11
       11
       +
         mkTclDerivation,

     

       12
       12
       +
         tcllib,

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       mkTclDerivation {

+6 -9

pkgs/servers/home-assistant/custom-components/README.md

···

       19
       19
        
       **Example Boilerplate:**

     

       20
       20
        
       

     

       21
       21
        
       ```nix

     

       22
       22
       -
       { lib

     

       23
       23
       -
       , buildHomeAssistantComponent

     

       24
       24
       -
       , fetchFromGitHub

     

       22
       22
       +
       {

     

       23
       23
       +
         lib,

     

       24
       24
       +
         buildHomeAssistantComponent,

     

       25
       25
       +
         fetchFromGitHub,

     

       25
       26
        
       }:

     

       26
       27
        
       

     

       27
       28
        
       buildHomeAssistantComponent {

     
···

       81
       82
        
       

     

       82
       83
        
       ```nix

     

       83
       84
        
       {

     

       84
       84
       -
         dependencies = [

     

       85
       85
       -
           pyemvue

     

       86
       86
       -
         ];

     

       85
       85
       +
         dependencies = [ pyemvue ];

     

       87
       86
        
       

     

       88
       87
        
         # don't check the version constraint of pyemvue

     

       89
       89
       -
         ignoreVersionRequirement = [

     

       90
       90
       -
           "pyemvue"

     

       91
       91
       -
         ];

     

       88
       88
       +
         ignoreVersionRequirement = [ "pyemvue" ];

     

       92
       89
        
       }

     

       93
       90
        
       ```

+1 -3

pkgs/servers/home-assistant/custom-lovelace-modules/README.md

···

       9
       9
        
       The entrypoint used can be overridden in `passthru` like this:

     

       10
       10
        
       

     

       11
       11
        
       ```nix

     

       12
       12
       -
       {

     

       13
       13
       -
         passthru.entrypoint = "demo-card-bundle.js";

     

       14
       14
       -
       }

     

       12
       12
       +
       { passthru.entrypoint = "demo-card-bundle.js"; }

     

       15
       13
        
       ```