diff options
| author | Malo Bourgon <mbourgon@gmail.com> | 2022-08-13 12:09:24 -0700 |
|---|---|---|
| committer | Malo Bourgon <mbourgon@gmail.com> | 2022-08-16 10:41:51 -0700 |
| commit | f729a09a28043159d6221df04b343260b1314644 (patch) | |
| tree | 41ea0fedbdea5eceb61ca14551943bd12d4acb3a /modules/examples | |
| parent | 80871c71edb3da76d40bdff9cae007a2a035c074 (diff) | |
Update `nix` module to use `settings` sub options like in NixOS module
Also update option definitions to match those in `nixpkgs` where it
makes sense.
Diffstat (limited to 'modules/examples')
| -rw-r--r-- | modules/examples/hydra.nix | 6 | ||||
| -rw-r--r-- | modules/examples/lnl.nix | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/examples/hydra.nix b/modules/examples/hydra.nix index ddd9a63..15808d9 100644 --- a/modules/examples/hydra.nix +++ b/modules/examples/hydra.nix @@ -19,10 +19,10 @@ in services.nix-daemon.enable = true; - nix.binaryCaches = [ http://cache1 ]; - nix.binaryCachePublicKeys = [ "cache.daiderd.com-1:R8KOWZ8lDaLojqD+v9dzXAqGn29gEzPTTbr/GIpCTrI=" ]; + nix.settings.substituters = [ http://cache1 ]; + nix.settings.trusted-public-keys = [ "cache.daiderd.com-1:R8KOWZ8lDaLojqD+v9dzXAqGn29gEzPTTbr/GIpCTrI=" ]; - nix.trustedUsers = [ "@admin" "@hydra" ]; + nix.settings.trusted-users = [ "@admin" "@hydra" ]; nix.extraOptions = '' pre-build-hook = diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 281347c..a0dd0ba 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -93,11 +93,11 @@ log-lines = 128 ''; - nix.binaryCachePublicKeys = [ "cache.daiderd.com-1:R8KOWZ8lDaLojqD+v9dzXAqGn29gEzPTTbr/GIpCTrI=" ]; - nix.trustedBinaryCaches = [ https://d3i7ezr9vxxsfy.cloudfront.net ]; + nix.settings.trusted-public-keys = [ "cache.daiderd.com-1:R8KOWZ8lDaLojqD+v9dzXAqGn29gEzPTTbr/GIpCTrI=" ]; + nix.settings.trusted-substituters = [ https://d3i7ezr9vxxsfy.cloudfront.net ]; - nix.useSandbox = true; - nix.sandboxPaths = [ "/private/tmp" "/private/var/tmp" "/usr/bin/env" ]; + nix.settings.sandbox = true; + nix.settings.extra-sandbox-paths = [ "/private/tmp" "/private/var/tmp" "/usr/bin/env" ]; programs.nix-index.enable = true; |