diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index b4710cc84060..903359f5c762 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,17 +2,20 @@ stdenv.mkDerivation rec { name = "universal-ctags-${version}"; - version = "2016-12-17"; + version = "2017-01-08"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "3093f73e81cddbea5d122dccd4fd9a6323ebbbd3"; - sha256 = "091359v3p865d39gchpc1x5qplf1s1y4nsph344ng5x1nkx44qsi"; + rev = "9668032d8715265ca5b4ff16eb2efa8f1c450883"; + sha256 = "0nwcf5mh3ba0g23zw7ym73pgpfdass412k2fy67ryr9vnc709jkj"; }; buildInputs = [ autoreconfHook pkgconfig ]; + # remove when https://github.com/universal-ctags/ctags/pull/1267 is merged + patches = [ ./sed-test.patch ]; + autoreconfPhase = '' ./autogen.sh --tmpdir ''; diff --git a/pkgs/development/tools/misc/universal-ctags/sed-test.patch b/pkgs/development/tools/misc/universal-ctags/sed-test.patch new file mode 100644 index 000000000000..7c44d699d79a --- /dev/null +++ b/pkgs/development/tools/misc/universal-ctags/sed-test.patch @@ -0,0 +1,12 @@ +--- a/Tmain/sorted-help-message.d/run.sh 2017-01-10 11:20:51.515093465 +0100 ++++ b/Tmain/sorted-help-message.d/run.sh 2017-01-10 11:17:56.639213720 +0100 +@@ -27,7 +27,7 @@ + extract_long_options() + { + sed -n '/Usage:/,$p' | \ +- sed -n 's/\(^ --[:alnum:][<>[:alnum:]_-]*\).*/\1/p' ++ sed -n 's/\(^ --[[:alnum:]][<>[:alnum:]_-]*\).*/\1/p' + } + + extract_debug_options() +