From 4511c29a72a285b12acdf440d306f83227b927df Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 12 Jul 2023 10:36:14 +1000 Subject: [PATCH] flake: use `nix-darwin` instead of `darwin` --- README.md | 8 ++++---- modules/examples/flake/flake.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 95ac05c9..8d081565 100644 --- a/README.md +++ b/README.md @@ -106,8 +106,8 @@ Add the following to `flake.nix` in the same folder as `configuration.nix`: inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; - darwin.url = "github:LnL7/nix-darwin/master"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; + nix-darwin.url = "github:LnL7/nix-darwin/master"; + nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs@{ self, darwin, nixpkgs }: { @@ -147,7 +147,7 @@ accessible as an argument `inputs`, similar to `pkgs` and `lib`, inside the conf ```nix # in flake.nix -darwin.lib.darwinSystem { +nix-darwin.lib.darwinSystem { modules = [ ./configuration.nix ]; specialArgs = { inherit inputs; }; } @@ -156,7 +156,7 @@ darwin.lib.darwinSystem { ```nix # in configuration.nix { pkgs, lib, inputs }: -# inputs.self, inputs.darwin, and inputs.nixpkgs can be accessed here +# inputs.self, inputs.nix-darwin, and inputs.nixpkgs can be accessed here ``` ## Manual Install diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index af149b48..02b445cc 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -3,11 +3,11 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - darwin.url = "github:LnL7/nix-darwin"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; + nix-darwin.url = "github:LnL7/nix-darwin"; + nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs@{ self, darwin, nixpkgs }: + outputs = inputs@{ self, nix-darwin, nixpkgs }: let configuration = { pkgs, ... }: { # List packages installed in system profile. To search by name, run: @@ -38,7 +38,7 @@ { # Build darwin flake using: # $ darwin-rebuild build --flake .#simple - darwinConfigurations."simple" = darwin.lib.darwinSystem { + darwinConfigurations."simple" = nix-darwin.lib.darwinSystem { modules = [ configuration ]; };