From 960ba4dcf90966c628aeb769da301110cd3830f8 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 13 Aug 2024 21:25:37 +0200
Subject: [PATCH 1/3] cowsay: 3.7.0 -> 3.8.1

https://github.com/cowsay-org/cowsay/releases/tag/v3.8.1
https://github.com/cowsay-org/cowsay/compare/v3.7.0...v3.8.1
---
 pkgs/tools/misc/cowsay/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix
index 38a7c3f39867..5888e439a589 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/pkgs/tools/misc/cowsay/default.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers }:
+{ lib, stdenv, perl, fetchFromGitHub, makeWrapper, nix-update-script, testers }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cowsay";
-  version = "3.7.0";
+  version = "3.8.1";
 
   outputs = [ "out" "man" ];
 
@@ -10,18 +10,9 @@ stdenv.mkDerivation (finalAttrs: {
     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 ];
 

From 0cb6287b21eb0e3de118e6528a66f0df91ea289c Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 13 Aug 2024 21:26:26 +0200
Subject: [PATCH 2/3] cowsay: format with nixfmt-rfc-style

---
 pkgs/tools/misc/cowsay/default.nix | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix
index 5888e439a589..b3a4cd87cb1c 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/pkgs/tools/misc/cowsay/default.nix
@@ -1,10 +1,21 @@
-{ lib, stdenv, perl, fetchFromGitHub, makeWrapper, nix-update-script, testers }:
+{
+  lib,
+  fetchFromGitHub,
+  makeWrapper,
+  nix-update-script,
+  perl,
+  stdenv,
+  testers,
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cowsay";
   version = "3.8.1";
 
-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "man"
+  ];
 
   src = fetchFromGitHub {
     owner = "cowsay-org";
@@ -14,17 +25,16 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   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 {
@@ -39,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";
   };
 })

From 187272024e93b7da3898aaa1d0a7606162ec99f4 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 13 Aug 2024 21:27:24 +0200
Subject: [PATCH 3/3] cowsay: move to pkgs/by-name

---
 .../misc/cowsay/default.nix => by-name/co/cowsay/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/cowsay/default.nix => by-name/co/cowsay/package.nix} (100%)

diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/by-name/co/cowsay/package.nix
similarity index 100%
rename from pkgs/tools/misc/cowsay/default.nix
rename to pkgs/by-name/co/cowsay/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af96e0487b56..fc458e647a88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4551,8 +4551,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 { };