From 9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jan 2016 20:31:44 +0100 Subject: Add version attribute where maintainers |= nckx This will probably be mandatory soon, and is a step in the right direction. Removes the deprecated meta.version, and move some meta sections to the end of the file where I should have put them in the first place. --- .../version-management/git-and-tools/git-bz/default.nix | 6 ++---- .../version-management/git-and-tools/git-hub/default.nix | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/version-management') 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 d43a49ac7514..b5e1cdbcffb9 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 @@ -2,9 +2,9 @@ , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto , pythonPackages }: -let version = "3.2015-09-08"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "git-bz-${version}"; + version = "3.2015-09-08"; src = fetchgit { sha256 = "19d9c81d4eeabe87079d8f60e4cfa7303f776f5a7c9874642cf2bd188851d029"; @@ -12,7 +12,6 @@ stdenv.mkDerivation { url = "git://git.fishsoup.net/git-bz"; }; - nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto ]; @@ -32,7 +31,6 @@ stdenv.mkDerivation { ''; 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 diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 271e1244820f..b1626f687d41 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, docutils, python }: -let version = "0.9.0"; in stdenv.mkDerivation rec { name = "git-hub-${version}"; + version = "0.9.0"; src = fetchFromGitHub { sha256 = "0c4kq4a906lr8nzway7qh0560n2ydvidh9rlffh44902rd48kp0h"; @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; inherit (src.meta) homepage; description = "Git command line interface to GitHub"; longDescription = '' -- cgit 1.4.1 From 890f000146eb499a9ab292ec875f7bf0c99701af Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 26 Jan 2016 17:54:53 +0100 Subject: goPackages.git-annex-remote-b2: init at 0.2 --- pkgs/applications/version-management/git-and-tools/default.nix | 2 ++ pkgs/top-level/go-packages.nix | 8 ++++++++ 2 files changed, 10 insertions(+) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 1bf58195f5eb..0aea48cb0562 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -45,6 +45,8 @@ rec { git-annex = pkgs.haskellPackages.git-annex-with-assistant; gitAnnex = git-annex; + git-annex-remote-b2 = pkgs.goPackages.git-annex-remote-b2; + qgit = import ./qgit { inherit fetchurl stdenv; inherit (xorg) libXext libX11; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index b53f7d524039..7a80200c60d8 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -862,6 +862,14 @@ let subPackages = [ "./" ]; # don't try to build test fixtures }; + git-annex-remote-b2 = buildFromGitHub { + buildInputs = [ go go-backblaze ]; + owner = "encryptio"; + repo = "git-annex-remote-b2"; + rev = "v0.2"; + sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; + }; + git-appraise = buildFromGitHub { rev = "v0.3"; owner = "google"; -- cgit 1.4.1 From f7578a4d327560300965bd666932c11d9cdd74a8 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 27 Jan 2016 17:15:42 +0100 Subject: gitflow: 1.8.0 -> 1.9.1 --- .../version-management/git-and-tools/gitflow/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 99c1db20fb2a..3fe7dec8f3bb 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gitflow-${version}"; - version = "1.8.0"; + pname = "gitflow"; + version = "1.9.1"; + name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/petervanderdoes/gitflow/archive/${version}.tar.gz"; - sha256 = "1vxdawx4sinl19g59ifmrdalmr2dl5pkgawyj9z0s5mcildi6fc2"; + src = fetchFromGitHub { + owner = "petervanderdoes"; + repo = pname; + rev = version; + sha256 = "0ad2421r3iq4xrdy46f4rrqbm8r3xphqcsdj3gqy8fnlrmxw5dfw"; }; preBuild = '' -- cgit 1.4.1