Compare commits

...

2 Commits

Author SHA1 Message Date
Jez Cope d32b3857e9 cachix: fix deprecation warnings in nix settings 2022-07-06 17:22:37 +01:00
Jez Cope 98c83398fe flake: update lockfile 2022-07-06 17:19:41 +01:00
3 changed files with 21 additions and 24 deletions

View File

@ -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/" ];
}

View File

@ -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="
];
};

View File

@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1656613796,
"narHash": "sha256-oQn4KFUjapGOK1ncsUD/SdArRIiX9hWRJIrj4n7+23E=",
"lastModified": 1657103562,
"narHash": "sha256-lSMA2B40tJxdRdAPftDxI9h+vBaS6mjlROz5nv3Ep3s=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3f21945eac3ef08d7f3fd329dbe3954fe52f3d10",
"rev": "88bfbe0c218e095f0d9e9aaa2ba18dc0df410244",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1656065134,
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
@ -44,11 +44,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1656367977,
"narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=",
"lastModified": 1656927578,
"narHash": "sha256-ZSFrM/1PlJOqCb3mN88ZUh9dkQvNLU/nkoQ2tu02/FM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1",
"rev": "f2445620d177e295e711c1b2bc6c01ed6df26c16",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1656461576,
"narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=",
"lastModified": 1657020478,
"narHash": "sha256-sU5hXEGcOcvz2xoPAuNLBQJLXjwvPpTkoddyXE8gw20=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c",
"rev": "71a4f0dc3d80ba76f437c888c1c3d59f1df98163",
"type": "github"
},
"original": {
@ -74,11 +74,11 @@
},
"nur": {
"locked": {
"lastModified": 1656611551,
"narHash": "sha256-S1GkwCgMimVVU1nrwezTkoOqsoiXvvK1+pu4zplsqwo=",
"lastModified": 1657106528,
"narHash": "sha256-Jm2XUK8PSdiWfzfF6f/lIfnaOCrcq+JsT/cV5P5c1Uw=",
"owner": "nix-community",
"repo": "NUR",
"rev": "b58e819d423cc525475b43bd06cf5f999feb5325",
"rev": "71d760099ad1a16ebae22b4ec551bf54a9e93d8e",
"type": "github"
},
"original": {