6 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
index 9a1269815afb..cee4ec925c01 100644
--- a/pkgs/tools/misc/asciinema/default.nix
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "asciinema-${version}";
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index d1fd3ac0afce..f9cf313b7748 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, ncurses, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, ncurses, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "fzf-${version}";
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 552d01041310..618d6c752e6e 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -1,8 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit }:
+{ stdenv, lib, buildGoPackage, fetchgit }:
 
 with builtins;
-with goPackages;
 
 buildGoPackage rec {
   name = "gawp-${version}";
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index c0333a14ed47..1cda3149bb42 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "i3cat-${version}";
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index 74240a859c89..723410183f1b 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 let
   tools = [
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index fef1707d5052..d02e2865c8f5 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
 #