Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
90 changes: 0 additions & 90 deletions pkgs/applications/version-management/jujutsu/default.nix

This file was deleted.

124 changes: 124 additions & 0 deletions pkgs/by-name/ju/jujutsu/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
installShellFiles,
pkg-config,
zstd,
libgit2,
libssh2,
openssl,
darwin,
libiconv,
git,
gnupg,
openssh,
buildPackages,
nix-update-script,
testers,
jujutsu,
}:

let
version = "0.21.0";
in

rustPlatform.buildRustPackage {
pname = "jujutsu";
inherit version;

src = fetchFromGitHub {
owner = "martinvonz";
repo = "jj";
rev = "v${version}";
hash = "sha256-uZsfHhcYpobatWaDQczuc9Z3BWHN5VO0qr/8mu5kEio=";
};

cargoHash = "sha256-BOO1jP1Y5CNbE97zj+tpariiBdcuxKb1wyvI7i/VpYI=";

nativeBuildInputs = [
installShellFiles
pkg-config
];

buildInputs =
[
zstd
libgit2
libssh2
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
libiconv
];

nativeCheckInputs = [
git
gnupg
openssh
];

cargoBuildFlags = [
# Don’t install the `gen-protos` build tool.
"--bin"
"jj"
];

useNextest = true;

cargoTestFlags = [
# Don’t build the `gen-protos` build tool when running tests.
"-p"
"jj-lib"
"-p"
"jj-cli"
];

env = {
# Disable vendored libraries.
ZSTD_SYS_USE_PKG_CONFIG = "1";
LIBGIT2_NO_VENDOR = "1";
LIBSSH2_SYS_USE_PKG_CONFIG = "1";
};

postInstall =
let
jj = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/jj";
in
lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''
${jj} util mangen > ./jj.1
installManPage ./jj.1

installShellCompletion --cmd jj \
--bash <(${jj} util completion bash) \
--fish <(${jj} util completion fish) \
--zsh <(${jj} util completion zsh)
'';

passthru = {
updateScript = nix-update-script { };
tests = {
version = testers.testVersion {
package = jujutsu;
command = "jj --version";
};
};
};

meta = {
description = "Git-compatible DVCS that is both simple and powerful";
homepage = "https://github.com/martinvonz/jj";
changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
_0x4A6F
thoughtpolice
emily
bbigras
];
mainProgram = "jj";
};
}
4 changes: 0 additions & 4 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31876,10 +31876,6 @@ with pkgs;

clerk = callPackage ../applications/audio/clerk { };

jujutsu = callPackage ../applications/version-management/jujutsu {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};

nbstripout = callPackage ../applications/version-management/nbstripout { };

ncmpc = callPackage ../applications/audio/ncmpc { };
Expand Down