Merge pull request #112855 from SuperSandro2000/fix-collection10

4 files changed, 30 insertions, 81 deletions

diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix
index 713e5c00587c..b8242cc3cd87 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/pkgs/development/tools/gron/default.nix
@@ -1,20 +1,25 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "gron";
   version = "0.6.1";
 
-  owner = "tomnomnom";
-  repo = "gron";
-  goPackagePath = "github.com/${owner}/${repo}";
-
   src = fetchFromGitHub {
-    inherit owner repo;
+    owner = "tomnomnom";
+    repo = "gron";
     rev = "v${version}";
     sha256 = "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m";
   };
 
-  goDeps = ./deps.nix;
+  patches = [
+    (fetchpatch {
+      name = "fix-inconsistent-vendoring.patch";
+      url = "https://github.com/tomnomnom/gron/pull/85/commits/d549a6cb68ed0e0ec7cc81d8275353acfe218725.patch";
+      sha256 = "1461v4f7w6q75l3988br0g1ynfhzsh34z38pd2w8fp57vrgkcfi5";
+    })
+  ];
+
+  vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy";
 
   meta = with lib; {
     description = "Make JSON greppable!";
@@ -26,7 +31,7 @@ buildGoPackage rec {
     '';
     homepage = "https://github.com/tomnomnom/gron";
     license = licenses.mit;
-    maintainers = [ maintainers.fgaz ];
-    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ fgaz SuperSandro2000 ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/gron/deps.nix b/pkgs/development/tools/gron/deps.nix
deleted file mode 100644
index effc255d877e..000000000000
--- a/pkgs/development/tools/gron/deps.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-  rec {
-    owner = "fatih";
-    repo = "color";
-    goPackagePath = "github.com/${owner}/${repo}";
-    fetch = {
-      type = "git";
-      url = "https://github.com/${owner}/${repo}";
-      rev = "v1.7.0";
-      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
-    };
-  }
-  rec {
-    owner = "nwidger";
-    repo = "jsoncolor";
-    goPackagePath = "github.com/${owner}/${repo}";
-    fetch = {
-      type = "git";
-      url = "https://github.com/${owner}/${repo}";
-      rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40";
-      sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki";
-    };
-  }
-  rec {
-    owner = "pkg";
-    repo = "errors";
-    goPackagePath = "github.com/${owner}/${repo}";
-    fetch = {
-      type = "git";
-      url = "https://github.com/${owner}/${repo}";
-      rev = "v0.8.0";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  rec {
-    owner = "mattn";
-    repo = "go-colorable";
-    goPackagePath = "github.com/${owner}/${repo}";
-    fetch = {
-      type = "git";
-      url = "https://github.com/${owner}/${repo}";
-      rev = "v0.0.9";
-      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
-    };
-  }
-  rec {
-    owner = "mattn";
-    repo = "go-isatty";
-    goPackagePath = "github.com/${owner}/${repo}";
-    fetch = {
-      type = "git";
-      url = "https://github.com/${owner}/${repo}";
-      rev = "v0.0.4";
-      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
-    };
-  }
-]
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 47966dcc1336..557ff4fa967c 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tokei";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
-    libiconv darwin.apple_sdk.frameworks.Security
+    libiconv Security
   ];
 
   # enable all output formats
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
index 13e8c233ec39..018232b3f40a 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/pkgs/development/tools/pup/default.nix
@@ -1,21 +1,22 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "pup";
-  version = "0.4.0";
-  rev = "v${version}";
+  version = "unstable-2019-09-19";
 
-  goPackagePath = "github.com/ericchiang/pup";
-
-  src = fetchgit {
-    inherit rev;
-    url = "https://${goPackagePath}";
-    sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz";
+  src = fetchFromGitHub {
+    owner = "ericchiang";
+    repo = "pup";
+    rev = "681d7bb639334bf485476f5872c5bdab10931f9a";
+    sha256 = "1hx1k0qlc1bq6gg5d4yprn4d7kvqzagg6mi5mvb39zdq6c4y17vr";
   };
 
+  vendorSha256 = null;
+
   meta = with lib; {
-    description = "Streaming HTML processor/selector";
+    description = "Parsing HTML at the command line";
+    homepage = "https://github.com/ericchiang/pup";
     license = licenses.mit;
-    maintainers = with maintainers; [ yegortimoshenko ];
+    maintainers = with maintainers; [ yegortimoshenko SuperSandro2000 ];
   };
 }