From 36a68c8b6bcfd4be96b044bd99f1cf43e1b22281 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Jan 2016 04:56:45 +0100 Subject: [PATCH] git-bz: 3.20110902 -> 3.2015-09-08 --- .../git-and-tools/git-bz/default.nix | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 4015867b0eb5..1ae5579dd8cf 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchgit, python, asciidoc, xmlto, pysqlite, makeWrapper }: +{ stdenv, fetchgit +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto +, pythonPackages }: -let - version = "3.20110902"; -in +let version = "3.2015-09-08"; in stdenv.mkDerivation { - name = "git-bz"; + name = "git-bz-${version}"; src = fetchgit { + sha256 = "19d9c81d4eeabe87079d8f60e4cfa7303f776f5a7c9874642cf2bd188851d029"; + rev = "e17bbae7a2ce454d9f69c32fc40066995d44913d"; url = "git://git.fishsoup.net/git-bz"; - rev = "refs/heads/master"; }; - buildInputs = [ - makeWrapper python pysqlite # asciidoc xmlto - ]; - buildPhase = '' - true - # make git-bz.1 + nativeBuildInputs = [ + asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto + ]; + buildInputs = [] + ++ (with pythonPackages; [ python pysqlite ]); + + postPatch = '' + patchShebangs configure + + # Don't create a .html copy of the man page that isn't installed anyway: + substituteInPlace Makefile --replace "git-bz.html" "" ''; - installPhase = '' - mkdir -p $out - mkdir -p $out/bin - cp git-bz $out/bin + postInstall = '' wrapProgram $out/bin/git-bz \ - --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $pysqlite)" + --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")" ''; meta = {