From ab1436b13e0b5a186b83672f87b3ef4a6a8f0247 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 9 Jun 2019 04:20:00 -0500
Subject: [PATCH] websocketd: 0.3.0 -> 0.3.1

---
 .../networking/websocketd/default.nix         | 24 +++++++++----------
 .../networking/websocketd/deps.nix            | 12 ----------
 2 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/applications/networking/websocketd/deps.nix

diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix
index 050358e4dcaa..4160e70b9c44 100644
--- a/pkgs/applications/networking/websocketd/default.nix
+++ b/pkgs/applications/networking/websocketd/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
-  name = "websocketd-${version}";
-  version = "0.3.0";
-  rev = "729c67f052f8f16a0a0aa032816a57649c0ebed3";
+buildGoModule rec {
+  pname = "websocketd";
+  version = "0.3.1";
 
-  goPackagePath = "github.com/joewalnes/websocketd";
-
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/joewalnes/websocketd";
-    sha256 = "1n4fag75lpfxg1pm1pr5v0p44dijrxj59s6dn4aqxirhxkq91lzb";
+  src = fetchFromGitHub {
+    owner = "joewalnes";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q";
   };
 
-  goDeps = ./deps.nix;
+  modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
     homepage = "http://websocketd.com/";
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/networking/websocketd/deps.nix b/pkgs/applications/networking/websocketd/deps.nix
deleted file mode 100644
index 1e610691f52a..000000000000
--- a/pkgs/applications/networking/websocketd/deps.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    goPackagePath = "github.com/gorilla/websocket";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/websocket";
-      rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
-      sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
-    };
-  }
-]