Commit 672879b3 authored by Adam Stephens's avatar Adam Stephens Committed by Austin Seipp
Browse files

jujutsu: 0.14.0 -> 0.15.1 

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
parent 3fe65f39

pkgs/applications/version-management/jujutsu/default.nix

+9 −5
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
, libssh2

, libgit2

, zstd

, fetchpatch

, installShellFiles

, nix-update-script

, testers
@@ -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
@@ -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 = {