nix/8.nix-darwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

treewide: point to the new GitHub organization

Browse source
This commit is contained in:
Emily 2025-03-22 14:17:40 +00:00
parent 000c40f4fe
commit ce5a3b9db9
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -209,7 +209,7 @@
Use a channel for nix-darwin or configure nix.nixPath Use a channel for nix-darwin or configure nix.nixPath
sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/master.tar.gz darwin
sudo nix-channel --update sudo nix-channel --update
nix.nixPath = nix.nixPath =

14
README.md
View file

@ -1,8 +1,8 @@
[<img src="https://daiderd.com/nix-darwin/images/nix-darwin.png" width="200px" alt="logo" />](https://github.com/LnL7/nix-darwin) [<img src="https://nix-darwin.github.io/nix-darwin/images/nix-darwin.png" width="200px" alt="logo" />](https://github.com/nix-darwin/nix-darwin)
# nix-darwin # nix-darwin
[![Test](https://github.com/LnL7/nix-darwin/actions/workflows/test.yml/badge.svg)](https://github.com/LnL7/nix-darwin/actions/workflows/test.yml) [![Test](https://github.com/nix-darwin/nix-darwin/actions/workflows/test.yml/badge.svg)](https://github.com/nix-darwin/nix-darwin/actions/workflows/test.yml)
Nix modules for darwin, `/etc/nixos/configuration.nix` for macOS. Nix modules for darwin, `/etc/nixos/configuration.nix` for macOS.
@ -73,8 +73,8 @@ Add the following to `flake.nix` in the same folder as `configuration.nix`:
inputs = { inputs = {
# Use `github:NixOS/nixpkgs/nixpkgs-24.11-darwin` to use Nixpkgs 24.11. # Use `github:NixOS/nixpkgs/nixpkgs-24.11-darwin` to use Nixpkgs 24.11.
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
# Use `github:LnL7/nix-darwin/nix-darwin-24.11` to use Nixpkgs 24.11. # Use `github:nix-darwin/nix-darwin/nix-darwin-24.11` to use Nixpkgs 24.11.
nix-darwin.url = "github:LnL7/nix-darwin/master"; nix-darwin.url = "github:nix-darwin/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -142,9 +142,9 @@ Copy the [simple](./modules/examples/simple.nix) example to `/etc/nix-darwin/con
```bash ```bash
# If you use Nixpkgs unstable (the default): # If you use Nixpkgs unstable (the default):
sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/master.tar.gz darwin
# If you use Nixpkgs 24.11: # If you use Nixpkgs 24.11:
sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/nix-darwin-24.11.tar.gz darwin sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/nix-darwin-24.11.tar.gz darwin
sudo nix-channel --update sudo nix-channel --update
``` ```
@ -177,7 +177,7 @@ sudo nix-channel --update
## Documentation ## Documentation
`darwin-help` will open up a local copy of the reference documentation, it can also be found online [here](https://daiderd.com/nix-darwin/manual/index.html). `darwin-help` will open up a local copy of the reference documentation, it can also be found online [here](https://nix-darwin.github.io/nix-darwin/manual/index.html).
The documentation is also available as manpages by running `man 5 configuration.nix`. The documentation is also available as manpages by running `man 5 configuration.nix`.

2
doc/manual/default.nix
View file

@ -30,7 +30,7 @@ let
declarations = map declarations = map
(decl: (decl:
if lib.hasPrefix (toString prefix) (toString decl) then if lib.hasPrefix (toString prefix) (toString decl) then
gitHubDeclaration "LnL7" "nix-darwin" revision gitHubDeclaration "nix-darwin" "nix-darwin" revision
(lib.removePrefix "/" (lib.removePrefix "/"
(lib.removePrefix (toString prefix) (toString decl))) (lib.removePrefix (toString prefix) (toString decl)))
# TODO: handle this in a better way (may require upstream # TODO: handle this in a better way (may require upstream

8
eval-config.nix
View file

@ -37,7 +37,7 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw ''
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/NIXPKGS-BRANCH"; nixpkgs.url = "github:NixOS/nixpkgs/NIXPKGS-BRANCH";
nix-darwin.url = "github:LnL7/nix-darwin/NIX-DARWIN-BRANCH"; nix-darwin.url = "github:nix-darwin/nix-darwin/NIX-DARWIN-BRANCH";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
# … # …
}; };
@ -46,7 +46,7 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw ''
$ sudo nix-channel --list $ sudo nix-channel --list
nixpkgs https://nixos.org/channels/NIXPKGS-BRANCH nixpkgs https://nixos.org/channels/NIXPKGS-BRANCH
darwin https://github.com/LnL7/nix-darwin/archive/NIX-DARWIN-BRANCH.tar.gz darwin https://github.com/nix-darwin/nix-darwin/archive/NIX-DARWIN-BRANCH.tar.gz
… …
$ nix-channel --list $ nix-channel --list
… …
@ -58,12 +58,12 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw ''
You can then fix your channels like this: You can then fix your channels like this:
$ sudo nix-channel --add https://nixos.org/channels/NIXPKGS-BRANCH nixpkgs $ sudo nix-channel --add https://nixos.org/channels/NIXPKGS-BRANCH nixpkgs
$ sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/NIX-DARWIN-BRANCH.tar.gz darwin $ sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/NIX-DARWIN-BRANCH.tar.gz darwin
$ sudo nix-channel --update $ sudo nix-channel --update
After that, activating your system again should work correctly. If it After that, activating your system again should work correctly. If it
doesn’t, please open an issue at doesn’t, please open an issue at
<https://github.com/LnL7/nix-darwin/issues/new> and include as much <https://github.com/nix-darwin/nix-darwin/issues/new> and include as much
information as possible. information as possible.
''; '';

2
modules/examples/flake/flake.nix
View file

@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nix-darwin.url = "github:LnL7/nix-darwin/master"; nix-darwin.url = "github:nix-darwin/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
}; };

2
modules/system/checks.nix
View file

@ -170,7 +170,7 @@ let
if ! test -e "$darwinPath"; then if ! test -e "$darwinPath"; then
echo "error: Changed <darwin> but target does not exist, aborting activation" >&2 echo "error: Changed <darwin> but target does not exist, aborting activation" >&2
echo "Add the darwin repo as a channel or set nix.nixPath:" >&2 echo "Add the darwin repo as a channel or set nix.nixPath:" >&2
echo "$ sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin" >&2 echo "$ sudo nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/master.tar.gz darwin" >&2
echo "$ sudo nix-channel --update" >&2 echo "$ sudo nix-channel --update" >&2
echo >&2 echo >&2
echo "or set" >&2 echo "or set" >&2