From 6c3563897be9138929a5e46b5ceac64ce2766eae Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 22 Mar 2025 14:17:40 +0000 Subject: [PATCH] treewide: point to the new GitHub organization (cherry picked from commit ce5a3b9db91ee65f2e969442884baac64b4b41f3) --- .github/workflows/test.yml | 2 +- CHANGELOG | 2 +- README.md | 2 +- doc/manual/default.nix | 2 +- eval-config.nix | 8 ++++---- modules/examples/flake/flake.nix | 2 +- modules/system/checks.nix | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 624133ff..4b8ab5d8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: nix_path: nixpkgs=channel:${{ env.NIXPKGS_BRANCH }} - name: Install channels run: | - nix-channel --add https://github.com/LnL7/nix-darwin/archive/${{ env.NIX_DARWIN_BRANCH }}.tar.gz darwin + nix-channel --add https://github.com/nix-darwin/nix-darwin/archive/${{ env.NIX_DARWIN_BRANCH }}.tar.gz darwin nix-channel --add https://nixos.org/channels/${{ env.NIXPKGS_BRANCH }} nixpkgs nix-channel --update - name: Install nix-darwin diff --git a/CHANGELOG b/CHANGELOG index b9a9adcc..5872ceb1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -189,7 +189,7 @@ 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 nix.nixPath = diff --git a/README.md b/README.md index 2419f391..0127bc12 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # nix-darwin -This is the 24.11 release branch of nix-darwin. See [the main readme](https://github.com/LnL7/nix-darwin#readme) for documentation. +This is the 24.11 release branch of nix-darwin. See [the main readme](https://github.com/nix-darwin/nix-darwin#readme) for documentation. diff --git a/doc/manual/default.nix b/doc/manual/default.nix index d8e12f29..00425d41 100644 --- a/doc/manual/default.nix +++ b/doc/manual/default.nix @@ -30,7 +30,7 @@ let declarations = map (decl: if lib.hasPrefix (toString prefix) (toString decl) then - gitHubDeclaration "LnL7" "nix-darwin" revision + gitHubDeclaration "nix-darwin" "nix-darwin" revision (lib.removePrefix "/" (lib.removePrefix (toString prefix) (toString decl))) # TODO: handle this in a better way (may require upstream diff --git a/eval-config.nix b/eval-config.nix index 7c6d48ff..131a0363 100644 --- a/eval-config.nix +++ b/eval-config.nix @@ -37,7 +37,7 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw '' inputs = { 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"; # … }; @@ -46,7 +46,7 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw '' $ sudo nix-channel --list 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 … @@ -58,12 +58,12 @@ assert enableNixpkgsReleaseCheck -> checkRelease lib || throw '' You can then fix your channels like this: $ 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 After that, activating your system again should work correctly. If it doesn’t, please open an issue at - and include as much + and include as much information as possible. ''; diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index cd859fe0..5b151694 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; - nix-darwin.url = "github:LnL7/nix-darwin/nix-darwin-24.11"; + nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-24.11"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/system/checks.nix b/modules/system/checks.nix index 17f6467d..7d427f89 100644 --- a/modules/system/checks.nix +++ b/modules/system/checks.nix @@ -226,7 +226,7 @@ let if ! test -e "$darwinPath"; then echo "error: Changed but target does not exist, aborting activation" >&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 >&2 echo "or set" >&2