diff --git a/nix/pkgs/jj.nix b/nix/pkgs/jj.nix index 594f3d283b..b82454a070 100644 --- a/nix/pkgs/jj.nix +++ b/nix/pkgs/jj.nix @@ -1,12 +1,12 @@ { pkgs, ... }: let - rev = "v0.14.0"; + rev = "v0.15.1"; src = (pkgs.fetchFromGitHub { owner = "martinvonz"; repo = "jj"; inherit rev; - hash = "sha256-xnGnervyXPfZyQTYsPu09fj+QvbEZ6rDJ4fYHBeF/RY="; + hash = "sha256-yppQIffjpyQ2nqhiZbV2pSMQJx8srmHjAk+UClCQfRw="; }) // { shortRev = rev; }; @@ -22,8 +22,8 @@ let rust-overlay-src = (pkgs.fetchFromGitHub { owner = "oxalica"; repo = "rust-overlay"; - rev = "b520a3889b24aaf909e287d19d406862ced9ffc9"; - sha256 = "1s20kv0yp5hmydkz9wmm1i4sbgvk9ws8dxw76ypjsckmgjm1sahw"; + rev = "78503e9199010a4df714f29a4f9c00eb2ccae071"; + hash = "sha256:0xhrcahhlm8bz5gaka0rni9g20ypnmckmh0nz96xn5jb4a913j9z"; }); rust-overlay = (import "${rust-overlay-src}/flake.nix").outputs { self = rust-overlay; @@ -37,5 +37,8 @@ let rust-overlay = rust-overlay; }; fromFlake = (flake.overlays.default pkgs pkgs).jujutsu; + fromFlake' = if pkgs.system == "aarch64-linux" then fromFlake.overrideAttrs (_: { + doCheck = false; + }) else fromFlake; in -fromFlake +fromFlake'