Skip to content

jujutsu: 0.14.0 -> 0.15.1 #293881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thoughtpolice merged 1 commit into from
Mar 10, 2024
Merged

jujutsu: 0.14.0 -> 0.15.1 #293881

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions pkgs/applications/version-management/jujutsu/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
, libssh2
, libgit2
, zstd
, fetchpatch
, installShellFiles
, nix-update-script
, testers
Expand All @@ -20,19 +19,19 @@

rustPlatform.buildRustPackage rec {
pname = "jujutsu";
version = "0.14.0";
version = "0.15.1";

src = fetchFromGitHub {
owner = "martinvonz";
repo = "jj";
rev = "v${version}";
hash = "sha256-xnGnervyXPfZyQTYsPu09fj+QvbEZ6rDJ4fYHBeF/RY=";
hash = "sha256-yppQIffjpyQ2nqhiZbV2pSMQJx8srmHjAk+UClCQfRw=";
};

cargoHash = "sha256-wuZ0zthaemzyDn5J2au2L2k0QJnzbrCRjSBIPivEbnQ=";
cargoHash = "sha256-2BmKC8DaOdD/THchImmGqplhDrHQHEMyWORWnE2ygSM=";

cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors
useNextest = true; # nextest is the upstream integration framework
useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping
ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib
LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2

Expand Down Expand Up @@ -63,6 +62,11 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/jj util completion zsh)
'';

checkFlags = [
# signing tests spin up an ssh-agent and do git checkouts
"--skip=test_ssh_signing"
];

passthru = {
updateScript = nix-update-script { };
tests = {
Expand Down