diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-11 03:51:33 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-11 03:51:33 +0100 |
commit | c1e6c6af692c2cf07b4982c0f573acc9f16b78fc (patch) | |
tree | c436a224f5f71c2a2d91926240b76ceab78d77b9 /doc | |
parent | 33aa224777a5077ff1dfa4c8f4653d8aab268d76 (diff) | |
parent | b0644b461f97d4f7240b089074084c18f521f497 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'doc')
-rw-r--r-- | doc/preface.chapter.md | 6 | ||||
-rw-r--r-- | doc/stdenv/stdenv.chapter.md | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 16f228272b3de..7aae7fa90591e 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -24,8 +24,8 @@ Packages, including the Nix packages collection, are distributed through [channels](https://nixos.org/nix/manual/#sec-channels). The collection is distributed for users of Nix on non-NixOS distributions through the channel `nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g. -`nixos-19.09`, which includes all packages and modules for the stable NixOS -19.09. Stable NixOS releases are generally only given +`nixos-22.11`, which includes all packages and modules for the stable NixOS +22.11. Stable NixOS releases are generally only given security updates. More up to date packages and modules are available via the `nixos-unstable` channel. @@ -43,4 +43,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the [`nixpkgs`](https://github.com/NixOS/nixpkgs) repository in branches -that correspond to the channel names (e.g. `nixos-19.09-small`). +that correspond to the channel names (e.g. `nixos-22.11-small`). diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index ceb3bfb5b8d08..7d861860a723b 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -837,6 +837,10 @@ The distribution phase is intended to produce a source distribution of the packa #### Variables controlling the distribution phase {#variables-controlling-the-distribution-phase} +##### `doDist` {#var-stdenv-doDist} + +If set, the distribution phase is executed. + ##### `distTarget` {#var-stdenv-distTarget} The make target that produces the distribution. Defaults to `dist`. |