nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

jujutsu: 0.14.0 -> 0.15.1

Browse Source 
Diff: https://github.com/martinvonz/jj/compare/v0.14.0...v0.15.1

Changelog: https://github.com/martinvonz/jj/blob/v0.15.1/CHANGELOG.md
This commit is contained in:
Adam Stephens 2024-03-09 18:53:43 -05:00 committed by Austin Seipp
parent 3fe65f3928
commit 672879b3c0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/version-management/jujutsu/default.nix
View File

@ -11,7 +11,6 @@
, libssh2 , libssh2
, libgit2 , libgit2
, zstd , zstd
, fetchpatch
, installShellFiles , installShellFiles
, nix-update-script , nix-update-script
, testers , testers
@ -20,19 +19,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "jujutsu"; pname = "jujutsu";
version = "0.14.0"; version = "0.15.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "martinvonz"; owner = "martinvonz";
repo = "jj"; repo = "jj";
rev = "v${version}"; 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 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 ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib
LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2 LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2
@ -63,6 +62,11 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/jj util completion zsh) --zsh <($out/bin/jj util completion zsh)
''; '';
checkFlags = [
# signing tests spin up an ssh-agent and do git checkouts
"--skip=test_ssh_signing"
];
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
tests = { tests = {