From d32b3857e97a0f1aec63c5b699c901f48b25bb36 Mon Sep 17 00:00:00 2001
From: Jez Cope <j.cope@erambler.co.uk>
Date: Wed, 6 Jul 2022 17:22:37 +0100
Subject: [PATCH] cachix: fix deprecation warnings in nix settings

---
 cachix.nix               | 6 +++---
 cachix/nix-community.nix | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/cachix.nix b/cachix.nix
index 88b2f08..063fdc3 100644
--- a/cachix.nix
+++ b/cachix.nix
@@ -1,4 +1,3 @@
-
 # WARN: this file will get overwritten by $ cachix use <name>
 { pkgs, lib, ... }:
 
@@ -6,8 +5,9 @@ let
   folder = ./cachix;
   toImport = name: value: folder + ("/" + name);
   filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
+  imports = lib.mapAttrsToList toImport
+    (lib.filterAttrs filterCaches (builtins.readDir folder));
 in {
   inherit imports;
-  nix.binaryCaches = ["https://cache.nixos.org/"];
+  nix.settings.substituters = [ "https://cache.nixos.org/" ];
 }
diff --git a/cachix/nix-community.nix b/cachix/nix-community.nix
index 427a518..2a6f291 100644
--- a/cachix/nix-community.nix
+++ b/cachix/nix-community.nix
@@ -1,10 +1,7 @@
-
 {
-  nix = {
-    binaryCaches = [
-      "https://nix-community.cachix.org"
-    ];
-    binaryCachePublicKeys = [
+  nix.settings = {
+    substituters = [ "https://nix-community.cachix.org" ];
+    trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };