From 0db4f4c4abce421fefe7e8d5e01fae93e317c93d Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Tue, 1 Apr 2025 12:37:10 -0400
Subject: [PATCH] dogfood nixcp everywhere

---
 .github/workflows/build-machines-and-homes.yml |  6 ++----
 .github/workflows/build-packages.yml           | 15 +++++----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 88d531a..6995a7a 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -76,8 +76,7 @@ jobs:
         if: '!cancelled()'
         run: |
           package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
-          nix profile install git+https://git.cy7.sh/cy/nixcp.git
-          nixcp \
+          nix run git+https://git.cy7.sh/cy/nixcp.git -- \
             --to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem' \
             -u https://nix-community.cachix.org \
             -u https://nixcache.cy7.sh \
@@ -149,8 +148,7 @@ jobs:
         if: '!cancelled()'
         run: |
           package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
-          nix profile install git+https://git.cy7.sh/cy/nixcp.git
-          nixcp \
+          nix run git+https://git.cy7.sh/cy/nixcp.git -- \
             --to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem' \
             -u https://nix-community.cachix.org \
             -u https://nixcache.cy7.sh \
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index fea88fc..ce4afd1 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -64,16 +64,11 @@ jobs:
         # https://stackoverflow.com/a/58859404
         if: '!cancelled()'
         run: |
-          derivations=()
-          while IFS=$'\n' read derivation; do
-              derivations+=("$derivation")
-          done < <(nix path-info --derivation "${{ matrix.package }}")
-
-          for derivation in "${derivations[@]}"; do
-              nix copy -j8 \
-                --to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem' \
-                $(nix-store --query --requisites --include-outputs "$derivation")
-          done
+          nix run git+https://git.cy7.sh/cy/nixcp.git -- \
+            --to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem' \
+            -u https://nix-community.cachix.org \
+            -u https://nixcache.cy7.sh \
+            "${{ matrix.package }}"
 
       - name: prepare tarball to upload
         run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result