mirror of
https://github.com/LnL7/nix-darwin.git
synced 2024-12-14 11:57:34 +00:00
flake: put nixpkgs in NIX_PATH and system registry for flake configs
Currently there are a bunch of really wacky hacks required to get nixpkgs path correctly set up under flake configs such that `nix run nixpkgs#hello` and `nix run -f '<nixpkgs>' hello` hit the nixpkgs that the system was built with. In particular you have to use specialArgs or an anonymous module, and everyone has to include this hack in their own configs. We can do this for users automatically. NixOS/nixpkgs@e456032add Co-authored-by: Antoine Cotten <hello@acotten.com>
This commit is contained in:
parent
f4f18f3d72
commit
8714f9e285
3 changed files with 107 additions and 0 deletions
|
@ -27,6 +27,7 @@
|
||||||
}
|
}
|
||||||
++ [ ({ lib, ... }: {
|
++ [ ({ lib, ... }: {
|
||||||
nixpkgs.source = lib.mkDefault nixpkgs;
|
nixpkgs.source = lib.mkDefault nixpkgs;
|
||||||
|
nixpkgs.flake.source = lib.mkDefault nixpkgs;
|
||||||
|
|
||||||
system.checks.verifyNixPath = lib.mkDefault false;
|
system.checks.verifyNixPath = lib.mkDefault false;
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
./nix/linux-builder.nix
|
./nix/linux-builder.nix
|
||||||
./nix/nix-darwin.nix
|
./nix/nix-darwin.nix
|
||||||
./nix/nixpkgs.nix
|
./nix/nixpkgs.nix
|
||||||
|
./nix/nixpkgs-flake.nix
|
||||||
./environment
|
./environment
|
||||||
./fonts
|
./fonts
|
||||||
./launchd
|
./launchd
|
||||||
|
|
105
modules/nix/nixpkgs-flake.nix
Normal file
105
modules/nix/nixpkgs-flake.nix
Normal file
|
@ -0,0 +1,105 @@
|
||||||
|
{ config, options, lib, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.nixpkgs.flake;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.nixpkgs.flake = {
|
||||||
|
source = mkOption {
|
||||||
|
# In newer Nix versions, particularly with lazy trees, outPath of
|
||||||
|
# flakes becomes a Nix-language path object. We deliberately allow this
|
||||||
|
# to gracefully come through the interface in discussion with @roberth.
|
||||||
|
#
|
||||||
|
# See: https://github.com/NixOS/nixpkgs/pull/278522#discussion_r1460292639
|
||||||
|
type = types.nullOr (types.either types.str types.path);
|
||||||
|
|
||||||
|
default = null;
|
||||||
|
defaultText = "if (using nix-darwin.lib.darwinSystem) then nixpkgs.source else null";
|
||||||
|
|
||||||
|
example = ''builtins.fetchTarball { name = "source"; sha256 = "${lib.fakeHash}"; url = "https://github.com/nixos/nixpkgs/archive/somecommit.tar.gz"; }'';
|
||||||
|
|
||||||
|
description = ''
|
||||||
|
The path to the nixpkgs sources used to build the system. This is automatically set up to be
|
||||||
|
the store path of the nixpkgs flake used to build the system if using
|
||||||
|
`nixpkgs.lib.darwinSystem`, and is otherwise null by default.
|
||||||
|
|
||||||
|
This can also be optionally set if the nix-darwin system is not built with a flake but still uses
|
||||||
|
pinned sources: set this to the store path for the nixpkgs sources used to build the system,
|
||||||
|
as may be obtained by `builtins.fetchTarball`, for example.
|
||||||
|
|
||||||
|
Note: the name of the store path must be "source" due to
|
||||||
|
<https://github.com/NixOS/nix/issues/7075>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
setNixPath = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
|
||||||
|
default = cfg.source != null;
|
||||||
|
defaultText = "config.nixpkgs.flake.source != null";
|
||||||
|
|
||||||
|
description = ''
|
||||||
|
Whether to set {env}`NIX_PATH` to include `nixpkgs=flake:nixpkgs` such that `<nixpkgs>`
|
||||||
|
lookups receive the version of nixpkgs that the system was built with, in concert with
|
||||||
|
{option}`nixpkgs.flake.setFlakeRegistry`.
|
||||||
|
|
||||||
|
This is on by default for nix-darwin configurations built with flakes.
|
||||||
|
|
||||||
|
This makes {command}`nix-build '<nixpkgs>' -A hello` work out of the box on flake systems.
|
||||||
|
|
||||||
|
Note that this option makes the nix-darwin closure depend on the nixpkgs sources, which may add
|
||||||
|
undesired closure size if the system will not have any nix commands run on it.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
setFlakeRegistry = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
|
||||||
|
default = cfg.source != null;
|
||||||
|
defaultText = "config.nixpkgs.flake.source != null";
|
||||||
|
|
||||||
|
description = ''
|
||||||
|
Whether to pin nixpkgs in the system-wide flake registry (`/etc/nix/registry.json`) to the
|
||||||
|
store path of the sources of nixpkgs used to build the nix-darwin system.
|
||||||
|
|
||||||
|
This is on by default for nix-darwin configurations built with flakes.
|
||||||
|
|
||||||
|
This option makes {command}`nix run nixpkgs#hello` reuse dependencies from the system, avoid
|
||||||
|
refetching nixpkgs, and have a consistent result every time.
|
||||||
|
|
||||||
|
Note that this option makes the nix-darwin closure depend on the nixpkgs sources, which may add
|
||||||
|
undesired closure size if the system will not have any nix commands run on it.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf (cfg.source != null) (mkMerge [
|
||||||
|
{
|
||||||
|
assertions = [
|
||||||
|
{
|
||||||
|
assertion = cfg.setNixPath -> cfg.setFlakeRegistry;
|
||||||
|
message = ''
|
||||||
|
Setting `nixpkgs.flake.setNixPath` requires that `nixpkgs.flake.setFlakeRegistry` also
|
||||||
|
be set, since it is implemented in terms of indirection through the flake registry.
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
(mkIf cfg.setFlakeRegistry {
|
||||||
|
nix.registry.nixpkgs.to = mkDefault {
|
||||||
|
type = "path";
|
||||||
|
path = cfg.source;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
(mkIf cfg.setNixPath {
|
||||||
|
# N.B. This does not include darwin-config in NIX_PATH unlike modules/nix/default.nix
|
||||||
|
# because we would need some kind of evil shim taking the *calling* flake's self path,
|
||||||
|
# perhaps, to ever make that work (in order to know where the Nix expr for the system came
|
||||||
|
# from and how to call it).
|
||||||
|
nix.nixPath = mkDefault ([ "nixpkgs=flake:nixpkgs" ]
|
||||||
|
++ optional config.nix.channel.enable "/nix/var/nix/profiles/per-user/root/channels");
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
}
|
Loading…
Reference in a new issue