From e445fc2017c929b7bf5ace6b1175656476246b22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 15:33:27 +0000 Subject: [PATCH 1/2] libconfuse: 3.2.2 -> 3.3 --- pkgs/development/libraries/libconfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index cfef09c480a..ccadc0f3f5a 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "libconfuse"; - version = "3.2.2"; + version = "3.3"; src = fetchFromGitHub { - sha256 = "0djjq7j9iiyqxqqrlzm476xkibjasqvgzjwkalgj1l3f2smi53aw"; + sha256 = "1npfk5jv59kk4n8pkyx89fn9s6p8x3gbffs42jaw24frgxfgp8ca"; rev = "v${version}"; repo = "libconfuse"; owner = "martinh"; From dc041e12f32a1a9da61d372f5215eaacb980e7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Nov 2020 09:05:42 +0100 Subject: [PATCH 2/2] libconfuse: Disable failing tests on darwin --- pkgs/development/libraries/libconfuse/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index ccadc0f3f5a..b7afe5ed03a 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { owner = "martinh"; }; + postPatch = '' + substituteInPlace tests/Makefile.am \ + --replace 'TESTS += empty_string' "" \ + --replace 'TESTS += print_filter' "" + ''; + nativeBuildInputs = [ autoreconfHook flex ]; enableParallelBuilding = true;