From bb1ab0b6a45174f55a577f633b1a10ca1ae633c1 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 14 Jan 2022 12:51:51 -0500
Subject: [PATCH] Try supplying the nix.conf as an env var, skipping the fs
---
.circleci/config.yml | 12 ++++++++----
nix/nix.conf | 8 --------
2 files changed, 8 insertions(+), 12 deletions(-)
delete mode 100644 nix/nix.conf
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f12e8e2..55ad469 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,14 @@ jobs:
resource_class: "xlarge"
environment:
- XDG_CONFIG_DIRS: "/root/project"
+ 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
+ extra-trusted-public-keys = saxtons.private.storage:MplOcEH8G/6mRlhlKkbA8GdeFR3dhCFsSszrspE/ZwY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
steps:
# Get *our* source code.
@@ -59,9 +66,6 @@ jobs:
- run:
name: "Building with Nix"
command: |
- echo "BASH_ENV: $BASH_ENV"
- cat $BASH_ENV
- echo
echo "XDG_CONFIG_DIRS: $XDG_CONFIG_DIRS"
nix-build \
-vvvv \
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