diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-15 21:55:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-15 21:55:54 +0200 |
commit | 2b6b345900f470dde8bdbeea24fddf9ff37749ed (patch) | |
tree | eaeb2fcdf6b898c6578f78ea866105266b3b5114 | |
parent | 16e9a398d9da9c73770ed2ee70dd286d946a830a (diff) | |
download | nixpkgs-2b6b345900f470dde8bdbeea24fddf9ff37749ed.tar nixpkgs-2b6b345900f470dde8bdbeea24fddf9ff37749ed.tar.gz nixpkgs-2b6b345900f470dde8bdbeea24fddf9ff37749ed.tar.bz2 nixpkgs-2b6b345900f470dde8bdbeea24fddf9ff37749ed.tar.lz nixpkgs-2b6b345900f470dde8bdbeea24fddf9ff37749ed.tar.xz nixpkgs-2b6b345900f470dde8bdbeea24fddf9ff37749ed.tar.zst nixpkgs-2b6b345900f470dde8bdbeea24fddf9ff37749ed.zip |
wiggle: cleanup (#126900)
-rw-r--r-- | pkgs/development/tools/wiggle/default.nix | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index d360500e1fb..6d1622c5b86 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -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 = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.3.tar.gz"; - sha256 = "sha256-/5LPATPB9NzjNWPiY8sw59229KvfhtQnsewUkL7CWvo="; + src = fetchFromGitHub { + owner = "neilbrown"; + repo = "wiggle"; + rev = "v${version}"; + sha256 = "sha256-rlHhYzP81lfblZvtZ1lhiq4iQ6WRpBYukoGqpVP+NKI="; }; 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 = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ ]; }; - } |