From 8b7bdf7053c036b26db46a7ac16f0f95b8a63094 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 17 Dec 2021 15:20:53 -0500
Subject: [PATCH] circleci wants to pass `-c thecommand` to the shell, so
nix-shell no go
maybe this nix-env invocation will work
---
.circleci/config.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 30b0743..d19c04e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -164,14 +164,13 @@ jobs:
# This pin has no particular bearing on what version of our dependencies
# we are testing against, what version of Python we support, etc. It is
# part of CI infrastructure.
- NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/28abc4e43a24d28729509e2d83f5c4f3b3418189.tar.gz"
+ NIXPKGS: "https://github.com/NixOS/nixpkgs/archive/28abc4e43a24d28729509e2d83f5c4f3b3418189.tar.gz"
steps:
- run:
name: "Set up Cachix"
- shell: "nix-shell -p cachix bash"
command: |
- set -eo pipefail
+ nix-env -f $NIXPKGS -iA nixpkgs.cachix nixpkgs.bash
cachix use "${CACHIX_NAME}"
nix path-info --all > /tmp/store-path-pre-build
@@ -197,11 +196,8 @@ jobs:
- run:
name: "Push to Cachix"
- shell: "nix-shell -p cachix bash"
when: "always"
command: |
- set -eo pipefail
-
# Cribbed from
# https://circleci.com/blog/managing-secrets-when-you-have-pull-requests-from-outside-contributors/
if [ -n "$CIRCLE_PR_NUMBER" ]; then
--
GitLab