wiggle: cleanup (#126900)
This commit is contained in:
parent
16e9a398d9
commit
2b6b345900
@ -1,12 +1,14 @@
|
|||||||
{ lib, stdenv, fetchurl, ncurses, groff }:
|
{ lib, stdenv, fetchFromGitHub, ncurses, groff }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
|
name = "wiggle";
|
||||||
|
version = "1.3";
|
||||||
|
|
||||||
name = "wiggle-1.3";
|
src = fetchFromGitHub {
|
||||||
|
owner = "neilbrown";
|
||||||
src = fetchurl {
|
repo = "wiggle";
|
||||||
url = "https://github.com/neilbrown/wiggle/archive/v1.3.tar.gz";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-/5LPATPB9NzjNWPiY8sw59229KvfhtQnsewUkL7CWvo=";
|
sha256 = "sha256-rlHhYzP81lfblZvtZ1lhiq4iQ6WRpBYukoGqpVP+NKI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ncurses groff ];
|
buildInputs = [ ncurses groff ];
|
||||||
@ -21,24 +23,22 @@ stdenv.mkDerivation {
|
|||||||
patchShebangs .
|
patchShebangs .
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
homepage = "http://blog.neil.brown.name/category/wiggle/";
|
homepage = "https://blog.neil.brown.name/category/wiggle/";
|
||||||
description = "Tool for applying patches with conflicts";
|
description = "Tool for applying patches with conflicts";
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Wiggle applies patches to a file in a similar manner to the patch(1)
|
Wiggle applies patches to a file in a similar manner to the patch(1)
|
||||||
program. The distinctive difference is, however, that wiggle will
|
program. The distinctive difference is, however, that wiggle will
|
||||||
attempt to apply a patch even if the "before" part of the patch doesn't
|
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
|
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
|
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
|
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
|
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
|
possible. Also, wiggle will (in some cases) detect changes that have
|
||||||
already been applied, and will ignore them.
|
already been applied, and will ignore them.
|
||||||
'';
|
'';
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
license = lib.licenses.gpl2Plus;
|
platforms = platforms.all;
|
||||||
platforms = lib.platforms.all;
|
maintainers = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user