diff --git a/source/concepts/faq.md b/source/concepts/faq.md index 846094c5b..2adf87c39 100644 --- a/source/concepts/faq.md +++ b/source/concepts/faq.md @@ -18,6 +18,13 @@ See [](flakes-definition). Nixpkgs and NixOS have both stable and rolling releases. +These releases are distributed in variants called "channel branches": +Git branches used for releases, which are also converted to Nix channels. + +:::{tip} +Consult the [`nix-channel`](https://nix.dev/manual/nix/2.22/command-ref/nix-channel) entry in the Nix Reference Manual for more information on channels, and the [Nixpkgs contributing guide](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions) on the Nixpkgs branching strategy. +::: + ### Stable Stable releases receive conservative updates to fix bugs or security vulnerabilities; otherwise package versions are not changed. @@ -51,10 +58,6 @@ Rolling releases follow [`master`](https://github.com/NixOS/nixpkgs/branches/all [`*-small`](https://github.com/NixOS/nixpkgs/branches/all?query=-small) channel branches have passed a smaller test suite, which means they are more up-to-date with respect to their base branch, but offer fewer stability guarantees. -:::{tip} -Consult the [`nix-channel`](https://nix.dev/manual/nix/2.22/command-ref/nix-channel) entry in the Nix Reference Manual for more information on channels, and the [Nixpkgs contributing guide](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions) on the Nixpkgs branching strategy. -::: - ## Are there any impurities left in sandboxed builds? Yes. There is: diff --git a/source/reference/pinning-nixpkgs.md b/source/reference/pinning-nixpkgs.md index 1c9b98741..de02cda25 100644 --- a/source/reference/pinning-nixpkgs.md +++ b/source/reference/pinning-nixpkgs.md @@ -77,8 +77,17 @@ Specifying remote Nix expressions, such as the one provided by Nixpkgs, can be d pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-22.11.tar.gz") {}; in pkgs.stdenv.mkDerivation { ... } ``` + ## Finding specific commits and releases -The latest commit that has passed tests for each release, and also a list of channel names are available at [status.nixos.org](https://status.nixos.org/). -The commit can be used when pinning to a specific commit and the channel name can be used when pinning to the latest channel version. -The official channels list is available at [nixos.org/channels](https://nixos.org/channels). +[status.nixos.org](https://status.nixos.org/) provides: + +- Latest tested commits for each release - use when pinning to specific commits +- List of active release channels - use when tracking latest channel versions + +The complete list of channels is available at [nixos.org/channels](https://nixos.org/channels). + +:::{tip} +More information on Nixpkgs and NixOS releases: [](channel-branches) +::: +