diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-15 08:07:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-15 08:07:00 +0200 |
| commit | 59dda0a42aa88005dab38cbdf1c39267431756a5 (patch) | |
| tree | fc1635b48ef7c57623d7400ee6274cecc9da03dc /nixos/doc | |
| parent | 6857bccf12e1b55b75e22342368feef22c78d7b9 (diff) | |
| parent | 9d0c3ffe6783d59b427d018e8341e0084737fde9 (diff) | |
| download | nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.gz nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.bz2 nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.lz nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.xz nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.zst nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/installation/installing-from-other-distro.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 8ed45899fd7f..45d68f8787f1 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -89,7 +89,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen> NixOS partition. They are installed by default on NixOS, but you don't have NixOS yet.. </para> -<screen><prompt>$ </prompt>nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"</screen> +<screen><prompt>$ </prompt>nix-env -f '<nixpkgs/nixos>' --arg configuration {} -iA config.system.build.{nixos-generate-config,nixos-install,nixos-enter,manual.manpages}</screen> </listitem> <listitem> <note> diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index ccb83f39acb2..f2485f7395c8 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -466,6 +466,14 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; initrd file has not been deleted. </para> </listitem> + <listitem> + <para> + The <link xlink:href="https://github.com/okTurtles/dnschain">DNSChain</link> + package and NixOS module have been removed from Nixpkgs as the software is + unmaintained and can't be built. For more information see issue + <link xlink:href="https://github.com/NixOS/nixpkgs/issues/89205">#89205</link>. + </para> + </listitem> </itemizedlist> </section> |