From 60ed03d0b10fa88054a73a0d34338f03f8d73f53 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 17 Nov 2024 02:14:06 +1100 Subject: installer: remove --- default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index c93b478..075ae6d 100644 --- a/default.nix +++ b/default.nix @@ -1,8 +1,8 @@ { nixpkgs ? , configuration ? -, lib ? pkgs.lib -, pkgs ? import nixpkgs { inherit system; } , system ? builtins.currentSystem +, pkgs ? import nixpkgs { inherit system; } +, lib ? pkgs.lib }: let @@ -15,20 +15,7 @@ let nixpkgs.system = lib.mkDefault system; }; }; - - # The source code of this repo needed by the installer. - nix-darwin = lib.cleanSource ( - lib.cleanSourceWith { - # We explicitly specify a name here otherwise `cleanSource` will use the - # basename of ./. which might be different for different clones of this - # repo leading to non-reproducible outputs. - name = "nix-darwin"; - src = ./.; - } - ); in - eval // { - installer = pkgs.callPackage ./pkgs/darwin-installer { inherit nix-darwin; }; uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller { }; } -- cgit v1.2.3 From 095ba5502c83c5fd8173a1b0dbc99a0e1be7e42d Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Thu, 21 Nov 2024 10:52:11 +1100 Subject: default: expose all the `darwin-*` commands Change `uninstaller` to `darwin-uninstaller` to match flake attribute --- default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index 075ae6d..8bae7e1 100644 --- a/default.nix +++ b/default.nix @@ -17,5 +17,7 @@ let }; in eval // { - uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller { }; + darwin-uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller { }; + + inherit (pkgs.callPackage ./pkgs/nix-tools { }) darwin-option darwin-rebuild darwin-version; } -- cgit v1.2.3