From 15a2343eb3f5e11fc8d7e2ac0b462390649b3a18 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 19 May 2019 10:17:43 -0500
Subject: minify: 2.0.0 -> 2.5.0, module

https://github.com/tdewolff/minify/releases/tag/v2.5.0
---
 pkgs/development/web/minify/default.nix | 24 +++++++----
 pkgs/development/web/minify/deps.nix    | 74 ---------------------------------
 2 files changed, 15 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/development/web/minify/deps.nix

(limited to 'pkgs/development/web')

diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index e63f609fc2b6c..76434809cb520 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -1,18 +1,24 @@
-{ buildGoPackage, fetchFromGitHub }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
-buildGoPackage rec {
-  name = "minify-${version}";
-  version = "v2.0.0";
-  rev = "41f3effd65817bac8acea89d49b3982211803a4d";
+buildGoModule rec {
+  pname = "minify";
+  version = "2.5.0";
 
   goPackagePath = "github.com/tdewolff/minify";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "tdewolff";
-    repo = "minify";
-    sha256 = "15d9ivg1a9v9c2n0a9pfw74952xhd4vqgx8d60dhvif9lx1d8wlq";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1ja26fs7klzggmfqvz5nzj9icaa8r8h4a91qg8rj4gx5cnvwx38d";
   };
 
-  goDeps = ./deps.nix;
+  modSha256 = "0kff2nj66bifbfi8srcvcsipbddw43mvjdwlq0lz04qak524pbvr";
+
+  meta = with lib; {
+    description = "Minifiers for web formats";
+    license = licenses.mit;
+    homepage = https://go.tacodewolff.nl/minify;
+    platforms = platforms.all;
+  };
 }
diff --git a/pkgs/development/web/minify/deps.nix b/pkgs/development/web/minify/deps.nix
deleted file mode 100644
index 4efaec46d571e..0000000000000
--- a/pkgs/development/web/minify/deps.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "d9157a9621b69ad1d8d77a1933590c416593f24f";
-      sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931";
-    };
-  }
-  {
-    goPackagePath = "github.com/dustin/go-humanize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dustin/go-humanize";
-      rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0";
-      sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0";
-    };
-  }
-  {
-    goPackagePath = "github.com/tdewolff/buffer";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tdewolff/buffer";
-      rev = "0edfcb7b750146ff879e95831de2ef53605a5cb5";
-      sha256 = "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl";
-    };
-  }
-  {
-    goPackagePath = "github.com/tdewolff/parse";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tdewolff/parse";
-      rev = "34d5c1160d4503da4b456e5094609f2331d6dde3";
-      sha256 = "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v";
-    };
-  }
-  {
-    goPackagePath = "github.com/tdewolff/strconv";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tdewolff/strconv";
-      rev = "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3";
-      sha256 = "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp";
-    };
-  }
-  {
-    goPackagePath = "github.com/matryer/try";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matryer/try";
-      rev = "93d30e50512f879b73829eb79867df38084bcd31";
-      sha256 = "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f";
-    };
-  }
-  {
-    goPackagePath = "github.com/fsnotify/fsnotify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8";
-      sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm";
-    };
-  }
-  {
-    goPackagePath = "github.com/ogier/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ogier/pflag";
-      rev = "45c278ab3607870051a2ea9040bb85fcb8557481";
-      sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l";
-    };
-  }
-]
-- 
cgit 1.4.1