Merge pull request #273440 from wegank/cxxtools-bump

cxxtools, tntnet: 2.2.1 -> 3.0; tntdb: 1.3 -> 1.4

pkgs/development/libraries/cxxtools/default.nix

@@ -1,22 +1,53 @@
-{ lib, stdenv, fetchurl }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, tzdata
+, autoreconfHook
+, openssl
+}:
 
 stdenv.mkDerivation rec {
-  version = "2.2.1";
   pname = "cxxtools";
+  version = "3.0";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
+    owner = "maekitalo";
-    sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc";
+    repo = "cxxtools";
+    rev = "V${version}";
+    hash = "sha256-AiMVmtvI20nyv/nuHHxGH4xFnlc9AagVkKlnRlaYCPM=";
   };
 
-  configureFlags = lib.optional stdenv.isAarch64 "--with-atomictype=pthread";
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/maekitalo/cxxtools/commit/b773c01fc13d2ae67abc0839888e383be23562fd.patch";
+      hash = "sha256-9yRkD+vMRhc4n/Xh6SKtmllBrmfDx3IBVOtHQV6s7Tw=";
+    })
+    (fetchpatch {
+      url = "https://github.com/maekitalo/cxxtools/commit/6e1439a108ce3892428e95f341f2d23ae32a590e.patch";
+      hash = "sha256-ZnlbdWBjL9lEtNLEF/ZPa0IzvJ7i4xWI4GbY8KeA6A4=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace src/tz.cpp \
+      --replace '::getenv("TZDIR")' '"${tzdata}/share/zoneinfo"'
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    openssl
+  ];
 
   enableParallelBuilding = true;
 
   meta = {
     homepage = "http://www.tntnet.org/cxxtools.html";
     description = "Comprehensive C++ class library for Unix and Linux";
-    platforms = lib.platforms.linux ;
+    platforms = lib.platforms.linux;
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.juliendehos ];
   };

pkgs/development/libraries/tntdb/default.nix

@@ -1,22 +1,45 @@
-{ lib, stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, cxxtools
+, postgresql
+, libmysqlclient
+, sqlite
+, zlib
+, openssl
+}:
 
 stdenv.mkDerivation rec {
   pname = "tntdb";
-  version = "1.3";
+  version = "1.4";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
+    owner = "maekitalo";
-    sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
+    repo = "tntdb";
+    rev = "V${version}";
+    hash = "sha256-ciqHv077sXnvCx+TJjdY1uPrlCP7/s972koXjGLgWhU=";
   };
 
-  buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    cxxtools
+    postgresql
+    libmysqlclient
+    sqlite
+    zlib
+    openssl
+  ];
 
   enableParallelBuilding = true;
 
   meta = with lib; {
     homepage = "http://www.tntnet.org/tntdb.html";
     description = "C++ library which makes accessing SQL databases easy and robust";
-    platforms = platforms.linux ;
+    platforms = platforms.linux;
     license = licenses.lgpl21;
     maintainers = [ maintainers.juliendehos ];
   };

pkgs/development/libraries/tntnet/default.nix

@@ -1,22 +1,49 @@
-{ lib, stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, cxxtools
+, zlib
+, openssl
+, zip
+}:
 
 stdenv.mkDerivation rec {
   pname = "tntnet";
-  version = "2.2.1";
+  version = "3.0";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
+    owner = "maekitalo";
-    sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8";
+    repo = "tntnet";
+    rev = "V${version}";
+    hash = "sha256-ujVPOreCGCFlYHa19yCIiZ0ed+p0jnS14DHDwKYvtc0=";
   };
 
-  buildInputs = [ cxxtools zlib openssl zip ];
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/maekitalo/tntnet/commit/69adfc8ee351a0e82990c1ffa7af6dab726e1e49.patch";
+      hash = "sha256-4UdUXKQiIa9CPlGg8XmfKQ8NTWb2A3AiuPthzEthlf8=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    cxxtools
+    zlib
+    openssl
+    zip
+  ];
 
   enableParallelBuilding = true;
 
   meta = with lib; {
     homepage = "http://www.tntnet.org/tntnet.html";
     description = "Web server which allows users to develop web applications using C++";
-    platforms = platforms.linux ;
+    platforms = platforms.linux;
     license = licenses.lgpl21;
     maintainers = [ maintainers.juliendehos ];
   };

pkgs/top-level/all-packages.nix

@@ -20971,7 +20971,7 @@ with pkgs;
 
   cutee = callPackage ../development/libraries/cutee { };
 
-  cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; };
+  cxxtools = callPackage ../development/libraries/cxxtools { };
 
   cwiid = callPackage ../development/libraries/cwiid { };