nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nix.nix: inherit from upstream nix.nix

Browse source
This commit is contained in:
Yueh-Shun Li 2024-02-16 01:58:46 +08:00
parent 5828992466
commit 0f78892de8
1 changed files with 13 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

55
modules/environment/nix.nix
View file

@ -7,21 +7,27 @@
# (Copyright (c) 2003-2022 Eelco Dolstra and the Nixpkgs/NixOS contributors, # (Copyright (c) 2003-2022 Eelco Dolstra and the Nixpkgs/NixOS contributors,
# licensed under MIT License as well) # licensed under MIT License as well)
{ config, lib, pkgs, ... }: { config, lib, pkgs, nixpkgs, ... }:
with lib; with lib;
let let
cfg = config.nix; cfg = config.nix;
renameNixOpt = old: new: renameNixOpt = old: new:
(mkRenamedOptionModule [ "nix" old ] [ "nix" new ]); mkRenamedOptionModuleWith {
sinceRelease = 2205;
from = [ "nix" old ];
to = [ "nix" "settings" new ];
};
in in
{ {
# Backward-compatibility with the NixOS options.
imports = [ imports = [
(renameNixOpt "binaryCaches" "substituters") # Use options and config from upstream nix.nix
(renameNixOpt "binaryCachePublicKeys" "trustedPublicKeys") "${nixpkgs}/nixos/modules/config/nix.nix"
# Backward-compatibility with pre-`settings` options.
(renameNixOpt "substituters" "substituters")
(renameNixOpt "trustedPublicKeys" "trusted-public-keys")
]; ];
###### interface ###### interface
@ -51,32 +57,6 @@ in
''; '';
}; };
## From nix.nix
substituters = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
A list of URLs of substituters. The official NixOS and Nix-on-Droid
substituters are added by default.
'';
};
trustedPublicKeys = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
A list of public keys. When paths are copied from another Nix store (such as a
binary cache), they must be signed with one of these keys. The official NixOS
and Nix-on-Droid public keys are added by default.
'';
};
extraOptions = mkOption {
type = types.lines;
default = "";
description = "Extra config to be appended to <filename>/etc/nix/nix.conf</filename>.";
};
}; };
}; };
@ -85,22 +65,13 @@ in
###### implementation ###### implementation
config = { config = {
environment.etc = {
"nix/nix.conf".text = ''
sandbox = false
substituters = ${concatStringsSep " " cfg.substituters}
trusted-public-keys = ${concatStringsSep " " cfg.trustedPublicKeys}
${cfg.extraOptions}
'';
};
nix = { nix = {
enable = true; enable = true;
substituters = [ settings.substituters = [
"https://cache.nixos.org" "https://cache.nixos.org"
"https://nix-on-droid.cachix.org" "https://nix-on-droid.cachix.org"
]; ];
trustedPublicKeys = [ settings.trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-on-droid.cachix.org-1:56snoMJTXmDRC1Ei24CmKoUqvHJ9XCp+nidK7qkMQrU=" "nix-on-droid.cachix.org-1:56snoMJTXmDRC1Ei24CmKoUqvHJ9XCp+nidK7qkMQrU="
]; ];