commit 32f75a0f2af55b50061629fd4e51221f15ada457 · pyrox.dev/nixpkgs

+2 -4

nixos/doc/manual/default.nix

···

       184
        
           '';

     

       185
        
       

     

       186
        
       

     

       187
       -
         # Generate the NixOS manpages.

     

       188
       -
         manpages = runCommand "nixos-manpages"

     

       189
        
           { nativeBuildInputs = [

     

       190
        
               buildPackages.installShellFiles

     

       191
        
               buildPackages.nixos-render-docs

     
···

       194
        
           }

     

       195
        
           ''

     

       196
        
             # Generate manpages.

     

       197
       -
             mkdir -p $out/share/man/man8

     

       198
       -
             installManPage ${./manpages}/*

     

       199
        
             mkdir -p $out/share/man/man5

     

       200
        
             nixos-render-docs -j $NIX_BUILD_CORES options manpage \

     

       201
        
               --revision ${lib.escapeShellArg revision} \

···

       184
        
           '';

     

       185
        
       

     

       186
        
       

     

       187
       +
         # Generate the configuration.nix manual package

     

       188
       +
         configuration-manual = runCommand "nixos-manpages"

     

       189
        
           { nativeBuildInputs = [

     

       190
        
               buildPackages.installShellFiles

     

       191
        
               buildPackages.nixos-render-docs

     
···

       194
        
           }

     

       195
        
           ''

     

       196
        
             # Generate manpages.

     

       0
        
       
     

       0
        
       
     

       197
        
             mkdir -p $out/share/man/man5

     

       198
        
             nixos-render-docs -j $NIX_BUILD_CORES options manpage \

     

       199
        
               --revision ${lib.escapeShellArg revision} \

nixos/doc/manual/manpages/README.md nixos/modules/installer/tools/manpages/README.md

nixos/doc/manual/manpages/nixos-build-vms.8 nixos/modules/installer/tools/manpages/nixos-build-vms.8

nixos/doc/manual/manpages/nixos-enter.8 nixos/modules/installer/tools/manpages/nixos-enter.8

nixos/doc/manual/manpages/nixos-generate-config.8 nixos/modules/installer/tools/manpages/nixos-generate-config.8

nixos/doc/manual/manpages/nixos-install.8 nixos/modules/installer/tools/manpages/nixos-install.8

nixos/doc/manual/manpages/nixos-version.8 nixos/modules/installer/tools/manpages/nixos-version.8

+11

nixos/modules/installer/tools/tools.nix

···

       9
        
         makeProg = args: pkgs.substituteAll (args // {

     

       10
        
           dir = "bin";

     

       11
        
           isExecutable = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
         });

     

       13
        
       

     

       14
        
         nixos-build-vms = makeProg {

     

       15
        
           name = "nixos-build-vms";

     

       16
        
           src = ./nixos-build-vms/nixos-build-vms.sh;

     

       17
        
           inherit (pkgs) runtimeShell;

     

       0
        
       
     

       18
        
         };

     

       19
        
       

     

       20
        
         nixos-install = makeProg {

     
···

       27
        
             nixos-enter

     

       28
        
             pkgs.util-linuxMinimal

     

       29
        
           ];

     

       0
        
       
     

       30
        
         };

     

       31
        
       

     

       32
        
         nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };

     
···

       40
        
           btrfs = "${pkgs.btrfs-progs}/bin/btrfs";

     

       41
        
           inherit (config.system.nixos-generate-config) configuration desktopConfiguration;

     

       42
        
           xserverEnabled = config.services.xserver.enable;

     

       0
        
       
     

       43
        
         };

     

       44
        
       

     

       45
        
         inherit (pkgs) nixos-option;

     
···

       57
        
           } // optionalAttrs (config.system.configurationRevision != null) {

     

       58
        
             configurationRevision = config.system.configurationRevision;

     

       59
        
           });

     

       0
        
       
     

       60
        
         };

     

       61
        
       

     

       62
        
         nixos-enter = makeProg {

     
···

       66
        
           path = makeBinPath [

     

       67
        
             pkgs.util-linuxMinimal

     

       68
        
           ];

     

       0
        
       
     

       69
        
         };

     

       70
        
       

     

       71
        
       in

···

       9
        
         makeProg = args: pkgs.substituteAll (args // {

     

       10
        
           dir = "bin";

     

       11
        
           isExecutable = true;

     

       12
       +
           nativeBuildInputs = [

     

       13
       +
             pkgs.installShellFiles

     

       14
       +
           ];

     

       15
       +
           postInstall = ''

     

       16
       +
             installManPage ${args.manPage}

     

       17
       +
           '';

     

       18
        
         });

     

       19
        
       

     

       20
        
         nixos-build-vms = makeProg {

     

       21
        
           name = "nixos-build-vms";

     

       22
        
           src = ./nixos-build-vms/nixos-build-vms.sh;

     

       23
        
           inherit (pkgs) runtimeShell;

     

       24
       +
           manPage = ./manpages/nixos-build-vms.8;

     

       25
        
         };

     

       26
        
       

     

       27
        
         nixos-install = makeProg {

     
···

       34
        
             nixos-enter

     

       35
        
             pkgs.util-linuxMinimal

     

       36
        
           ];

     

       37
       +
           manPage = ./manpages/nixos-install.8;

     

       38
        
         };

     

       39
        
       

     

       40
        
         nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };

     
···

       48
        
           btrfs = "${pkgs.btrfs-progs}/bin/btrfs";

     

       49
        
           inherit (config.system.nixos-generate-config) configuration desktopConfiguration;

     

       50
        
           xserverEnabled = config.services.xserver.enable;

     

       51
       +
           manPage = ./manpages/nixos-generate-config.8;

     

       52
        
         };

     

       53
        
       

     

       54
        
         inherit (pkgs) nixos-option;

     
···

       66
        
           } // optionalAttrs (config.system.configurationRevision != null) {

     

       67
        
             configurationRevision = config.system.configurationRevision;

     

       68
        
           });

     

       69
       +
           manPage = ./manpages/nixos-version.8;

     

       70
        
         };

     

       71
        
       

     

       72
        
         nixos-enter = makeProg {

     
···

       76
        
           path = makeBinPath [

     

       77
        
             pkgs.util-linuxMinimal

     

       78
        
           ];

     

       79
       +
           manPage = ./manpages/nixos-enter.8;

     

       80
        
         };

     

       81
        
       

     

       82
        
       in

+1 -1

nixos/modules/misc/documentation.nix

···

       346
        
             system.build.manual = manual;

     

       347
        
       

     

       348
        
             environment.systemPackages = []

     

       349
       -
               ++ optional cfg.man.enable manual.manpages

     

       350
        
               ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ];

     

       351
        
           })

     

       352

···

       346
        
             system.build.manual = manual;

     

       347
        
       

     

       348
        
             environment.systemPackages = []

     

       349
       +
               ++ optional cfg.man.enable manual.configuration-manual

     

       350
        
               ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ];

     

       351
        
           })

     

       352

+1 -1

nixos/release.nix

···

       143
        
         manualHTML = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualHTML);

     

       144
        
         manual = manualHTML; # TODO(@oxij): remove eventually

     

       145
        
         manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub));

     

       146
       -
         manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages);

     

       147
        
         options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;

     

       148
        
       

     

       149

···

       143
        
         manualHTML = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualHTML);

     

       144
        
         manual = manualHTML; # TODO(@oxij): remove eventually

     

       145
        
         manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub));

     

       146
       +
         manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.configuration-manual);

     

       147
        
         options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;

     

       148
        
       

     

       149

+1 -2

pkgs/tools/nix/nixos-install-tools/default.nix

···

       20
        
           inherit (config.system.build)

     

       21
        
             nixos-install nixos-generate-config nixos-enter;

     

       22
        
       

     

       23
       -
           # Required for --help.

     

       24
       -
           inherit (config.system.build.manual) manpages;

     

       25
        
         };

     

       26
        
       

     

       27
        
         extraOutputsToInstall = ["man"];

···

       20
        
           inherit (config.system.build)

     

       21
        
             nixos-install nixos-generate-config nixos-enter;

     

       22
        
       

     

       23
       +
           inherit (config.system.build.manual) configuration-manual;

     

       0
        
       
     

       24
        
         };

     

       25
        
       

     

       26
        
         extraOutputsToInstall = ["man"];