From 3f8ed79a5a5e7ecba335e72e0a736a3b6390fb82 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 20:22:54 -0600
Subject: [PATCH] s6-portable-utils: 2.0.5.3 -> 2.1.0.0

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 70b36222cca..357600e8d4f 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchurl, skalibs }:
-
-let
-
-  version = "2.0.5.3";
-
-in stdenv.mkDerivation rec {
+{ stdenv, fetchFromGitHub, skalibs }:
 
+stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
+  version = "2.1.0.0";
 
-  src = fetchurl {
-    url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
-    sha256 = "029fg9c37vwh9yagd69h8r192nrx4mfva8dwgpm1gxkdssrh3gi7";
+  src = fetchFromGitHub {
+    owner = "skarnet";
+    repo = "s6-portable-utils";
+    rev = "v${version}";
+    sha256 = "0k5pcwc45jw5l8ycz03wx2w4pds0wp4ll47d3i5i1j02i9v0rhc9";
   };
 
   dontDisableStatic = true;
@@ -23,12 +21,12 @@ in stdenv.mkDerivation rec {
   ]
   ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
     description = "A set of tiny general Unix utilities optimized for simplicity and small size";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    platforms = platforms.all;
+    license = licenses.isc;
+    maintainers = with maintainers; [ pmahoney ];
   };
 
 }