From 898456dffe16167c96315f1553c3fed6ae6b4046 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Fri, 29 Mar 2024 16:26:26 -0300
Subject: [PATCH] Fix dev shell upload to cache

---
 .envrc                               | 6 +-----
 .github/workflows/flakehub-cache.yml | 2 ++
 flake.nix                            | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.envrc b/.envrc
index c2a417d..3550a30 100644
--- a/.envrc
+++ b/.envrc
@@ -1,5 +1 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.1.1; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.1.1/direnvrc" "sha256-b6qJ4r34rbE23yWjMqbmu3ia2z4b2wIlZUksBke/ol0="
-fi
-
-use_flake
+use flake
diff --git a/.github/workflows/flakehub-cache.yml b/.github/workflows/flakehub-cache.yml
index c7969de..118fc4b 100644
--- a/.github/workflows/flakehub-cache.yml
+++ b/.github/workflows/flakehub-cache.yml
@@ -21,6 +21,8 @@ jobs:
             runner: "macos-12"
           - nix-system: "x86_64-linux"
             runner: "ubuntu-22.04"
+        shells:
+          - default
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main
diff --git a/flake.nix b/flake.nix
index c8e8571..d5d807d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,6 @@
         default = magic-nix-cache;
       });
 
-      /*
       devShells = forEachSupportedSystem ({ pkgs, cranePkgs, lib }: {
         default = pkgs.mkShell {
           inputsFrom = [ cranePkgs.magic-nix-cache ];
@@ -63,6 +62,7 @@
           ];
         };
 
+        /*
         cross = pkgs.mkShell ({
           inputsFrom = [ cranePkgs.magic-nix-cache ];
           packages = with pkgs; [
@@ -156,7 +156,7 @@
             age
           ];
         };
+        */
       });
-      */
     };
 }