From 7b4e868173c66e58f3d200e7cc5b5bcbbe35a4d0 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sun, 5 Jun 2016 16:48:15 +0200 Subject: [PATCH] govers: extracted from goPackages --- pkgs/development/tools/govers/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++--- pkgs/top-level/go-packages.nix | 9 --------- 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/tools/govers/default.nix diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix new file mode 100644 index 000000000000..b3e2b921bd2e --- /dev/null +++ b/pkgs/development/tools/govers/default.nix @@ -0,0 +1,20 @@ +# This file was generated by go2nix. +{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with goPackages; + +buildGoPackage rec { + name = "govers-${version}"; + version = "20150109-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; + + goPackagePath = "github.com/rogpeppe/govers"; + + src = fetchgit { + inherit rev; + url = "https://github.com/rogpeppe/govers"; + sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc"; + }; + + dontRenameImports = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41a2534b4e67..d37594c67c25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9603,7 +9603,6 @@ in go = go_1_4; buildGoPackage = callPackage ../development/go-modules/generic { go = go_1_4; - govers = go14Packages.govers.bin; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }; @@ -9612,7 +9611,6 @@ in go = go_1_5; buildGoPackage = callPackage ../development/go-modules/generic { go = go_1_5; - govers = go15Packages.govers.bin; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }; @@ -9621,7 +9619,6 @@ in go = go_1_6; buildGoPackage = callPackage ../development/go-modules/generic { go = go_1_6; - govers = go16Packages.govers.bin; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }; @@ -11167,6 +11164,8 @@ in goimports = callPackage ../development/tools/goimports { }; + govers = callPackage ../development/tools/govers { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 521452b55064..d38aea502b5a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1020,15 +1020,6 @@ let sha256 = "1l1w4mczqmah0c154vb1daw5l3cc7vn5gmy5s67p3ad1lnz5l79x"; }; - govers = buildFromGitHub { - rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; - version = "2015-01-09"; - owner = "rogpeppe"; - repo = "govers"; - sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc"; - dontRenameImports = true; - }; - golang-lru = buildFromGitHub { rev = "7f9ef20a0256f494e24126014135cf893ab71e9e"; owner = "hashicorp";