summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2017-09-23 12:04:06 +0000
committerGitHub <noreply@github.com>2017-09-23 12:04:06 +0000
commitdbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9 (patch)
tree4a5392eab9d3896ee556fbf633f9acab6c0cf3e0 /pkgs/development/tools
parent6cd2ebc1d1411b74ab3afe7ecb34b70c22404f00 (diff)
parent5c4ddc30d3fc196188b953f43e117e86b79d6637 (diff)
downloadnixlib-dbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9.tar
nixlib-dbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9.tar.gz
nixlib-dbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9.tar.bz2
nixlib-dbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9.tar.lz
nixlib-dbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9.tar.xz
nixlib-dbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9.tar.zst
nixlib-dbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9.zip
Merge pull request #29658 from teto/ctags
universal-ctags: generate manpage
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/misc/universal-ctags/default.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index b0d5bcd28f79..ceff549f3736 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages }:
 
 stdenv.mkDerivation rec {
   name = "universal-ctags-${version}";
-  version = "2017-01-08";
+  version = "2017-09-22";
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = "ctags";
-    rev = "9668032d8715265ca5b4ff16eb2efa8f1c450883";
-    sha256 = "0nwcf5mh3ba0g23zw7ym73pgpfdass412k2fy67ryr9vnc709jkj";
+    rev = "b9537289952cc7b26526aaff3094599d714d1729";
+    sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g";
   };
 
+  nativeBuildInputs = [ pythonPackages.docutils ];
   buildInputs = [ autoreconfHook pkgconfig ];
 
-  # remove when https://github.com/universal-ctags/ctags/pull/1267 is merged
-  patches = [ ./sed-test.patch ];
-
   autoreconfPhase = ''
     ./autogen.sh --tmpdir
   '';