diff options
| -rw-r--r-- | ops/nixos.nix | 2 | ||||
| -rw-r--r-- | third_party/cgit/Makefile | 2 | ||||
| -rw-r--r-- | third_party/cgit/default.nix | 1 | ||||
| -rw-r--r-- | third_party/cgit/ui-log.c | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/ops/nixos.nix b/ops/nixos.nix index 9b4133d6d0..291413c5b5 100644 --- a/ops/nixos.nix +++ b/ops/nixos.nix @@ -51,5 +51,5 @@ in rec { # Systems that should be built in CI whitbySystem = (nixosFor depot.ops.machines.whitby).system; sandunySystem = (nixosFor depot.ops.machines.sanduny).system; - meta.ci.targets = [ "sandunySystem" /* "whitbySystem" */ ]; + meta.ci.targets = [ "sandunySystem" "whitbySystem" ]; } diff --git a/third_party/cgit/Makefile b/third_party/cgit/Makefile index 9153a393f7..2509d21775 100644 --- a/third_party/cgit/Makefile +++ b/third_party/cgit/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.34.0 +GIT_VER = 2.36.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/third_party/cgit/default.nix b/third_party/cgit/default.nix index e07bebee86..55aaa02f32 100644 --- a/third_party/cgit/default.nix +++ b/third_party/cgit/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ bjornfor ]; - ci.skip = true; # needs subtree update to work with git 2.36 }; } diff --git a/third_party/cgit/ui-log.c b/third_party/cgit/ui-log.c index 20774bf82f..565929f3f0 100644 --- a/third_party/cgit/ui-log.c +++ b/third_party/cgit/ui-log.c @@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs) "", &revs->diffopt); diffcore_std(&revs->diffopt); - found = !diff_queue_is_empty(); + found = !diff_queue_is_empty(&revs->diffopt); saved_fmt = revs->diffopt.output_format; revs->diffopt.output_format = DIFF_FORMAT_CALLBACK; revs->diffopt.format_callback = cgit_diff_tree_cb; |