diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
| commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
| tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/development/tools/gotools | |
| parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
| parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) | |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/development/tools/gotools')
| -rw-r--r-- | pkgs/development/tools/gotools/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/gotools/deps.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 4bbb6b0bd4ff3..05e87d0846066 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,9 +1,9 @@ { stdenv, go, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gotools-${version}"; - version = "20170807-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "5d2fd3ccab986d52112bf301d47a819783339d0e"; + name = "gotools-unstable-${version}"; + version = "2018-07-20"; + rev = "be728107ea8275e6f58ba07e246b94181acaab24"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn"; + sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix index d4be771e8d6b9..e85fb1201012c 100644 --- a/pkgs/development/tools/gotools/deps.nix +++ b/pkgs/development/tools/gotools/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + rev = "0ed95abb35c445290478a5348a7b38bb154135fd"; + sha256 = "1v7yhcgqj0fy7rsliijw2iwmvyd85hqshrhh2n083x62kw9n9nsl"; }; } ] |