diff --git a/nix/pkgs/jj.nix b/nix/pkgs/jj.nix
index 405904e13c..027b8ff138 100644
--- a/nix/pkgs/jj.nix
+++ b/nix/pkgs/jj.nix
@@ -1,19 +1,41 @@
 { pkgs, ... }:
 
 let
-  rev = "v0.6.1";
+  rev = "v0.8.0";
   src = (pkgs.fetchFromGitHub {
     owner = "martinvonz";
     repo = "jj";
     inherit rev;
-    sha256 = "0npv36q0c637jq10pqn5bzkyjzxn2phzbv5zjjf4kqb2ivd4nc3a";
+    sha256 = "0kx0qcm3rfd5dr62admih10mla38ldkz3079558vbvyv5685dcli";
   }) // {
     shortRev = rev;
   };
-  flake = (import "${src}/flake.nix").outputs {
-    self = src;
-    nixpkgs = pkgs;
+  flake-utils-src = (pkgs.fetchFromGitHub {
+    owner = "numtide";
+    repo = "flake-utils";
+    rev = "v1.0.0";
+    sha256 = "0hynd4rbkbplxzl2a8wb3r8z0h17z2alhhdsam78g3vgzpzg0d43";
+  });
+  flake-utils = (import "${flake-utils-src}/flake.nix").outputs {
+    self = flake-utils;
   };
-  fromFlake = (flake.overlay pkgs pkgs).jujutsu;
+  rust-overlay-src = (pkgs.fetchFromGitHub {
+    owner = "oxalica";
+    repo = "rust-overlay";
+    rev = "b520a3889b24aaf909e287d19d406862ced9ffc9";
+    sha256 = "1s20kv0yp5hmydkz9wmm1i4sbgvk9ws8dxw76ypjsckmgjm1sahw";
+  });
+  rust-overlay = (import "${rust-overlay-src}/flake.nix").outputs {
+    self = rust-overlay;
+    nixpkgs = pkgs;
+    flake-utils = flake-utils;
+  };
+  flake = (import "${src}/flake.nix").outputs {
+    self = flake;
+    nixpkgs = pkgs.path;
+    flake-utils = flake-utils;
+    rust-overlay = rust-overlay;
+  };
+  fromFlake = (flake.overlays.default pkgs pkgs).jujutsu;
 in
 fromFlake