diff --git a/pkgs/development/tools/godep/default.nix b/pkgs/development/tools/godep/default.nix index 2dd4ce351222..3503a6c2c625 100644 --- a/pkgs/development/tools/godep/default.nix +++ b/pkgs/development/tools/godep/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "ddd7fbf"; + version = "73"; name = "godep-${version}"; src = import ./deps.nix { - inherit stdenv lib fetchgit fetchFromGitHub; + inherit stdenv lib fetchgit; }; buildInputs = [ go ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Ddependency tool for go"; + description = "Dependency tool for go"; homepage = https://github.com/tools/godep; license = licenses.bsd3; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/godep/deps.nix b/pkgs/development/tools/godep/deps.nix index e0369c9476d4..10071fa51955 100644 --- a/pkgs/development/tools/godep/deps.nix +++ b/pkgs/development/tools/godep/deps.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, lib, fetchFromGitHub, fetchgit }: +{ stdenv, lib, fetchgit }: let goDeps = [ @@ -15,32 +15,40 @@ let root = "github.com/tools/godep"; src = fetchgit { url = "https://github.com/tools/godep.git"; - rev = "0baa7ea464025b2cb8e84b13c5ac4da99237a1bf"; - sha256 = "10hr10fj6ymmfzwjg5drf7j0f4mrpb4p97a01rqp7xvfv5j0zisj"; + rev = "f4edf338389e6e2bde0e8307886718133dc0613e"; + sha256 = "1jdza8kwnzdsh3layqjzy9dnr92xdg3kfhnzvqkq3p50vsdims9w"; }; } { - root = "golang.org/x/net"; + root = "github.com/kr/pretty"; src = fetchgit { - url = "https://go.googlesource.com/net"; - rev = "8b2d0ae1f4c3b83c10ff17e89a89ff04cc0903c3"; - sha256 = "0nxawxhq7yysbrrd88hkqzfr5hvsqpd452yzi53cp1afzma3zjay"; + url = "https://github.com/kr/pretty"; + rev = "f31442d60e51465c69811e2107ae978868dbea5c"; + sha256 = "12nczwymikxmivb10q5ml5yxrwpz9s8p6k4vqig9g9707yhpxrkh"; }; } { - root = "golang.org/x/text"; + root = "github.com/kr/text"; src = fetchgit { - url = "https://go.googlesource.com/text"; - rev = "bfad311ce93436dc888b40d76c78f99dc3104473"; - sha256 = "1mbhp5q24drz2l2x6ib3180i42f9015ry80bn7jhr7rwizvyp6lh"; + url = "https://github.com/kr/text"; + rev = "6807e777504f54ad073ecef66747de158294b639"; + sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; + }; + } + { + root = "github.com/pmezard/go-difflib"; + src = fetchgit { + url = "https://github.com/pmezard/go-difflib"; + rev = "f78a839676152fd9f4863704f5d516195c18fc14"; + sha256 = "1bws3qyy572b62i3wkwfr1aw1g2nwcim2sy42jqsvh9pajjsf1vz"; }; } { root = "golang.org/x/tools"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "3ecc311976cc3f7c7b7a50314929bdc1b07c4c9d"; - sha256 = "0ic3lrg6ykxrlnzcway4ka280n052qysjawf4lvj8gl3r1vlmwfg"; + rev = "1f1b3322f67af76803c942fd237291538ec68262"; + sha256 = "0h2yarcvcgg1px20r8n58psra1czv0sgly5gins2q3wp25iql6gj"; }; } ];