From 30854e2c9602e002c27211f5d83446d829e1e831 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Wed, 12 May 2021 13:34:12 -0400 Subject: [PATCH] Switch to PrivateStorageio/nixpkgs for CI --- .circleci/config.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index af42058..6032704 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -140,13 +140,14 @@ jobs: - image: "nixorg/nix:circleci" environment: - # Specify a revision of NixOS/nixpkgs to run against. This essentially - # pins the majority of the software involved in the build. This - # revision is selected arbitrarily. 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. - NIXPKGS_REV: "8bf142e001b6876b021c8ee90c2c7cec385fe8e9" + # 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. + NIXPKGS_REV: "64312fec143e4a0153acdc4d03619e01992ec574" steps: - run: @@ -157,7 +158,7 @@ jobs: # the `BASE_ENV` feature as we do here. name: "Setup NIX_PATH Environment Variable" command: | - echo "export NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/$NIXPKGS_REV.tar.gz" >> $BASH_ENV + echo "export NIX_PATH=nixpkgs=https://github.com/PrivateStorageio/nixpkgs/archive/$NIXPKGS_REV.tar.gz" >> $BASH_ENV - "checkout" -- GitLab