diff --git a/.circleci/config.yml b/.circleci/config.yml index f12e8e2bacf310634f67d384c0f7174b5c3cacc8..55ad46994c6ec3c79f6e7b60ca75f31a5a09ea89 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 021bd60958ae4c441a26574778100c3864032963..0000000000000000000000000000000000000000 --- 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=