From 77c49233321bd85072b0c322076f01c03d2476bf Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 14 Jan 2022 11:12:50 -0500
Subject: [PATCH] try supplying nix.conf in an environment variable
It's not clear if nix.conf is being respected on CI, which is building all of
the things and not substituting anything from the iohk cache. Maybe this will
help?
---
.circleci/config.yml | 11 +++++++++++
nix/nix.conf | 8 --------
2 files changed, 11 insertions(+), 8 deletions(-)
delete mode 100644 nix/nix.conf
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 68888fa..04bff73 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,6 +24,17 @@ jobs:
resource_class: "xlarge"
+ environment:
+ NIX_CONFIG: |
+ # Add privatestorage's and haskell.nix[1] nix caches for builds. [1]
+ # https://input-output-hk.github.io/haskell.nix/tutorials/getting-started/#setting-up-the-binary-cache
+ extra-substituters = http://saxtons.private.storage/ https://hydra.iohk.io
+ # We needed to explictly specify the key for cache.nixos.org until we
+ # are using a version of nix that has
+ # https://github.com/NixOS/nix/commit/ff4dea63c9403880500f82ce273713ecf793d2d9
+ trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= saxtons.private.storage:MplOcEH8G/6mRlhlKkbA8GdeFR3dhCFsSszrspE/ZwY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
+
+
steps:
- run:
name: "Setup Environment Variables"
diff --git a/nix/nix.conf b/nix/nix.conf
deleted file mode 100644
index 021bd60..0000000
--- a/nix/nix.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# nix.conf for usage in CI.
-
-# Add privatestorage's and haskell.nix[1] nix caches for builds.
-# [1] https://input-output-hk.github.io/haskell.nix/tutorials/getting-started/#setting-up-the-binary-cache
-extra-substituters = http://saxtons.private.storage/ https://hydra.iohk.io/
-# We needed to explictly specify the key for cache.nixos.org until we are using a version of nix
-# that has https://github.com/NixOS/nix/commit/ff4dea63c9403880500f82ce273713ecf793d2d9
-trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= saxtons.private.storage:MplOcEH8G/6mRlhlKkbA8GdeFR3dhCFsSszrspE/ZwY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
--
GitLab