mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-05 20:19:16 +03:00
Merge pull request #334458 from anthonyroussel/update/cowsay
cowsay: 3.7.0 -> 3.8.1
This commit is contained in:
commit
cbccff9966
@ -1,39 +1,40 @@
|
|||||||
{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers }:
|
{
|
||||||
|
lib,
|
||||||
|
fetchFromGitHub,
|
||||||
|
makeWrapper,
|
||||||
|
nix-update-script,
|
||||||
|
perl,
|
||||||
|
stdenv,
|
||||||
|
testers,
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "cowsay";
|
pname = "cowsay";
|
||||||
version = "3.7.0";
|
version = "3.8.1";
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"man"
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cowsay-org";
|
owner = "cowsay-org";
|
||||||
repo = "cowsay";
|
repo = "cowsay";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-t1grmCPQhRgwS64RjEwkK61F2qxxMBKuv0/DzBTnL3s=";
|
hash = "sha256-4y+k1CzgTFq48g9gCzPTHdQFf3zgGTBm6tZTEXb7uTU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Install cowthink as a symlink, not a copy
|
|
||||||
# See https://github.com/cowsay-org/cowsay/pull/18
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/cowsay-org/cowsay/commit/9e129fa0933cf1837672c97f5ae5ad4a1a10ec11.patch";
|
|
||||||
hash = "sha256-zAYEUAM5MkyMONAl5BXj8hBHRalQVAOdpxgiM+Ewmlw=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
buildInputs = [ perl ];
|
buildInputs = [ perl ];
|
||||||
|
|
||||||
|
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram $out/bin/cowsay \
|
wrapProgram $out/bin/cowsay \
|
||||||
--suffix COWPATH : $out/share/cowsay/cows
|
--suffix COWPATH : $out/share/cowsay/cows
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [
|
|
||||||
"prefix=${placeholder "out"}"
|
|
||||||
];
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = nix-update-script { };
|
updateScript = nix-update-script { };
|
||||||
tests.version = testers.testVersion {
|
tests.version = testers.testVersion {
|
||||||
@ -48,7 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${finalAttrs.version}";
|
changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${finalAttrs.version}";
|
||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3Only;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ rob anthonyroussel ];
|
maintainers = with maintainers; [
|
||||||
|
rob
|
||||||
|
anthonyroussel
|
||||||
|
];
|
||||||
mainProgram = "cowsay";
|
mainProgram = "cowsay";
|
||||||
};
|
};
|
||||||
})
|
})
|
@ -4549,8 +4549,6 @@ with pkgs;
|
|||||||
|
|
||||||
corosync = callPackage ../servers/corosync { };
|
corosync = callPackage ../servers/corosync { };
|
||||||
|
|
||||||
cowsay = callPackage ../tools/misc/cowsay { };
|
|
||||||
|
|
||||||
fw-ectool = callPackage ../os-specific/linux/fw-ectool { };
|
fw-ectool = callPackage ../os-specific/linux/fw-ectool { };
|
||||||
|
|
||||||
chayang = callPackage ../tools/wayland/chayang { };
|
chayang = callPackage ../tools/wayland/chayang { };
|
||||||
|
Loading…
Reference in New Issue
Block a user