From e0d51db401a64b7e69f10bde7221c1d27bed29dc Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 13 Sep 2020 01:17:37 +0200 Subject: nixos: boot.zfsImportAll = false; by default Also add 21.03 release note --- nixos/doc/manual/release-notes/rl-2103.xml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 9bff9a74507..62dcbd6184e 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -151,6 +151,15 @@ vim switched to Python 3, dropping all Python 2 support. + + + boot.zfs.forceImportAll + previously did nothing, but has been fixed. However its default has been + changed to false to preserve the existing default + behaviour. If you have this explicitly set to true, + please note that your non-root pools will now be forcibly imported. + + -- cgit 1.4.1 From 88b7340a79751b648d0f8c4339587464b5918595 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 11 Nov 2020 11:20:14 -0800 Subject: doc: Fix doc-building instructions --- nixos/doc/manual/contributing-to-this-manual.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/contributing-to-this-manual.xml b/nixos/doc/manual/contributing-to-this-manual.xml index 9820e75fc33..935dd66bc14 100644 --- a/nixos/doc/manual/contributing-to-this-manual.xml +++ b/nixos/doc/manual/contributing-to-this-manual.xml @@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs repository. You can quickly check your edits with the following: -$ cd /path/to/nixpkgs/nixos/doc/manual +$ cd /path/to/nixpkgs $ nix-build nixos/release.nix -A manual.x86_64-linux -- cgit 1.4.1 From f72a3142f07352b326906a2cd609e311d77ef555 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 11 Nov 2020 11:27:46 -0800 Subject: doc: 20.09 release notes: nixos-YY.MM branches no longer in nixos-channels repo Since https://github.com/NixOS/nixos-channel-scripts/commit/7c442a2f67c77344a71e5aae7e4cd2a1554420a9 for https://github.com/NixOS/nixpkgs/issues/99257 --- nixos/doc/manual/release-notes/rl-2009.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 75c8adbf45e..75358835baa 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -234,7 +234,17 @@ - + + + Starting with this release, the hydra-build-result + nixos-YY.MM + branches no longer exist in the deprecated + nixpkgs-channels repository. These branches are now in + the main nixpkgs + repository. + + -- cgit 1.4.1 From 31051812bc4117d394966f5df240de531a747809 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 11 Nov 2020 10:26:18 +1000 Subject: nixos/doc/*: fix indentation --- nixos/doc/manual/configuration/gpu-accel.xml | 76 ++++++++++++++-------------- nixos/doc/manual/release-notes/rl-2009.xml | 48 +++++++++--------- nixos/doc/varlistentry-fixer.rb | 74 +++++++++++++-------------- 3 files changed, 99 insertions(+), 99 deletions(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml index 95ee13f4796..3695a5ff445 100644 --- a/nixos/doc/manual/configuration/gpu-accel.xml +++ b/nixos/doc/manual/configuration/gpu-accel.xml @@ -65,16 +65,16 @@ Platform Vendor Advanced Micro Devices, Inc. AMD - Modern AMD Graphics - Core Next (GCN) GPUs are supported through the - rocm-opencl-icd package. Adding this package to - enables OpenCL - support: - - = [ - rocm-opencl-icd -]; + Modern AMD Graphics + Core Next (GCN) GPUs are supported through the + rocm-opencl-icd package. Adding this package to + enables OpenCL + support: + + = [ + rocm-opencl-icd + ]; @@ -100,9 +100,9 @@ Platform Vendor Advanced Micro Devices, Inc. support. For example, for Gen8 and later GPUs, the following configuration can be used: - = [ - intel-compute-runtime -]; + = [ + intel-compute-runtime + ]; @@ -173,31 +173,31 @@ GPU1: AMD - Modern AMD Graphics - Core Next (GCN) GPUs are supported through either radv, which is - part of mesa, or the amdvlk package. - Adding the amdvlk package to - makes both drivers - available for applications and lets them choose. A specific driver can - be forced as follows: - - = [ - pkgs.amdvlk -]; - -# To enable Vulkan support for 32-bit applications, also add: - = [ - pkgs.driversi686Linux.amdvlk -]; - -# For amdvlk -.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; -# For radv -.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; - + Modern AMD Graphics + Core Next (GCN) GPUs are supported through either radv, which is + part of mesa, or the amdvlk package. + Adding the amdvlk package to + makes both drivers + available for applications and lets them choose. A specific driver can + be forced as follows: + + = [ + pkgs.amdvlk + ]; + + # To enable Vulkan support for 32-bit applications, also add: + = [ + pkgs.driversi686Linux.amdvlk + ]; + + # For amdvlk + .VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; + # For radv + .VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; + diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 75c8adbf45e..881a95a7822 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -1593,30 +1593,30 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; Agda has been heavily reworked. - - - agda.mkDerivation has been heavily changed and - is now located at agdaPackages.mkDerivation. - - - - - New top-level packages agda and - agda.withPackages have been added, the second - of which sets up agda with access to chosen libraries. - - - - - All agda libraries now live under - agdaPackages. - - - - - Many broken libraries have been removed. - - + + + agda.mkDerivation has been heavily changed and + is now located at agdaPackages.mkDerivation. + + + + + New top-level packages agda and + agda.withPackages have been added, the second + of which sets up agda with access to chosen libraries. + + + + + All agda libraries now live under + agdaPackages. + + + + + Many broken libraries have been removed. + + See the new diff --git a/nixos/doc/varlistentry-fixer.rb b/nixos/doc/varlistentry-fixer.rb index 6c7cc1e6439..02168016b55 100755 --- a/nixos/doc/varlistentry-fixer.rb +++ b/nixos/doc/varlistentry-fixer.rb @@ -15,8 +15,8 @@ require "rexml/document" include REXML if ARGV.length < 1 then - $stderr.puts "Needs a filename." - exit 1 + $stderr.puts "Needs a filename." + exit 1 end filename = ARGV.shift @@ -51,17 +51,17 @@ $touched = false # Generates: --optionnamevalue # ^^ ^^ doc.elements.each("//varlistentry/term") do |term| - ["varname", "function", "option", "replaceable"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end + ["varname", "function", "option", "replaceable"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end end @@ -75,17 +75,17 @@ end # Generates: -Ipath # ^^ doc.elements.each("//cmdsynopsis/arg") do |term| - ["option", "replaceable"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end + ["option", "replaceable"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end end # @@ -104,21 +104,21 @@ end # Generates: [{--profile-name | -p }name] # ^^^^ doc.elements.each("//cmdsynopsis/arg") do |term| - ["group"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end + ["group"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end end if $touched then - doc.context[:attribute_quote] = :quote - doc.write(output: File.open(filename, "w")) + doc.context[:attribute_quote] = :quote + doc.write(output: File.open(filename, "w")) end -- cgit 1.4.1 From be0555b8a84b6c3813e58492f232a3714b891424 Mon Sep 17 00:00:00 2001 From: Max Bruckner Date: Fri, 13 Dec 2019 20:42:42 +0100 Subject: nixos/doc: Add note about /usr/sbin and /sbin An installation from Debian buster may fail without adding /usr/sbin to $PATH because chroot is not in the PATH of a non-root user. --- nixos/doc/manual/installation/installing-from-other-distro.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 8ed45899fd7..2947f9d5a0b 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -161,6 +161,13 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable existing systems without the help of a rescue USB drive or similar. + + + On some distributions there are separate PATHS for programs intended only for root. + In order for the installation to succeed, you might have to use PATH="$PATH:/usr/sbin:/sbin" + in the following command. + + $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt Again, please refer to the nixos-install step in -- cgit 1.4.1