try harder

abathur · Mar 27, 2024 · 79eae72 · 79eae72
1 parent 043d044
commit 79eae72
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,4 +34,5 @@ jobs:
       with:
         nix_path: nixpkgs=channel:nixpkgs-unstable
     # DOING: figure out how to run the equivalent of this with the development resholve we're using here
+    - uses: DeterminateSystems/magic-nix-cache-action@main
     - run: nix flake check --print-build-logs
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/staging";
     flake-utils.url = "github:numtide/flake-utils";
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -76,7 +76,10 @@
             inherit (pkgs) resholve;
             rSrc = pkgs.lib.cleanSource self;
           } // {
-            aarch64-cross-test = pkgs.pkgsCross.aarch64-multiplatform.lesspipe.override (old: {
+            aarch64-cross-test-lesspipe = pkgs.pkgsCross.aarch64-multiplatform.lesspipe.override (old: {
+              inherit (pkgs.pkgsCross.aarch64-multiplatform) resholve;
+            });
+            aarch64-cross-test-xdg-utils = pkgs.pkgsCross.aarch64-multiplatform.xdg-utils.override (old: {
               inherit (pkgs.pkgsCross.aarch64-multiplatform) resholve;
             });
           };