From 7cd5154a977d1fd1f5cc286a0a1aa8acc58f0db0 Mon Sep 17 00:00:00 2001
From: Shaw Vrana <shaw@vranix.com>
Date: Mon, 7 Feb 2022 12:40:32 -0800
Subject: [PATCH] update nixpkgs

---
 nix/sources.json       |  6 +++---
 roles/standard/nix.nix | 36 +++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index 2517a30..8bef97c 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "03ec468b14067729a285c2c7cfa7b9434a04816c",
-        "sha256": "1b9zxhr76n0gqw0xnzainzxjkmlnzvvqk9vrv3dj36n6wrczlmdn",
+        "rev": "9f697d60e4d9f08eacf549502528bfaed859d33b",
+        "sha256": "0y7j1n2y3dpmdakfbi1yx77pzvwi38ncz9vnf9mzhq3vrmm29svd",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/03ec468b14067729a285c2c7cfa7b9434a04816c.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/9f697d60e4d9f08eacf549502528bfaed859d33b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
diff --git a/roles/standard/nix.nix b/roles/standard/nix.nix
index 872f6b8..fcf07f0 100644
--- a/roles/standard/nix.nix
+++ b/roles/standard/nix.nix
@@ -2,27 +2,29 @@
 {
   nix = {
     nixPath = import ../../nix-path.nix;
-    trustedUsers = [ "@wheel" ];
-    # Automatically optimize the Nix store to save space by hard-linking
-    # identical files together. These savings add up.
-    autoOptimiseStore = true;
-    # keep-* for nix-direnv nix-shell generations
     extraOptions = ''
       keep-outputs = true
       keep-derivations = true
       experimental-features = nix-command flakes
     '';
-    binaryCaches = [
-      "https://cache.nixos.org"
-      "https://nix-community.cachix.org"
-      "https://hydra.iohk.io"
-      "https://iohk.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
-      "iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo="
-    ];
+    settings = {
+      trusted-users = [ "@wheel" ];
+      # Automatically optimize the Nix store to save space by hard-linking
+      # identical files together. These savings add up.
+      auto-optimise-store = true;
+      # keep-* for nix-direnv nix-shell generations
+      substituters = [
+        "https://cache.nixos.org"
+        "https://nix-community.cachix.org"
+        "https://hydra.iohk.io"
+        "https://iohk.cachix.org"
+      ];
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
+        "iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo="
+      ];
+    };
   };
 }