From c6efa50e657c2cf50eac775558231d765dfddb29 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sun, 26 May 2024 15:32:14 -0400
Subject: [PATCH] Use newer version of just

until it is upgraded in nixpkgs, like:

https://github.com/NixOS/nixpkgs/pull/311583
---
 flake.nix            | 10 +++++++++-
 justfile             |  4 ++++
 packages/overlay.nix | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index a5d8240..f46ddcc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,7 +98,7 @@
             ./systems/ax41.nix;
       };
 
-      perSystem = { self', pkgs, lib, config, ... }: {
+      perSystem = { self', pkgs, system, config, ... }: {
         # Flake inputs we want to update periodically
         # Run: `nix run .#update`.
         nixos-flake.primary-inputs = [
@@ -117,6 +117,7 @@
         formatter = config.treefmt.build.wrapper;
 
         packages.default = self'.packages.activate;
+
         devShells.default = pkgs.mkShell {
           inputsFrom = [ config.treefmt.build.devShell ];
           packages = with pkgs; [
@@ -125,6 +126,13 @@
             nixd
           ];
         };
+        # Make our overlay available to the devShell
+        _module.args.pkgs = import inputs.nixpkgs {
+          inherit system;
+          overlays = [
+            (import ./packages/overlay.nix { inherit system; flake = { inherit inputs; }; })
+          ];
+        };
       };
     };
 }
diff --git a/justfile b/justfile
index d04839f..47b9c2a 100644
--- a/justfile
+++ b/justfile
@@ -14,16 +14,20 @@ deploy:
     colmena apply --build-on-target
 
 # Deploy to github-runner VM
+[group('gr')]
 gr-deploy:
     colmena apply --build-on-target --on github-runner
 
 # Re-animate the VM that was suspended until now.
+[group('gr')]
 gr-animate:
     colmena upload-keys
     ssh -t github-runner "sudo systemctl restart --all github-runner-*"
 
+[group('gr')]
 gr-inspect:
     ssh -t github-runner "sudo systemctl status --all github-runner-*"
 
+[group('gr')]
 gr-ssh:
     ssh -t github-runner
\ No newline at end of file
diff --git a/packages/overlay.nix b/packages/overlay.nix
index 3b2971f..53fa3d9 100644
--- a/packages/overlay.nix
+++ b/packages/overlay.nix
@@ -7,4 +7,25 @@ self: super: {
   nixci = flake.inputs.nixci.packages.${system}.default;
   # nix-health = flake.inputs.nix-browser.packages.${system}.nix-health;
   actualism-app = flake.inputs.actualism-app.packages.${system}.default;
+
+  # Use just v1.27.0, until upstream upgrades it.
+  just = super.just.overrideAttrs (oa: rec {
+    name = "${oa.pname}-${version}";
+    version = "1.27.0";
+    src = super.fetchFromGitHub {
+      owner = "casey";
+      repo = oa.pname;
+      rev = "refs/tags/${version}";
+      hash = "sha256-xyiIAw8PGMgYPtnnzSExcOgwG64HqC9TbBMTKQVG97k=";
+    };
+    # Overriding `cargoHash` has no effect; we must override the resultant
+    # `cargoDeps` and set the hash in its `outputHash` attribute.
+    cargoDeps = oa.cargoDeps.overrideAttrs (super.lib.const {
+      name = "${name}-vendor.tar.gz";
+      inherit src;
+      outputHash = "sha256-jMurOCr9On+sudgCzIBrPHF+6jCE/6dj5E106cAL2qw=";
+    });
+
+    doCheck = false;
+  });
 }