diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-11-18 00:26:00 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-11-19 20:58:45 +0000 |
| commit | a5992ad61b314104aff7e28a41ce101a1b0e7c35 (patch) | |
| tree | 7fbf4a4ffb401b4a6d1a0c97357625d77cc4dc6b /nixos/doc/manual | |
| parent | bd33a4149364ee5123070fe6e706876fa2ebf984 (diff) | |
| download | nixpkgs-a5992ad61b314104aff7e28a41ce101a1b0e7c35.tar nixpkgs-a5992ad61b314104aff7e28a41ce101a1b0e7c35.tar.gz nixpkgs-a5992ad61b314104aff7e28a41ce101a1b0e7c35.tar.bz2 nixpkgs-a5992ad61b314104aff7e28a41ce101a1b0e7c35.tar.lz nixpkgs-a5992ad61b314104aff7e28a41ce101a1b0e7c35.tar.xz nixpkgs-a5992ad61b314104aff7e28a41ce101a1b0e7c35.tar.zst nixpkgs-a5992ad61b314104aff7e28a41ce101a1b0e7c35.zip | |
Add a way to pin a NixOS version within the module system.
This modification add a way to re-evaluate the module system with a different version of NixOS, or with a different set of arguments.
Diffstat (limited to 'nixos/doc/manual')
| -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 | 20 |
3 files changed, 22 insertions, 0 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 8fde0dc7e61..afffd60bc48 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -26,6 +26,7 @@ effect after you run <command>nixos-rebuild</command>.</para> <!-- FIXME: auto-include NixOS module docs --> <xi:include href="postgresql.xml" /> +<xi:include href="nixos.xml" /> <!-- Apache; libvirtd virtualisation --> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 87964e27bb9..844cba57cd8 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -55,6 +55,7 @@ let cp -prd $sources/* . # */ chmod -R u+w . cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.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 573b99d4902..65aa36586cb 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -6,6 +6,26 @@ <title>Unstable</title> +<para>In addition to numerous new and upgraded packages, this release +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> + +</itemizedlist> + <para>When upgrading from a previous release, please be aware of the following incompatible changes:</para> |