From aff194c6ebae9b6305fefe3560e8a1668cdd1c3a Mon Sep 17 00:00:00 2001 From: Samuel Meenzen Date: Sun, 22 Jun 2025 21:02:14 +0200 Subject: [PATCH] feat: add new attic cache --- .gitlab-ci.yml | 4 ++-- bin/nix-build-and-cache | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81431686..d3bb4890 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,8 +25,8 @@ before_script: - if command -v nix > /dev/null; then echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf; fi # Add our own binary cache - - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.conduit.rs/conduit" >> /etc/nix/nix.conf; fi - - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:zXpsVmtm+MBbweaCaG/CT4pCEDDjfFAKjgbCqfDBjLE=" >> /etc/nix/nix.conf; fi + - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.mnzn.dev/conduit" >> /etc/nix/nix.conf; fi + - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:pkmOYsJpoYy5y4Ws5sILt/O5XVzp0fXdxkW2Tqk0K/c=" >> /etc/nix/nix.conf; fi # Add alternate binary cache - if command -v nix > /dev/null && [ -n "$ATTIC_ENDPOINT" ]; then echo "extra-substituters = $ATTIC_ENDPOINT" >> /etc/nix/nix.conf; fi diff --git a/bin/nix-build-and-cache b/bin/nix-build-and-cache index 6bd62664..f4132ae3 100755 --- a/bin/nix-build-and-cache +++ b/bin/nix-build-and-cache @@ -14,7 +14,7 @@ if [ ! -z ${ATTIC_TOKEN+x} ]; then nix run --inputs-from . attic -- \ login \ conduit \ - "${ATTIC_ENDPOINT:-https://attic.conduit.rs/conduit}" \ + "${ATTIC_ENDPOINT:-https://attic.mnzn.dev/conduit}" \ "$ATTIC_TOKEN" readarray -t derivations < <(nix path-info "$@" --derivation)