diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-18 00:02:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-18 00:02:27 +0000 |
commit | 92cdfb811993ecdf2c4b21738c2906119cf68b29 (patch) | |
tree | 4a90a7f30ac79b181560182e512e794dfe4f64ab /pkgs/development/libraries | |
parent | 6396e5680929ec6b9e88d6f1b308af5b83995183 (diff) | |
parent | 3a16c6447466f4034c2d75fe7014477142c9513e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/cxxtools/default.nix | 45 | ||||
-rw-r--r-- | pkgs/development/libraries/libspectre/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch | 42 | ||||
-rw-r--r-- | pkgs/development/libraries/tntdb/default.nix | 37 | ||||
-rw-r--r-- | pkgs/development/libraries/tntnet/default.nix | 41 |
5 files changed, 109 insertions, 68 deletions
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 50417dab1feb..8682c8ba8196 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/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 { - url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; - sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; + src = fetchFromGitHub { + owner = "maekitalo"; + 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 ]; }; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 2d916fa9a939..9299e4dbfb13 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { pname = "libspectre"; - version = "0.2.7"; + version = "0.2.12"; src = fetchurl { url = "https://libspectre.freedesktop.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; + hash = "sha256-VadRfNNXK9JWXfDPRQlEoE1Sc7J567NpqJU5GVfw+WA="; }; - patches = [ ./libspectre-0.2.7-gs918.patch ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ # Need `libgs.so'. - ghostscript cairo /*for tests*/ + ghostscript ]; doCheck = true; + checkInputs = [ + cairo + ]; + meta = { homepage = "http://libspectre.freedesktop.org/"; description = "PostScript rendering library"; diff --git a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch b/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch deleted file mode 100644 index e9a4eda192ba..000000000000 --- a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch +++ /dev/null @@ -1,42 +0,0 @@ -Fixed error namespace for >=ghostscript-gpl-9.18 - -https://bugs.gentoo.org/563540 - ---- libspectre-0.2.7/libspectre/spectre-gs.c -+++ libspectre-0.2.7/libspectre/spectre-gs.c -@@ -43,12 +43,12 @@ - - if (code <= -100) { - switch (code) { -- case e_Fatal: -+ case gs_error_Fatal: - fprintf (stderr, "fatal internal error %d", code); - return TRUE; - break; - -- case e_ExecStackUnderflow: -+ case gs_error_ExecStackUnderflow: - fprintf (stderr, "stack overflow %d", code); - return TRUE; - break; -@@ -109,9 +109,9 @@ - set = _spectre_strdup_printf ("%d %d translate\n", -x, -y); - error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set), - 0, &exit_code); -- error = error == e_NeedInput ? 0 : error; -+ error = error == gs_error_NeedInput ? 0 : error; - free (set); -- if (error != e_NeedInput && critic_error_code (error)) { -+ if (error != gs_error_NeedInput && critic_error_code (error)) { - fclose (fd); - return FALSE; - } -@@ -126,7 +126,7 @@ - read = fread (buf, sizeof (char), to_read, fd); - error = gsapi_run_string_continue (ghostscript_instance, - buf, read, 0, &exit_code); -- error = error == e_NeedInput ? 0 : error; -+ error = error == gs_error_NeedInput ? 0 : error; - left -= read; - } - diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index a21a71b89bfd..9080893d5e44 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/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 { - url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; - sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; + src = fetchFromGitHub { + owner = "maekitalo"; + 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 ]; }; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index a80b923e2358..03e8558a0c1e 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/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 { - url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; - sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8"; + src = fetchFromGitHub { + owner = "maekitalo"; + 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 ]; }; |