diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/by-name/co/cowsay/package.nix similarity index 58% rename from pkgs/tools/misc/cowsay/default.nix rename to pkgs/by-name/co/cowsay/package.nix index 38a7c3f39867..b3a4cd87cb1c 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/by-name/co/cowsay/package.nix @@ -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: { pname = "cowsay"; - version = "3.7.0"; + version = "3.8.1"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "cowsay-org"; repo = "cowsay"; 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 ]; + buildInputs = [ perl ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; + postInstall = '' wrapProgram $out/bin/cowsay \ --suffix COWPATH : $out/share/cowsay/cows ''; - makeFlags = [ - "prefix=${placeholder "out"}" - ]; - passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { @@ -48,7 +49,10 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ rob anthonyroussel ]; + maintainers = with maintainers; [ + rob + anthonyroussel + ]; mainProgram = "cowsay"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8a1a873dfdf..70542056c7d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4549,8 +4549,6 @@ with pkgs; corosync = callPackage ../servers/corosync { }; - cowsay = callPackage ../tools/misc/cowsay { }; - fw-ectool = callPackage ../os-specific/linux/fw-ectool { }; chayang = callPackage ../tools/wayland/chayang { };