Merge branch 'nixpkgs-update' into master

1 files changed, 23 insertions, 23 deletions

diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
index b89d36273f8..2da789fdc60 100644
--- a/pkgs/development/tools/wiggle/default.nix
+++ b/pkgs/development/tools/wiggle/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, ncurses, groff }:
+{ lib, stdenv, fetchFromGitHub, ncurses, groff }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  pname = "wiggle";
+  version = "1.3";
 
-  name = "wiggle-1.2";
-
-  src = fetchurl {
-    url = "https://github.com/neilbrown/wiggle/archive/v1.2.tar.gz";
-    sha256 = "1gckj0zv2xznzg7i70p9dfmkhdpdg3953msi4gg5h6mpmmiiiwrw";
+  src = fetchFromGitHub {
+    owner = "neilbrown";
+    repo = "wiggle";
+    rev = "v${version}";
+    sha256 = "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf";
   };
 
   buildInputs = [ ncurses groff ];
@@ -21,24 +23,22 @@ stdenv.mkDerivation {
     patchShebangs .
   '';
 
-  meta = {
-    homepage = "http://blog.neil.brown.name/category/wiggle/";
+  meta = with lib; {
+    homepage = "https://blog.neil.brown.name/category/wiggle/";
     description = "Tool for applying patches with conflicts";
-
     longDescription = ''
-       Wiggle applies patches to a file in a similar manner to the patch(1)
-       program. The distinctive difference is, however, that wiggle will
-       attempt to apply a patch even if the "before" part of the patch doesn't
-       match the target file perfectly. This is achieved by breaking the file
-       and patch into words and finding the best alignment of words in the file
-       with words in the patch. Once this alignment has been found, any
-       differences (word-wise) in the patch are applied to the file as best as
-       possible. Also, wiggle will (in some cases) detect changes that have
-       already been applied, and will ignore them.
+      Wiggle applies patches to a file in a similar manner to the patch(1)
+      program. The distinctive difference is, however, that wiggle will
+      attempt to apply a patch even if the "before" part of the patch doesn't
+      match the target file perfectly. This is achieved by breaking the file
+      and patch into words and finding the best alignment of words in the file
+      with words in the patch. Once this alignment has been found, any
+      differences (word-wise) in the patch are applied to the file as best as
+      possible. Also, wiggle will (in some cases) detect changes that have
+      already been applied, and will ignore them.
     '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ ];
   };
-
 }