From 67f34cbd0d3c4141570eab655b845f86e2c4ec72 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 4 Feb 2015 11:41:45 +0100 Subject: [PATCH] Port gotags to buildGoPackage --- pkgs/development/tools/gotags/default.nix | 30 ++++++++++------------- pkgs/development/tools/gotags/deps.nix | 27 -------------------- 2 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/tools/gotags/deps.nix diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index 5fec8c181a8..c7d265a10dc 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,24 +1,20 @@ -{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +{ lib, goPackages, fetchFromGitHub }: -stdenv.mkDerivation rec { - name = "gotags"; +with goPackages; - src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; +buildGoPackage rec { + rev = "a60c6a1b171faedc44354bd437d965e5e3bdc220"; + name = "gotags-${lib.strings.substring 0 7 rev}"; + + goPackagePath = "github.com/jstemmer/gotags"; + + src = fetchFromGitHub { + inherit rev; + owner = "jstemmer"; + repo = "gotags"; + sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq"; }; - buildInputs = [ go ]; - - buildPhase = '' - export GOPATH=$src - go build -v -o gotags github.com/jstemmer/gotags - ''; - - installPhase = '' - mkdir -p $out/bin - mv gotags $out/bin - ''; - meta = with lib; { description = "Ctags-compatible tag generator for Go"; homepage = https://github.com/nsf/gotags; diff --git a/pkgs/development/tools/gotags/deps.nix b/pkgs/development/tools/gotags/deps.nix deleted file mode 100644 index 97e77bdd977..00000000000 --- a/pkgs/development/tools/gotags/deps.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -let - goDeps = [ - { - root = "github.com/jstemmer/gotags"; - src = fetchFromGitHub { - owner = "jstemmer"; - repo = "gotags"; - rev = "a60c6a1b171faedc44354bd437d965e5e3bdc220"; - sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq"; - }; - } - ]; - -in - -stdenv.mkDerivation rec { - name = "go-deps"; - - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); -}