From afd895debbd40d1d12d2d5de86cc43c1568ec1b4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 31 Jul 2020 14:07:43 +1000
Subject: [PATCH 1/2] buildGoPackage packages: editorconfig fixes

---
 pkgs/applications/blockchains/quorum.nix          | 2 +-
 pkgs/development/tools/go-repo-root/default.nix   | 2 +-
 pkgs/development/tools/golint/default.nix         | 2 +-
 pkgs/development/tools/gotags/default.nix         | 2 +-
 pkgs/development/tools/leaps/default.nix          | 3 +--
 pkgs/development/web/shopify-themekit/default.nix | 2 +-
 pkgs/servers/cayley/default.nix                   | 2 +-
 pkgs/servers/mesos-dns/default.nix                | 2 +-
 pkgs/servers/skydns/default.nix                   | 2 +-
 pkgs/servers/trickster/trickster.nix              | 2 +-
 pkgs/tools/misc/gawp/default.nix                  | 2 +-
 pkgs/tools/misc/ical2org/default.nix              | 2 +-
 pkgs/tools/misc/upower-notify/default.nix         | 2 +-
 pkgs/tools/networking/s3gof3r/default.nix         | 2 +-
 pkgs/tools/virtualization/govc/default.nix        | 2 +-
 15 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix
index f745860f661..5a525dec999 100644
--- a/pkgs/applications/blockchains/quorum.nix
+++ b/pkgs/applications/blockchains/quorum.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, buildGoPackage, git, which }:
-  
+
 buildGoPackage rec {
   pname = "quorum";
   version = "2.5.0";
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index 7fcec1937c7..3392a19b636 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
   pname = "go-repo-root";
   version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
-  
+
   goPackagePath = "github.com/cstrahan/go-repo-root";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index b0b53f7699c..da8d5fb286b 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
   pname = "lint";
   version = "20181026-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
-  
+
   goPackagePath = "golang.org/x/lint";
   excludedPackages = "testdata";
 
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index 881ae7e24d4..5499a22ec01 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
   pname = "gotags";
   version = "20150803-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "be986a34e20634775ac73e11a5b55916085c48e7";
-  
+
   goPackagePath = "github.com/jstemmer/gotags";
 
   src = fetchgit {
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index 569ad6eb3cf..bb8673d4d56 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -14,7 +14,7 @@ buildGoPackage rec {
   };
 
   goDeps = ./deps.nix;
-  
+
   meta = {
     description = "A pair programming tool and library written in Golang";
     homepage = "https://github.com/jeffail/leaps/";
@@ -23,4 +23,3 @@ buildGoPackage rec {
     platforms = stdenv.lib.platforms.unix;
   };
 }
-
diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix
index b8bc3deaca1..7f55232edb7 100644
--- a/pkgs/development/web/shopify-themekit/default.nix
+++ b/pkgs/development/web/shopify-themekit/default.nix
@@ -22,4 +22,4 @@ buildGoPackage rec {
     maintainers = with maintainers; [ maintainers."1000101" ];
     platforms = platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index c62a28e41bd..0d89d2f1165 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
     -ldflags=
       -X=main.Version=${version}
   '';
-  
+
   meta = {
     homepage = "https://cayley.io/";
     description = "A graph database inspired by Freebase and Knowledge Graph";
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index 8430f2d61e8..e26b13bb25a 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
   pname = "mesos-dns";
   version = "0.1.2";
   rev = "v${version}";
-  
+
   goPackagePath = "github.com/mesosphere/mesos-dns";
 
   # Avoid including the benchmarking test helper in the output:
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index 2fc67008b89..176b41a1fe2 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
   pname = "skydns";
   version = "2.5.3a";
   rev = version;
-  
+
   goPackagePath = "github.com/skynetservices/skydns";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix
index 3c03193e770..15c163d16f1 100644
--- a/pkgs/servers/trickster/trickster.nix
+++ b/pkgs/servers/trickster/trickster.nix
@@ -24,4 +24,4 @@ buildGoPackage rec {
     maintainers = with maintainers; [ maintainers."1000101" ];
     platforms = platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 865ce3c440d..2856dd48559 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -6,7 +6,7 @@ buildGoPackage rec {
   pname = "gawp";
   version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
-  
+
   goPackagePath = "github.com/martingallagher/gawp";
 
   src = fetchgit {
diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
index 095336b7df5..ffdb4e93f58 100644
--- a/pkgs/tools/misc/ical2org/default.nix
+++ b/pkgs/tools/misc/ical2org/default.nix
@@ -23,5 +23,5 @@ buildGoPackage rec {
     maintainers = with maintainers; [ swflint ];
     platforms = platforms.unix;
   };
-  
+
 }
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index 607cb47ed4e..2258f31fd31 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -10,7 +10,7 @@ buildGoPackage rec {
   pname = "upower-notify";
   version = "20160310-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
-  
+
   goPackagePath = "github.com/omeid/upower-notify";
 
   src = fetchgit {
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index d53d60333ba..0930be914cf 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
   pname = "s3gof3r";
   version = "20151109-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
-  
+
   goPackagePath = "github.com/rlmcpherson/s3gof3r";
 
   src = fetchgit {
diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
index 08999aca97b..30cf09d2942 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchFromGitHub, buildGoPackage }:
-  
+
 buildGoPackage rec {
   pname = "govc";
   version = "0.23.1";

From 7d58c271b8ac0070e1a783f31c01682254a4c813 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 31 Jul 2020 14:08:19 +1000
Subject: [PATCH 2/2] buildRustPackage packages: editorconfig fixes

---
 pkgs/applications/misc/rsclock/default.nix | 3 +--
 pkgs/development/tools/rq/default.nix      | 2 +-
 pkgs/servers/sozu/default.nix              | 2 +-
 pkgs/tools/misc/heatseeker/default.nix     | 2 +-
 pkgs/tools/networking/tdns-cli/default.nix | 2 +-
 pkgs/tools/nix/nixpkgs-fmt/default.nix     | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index 4f63ed057b7..b508a73de1d 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
   };
-   
+
   cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl";
 
   meta = with stdenv.lib; {
@@ -21,4 +21,3 @@ rustPlatform.buildRustPackage rec {
     platforms = platforms.all;
   };
 }
-
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index 89ba58ea5f5..edd24a8aaa2 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67";
 
-  buildInputs = [ llvmPackages.clang-unwrapped v8 ] 
+  buildInputs = [ llvmPackages.clang-unwrapped v8 ]
   ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   configurePhase = ''
diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix
index f7feda5e916..1e808358705 100644
--- a/pkgs/servers/sozu/default.nix
+++ b/pkgs/servers/sozu/default.nix
@@ -19,4 +19,4 @@ rustPlatform.buildRustPackage rec {
         license = licenses.agpl3;
         maintainers = with maintainers; [ filalex77 ];
     };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index e0b8c02a08e..207788ed61d 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple
   # as a substitution, and this works since we have the path to coreutils stty.
   patchPhase = ''
-    substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty" 
+    substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty"
   '';
 
   # some tests require a tty, this variable turns them off for Travis CI,
diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix
index 20bc456eea8..681109712ab 100644
--- a/pkgs/tools/networking/tdns-cli/default.nix
+++ b/pkgs/tools/networking/tdns-cli/default.nix
@@ -3,7 +3,7 @@
 rustPlatform.buildRustPackage rec {
   name = "tdns-cli";
   version = "0.0.5";
-  
+
   src = fetchFromGitHub {
     owner = "rotty";
     repo = name;
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index 53e70ad7bd7..432f13d86f4 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad";
   };
-  
+
   cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x";
 
   meta = with lib; {