From e30ca97184450af57792b8ada81e9c8b115d8e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 25 May 2021 17:53:47 +0200 Subject: [PATCH] nix: drop references to nix-cache-cn.status.im MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See: https://github.com/status-im/infra-ci/commit/faaf051b Signed-off-by: Jakub SokoĊ‚owski --- nix/README.md | 2 -- nix/nix.conf | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nix/README.md b/nix/README.md index a95db71b2f..d877e8ce3b 100644 --- a/nix/README.md +++ b/nix/README.md @@ -6,8 +6,6 @@ This folder contains configuration for [Nix](https://nixos.org/), a purely funct The main config file is [`nix/nix.conf`](/nix/nix.conf) and its main purpose is defining the [binary caches](https://nixos.org/nix/manual/#ch-basic-package-mgmt) which allow download of packages to avoid having to compile them yourself locally. -__NOTE:__ If you are in Asia you might want to add the `https://nix-cache-cn.status.im/` to be first in order of `extra-substituters`. Removing `cache.nixos.org` could also help. - ## Build arguments We leverage the `config` argument of standard `nixpkgs` for our own parameterization of the builds (e.g. to pass a build number or build type). diff --git a/nix/nix.conf b/nix/nix.conf index 4f3875c828..19488b3659 100644 --- a/nix/nix.conf +++ b/nix/nix.conf @@ -1,7 +1,7 @@ # NOTE: If you are in Asia you might want to add https://nix-cache-cn.status.im/ to extra-substituters extra-substituters = https://nix-cache.status.im/ substituters = https://cache.nixos.org/ -trusted-public-keys = nix-cache.status.im-1:x/93lOfLU+duPplwMSBR+OlY4+mo+dCN7n0mr4oPwgY= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-cache-cn.status.im:WUiOoTQQurm+rEL/yuAuU/a3TViDtMM9DCMgMx/KkOw= +trusted-public-keys = nix-cache.status.im-1:x/93lOfLU+duPplwMSBR+OlY4+mo+dCN7n0mr4oPwgY= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= # Some downloads are multiple GB, default is 5 minutes stalled-download-timeout = 3600 connect-timeout = 10