From f26b6bb75bfb0c489af43da7217defb762c2ef1b Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Wed, 17 Feb 2021 12:12:47 -0800 Subject: [PATCH] universal-ctags: bump to p5.9.20210124.0 from git tags (#111216) --- .../tools/misc/universal-ctags/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index bd362e8d1a4..eea1e78d403 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "unstable-2019-07-30"; + version = "5.9.20201206.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "920e7910146915e5cae367bc9f135ffd8b042042"; - sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn"; + rev = "p${version}"; + sha256 = "0w10zjyz46sjm6ypxmq550dkr84hvc4phm4vm9j53jp5s19x5q19"; }; - nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; + nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ]; buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv; # to generate makefile.in @@ -25,6 +25,9 @@ stdenv.mkDerivation { # Remove source of non-determinism substituteInPlace main/options.c \ --replace "printf (\" Compiled: %s, %s\n\", __DATE__, __TIME__);" "" + + substituteInPlace Tmain/utils.sh \ + --replace /bin/echo ${coreutils}/bin/echo ''; postConfigure = ''