From 85888a1298b3560579a3f5e98995c7e66e210fc9 Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Mon, 24 Apr 2023 23:39:59 -0400
Subject: tclap: add 1.4 variant

---
 pkgs/development/libraries/tclap/1.2.nix     | 18 +++++++++++
 pkgs/development/libraries/tclap/1.4.nix     | 48 ++++++++++++++++++++++++++++
 pkgs/development/libraries/tclap/default.nix | 18 -----------
 pkgs/top-level/all-packages.nix              |  6 +++-
 4 files changed, 71 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/libraries/tclap/1.2.nix
 create mode 100644 pkgs/development/libraries/tclap/1.4.nix
 delete mode 100644 pkgs/development/libraries/tclap/default.nix

diff --git a/pkgs/development/libraries/tclap/1.2.nix b/pkgs/development/libraries/tclap/1.2.nix
new file mode 100644
index 00000000000..cdb2b519329
--- /dev/null
+++ b/pkgs/development/libraries/tclap/1.2.nix
@@ -0,0 +1,18 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "tclap";
+  version = "1.2.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tclap/${pname}-${version}.tar.gz";
+    sha256 = "sha256-u2SfdtrjXo0Ny6S1Ks/U4GLXh+aoG0P3pLASdRUxZaY=";
+  };
+
+  meta = with lib; {
+    homepage = "https://tclap.sourceforge.net/";
+    description = "Templatized C++ Command Line Parser Library";
+    platforms = platforms.all;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/libraries/tclap/1.4.nix b/pkgs/development/libraries/tclap/1.4.nix
new file mode 100644
index 00000000000..7a0b5765963
--- /dev/null
+++ b/pkgs/development/libraries/tclap/1.4.nix
@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchgit
+, cmake
+, doxygen
+, python3
+}:
+stdenv.mkDerivation {
+  pname = "tclap";
+
+  # This version is slightly newer than 1.4.0-rc1:
+  # See https://github.com/mirror/tclap/compare/1.4.0-rc1..3feeb7b2499b37d9cb80890cadaf7c905a9a50c6
+  version = "1.4-3feeb7b";
+
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/tclap/code";
+    rev = "3feeb7b2499b37d9cb80890cadaf7c905a9a50c6"; # 1.4 branch
+    hash = "sha256-byLianB6Vf+I9ABMmsmuoGU2o5RO9c5sMckWW0F+GDM=";
+  };
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR}
+    substituteInPlace packaging/pkgconfig.pc.in \
+      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    python3
+  ];
+
+  # Installing docs is broken in this package+version so we stub out some files
+  preInstall = ''
+    touch docs/manual.html
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Templatized C++ Command Line Parser Library (v1.4)";
+    homepage = "https://tclap.sourceforge.net/";
+    license = licenses.mit;
+    maintainers = teams.deshaw.members;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix
deleted file mode 100644
index cdb2b519329..00000000000
--- a/pkgs/development/libraries/tclap/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "tclap";
-  version = "1.2.5";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/tclap/${pname}-${version}.tar.gz";
-    sha256 = "sha256-u2SfdtrjXo0Ny6S1Ks/U4GLXh+aoG0P3pLASdRUxZaY=";
-  };
-
-  meta = with lib; {
-    homepage = "https://tclap.sourceforge.net/";
-    description = "Templatized C++ Command Line Parser Library";
-    platforms = platforms.all;
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 523be31c5a0..38c00cfc82b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24858,7 +24858,11 @@ with pkgs;
 
   taskflow = callPackage ../development/libraries/taskflow { };
 
-  tclap = callPackage ../development/libraries/tclap { };
+  tclap = tclap_1_2;
+
+  tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { };
+
+  tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };
 
   tcllib = callPackage ../development/libraries/tcllib { };
 
-- 
cgit 1.4.1