From 665b4e7b14f2c11092ea57cf73eaf374f2bc2309 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Wed, 7 Feb 2024 17:08:42 +0800 Subject: [PATCH 1/2] gitstatus: disable checks for forked libgit2 dep The libgit2 dep for gitstatus is a heavy fork, for which the original checkPhase does not work. This commit ensures that it is disabled as before. --- .../version-management/gitstatus/romkatv_libgit2.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix index 1caea82b048f..9881bd480406 100644 --- a/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix @@ -21,5 +21,9 @@ libgit2.overrideAttrs (oldAttrs: { hash = "sha256-Bm3Gj9+AhNQMvkIqdrTkK5D9vrZ1qq6CS8Wrn9kfKiw="; }; + # this is a heavy fork of the original libgit2 + # the original checkPhase does not work for this fork + doCheck = false; + patches = [ ]; }) From a292ac8cd25d2a3e7125a4efea750f82f03a4f48 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Wed, 7 Feb 2024 20:42:48 +0800 Subject: [PATCH 2/2] libgit2: add gitstatus to passthru.tests gitstatus crucially depends on an overridden version of libgit2, thus we add it to libgit2.passthru.tests to prevent future breakage. --- pkgs/development/libraries/libgit2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index d21dbcb7ac0a..1012092c71df 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -15,6 +15,7 @@ # for passthru.tests , libgit2-glib , python3Packages +, gitstatus }: stdenv.mkDerivation rec { @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit libgit2-glib; inherit (python3Packages) pygit2; + inherit gitstatus; }; meta = with lib; {