diff options
author | Artturi <Artturin@artturin.com> | 2023-02-03 02:31:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-03 02:31:39 +0200 |
commit | f6fcd73afcb64174a2dd7d91629e4152aeba5227 (patch) | |
tree | 73d4d12f4f6156f2025af163015773f354908c70 | |
parent | 4554582f2e543c7373dcf3fa136d5f1769aaf244 (diff) | |
parent | 7bd0044abd5f703a015c256adb6c55925cf1c528 (diff) | |
download | nixpkgs-f6fcd73afcb64174a2dd7d91629e4152aeba5227.tar nixpkgs-f6fcd73afcb64174a2dd7d91629e4152aeba5227.tar.gz nixpkgs-f6fcd73afcb64174a2dd7d91629e4152aeba5227.tar.bz2 nixpkgs-f6fcd73afcb64174a2dd7d91629e4152aeba5227.tar.lz nixpkgs-f6fcd73afcb64174a2dd7d91629e4152aeba5227.tar.xz nixpkgs-f6fcd73afcb64174a2dd7d91629e4152aeba5227.tar.zst nixpkgs-f6fcd73afcb64174a2dd7d91629e4152aeba5227.zip |
Merge pull request #197605 from pbsds/pokesay
pokemonsay: unstable-2021-10-05 -> 1.0.0
-rw-r--r-- | pkgs/tools/misc/pokemonsay/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/tools/misc/pokemonsay/default.nix b/pkgs/tools/misc/pokemonsay/default.nix index f61b93a874f..7053e4ba807 100644 --- a/pkgs/tools/misc/pokemonsay/default.nix +++ b/pkgs/tools/misc/pokemonsay/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , cowsay , coreutils , findutils @@ -8,15 +9,23 @@ stdenvNoCC.mkDerivation rec { pname = "pokemonsay"; - version = "unstable-2021-10-05"; + version = "1.0.0"; src = fetchFromGitHub { owner = "HRKings"; repo = "pokemonsay-newgenerations"; - rev = "baccc6d2fe1897c48f60d82ff9c4d4c018f5b594"; + rev = "v${version}"; hash = "sha256-IDTAZmOzkUg0kLUM0oWuVbi8EwE4sEpLWrNAtq/he+g="; }; + patches = [ + (fetchpatch { # https://github.com/HRKings/pokemonsay-newgenerations/pull/5 + name = "word-wrap-fix.patch"; + url = "https://github.com/pbsds/pokemonsay-newgenerations/commit/7056d7ba689479a8e6c14ec000be1dfcd83afeb0.patch"; + hash = "sha256-aqUJkyJDWArLjChxLZ4BbC6XAB53LAqARzTvEAxrFCI="; + }) + ]; + postPatch = '' substituteInPlace pokemonsay.sh \ --replace \ @@ -51,8 +60,11 @@ stdenvNoCC.mkDerivation rec { cp pokemons/*.cow $out/share/pokemonsay ''; - checkPhase = '' - $out/bin/pokemonsay --list-pokemon + doInstallCheck = true; + installCheckPhase = '' + (set -x + test "$($out/bin/pokemonsay --list | wc -l)" -ge 891 + ) ''; meta = with lib; { |