diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-15 13:43:57 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-15 13:43:57 +0100 |
commit | 2d0893088fff99e1c0c438ba7b4c42ac6769af75 (patch) | |
tree | 771ce9e6e1020b623ea4c65b84bf05bd7ee24821 /pkgs/applications/version-management/git-and-tools | |
parent | 4e9575c314baab5e45a95785918c721f7fed45e3 (diff) | |
parent | c29df5f8a7122fbc9411765156ab42c12baadbbb (diff) | |
download | nixlib-2d0893088fff99e1c0c438ba7b4c42ac6769af75.tar nixlib-2d0893088fff99e1c0c438ba7b4c42ac6769af75.tar.gz nixlib-2d0893088fff99e1c0c438ba7b4c42ac6769af75.tar.bz2 nixlib-2d0893088fff99e1c0c438ba7b4c42ac6769af75.tar.lz nixlib-2d0893088fff99e1c0c438ba7b4c42ac6769af75.tar.xz nixlib-2d0893088fff99e1c0c438ba7b4c42ac6769af75.tar.zst nixlib-2d0893088fff99e1c0c438ba7b4c42ac6769af75.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
3 files changed, 30 insertions, 32 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 4d3c31b4f914..1bf58195f5eb 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -26,11 +26,7 @@ in rec { # support for bugzilla - gitBz = import ./git-bz { - inherit fetchgit stdenv makeWrapper python asciidoc xmlto # docbook2x docbook_xsl docbook_xml_dtd_45 libxslt - ; - inherit (pythonPackages) pysqlite; - }; + git-bz = callPackage ./git-bz { }; git = appendToName "minimal" gitBase; 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..d43a49ac7514 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,38 +1,39 @@ -{ 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 + + nativeBuildInputs = [ + asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto ]; + buildInputs = [] + ++ (with pythonPackages; [ python pysqlite ]); + + postPatch = '' + patchShebangs configure - buildPhase = '' - true - # make git-bz.1 + # 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 = { - homepage = "http://git.fishsoup.net/cgit/git-bz/"; - description = "integration of git with Bugzilla"; - license = stdenv.lib.licenses.gpl2; - + meta = with stdenv.lib; { + inherit version; + description = "Bugzilla integration for git"; longDescription = '' git-bz is a tool for integrating the Git command line with the Bugzilla bug-tracking system. Operations such as attaching patches to @@ -46,9 +47,10 @@ stdenv.mkDerivation { currently is able to do this for Firefox, Epiphany, Galeon and Chromium on Linux. ''; + license = licenses.gpl2Plus; + homepage = http://git.fishsoup.net/cgit/git-bz/; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.pierron ]; - broken = true; + maintainers = with maintainers; [ nckx ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 089b605563f4..49ecce0456b2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.6.4"; + version = "2.7.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0rnlbp7l4ggq3lk96v24rzw7qqawp6477i3b4m0b5q3346ap008w"; + sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs"; }; patches = [ @@ -144,7 +144,7 @@ stdenv.mkDerivation { meta = { homepage = http://git-scm.com/; description = "Distributed version control system"; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl2; longDescription = '' Git, a popular distributed version control system designed to |