From 0e0b8db33562c711b1666a4aa301e7f548244498 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 14 Jun 2021 17:26:59 -0400
Subject: [PATCH] try to have a new enough nixpkgs to get cachix
---
.circleci/config.yml | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a959ae..24d4a45 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,17 +144,11 @@ jobs:
# CACHIX_AUTH_TOKEN is manually set in the CircleCI web UI and allows us to push to CACHIX_NAME.
CACHIX_NAME: "privatestorage-opensource"
- # Specify a revision of PrivateStorageio/nixpkgs to run against. This
- # essentially pins the majority of the software involved in the build.
- # This revision is selected arbitrarily (it's just new enough to define
- # all of the PrivateStorage stuff that ZKAPAuthorizer depends on). It's
- # somewhat current as of the time of this comment. We can bump it to a
- # newer version when that makes sense. Meanwhile, the platform won't
- # shift around beneath us unexpectedly.
- NIX_PATH: "nixpkgs=https://github.com/PrivateStorageio/nixpkgs/archive/730129887a84a8f84f3b78ffac7add72aeb551b6.tar.gz"
steps:
- run:
+ environment:
+ NIX_PATH: "nixpkgs=https://nixos.org/channels/nixos-21.05-small"
name: "Set up Cachix"
command: |
nix-env -iA nixpkgs.cachix
@@ -163,6 +157,16 @@ jobs:
- "checkout"
- run:
+ environment:
+ # Specify a revision of PrivateStorageio/nixpkgs to run against.
+ # This essentially pins the majority of the software involved in
+ # the build. This revision is selected arbitrarily (it's just new
+ # enough to define all of the PrivateStorage stuff that
+ # ZKAPAuthorizer depends on). It's somewhat current as of the
+ # time of this comment. We can bump it to a newer version when
+ # that makes sense. Meanwhile, the platform won't shift around
+ # beneath us unexpectedly.
+ NIX_PATH: "nixpkgs=https://github.com/PrivateStorageio/nixpkgs/archive/730129887a84a8f84f3b78ffac7add72aeb551b6.tar.gz"
name: "Run Test Suite"
command: |
# Building the package has, as a side effect, running the test
--
GitLab