mirror of
https://github.com/nix-community/home-manager.git
synced 2026-06-05 21:02:51 +00:00
flake: track nixpkgs-unstable
This commit is contained in:
2
.github/workflows/github_pages.yml
vendored
2
.github/workflows/github_pages.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: cachix/install-nix-action@v31
|
- uses: cachix/install-nix-action@v31
|
||||||
with:
|
with:
|
||||||
nix_path: nixpkgs=channel:nixos-unstable
|
nix_path: nixpkgs=channel:nixpkgs-unstable
|
||||||
- uses: cachix/cachix-action@v17
|
- uses: cachix/cachix-action@v17
|
||||||
with:
|
with:
|
||||||
name: nix-community
|
name: nix-community
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ Reference commits:
|
|||||||
- Update the nixpkgs input to track the corresponding stable branch
|
- Update the nixpkgs input to track the corresponding stable branch
|
||||||
- Example: For `release-25.11`, change from:
|
- Example: For `release-25.11`, change from:
|
||||||
```nix
|
```nix
|
||||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
```
|
```
|
||||||
to:
|
to:
|
||||||
```nix
|
```nix
|
||||||
@@ -135,7 +135,7 @@ Reference commits:
|
|||||||
- Commit the flake.nix and flake.lock changes
|
- Commit the flake.nix and flake.lock changes
|
||||||
|
|
||||||
**Note**: The release branch should track the stable NixOS release channel
|
**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
|
#### Step 3.5: On master - Update CI for the New Release Branch
|
||||||
|
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -1,5 +1,5 @@
|
|||||||
.PHONY: all all-tests test test-install format
|
.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
|
NIX_PATH := nixpkgs=https://github.com/NixOS/nixpkgs/archive/${NIXPKGS_REV}.tar.gz
|
||||||
|
|
||||||
all: all-tests test-install
|
all: all-tests test-install
|
||||||
|
|||||||
@@ -25,8 +25,9 @@ If you would like to contribute to Home Manager, then please have a look at
|
|||||||
Releases
|
Releases
|
||||||
--------
|
--------
|
||||||
|
|
||||||
Home Manager is developed against `nixos-unstable` branch, which often causes
|
Home Manager is developed against the `nixpkgs-unstable` branch, which often
|
||||||
it to contain tweaks for changes/packages not yet released in stable [NixOS][].
|
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
|
To avoid breaking users' configurations, Home Manager is released in branches
|
||||||
corresponding to NixOS releases (e.g. `release-26.05`). These branches get
|
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
|
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
|
overwritten was from a previous Home Manager generation or from manual
|
||||||
configuration.
|
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
|
stable version), it may or may not work on other Linux distributions and NixOS
|
||||||
versions.
|
versions.
|
||||||
|
|
||||||
|
|||||||
8
docs/flake.lock
generated
8
docs/flake.lock
generated
@@ -2,16 +2,16 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773821835,
|
"lastModified": 1779877693,
|
||||||
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
|
"narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
|
"rev": "4100e830e085863741bc69b156ec4ccd53ab5be0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixpkgs-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
description = "Support developing Home Manager documentation";
|
description = "Support developing Home Manager documentation";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
scss-reset = {
|
scss-reset = {
|
||||||
url = "github:andreymatin/scss-reset/1.4.2";
|
url = "github:andreymatin/scss-reset/1.4.2";
|
||||||
flake = false;
|
flake = false;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ Manager's flake module, `flakeModules.home-manager`.
|
|||||||
description = "flake-parts configuration";
|
description = "flake-parts configuration";
|
||||||
|
|
||||||
inputs = {
|
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.url = "github:nix-community/home-manager";
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ to that of NixOS. The `flake.nix` would be:
|
|||||||
description = "Darwin configuration";
|
description = "Darwin configuration";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
darwin.url = "github:nix-darwin/nix-darwin";
|
darwin.url = "github:nix-darwin/nix-darwin";
|
||||||
darwin.inputs.nixpkgs.follows = "nixpkgs";
|
darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ be as follows:
|
|||||||
description = "NixOS configuration";
|
description = "NixOS configuration";
|
||||||
|
|
||||||
inputs = {
|
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.url = "github:nix-community/home-manager";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ imported Home Manager modules, use `extraSpecialArgs` in the call to
|
|||||||
``` nix
|
``` nix
|
||||||
{
|
{
|
||||||
inputs = {
|
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.url = "github:nix-community/home-manager";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Home Manager follows NixOS release cycles and provides corresponding branches:
|
|||||||
- **release-<version>**: Stable branch for the matching NixOS or
|
- **release-<version>**: Stable branch for the matching NixOS or
|
||||||
Nixpkgs release, such as `release-25.11`.
|
Nixpkgs release, such as `release-25.11`.
|
||||||
|
|
||||||
- **master**: Development branch (tracks nixos-unstable)
|
- **master**: Development branch (tracks nixpkgs-unstable)
|
||||||
|
|
||||||
:::{.note}
|
:::{.note}
|
||||||
Use the Home Manager branch that matches the Nixpkgs branch used to
|
Use the Home Manager branch that matches the Nixpkgs branch used to
|
||||||
@@ -61,7 +61,7 @@ instead:
|
|||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
|
|||||||
8
flake.lock
generated
8
flake.lock
generated
@@ -2,16 +2,16 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779508470,
|
"lastModified": 1779877693,
|
||||||
"narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
|
"narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "29916453413845e54a65b8a1cf996842300cd299",
|
"rev": "4100e830e085863741bc69b156ec4ccd53ab5be0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixpkgs-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
description = "Home Manager for Nix";
|
description = "Home Manager for Nix";
|
||||||
|
|
||||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -313,7 +313,7 @@ function doInit() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
local homeManagerUrl="github:nix-community/home-manager"
|
local homeManagerUrl="github:nix-community/home-manager"
|
||||||
local nixpkgsUrl="github:nixos/nixpkgs/nixos-unstable"
|
local nixpkgsUrl="github:nixos/nixpkgs/nixpkgs-unstable"
|
||||||
|
|
||||||
while (( $# > 0 )); do
|
while (( $# > 0 )); do
|
||||||
local opt="$1"
|
local opt="$1"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
description = "NixOS configuration";
|
description = "NixOS configuration";
|
||||||
|
|
||||||
inputs = {
|
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.url = "github:nix-community/home-manager";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# Specify the source of Home Manager and Nixpkgs.
|
# Specify the source of Home Manager and Nixpkgs.
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|||||||
Reference in New Issue
Block a user