lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

jj: 0.14.0 -> 0.15.1, disable test on aarch64

Browse source
This commit is contained in:
Luke Granger-Brown 2024-03-26 19:00:52 +00:00
parent ef157732dc
commit 401b903cdb
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nix/pkgs/jj.nix
View file

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