mirror of
https://github.com/LnL7/nix-darwin.git
synced 2024-12-15 17:51:01 +00:00
f9724c4543
This is a big change that disentangles a lot of mistaken assumptions about mixing multiple versions of Nixpkgs, treating external flake inputs as gospel for the source of Nixpkgs and nix-darwin, etc.; the end result should be much simpler conceptually, but it will be a breaking change for anyone using `eval-config.nix` directly. Hopefully that shouldn't be a big issue, as it is more of an internal API and it's quite likely that existing uses may have been broken in the same way the internal ones were. It was previously easy to get into a state where your `lib` comes from nix-darwin's `nixpkgs` input or a global channel and your `pkgs` comes from another major version of Nixpkgs. This is pretty fundamentally broken due to the coupling of `pkgs` to its corresponding `lib`, but the brokenness was hidden much of the time until something surfaced it. Now there is exactly one mandatory `lib` input to system evaluation, and the handling of various additional options like `pkgs` and `system` can be done modularly; maintaining backwards compatibility with the previous calling convention is punted to the `default.nix` and `lib.darwinSystem` entry points. `inputs` is no longer read by nix-darwin or special in any way, merely a convention for user code, and the argument is retained in the entry points only for backwards compatibility. All correct invocations of the entry points should keep working after this change, and some previously-broken ones should be fixed too. The documentation and template have been adjusted to show the newly-recommended modular way of specifying various things, but no deprecation warnings have been introduced yet by this change. There is one potential, mostly cosmetic regression: `system.nixpkgsRevision` and related options are less likely to be set than before, in cases where it is not possible to determine the origin of the package set. Setting `nixpkgs.source` explicitly will make this work again, and I hope to look into sending changes upstream to Nixpkgs to make `lib.trivial.revisionWithDefault` behave properly under flakes, which would fix this regression and potentially allow reducing some of the complexity. Fixes: #669
34 lines
962 B
Nix
34 lines
962 B
Nix
{ nixpkgs ? <nixpkgs>
|
|
, configuration ? <darwin-config>
|
|
, lib ? pkgs.lib
|
|
, pkgs ? import nixpkgs { inherit system; }
|
|
, system ? builtins.currentSystem
|
|
}:
|
|
|
|
let
|
|
eval = import ./eval-config.nix {
|
|
inherit lib;
|
|
modules = [
|
|
configuration
|
|
{ nixpkgs.source = lib.mkDefault nixpkgs; }
|
|
] ++ lib.optional (system != null) {
|
|
nixpkgs.system = lib.mkDefault system;
|
|
};
|
|
};
|
|
|
|
# The source code of this repo needed by the [un]installers.
|
|
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 { inherit nix-darwin; };
|
|
}
|