commit a0559c7b2bf243978a759fdaceb8507d9a04e657 · pyrox.dev/nixpkgs

+1 -1

CONTRIBUTING.md

···

       345
       345
        
       Here's a brief overview of the main Git branches and what channels they're used for:

     

       346
       346
        
       

     

       347
       347
        
       - `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`.

     

       348
       348
       -
       - `release-YY.MM` (e.g. `release-24.11`): The NixOS release branches, used for the stable channels such as `nixos-24.11`, `nixos-24.11-small` and `nixpkgs-24.11-darwin`.

     

       348
       348
       +
       - `release-YY.MM` (e.g. `release-25.05`): The NixOS release branches, used for the stable channels such as `nixos-25.05`, `nixos-25.05-small` and `nixpkgs-25.05-darwin`.

     

       349
       349
        
       

     

       350
       350
        
       When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit.

     

       351
       351
        
       So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable).

+8 -8

nixos/doc/manual/installation/upgrading.chapter.md

···

       6
       6
        
       automatically from NixOS's Git repository after certain tests have

     

       7
       7
        
       passed and all packages have been built. These channels are:

     

       8
       8
        
       

     

       9
       9
       -
       -   *Stable channels*, such as [`nixos-24.05`](https://channels.nixos.org/nixos-24.05).

     

       9
       9
       +
       -   *Stable channels*, such as [`nixos-24.11`](https://channels.nixos.org/nixos-24.11).

     

       10
       10
        
           These only get conservative bug fixes and package upgrades. For

     

       11
       11
        
           instance, a channel update may cause the Linux kernel on your system

     

       12
       12
        
           to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not

     
···

       19
       19
        
           radical changes between channel updates. It's not recommended for

     

       20
       20
        
           production systems.

     

       21
       21
        
       

     

       22
       22
       -
       -   *Small channels*, such as [`nixos-24.05-small`](https://channels.nixos.org/nixos-24.05-small)

     

       22
       22
       +
       -   *Small channels*, such as [`nixos-24.11-small`](https://channels.nixos.org/nixos-24.11-small)

     

       23
       23
        
           or [`nixos-unstable-small`](https://channels.nixos.org/nixos-unstable-small).

     

       24
       24
        
           These are identical to the stable and unstable channels described above,

     

       25
       25
        
           except that they contain fewer binary packages. This means they get updated

     
···

       38
       38
        
       

     

       39
       39
        
       When you first install NixOS, you're automatically subscribed to the

     

       40
       40
        
       NixOS channel that corresponds to your installation source. For

     

       41
       41
       -
       instance, if you installed from a 24.05 ISO, you will be subscribed to

     

       42
       42
       -
       the `nixos-24.05` channel. To see which NixOS channel you're subscribed

     

       41
       41
       +
       instance, if you installed from a 24.11 ISO, you will be subscribed to

     

       42
       42
       +
       the `nixos-24.11` channel. To see which NixOS channel you're subscribed

     

       43
       43
        
       to, run the following as root:

     

       44
       44
        
       

     

       45
       45
        
       ```ShellSession

     
···

       54
       54
        
       ```

     

       55
       55
        
       

     

       56
       56
        
       (Be sure to include the `nixos` parameter at the end.) For instance, to

     

       57
       57
       -
       use the NixOS 24.05 stable channel:

     

       57
       57
       +
       use the NixOS 24.11 stable channel:

     

       58
       58
        
       

     

       59
       59
        
       ```ShellSession

     

       60
       60
       -
       # nix-channel --add https://channels.nixos.org/nixos-24.05 nixos

     

       60
       60
       +
       # nix-channel --add https://channels.nixos.org/nixos-24.11 nixos

     

       61
       61
        
       ```

     

       62
       62
        
       

     

       63
       63
        
       If you have a server, you may want to use the "small" channel instead:

     

       64
       64
        
       

     

       65
       65
        
       ```ShellSession

     

       66
       66
       -
       # nix-channel --add https://channels.nixos.org/nixos-24.05-small nixos

     

       66
       66
       +
       # nix-channel --add https://channels.nixos.org/nixos-24.11-small nixos

     

       67
       67
        
       ```

     

       68
       68
        
       

     

       69
       69
        
       And if you want to live on the bleeding edge:

     
···

       117
       117
        
       

     

       118
       118
        
       ```nix

     

       119
       119
        
       {

     

       120
       120
       -
         system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.05";

     

       120
       120
       +
         system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.11";

     

       121
       121
        
       }

     

       122
       122
        
       ```

+1 -1

nixos/doc/manual/release-notes/rl-2411.section.md

···

       1
       1
       -
       # Release 24.11 (“Vicuña”, 2024.11/??) {#sec-release-24.11}

     

       1
       1
       +
       # Release 24.11 (“Vicuña”, 2024.11/28) {#sec-release-24.11}

     

       2
       2
        
       

     

       3
       3
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     

       4
       4