push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
--- a/lib/Recognizer.cxx 2005-11-05 04:05:20.000000000 -0500
+++ b/lib/Recognizer.cxx 2023-06-03 11:45:04.497116217 -0400
@@ -39,7 +39,7 @@
}
else
in->startTokenNoMulticode();
- register const Trie *pos = trie_.pointer();
+ const Trie *pos = trie_.pointer();
do {
pos = pos->next(map_[in->tokenChar(mgr)]);
} while (pos->hasNext());

View File

@@ -0,0 +1,79 @@
{
lib,
stdenv,
fetchurl,
fetchpatch,
xmlto,
docbook_xml_dtd_412,
docbook_xsl,
autoconf,
automake,
libtool,
autoreconfHook,
}:
stdenv.mkDerivation rec {
pname = "opensp";
version = "1.5.2";
src = fetchurl {
url = "mirror://sourceforge/openjade/OpenSP-${version}.tar.gz";
sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p";
};
postPatch = ''
sed -i s,/usr/share/sgml/docbook/xml-dtd-4.1.2/,${docbook_xml_dtd_412}/xml/dtd/docbook/, \
docsrc/*.xml
'';
patches = [
(fetchpatch {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/opensp/files/opensp-1.5.2-c11-using.patch?id=688d9675782dfc162d4e6cff04c668f7516118d0";
sha256 = "04q14s8qsad0bkjmj067dn831i0r6v7742rafdlnbfm5y249m2q6";
})
# Clang 16 defaults to C++17, which does not allow `register` as a storage class specifier.
./fix-register-storage-class.patch
];
setupHook = ./setup-hook.sh;
postFixup = ''
# Remove random ids in the release notes
sed -i -e 's/href="#idm.*"//g' $out/share/doc/OpenSP/releasenotes.html
sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html
'';
preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin ''
autoreconf -fi
'';
strictDeps = true;
nativeBuildInputs = [
xmlto
docbook_xml_dtd_412
docbook_xsl
]
# Clang 16 fails to build due to inappropriate definitions in the `config.h` generated by the
# existing configure scripts. Regenerate them to make sure they detect its features correctly.
++ lib.optional stdenv.cc.isClang autoreconfHook
++ lib.optionals stdenv.hostPlatform.isCygwin [
autoconf
automake
libtool
];
env = lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = "-fpermissive";
};
doCheck = false; # fails
meta = with lib; {
description = "Suite of SGML/XML processing tools";
license = licenses.mit;
homepage = "https://openjade.sourceforge.net/";
platforms = platforms.unix;
maintainers = [ ];
};
}

View File

@@ -0,0 +1,22 @@
addSGMLCatalogs () {
if test -d $1/sgml/dtd; then
for i in $(find $1/sgml/dtd -name docbook.cat); do
export SGML_CATALOG_FILES="${SGML_CATALOG_FILES:+:}$i"
done
fi
}
if test -z "${sgmlHookDone-}"; then
sgmlHookDone=1
# Set http_proxy and ftp_proxy to a invalid host to prevent
# xmllint and xsltproc from trying to download DTDs from the
# network even when --nonet is not given. That would be impure.
# (Note that .invalid is a reserved domain guaranteed not to
# work.)
export http_proxy=http://nodtd.invalid/
export ftp_proxy=http://nodtd.invalid/
export SGML_CATALOG_FILES
addEnvHooks "$targetOffset" addSGMLCatalogs
fi