diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-07 00:02:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 00:02:15 +0000 |
| commit | 4ace29447c3c16fd661acaa2f0a1841b839e7baf (patch) | |
| tree | 8a2c944dc6c7b7d5ab243c607ed5b82fb0d553b3 /pkgs/tools/text | |
| parent | 9f1130c9a6a782e5ceff5d8555a074eac3ae88bc (diff) | |
| parent | dd443d2d10ff7f7f7451f5bd04268f21daceb74d (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/ascii/default.nix | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index ad9884faa17d6..6a280bc516f96 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitLab, gitUpdater, asciidoctor }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ascii"; - version = "3.20"; + version = "3.30"; - src = fetchurl { - url = "http://www.catb.org/~esr/ascii/${pname}-${version}.tar.gz"; - sha256 = "sha256-nm5X6mDUGagDoCTOY2YlTvtxYma4Tu3VjNmA2rzBFnQ="; + src = fetchFromGitLab { + owner = "esr"; + repo = "ascii"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-TE9YR5Va9tXaf2ZyNxz7d8lZRTgnD4Lz7FyqRDl1HNY="; }; + nativeBuildInputs = [ + asciidoctor + ]; + prePatch = '' sed -i -e "s|^PREFIX = .*|PREFIX = $out|" Makefile ''; @@ -17,12 +23,15 @@ stdenv.mkDerivation rec { mkdir -vp "$out/bin" "$out/share/man/man1" ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Interactive ASCII name and synonym chart"; mainProgram = "ascii"; homepage = "http://www.catb.org/~esr/ascii/"; - license = licenses.bsd3; + changelog = "https://gitlab.com/esr/ascii/-/blob/${finalAttrs.version}/NEWS.adoc"; + license = licenses.bsd2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; -} +}) |