diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml index 793c10f4a..fc926432a 100644 --- a/.github/workflows/github_pages.yml +++ b/.github/workflows/github_pages.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v6 - uses: cachix/install-nix-action@v31 with: - nix_path: nixpkgs=channel:nixos-unstable + nix_path: nixpkgs=channel:nixpkgs-unstable - uses: cachix/cachix-action@v17 with: name: nix-community diff --git a/MAINTAINING.md b/MAINTAINING.md index 7db7364f4..8276c14f5 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -125,7 +125,7 @@ Reference commits: - Update the nixpkgs input to track the corresponding stable branch - Example: For `release-25.11`, change from: ```nix - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; ``` to: ```nix @@ -135,7 +135,7 @@ Reference commits: - Commit the flake.nix and flake.lock changes **Note**: The release branch should track the stable NixOS release channel -(e.g., `nixos-25.11`), while master continues to track `nixos-unstable`. +(e.g., `nixos-25.11`), while master continues to track `nixpkgs-unstable`. #### Step 3.5: On master - Update CI for the New Release Branch diff --git a/Makefile b/Makefile index 30208459f..ac19dd6df 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: all all-tests test test-install format -NIXPKGS_REV := nixos-unstable +NIXPKGS_REV := nixpkgs-unstable NIX_PATH := nixpkgs=https://github.com/NixOS/nixpkgs/archive/${NIXPKGS_REV}.tar.gz all: all-tests test-install diff --git a/README.md b/README.md index 062bcd638..90077e097 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,9 @@ If you would like to contribute to Home Manager, then please have a look at Releases -------- -Home Manager is developed against `nixos-unstable` branch, which often causes -it to contain tweaks for changes/packages not yet released in stable [NixOS][]. +Home Manager is developed against the `nixpkgs-unstable` branch, which often +causes it to contain tweaks for changes/packages not yet released in stable +[NixOS][]. To avoid breaking users' configurations, Home Manager is released in branches corresponding to NixOS releases (e.g. `release-26.05`). These branches get fixes, but usually not new modules. If you need a module to be backported, then @@ -49,7 +50,7 @@ dconf store and cannot tell whether a configuration that is about to be overwritten was from a previous Home Manager generation or from manual configuration. -Home Manager targets [NixOS][] unstable and NixOS version 26.05 (the current +Home Manager targets `nixpkgs-unstable` and NixOS version 26.05 (the current stable version), it may or may not work on other Linux distributions and NixOS versions. diff --git a/docs/flake.lock b/docs/flake.lock index df454b792..729b613b5 100644 --- a/docs/flake.lock +++ b/docs/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "lastModified": 1779877693, + "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/docs/flake.nix b/docs/flake.nix index 469ce8672..a7a3f371c 100644 --- a/docs/flake.nix +++ b/docs/flake.nix @@ -2,7 +2,7 @@ description = "Support developing Home Manager documentation"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; scss-reset = { url = "github:andreymatin/scss-reset/1.4.2"; flake = false; diff --git a/docs/manual/nix-flakes/flake-parts.md b/docs/manual/nix-flakes/flake-parts.md index ae4bbf86d..1c65d45ca 100644 --- a/docs/manual/nix-flakes/flake-parts.md +++ b/docs/manual/nix-flakes/flake-parts.md @@ -8,7 +8,7 @@ Manager's flake module, `flakeModules.home-manager`. description = "flake-parts configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager"; flake-parts.url = "github:hercules-ci/flake-parts"; }; diff --git a/docs/manual/nix-flakes/nix-darwin.md b/docs/manual/nix-flakes/nix-darwin.md index 5724a0c89..c955afd4d 100644 --- a/docs/manual/nix-flakes/nix-darwin.md +++ b/docs/manual/nix-flakes/nix-darwin.md @@ -8,7 +8,7 @@ to that of NixOS. The `flake.nix` would be: description = "Darwin configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; darwin.url = "github:nix-darwin/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; diff --git a/docs/manual/nix-flakes/nixos.md b/docs/manual/nix-flakes/nixos.md index 2c80d0258..9c7b2c531 100644 --- a/docs/manual/nix-flakes/nixos.md +++ b/docs/manual/nix-flakes/nixos.md @@ -8,7 +8,7 @@ be as follows: description = "NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager"; }; diff --git a/docs/manual/nix-flakes/standalone.md b/docs/manual/nix-flakes/standalone.md index 191526781..3c275c0a8 100644 --- a/docs/manual/nix-flakes/standalone.md +++ b/docs/manual/nix-flakes/standalone.md @@ -27,7 +27,7 @@ imported Home Manager modules, use `extraSpecialArgs` in the call to ``` nix { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager"; }; diff --git a/docs/manual/usage/upgrading.md b/docs/manual/usage/upgrading.md index 6e2f3ffbc..f4e899273 100644 --- a/docs/manual/usage/upgrading.md +++ b/docs/manual/usage/upgrading.md @@ -19,7 +19,7 @@ Home Manager follows NixOS release cycles and provides corresponding branches: - **release-**: Stable branch for the matching NixOS or Nixpkgs release, such as `release-25.11`. -- **master**: Development branch (tracks nixos-unstable) +- **master**: Development branch (tracks nixpkgs-unstable) :::{.note} Use the Home Manager branch that matches the Nixpkgs branch used to @@ -61,7 +61,7 @@ instead: ```nix { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/flake.lock b/flake.lock index ad7e9d6f2..53fb11a91 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1779508470, - "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=", + "lastModified": 1779877693, + "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29916453413845e54a65b8a1cf996842300cd299", + "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 5da536f2a..95a2af4c0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Home Manager for Nix"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; outputs = { diff --git a/home-manager/home-manager b/home-manager/home-manager index 5d0b46aed..686cbdce7 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -313,7 +313,7 @@ function doInit() { fi local homeManagerUrl="github:nix-community/home-manager" - local nixpkgsUrl="github:nixos/nixpkgs/nixos-unstable" + local nixpkgsUrl="github:nixos/nixpkgs/nixpkgs-unstable" while (( $# > 0 )); do local opt="$1" diff --git a/templates/nixos/flake.nix b/templates/nixos/flake.nix index 007f6d618..b5e69f4c8 100644 --- a/templates/nixos/flake.nix +++ b/templates/nixos/flake.nix @@ -2,7 +2,7 @@ description = "NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/templates/standalone/flake.nix b/templates/standalone/flake.nix index d09dd3cd1..639fc1359 100644 --- a/templates/standalone/flake.nix +++ b/templates/standalone/flake.nix @@ -3,7 +3,7 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs";