From 2c4c9bee13f171e944e7f7a15f7f2e7b65063a23 Mon Sep 17 00:00:00 2001 From: somaticweb Date: Tue, 5 Jan 2016 22:15:17 -0800 Subject: git: 2.6.4 -> 2.7.0 Also corrected the license, which is GPL2-only --- pkgs/applications/version-management/git-and-tools/git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 84b033f981fc..1045724090ff 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 = [ @@ -143,7 +143,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 -- cgit 1.4.1 From 123065aa3dd9b582abf7bac6e2ea75a6e35ff1a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Jan 2016 04:46:32 +0100 Subject: git-bz: use callPackage and canonical package name Don't add a compatibility alias as this package was/is marked as being broken anyway. --- pkgs/applications/version-management/git-and-tools/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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; -- cgit 1.4.1 From 36a68c8b6bcfd4be96b044bd99f1cf43e1b22281 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Jan 2016 04:56:45 +0100 Subject: git-bz: 3.20110902 -> 3.2015-09-08 --- .../git-and-tools/git-bz/default.nix | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 + + 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 = { -- cgit 1.4.1 From d1440745c6e6f6ee611679dc30b40cb963724427 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Jan 2016 05:21:26 +0100 Subject: git-bz: meta: un-break; fix licence; maintain CC @nbp (I assume it was abandoned years ago, apologies otherwise). --- .../version-management/git-and-tools/git-bz/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 1ae5579dd8cf..4a059367678b 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 @@ -31,11 +31,9 @@ stdenv.mkDerivation { --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 @@ -49,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; + mantainers = with maintainers; [ nckx ]; + platforms = platforms.linux; }; } -- cgit 1.4.1 From c169718a6b9bddb6ef91234411c055c9431df208 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 15 Jan 2016 10:23:45 +0100 Subject: git-bz: fix meta typo Thanks to @heydojo. --- pkgs/applications/version-management/git-and-tools/git-bz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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 4a059367678b..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 @@ -50,7 +50,7 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; homepage = http://git.fishsoup.net/cgit/git-bz/; - mantainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } -- cgit 1.4.1