ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

nix: refactor flake to avoid building jj for the dev shell

Browse source 
We don't actually need `jj` itself in the development shell. But having it in
the overlay significantly increases the time it takes to build the shell.
This commit is contained in:
Michael Forster 2023-01-26 18:06:51 +01:00 committed by Mike Forster
parent 388fb0ffc1
commit 3c0eb21ed1
1 changed files with 36 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
flake.nix
View file

@ -21,64 +21,7 @@
in
{
overlays.default = (final: prev: {
jujutsu = final.callPackage
(
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
, dbus
, sqlite
, file
, gzip
, makeWrapper
, Security
, SystemConfiguration
, libiconv
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "jujutsu";
version = "unstable-${self.shortRev or "dirty"}";
buildNoDefaultFeatures = true;
buildFeatures = [ "jujutsu-lib/legacy-thrift" ];
src = self;
cargoLock = {
lockFile = "${self}/Cargo.lock";
};
nativeBuildInputs = [
gzip
installShellFiles
makeWrapper
pkg-config
];
buildInputs = [ openssl dbus sqlite ]
++ lib.optionals stdenv.isDarwin [
Security
SystemConfiguration
libiconv
];
postInstall = ''
$out/bin/jj debug mangen > ./jj.1
installManPage ./jj.1
$out/bin/jj debug completion --bash > ./completions.bash
installShellCompletion --bash --name ${pname}.bash ./completions.bash
$out/bin/jj debug completion --fish > ./completions.fish
installShellCompletion --fish --name ${pname}.fish ./completions.fish
$out/bin/jj debug completion --zsh > ./completions.zsh
installShellCompletion --zsh --name _${pname} ./completions.zsh
'';
}
)
{
inherit (final.darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
jujutsu = self.packages.${final.system}.jujutsu;
});
} //
(foreachSystem (system:
@ -86,21 +29,52 @@
pkgs = import nixpkgs {
inherit system;
overlays = [
self.overlays.default
rust-overlay.overlays.default
];
};
in
{
packages.${system} = {
jujutsu = pkgs.jujutsu;
jujutsu = pkgs.rustPlatform.buildRustPackage rec {
pname = "jujutsu";
version = "unstable-${self.shortRev or "dirty"}";
buildNoDefaultFeatures = true;
buildFeatures = [ "jujutsu-lib/legacy-thrift" ];
src = ./.;
cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = with pkgs; [
gzip
installShellFiles
makeWrapper
pkg-config
];
buildInputs = with pkgs; [ openssl dbus sqlite ]
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
libiconv
];
postInstall = ''
$out/bin/jj debug mangen > ./jj.1
installManPage ./jj.1
$out/bin/jj debug completion --bash > ./completions.bash
installShellCompletion --bash --name ${pname}.bash ./completions.bash
$out/bin/jj debug completion --fish > ./completions.fish
installShellCompletion --fish --name ${pname}.fish ./completions.fish
$out/bin/jj debug completion --zsh > ./completions.zsh
installShellCompletion --zsh --name _${pname} ./completions.zsh
'';
};
default = self.packages.${system}.jujutsu;
};
apps.${system}.default = {
type = "app";
program = "${pkgs.jujutsu}/bin/jj";
program = "${self.packages.${system}.jujutsu}/bin/jj";
};
checks.${system}.jujutsu = pkgs.jujutsu.overrideAttrs ({ ... }: {
checks.${system}.jujutsu = self.packages.${system}.jujutsu.overrideAttrs ({ ... }: {
cargoBuildType = "debug";
cargoCheckType = "debug";
preCheck = ''