From aec3288ba14e38093e76730937a7c901b5786d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= <me@gaelreyrol.dev>
Date: Sun, 2 Jul 2023 15:04:15 +0200
Subject: [PATCH] libtree: 3.1.0 -> 3.1.1
---
.../tools/misc/libtree/default.nix | 46 +++++++++++--------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/development/tools/misc/libtree/default.nix
index 624d33561e6a..24083a60d28e 100644
--- a/pkgs/development/tools/misc/libtree/default.nix
+++ b/pkgs/development/tools/misc/libtree/default.nix
@@ -1,36 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
-, binutils
-, chrpath
-, cmake
-, cxxopts
-, elfio
-, termcolor
-, gtest
+, testers
+, libtree
+, runCommand
+, coreutils
+, dieHook
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libtree";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "haampie";
repo = "libtree";
- rev = "v${version}";
- sha256 = "sha256-C5QlQsBL9Als80Tv13ex2XS5Yj50Ht8eDfGYAtnh/HI=";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-q3JtQ9AxoP0ma9K96cC3gf6QmQ1FbS7T7I59qhkwbMk=";
};
- buildInputs = [ cxxopts elfio termcolor ];
-
makeFlags = [ "PREFIX=$(out)" ];
- # note: "make check" returns exit code 0 even when the tests fail.
- # This has been reported upstream:
- # https://github.com/haampie/libtree/issues/77
- nativeCheckInputs = [ gtest ];
- checkTarget = [ "check" ];
- doCheck = true;
+ # Fails at https://github.com/haampie/libtree/blob/v3.1.1/tests/07_origin_is_relative_to_symlink_location_not_realpath/Makefile#L28
+ doCheck = false;
+
+ passthru.tests = {
+ version = testers.testVersion {
+ package = libtree;
+ command = "libtree --version";
+ version = finalAttrs.version;
+ };
+ checkCoreUtils = runCommand "${finalAttrs.pname}-ls-test" {
+ nativeBuildInputs = [ finalAttrs.finalPackage dieHook ];
+ } ''
+ libtree ${coreutils}/bin/ls > $out || die "libtree failed to show dependencies."
+ [ -s $out ]
+ '';
+ };
meta = with lib; {
description = "Tree ldd with an option to bundle dependencies into a single folder";
@@ -39,4 +45,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ prusnak rardiol ];
};
-}
+})