Revert "update nixpkgs"

This reverts commit 7cd5154. Sound not working in qutebrowser. Will wait for changes in NixOS/nixpkgs#157631 to be in nixos-unstable.
svrana · Feb 8, 2022 · 86946f4 · 86946f4
1 parent 38a6509
commit 86946f4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/nix/sources.json b/nix/sources.json
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f697d60e4d9f08eacf549502528bfaed859d33b",
-        "sha256": "0y7j1n2y3dpmdakfbi1yx77pzvwi38ncz9vnf9mzhq3vrmm29svd",
+        "rev": "03ec468b14067729a285c2c7cfa7b9434a04816c",
+        "sha256": "1b9zxhr76n0gqw0xnzainzxjkmlnzvvqk9vrv3dj36n6wrczlmdn",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/9f697d60e4d9f08eacf549502528bfaed859d33b.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/03ec468b14067729a285c2c7cfa7b9434a04816c.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
@@ -2,29 +2,27 @@
 {
   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
     '';
-    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="
-      ];
-    };
+    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="
+    ];
   };
 }