NixOS · May 31, 2017 · May 31, 2017
Showing with 48 additions and 3 deletions.

+3 −3 pkgs/development/tools/quilt/default.nix

+43 −0 pkgs/development/tools/wiggle/default.nix

+2 −0 pkgs/top-level/all-packages.nix
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, pkgs}:
-
-with pkgs;
+{ stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }:
 
 stdenv.mkDerivation rec {
+
   name = "quilt-0.65";
 
   src = fetchurl {
@@ -31,4 +30,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
   };
+
 }
diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, ncurses, groff }:
+
+stdenv.mkDerivation {
+
+  name = "wiggle-1.0";
+
+  src = fetchurl {
+    url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz";
+    sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs";
+  };
+
+  buildInputs = [ ncurses groff ];
+
+  configurePhase = ''
+    makeFlagsArray=( CFLAGS="-I. -O3"
+                     INSTALL="install"
+                     BINDIR="$out/bin"
+                     MANDIR="$out/share/man"
+                   )
+    patchShebangs .
+  '';
+
+  meta = {
+    homepage = http://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.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -3800,6 +3800,8 @@ with pkgs;
 
   quilt = callPackage ../development/tools/quilt { };
 
+  wiggle = callPackage ../development/tools/wiggle { };
+
   radamsa = callPackage ../tools/security/radamsa { };
 
   radarr = callPackage ../servers/radarr { };