89d9ce39b4
It's been a long time since we updated josh, almost 400 commits in between. I read through the entire changelog, and here are relevant josh commits from in between that might be interesting to us: 38eecee Fix optimisation bug for compose filter (#1159) e1d10b6 Add :rev(...) filter 0f1a07b Initial implementation of refs locking (#929) 88cea2a Initial work on meta repo support 030ad93 Change magic refs to include "for" 28b1d75 Add split changes feature (#904) 1f908d7 Discover filters only on HEAD (#774) a368d8f Make --require-auth only apply to push 8d80230 Add :linear filter (#741) 3460ec2 Implement redundant refs filtering (#700) 55b4e50 Implement stacked changes support (#699) ea1f814 Handle @sha urls by creating magic ref (#690) 883a381 Run filter discovery only on changed refs (#685) 4bb004f Prepend refs/heads to base parameter as default (#664) Of particular interest is a368d8f, which allows us to drop our authentication patch and use the standard --require-auth flag again. The default behaviour of dropping signatures on commits (which are invalid after filtering) has also been changed in josh, now only occuring when the `:unsign` filter is present. Since this breaks commit hashes with our existing exported histories, we are opting to set a `:unsign` filter prefix on all proxy requests to ensure that the hashes stay consistent. During this update we found a bug (josh#1155) which was fixed in the commit that this CL moves josh to. Change-Id: I3afac1619f3aa90313a0441da91f0e4a96fe0a3b Reviewed-on: https://cl.tvl.fyi/c/depot/+/8186 Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
36 lines
778 B
Nix
36 lines
778 B
Nix
# https://github.com/josh-project/josh
|
|
{ depot, pkgs, ... }:
|
|
|
|
let
|
|
rev = "fc857afda2c1536234e3bb1983c518a1abf63d25";
|
|
src = pkgs.fetchFromGitHub {
|
|
owner = "josh-project";
|
|
repo = "josh";
|
|
inherit rev;
|
|
hash = "sha256:16ch7al7xfyjipgqh2n7grj985fv713mhi8y5bixb736vsad9q3w";
|
|
};
|
|
in
|
|
depot.third_party.naersk.buildPackage {
|
|
inherit src;
|
|
JOSH_VERSION = "git-${builtins.substring 0 8 rev}";
|
|
|
|
buildInputs = with pkgs; [
|
|
libgit2
|
|
openssl
|
|
pkg-config
|
|
];
|
|
|
|
cargoBuildOptions = x: x ++ [
|
|
"-p"
|
|
"josh-filter"
|
|
"-p"
|
|
"josh-proxy"
|
|
];
|
|
|
|
overrideMain = x: {
|
|
nativeBuildInputs = (x.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
|
|
postInstall = ''
|
|
wrapProgram $out/bin/josh-proxy --prefix PATH : "${pkgs.git}/bin"
|
|
'';
|
|
};
|
|
}
|