diff options
author | Naïm Favier <n@monade.li> | 2022-12-21 22:00:27 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2022-12-27 17:23:25 +0100 |
commit | 07cb3bf3ccaff42789336a0a22c49ea4d25d309b (patch) | |
tree | 956cae8853f1242d589d53a0b4b977d5f4ad05c9 /nixos/doc/manual/from_md/release-notes | |
parent | 3f6fed2e59d556a5cec475b14b7af54558e19f25 (diff) | |
download | nixpkgs-07cb3bf3ccaff42789336a0a22c49ea4d25d309b.tar nixpkgs-07cb3bf3ccaff42789336a0a22c49ea4d25d309b.tar.gz nixpkgs-07cb3bf3ccaff42789336a0a22c49ea4d25d309b.tar.bz2 nixpkgs-07cb3bf3ccaff42789336a0a22c49ea4d25d309b.tar.lz nixpkgs-07cb3bf3ccaff42789336a0a22c49ea4d25d309b.tar.xz nixpkgs-07cb3bf3ccaff42789336a0a22c49ea4d25d309b.tar.zst nixpkgs-07cb3bf3ccaff42789336a0a22c49ea4d25d309b.zip |
nixos/doc: bump Pandoc
Update the pinned channel in `md-to-db`, which bumps the Pandoc version, which fixes https://github.com/NixOS/nixpkgs/issues/125511 maybe.
Diffstat (limited to 'nixos/doc/manual/from_md/release-notes')
16 files changed, 80 insertions, 80 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml index 8771623b468..5686545c1af 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml @@ -79,7 +79,7 @@ the NixOS configuration. For instance, if a package <literal>foo</literal> provides systemd units, you can say: </para> - <programlisting language="bash"> + <programlisting language="nix"> { systemd.packages = [ pkgs.foo ]; } @@ -88,7 +88,7 @@ to enable those units. You can then set or override unit options in the usual way, e.g. </para> - <programlisting language="bash"> + <programlisting language="nix"> { systemd.services.foo.wantedBy = [ "multi-user.target" ]; systemd.services.foo.serviceConfig.MemoryLimit = "512M"; @@ -105,7 +105,7 @@ NixOS configuration requires unfree packages from Nixpkgs, you need to enable support for them explicitly by setting: </para> - <programlisting language="bash"> + <programlisting language="nix"> { nixpkgs.config.allowUnfree = true; } @@ -123,7 +123,7 @@ The Adobe Flash player is no longer enabled by default in the Firefox and Chromium wrappers. To enable it, you must set: </para> - <programlisting language="bash"> + <programlisting language="nix"> { nixpkgs.config.allowUnfree = true; nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox @@ -136,7 +136,7 @@ The firewall is now enabled by default. If you don’t want this, you need to disable it explicitly: </para> - <programlisting language="bash"> + <programlisting language="nix"> { networking.firewall.enable = false; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml index 3b6af73359d..ccaa4f6bd08 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml @@ -370,7 +370,7 @@ documentation</link> for details. If you wish to continue to use httpd 2.2, add the following line to your NixOS configuration: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.httpd.package = pkgs.apacheHttpd_2_2; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml index 2420747da08..96b51a05106 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml @@ -42,7 +42,7 @@ </para> </listitem> </itemizedlist> - <programlisting language="bash"> + <programlisting language="nix"> { system.autoUpgrade.enable = true; } @@ -432,7 +432,7 @@ </para> </listitem> </itemizedlist> - <programlisting language="bash"> + <programlisting language="nix"> { system.stateVersion = "14.12"; } @@ -523,7 +523,7 @@ </para> </listitem> </itemizedlist> - <programlisting language="bash"> + <programlisting language="nix"> { fileSystems."/shiny" = { device = "myshinysharedfolder"; @@ -662,7 +662,7 @@ infinite recursion encountered <literal>lib</literal>, after adding it as argument of the module. The following module </para> - <programlisting language="bash"> + <programlisting language="nix"> { config, pkgs, ... }: with pkgs.lib; @@ -677,7 +677,7 @@ with pkgs.lib; <para> should be modified to look like: </para> - <programlisting language="bash"> + <programlisting language="nix"> { config, pkgs, lib, ... }: with lib; @@ -695,7 +695,7 @@ with lib; replaced by <literal>(import <nixpkgs> {})</literal>. The following module </para> - <programlisting language="bash"> + <programlisting language="nix"> { config, pkgs, ... }: let @@ -712,7 +712,7 @@ in <para> should be modified to look like: </para> - <programlisting language="bash"> + <programlisting language="nix"> { config, pkgs, ... }: let diff --git a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml index bdb58ab8e49..25b356e0aa6 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml @@ -378,7 +378,7 @@ You will need to add an import statement to your NixOS configuration in order to use it, e.g. </para> - <programlisting language="bash"> + <programlisting language="nix"> { imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ]; } @@ -395,7 +395,7 @@ to be built in. All modules now reside in <literal>nginxModules</literal> set. Example configuration: </para> - <programlisting language="bash"> + <programlisting language="nix"> nginx.override { modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; } @@ -468,7 +468,7 @@ nginx.override { continue to work, but print a warning, until the 16.09 release. An example of the new style: </para> - <programlisting language="bash"> + <programlisting language="nix"> { fileSystems."/example" = { device = "/dev/sdc"; @@ -524,7 +524,7 @@ nginx.override { used input method name, <literal>"ibus"</literal> for ibus. An example of the new style: </para> - <programlisting language="bash"> + <programlisting language="nix"> { i18n.inputMethod.enabled = "ibus"; i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ]; @@ -533,7 +533,7 @@ nginx.override { <para> That is equivalent to the old version: </para> - <programlisting language="bash"> + <programlisting language="nix"> { programs.ibus.enable = true; programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; @@ -587,7 +587,7 @@ $TTL 1800 point to exact folder where syncthing is writing to. Example configuration should look something like: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.syncthing = { enable = true; diff --git a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml index b0b0ed5aeac..c2adbc88f5c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml @@ -192,7 +192,7 @@ interface has been streamlined. Desktop users should be able to simply set </para> - <programlisting language="bash"> + <programlisting language="nix"> { security.grsecurity.enable = true; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml index 01447b38462..8667063f37e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml @@ -581,7 +581,7 @@ <literal>service.nylon</literal> is now declared using named instances. As an example: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.nylon = { enable = true; @@ -594,7 +594,7 @@ <para> should be replaced with: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.nylon.myvpn = { enable = true; @@ -615,7 +615,7 @@ <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> overlays</link>. For example, the following code: </para> - <programlisting language="bash"> + <programlisting language="nix"> let pkgs = import <nixpkgs> {}; in @@ -624,7 +624,7 @@ in <para> should be replaced by: </para> - <programlisting language="bash"> + <programlisting language="nix"> let pkgs = import <nixpkgs> {}; in diff --git a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml index 8aafd9f23c8..849ec868c78 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml @@ -29,7 +29,7 @@ head. Apart from that, it’s now possible to also set additional options by using an attribute set, for example: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.xserver.xrandrHeads = [ "HDMI-0" { diff --git a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml index 7e32c6f0cfd..f197c52906b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml @@ -830,7 +830,7 @@ <para> In order to have the previous default configuration add </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ "~host" "~spacer" diff --git a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml index e3db02aed8c..4bbfa7be398 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml @@ -54,7 +54,7 @@ <para> For example </para> - <programlisting language="bash"> + <programlisting language="nix"> { programs.firejail = { enable = true; @@ -695,7 +695,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example: </para> - <programlisting language="bash"> + <programlisting language="nix"> { inherit (pkgs.nixos { boot.loader.grub.enable = false; @@ -791,7 +791,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <para> An example usage of this would be: </para> - <programlisting language="bash"> + <programlisting language="nix"> { config, ... }: { diff --git a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml index b932f3da9eb..ed26f2ba45d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml @@ -374,7 +374,7 @@ setting the <literal>services.nscd.config</literal> option with the desired caching parameters. </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.nscd.config = '' diff --git a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml index fbd2212f295..35fbb7447c7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml @@ -133,7 +133,7 @@ option to improve support for upstream session files. If you used something like: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.xserver.desktopManager.default = "xfce"; services.xserver.windowManager.default = "icewm"; @@ -142,7 +142,7 @@ <para> you should change it to: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.xserver.displayManager.defaultSession = "xfce+icewm"; } @@ -821,7 +821,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. is a <literal>loaOf</literal> option that is commonly used as follows: </para> - <programlisting language="bash"> + <programlisting language="nix"> { users.users = [ { name = "me"; @@ -836,7 +836,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. value of <literal>name</literal> as the name of the attribute set: </para> - <programlisting language="bash"> + <programlisting language="nix"> { users.users.me = { description = "My personal user."; @@ -940,7 +940,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. because it permitted root auto-login you can override the lightdm-autologin pam module like: </para> - <programlisting language="bash"> + <programlisting language="nix"> { security.pam.services.lightdm-autologin.text = lib.mkForce '' auth requisite pam_nologin.so @@ -1004,7 +1004,7 @@ auth required pam_succeed_if.so quiet Additionally, some Postfix configuration must now be set manually instead of automatically by the Mailman module: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.postfix.relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ]; services.postfix.config.transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; @@ -1066,7 +1066,7 @@ auth required pam_succeed_if.so quiet or by passing a TOML configuration file via <link xlink:href="options.html#opt-services.dnscrypt-proxy2.configFile">services.dnscrypt-proxy2.configFile</link>. </para> - <programlisting language="bash"> + <programlisting language="nix"> { # Example configuration: services.dnscrypt-proxy2.enable = true; @@ -1229,7 +1229,7 @@ auth required pam_succeed_if.so quiet when upgrading. Otherwise, the package can be deployed using the following config: </para> - <programlisting language="bash"> + <programlisting language="nix"> { pkgs, ... }: { services.hydra.package = pkgs.hydra-migration; } @@ -1319,7 +1319,7 @@ $ hydra-backfill-ids <para> To continue to use the old approach, you can configure: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.nginx.appendConfig = let cfg = config.services.nginx; in ''user ${cfg.user} ${cfg.group};''; systemd.services.nginx.serviceConfig.User = lib.mkForce "root"; @@ -1432,7 +1432,7 @@ $ hydra-backfill-ids older, you simply need to enable postgresql-support explicitly: </para> - <programlisting language="bash"> + <programlisting language="nix"> { ... }: { services.matrix-synapse = { enable = true; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml index a912702814f..a1b007e711d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml @@ -730,7 +730,7 @@ traditional mysql_native_password plugin method, one must run the following: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret"); @@ -755,7 +755,7 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' allow MySQL to read from /home and /tmp directories when using <literal>LOAD DATA INFILE</literal> </para> - <programlisting language="bash"> + <programlisting language="nix"> { systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only"; } @@ -766,7 +766,7 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' <literal>SELECT * INTO OUTFILE</literal>, assuming the mysql user has write access to <literal>/var/data</literal> </para> - <programlisting language="bash"> + <programlisting language="nix"> { systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; } @@ -885,7 +885,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ <literal>phantomJsSupport = true</literal> to the package instantiation: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec { phantomJsSupport = true; @@ -958,7 +958,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ <literal>opcache</literal>, <literal>pdo</literal> and <literal>pdo_mysql</literal> loaded: </para> - <programlisting language="bash"> + <programlisting language="nix"> { environment.systemPackages = [ (pkgs.php.withExtensions @@ -997,7 +997,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ The remaining configuration flags can now be set directly on the <literal>php</literal> attribute. For example, instead of </para> - <programlisting language="bash"> + <programlisting language="nix"> { php.override { config.php.embed = true; @@ -1008,7 +1008,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ <para> you should now write </para> - <programlisting language="bash"> + <programlisting language="nix"> { php.override { embedSupport = true; @@ -1062,7 +1062,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ writing to other folders, use <literal>systemd.services.nginx.serviceConfig.ReadWritePaths</literal> </para> - <programlisting language="bash"> + <programlisting language="nix"> { systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; } @@ -1076,7 +1076,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ docs</link> for details). If you require serving files from home directories, you may choose to set e.g. </para> - <programlisting language="bash"> + <programlisting language="nix"> { systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; } @@ -1093,7 +1093,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ <para> Replace a <literal>nesting.clone</literal> entry with: </para> - <programlisting language="bash"> + <programlisting language="nix"> { specialisation.example-sub-configuration = { configuration = { @@ -1104,7 +1104,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ <para> Replace a <literal>nesting.children</literal> entry with: </para> - <programlisting language="bash"> + <programlisting language="nix"> { specialisation.example-sub-configuration = { inheritParentConfig = false; @@ -1385,7 +1385,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test multi-instance config with an existing bitcoind data directory and user, you have to adjust the original config, e.g.: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.bitcoind = { enable = true; @@ -1397,7 +1397,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test <para> To something similar: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.bitcoind.mainnet = { enable = true; @@ -1447,7 +1447,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test the original SSL settings, you have to adjust the original config, e.g.: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.dokuwiki = { enable = true; @@ -1458,7 +1458,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test <para> To something similar: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.dokuwiki."mywiki" = { enable = true; @@ -1492,7 +1492,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test option is (<literal>/var/db/postgresql</literal>) and then explicitly set this value to maintain compatibility: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.postgresql.dataDir = "/var/db/postgresql"; } @@ -1825,7 +1825,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; you must include those directories into the <literal>BindPaths</literal> of the service: </para> - <programlisting language="bash"> + <programlisting language="nix"> { systemd.services.transmission.serviceConfig.BindPaths = [ "/path/to/alternative/download-dir" ]; } @@ -1835,7 +1835,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; <literal>transmission-daemon</literal> is now only available on the local network interface by default. Use: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.transmission.settings.rpc-bind-address = "0.0.0.0"; } @@ -1900,7 +1900,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; <para> This means that a configuration like this </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.dovecot2.mailboxes = [ { name = "Junk"; @@ -1912,7 +1912,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; <para> should now look like this: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.dovecot2.mailboxes = { Junk.auto = "create"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index 0a0cbe2790b..868c1709879 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -330,7 +330,7 @@ <literal>mediatomb</literal> package. If you want to keep the old behavior, you must declare it with: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.mediatomb.package = pkgs.mediatomb; } @@ -341,7 +341,7 @@ service declaration to add the firewall rules itself before, you should now declare it with: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.mediatomb.openFirewall = true; } @@ -368,7 +368,7 @@ <link xlink:href="options.html#opt-services.uwsgi.capabilities">services.uwsgi.capabilities</link>. The previous behaviour can be restored by setting: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.uwsgi.user = "root"; services.uwsgi.group = "root"; @@ -552,7 +552,7 @@ $ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' has been removed. To enable Privoxy, and to configure it to use Tor’s faster port, use the following configuration: </para> - <programlisting language="bash"> + <programlisting language="nix"> { opt-services.privoxy.enable = true; opt-services.privoxy.enableTor = true; @@ -689,7 +689,7 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e <literal>mpich</literal> instead of the default <literal>openmpi</literal> can now be achived like this: </para> - <programlisting language="bash"> + <programlisting language="nix"> self: super: { mpi = super.mpich; @@ -850,7 +850,7 @@ self: super: kodiPackages.inputstream-adaptive and kodiPackages.vfs-sftp addons: </para> - <programlisting language="bash"> + <programlisting language="nix"> { environment.systemPackages = [ pkgs.kodi @@ -867,7 +867,7 @@ self: super: and as a result the above configuration should now be written as: </para> - <programlisting language="bash"> + <programlisting language="nix"> { environment.systemPackages = [ (pkgs.kodi.withPackages (p: with p; [ @@ -1158,7 +1158,7 @@ self: super: users to declare autoscan media directories from their nixos configuration: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.mediatomb.mediaDirectories = [ { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; } @@ -1519,7 +1519,7 @@ self: super: been dropped. Users that still want it should add the following to their system configuration: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.gvfs.package = pkgs.gvfs.override { samba = null; }; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 644b67f0fb3..48a71791653 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -642,7 +642,7 @@ </para> </listitem> </itemizedlist> - <programlisting language="bash"> + <programlisting language="nix"> { services.paperless-ng.extraConfig = { # Provide languages as ISO 639-2 codes @@ -737,7 +737,7 @@ Superuser created successfully. insecure. Out-of-tree modules are likely to require adaptation: instead of </para> - <programlisting language="bash"> + <programlisting language="nix"> { users.users.foo = { isSystemUser = true; @@ -747,7 +747,7 @@ Superuser created successfully. <para> also create a group for your user: </para> - <programlisting language="bash"> + <programlisting language="nix"> { users.users.foo = { isSystemUser = true; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index c43757a9a05..457bb46137f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -714,7 +714,7 @@ <literal>programs.msmtp.*</literal> can be used instead for an equivalent setup. For example: </para> - <programlisting language="bash"> + <programlisting language="nix"> { # Original ssmtp configuration: services.ssmtp = { @@ -847,7 +847,7 @@ <literal>config.nixpkgs.config.allowUnfree</literal> are enabled. If you still want these fonts, use: </para> - <programlisting language="bash"> + <programlisting language="nix"> { fonts.fonts = [ pkgs.xorg.fontbhlucidatypewriter100dpi @@ -942,7 +942,7 @@ <para> Before: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.matrix-synapse = { enable = true; @@ -977,7 +977,7 @@ <para> After: </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.matrix-synapse = { enable = true; @@ -1143,7 +1143,7 @@ <para> Before: </para> - <programlisting language="bash"> + <programlisting language="nix"> services.keycloak = { enable = true; httpPort = "8080"; @@ -1157,7 +1157,7 @@ <para> After: </para> - <programlisting language="bash"> + <programlisting language="nix"> services.keycloak = { enable = true; settings = { diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index f7168d5ea17..2d7226caa5b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1082,7 +1082,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ removed. This option was an association of environment variables for Grafana. If you had an expression like </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar"; } @@ -1096,7 +1096,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ For the migration, it is recommended to turn it into the INI format, i.e. to declare </para> - <programlisting language="bash"> + <programlisting language="nix"> { services.grafana.settings.security.admin_user = "foobar"; } |