diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-27 20:42:55 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-27 20:48:12 +0100 |
commit | d4636fa2548a1980b3541dd386b6977c56218964 (patch) | |
tree | 152ce4d75458a510af87f4f7a4ed84d693696d98 /nixos/doc | |
parent | a6347a34777161817640dce5f96a23da33dd5705 (diff) | |
download | nixlib-d4636fa2548a1980b3541dd386b6977c56218964.tar nixlib-d4636fa2548a1980b3541dd386b6977c56218964.tar.gz nixlib-d4636fa2548a1980b3541dd386b6977c56218964.tar.bz2 nixlib-d4636fa2548a1980b3541dd386b6977c56218964.tar.lz nixlib-d4636fa2548a1980b3541dd386b6977c56218964.tar.xz nixlib-d4636fa2548a1980b3541dd386b6977c56218964.tar.zst nixlib-d4636fa2548a1980b3541dd386b6977c56218964.zip |
Revert "Add a way to pin a NixOS version within the module system."
This reverts commit a5992ad61b314104aff7e28a41ce101a1b0e7c35. Motivation: https://github.com/NixOS/nixpkgs/commit/a5992ad61b314104aff7e28a41ce101a1b0e7c35#commitcomment-14986820
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/configuration/configuration.xml | 1 | ||||
-rw-r--r-- | nixos/doc/manual/default.nix | 1 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-unstable.xml | 13 |
3 files changed, 0 insertions, 15 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index ff00c4feb31a..caba8fb1f4ad 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -28,7 +28,6 @@ effect after you run <command>nixos-rebuild</command>.</para> <xi:include href="postgresql.xml" /> <xi:include href="gitlab.xml" /> <xi:include href="acme.xml" /> -<xi:include href="nixos.xml" /> <!-- Apache; libvirtd virtualisation --> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 4eda7f94ab4a..4ce6ea1c1118 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -58,7 +58,6 @@ let cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml cp ${../../modules/security/acme.xml} configuration/acme.xml - cp ${../../modules/misc/nixos.xml} configuration/nixos.xml ln -s ${optionsDocBook} options-db.xml echo "${version}" > version ''; diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 5bad7f63b61e..ddbd80a8a00d 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -12,19 +12,6 @@ has the following highlights:</para> <itemizedlist> <listitem> - <para>You can now pin a specific version of NixOS in your <filename>configuration.nix</filename> - by setting: - -<programlisting> -nixos.path = ./nixpkgs-unstable-2015-12-06/nixos; -</programlisting> - - This will make NixOS re-evaluate your configuration with the modules of - the specified NixOS version at the given path. For more details, see - <xref linkend="module-misc-nixos" /></para> - </listitem> - - <listitem> <para>Firefox and similar browsers are now <emphasis>wrapped by default</emphasis>. The package and attribute names are plain <literal>firefox</literal> or <literal>midori</literal>, etc. Backward-compatibility attributes were set up, |