nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

flatcc: 0.6.1 -> 0.6.3

Browse Source 
Diff: https://github.com/dvidelabs/flatcc/compare/v0.6.1...v0.6.3

Changelog: https://github.com/dvidelabs/flatcc/blob/v0.6.3/CHANGELOG.md
(cherry picked from commit ff60334bb9)
This commit is contained in:
Gaetan Lepage
2026-07-29 11:50:43 +00:00
committed by github-actions[bot]
parent 31d7c6a54b
commit 89b68553e7
1 changed files with 3 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
pkgs/by-name/fl/flatcc/package.nix
View File

@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
versionCheckHook,
nix-update-script,
@@ -10,69 +9,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flatcc";
version = "0.6.1";
version = "0.6.3";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "dvidelabs";
repo = "flatcc";
tag = "v${finalAttrs.version}";
hash = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ=";
hash = "sha256-kDZ05r/k15peBLGG2jzyeKwrdTn3+1PWrrDUmC3SV50=";
};
patches = [
# Fix builds on clang15. Remove post-0.6.1.
(fetchpatch {
name = "clang15fixes.patch";
url = "https://github.com/dvidelabs/flatcc/commit/5885e50f88248bc7ed398880c887ab23db89f05a.patch";
hash = "sha256-z2HSxNXerDFKtMGu6/vnzGRlqfz476bFMjg4DVfbObQ";
})
# Bump cmake to 2.8.12, required fox 3.16 patch
(fetchpatch {
name = "bump-cmake-version.patch";
url = "https://github.com/dvidelabs/flatcc/commit/5f07eda43caabd81a2bfa2857af0e3f26dc6d4ee.patch?full_index=1";
hash = "sha256-eRlkQw+YGRgCUjrlYB3I8w+/cPuJhgEfNUW/+TZhHlI=";
})
# Bump min. CMake to 3.16 and fix custom build rules
(fetchpatch {
name = "fix-cmake-version.patch";
url = "https://github.com/dvidelabs/flatcc/commit/385c27b23236dff7ad4fa35c59fd4f9143dcaae6.patch?full_index=1";
hash = "sha256-ORDby2LRRQdFrNc1owHKxo0TfMIxISj5SuD5oqvDFFo=";
excludes = [
"README.md"
"CHANGELOG.md"
"test/doublevec_test/CMakeLists.txt"
"test/monster_test_cpp/CMakeLists.txt"
];
})
]
++ lib.optionals stdenv.cc.isClang [
# Fix clang compilation
# https://github.com/dvidelabs/flatcc/pull/273
(fetchpatch {
name = "fix-c23-fallthrough.patch";
url = "https://github.com/dvidelabs/flatcc/commit/7c199e3b191a6f714694035f1eba40112e71675c.patch";
hash = "sha256-kGupiMVa2r+hsQnknatRK+EfscNjJD0T75NY1ELkJ5U=";
})
# Fix implicit int conversion on negation for int8/int16
# https://github.com/dvidelabs/flatcc/commit/5df663837c93eb7516890c27574dcc4b042890cb
(fetchpatch {
name = "fix-pprintint-implicit-int-conversion.patch";
url = "https://github.com/dvidelabs/flatcc/commit/5df663837c93eb7516890c27574dcc4b042890cb.patch";
hash = "sha256-pntpatUDkZbj5pEViA8jDvXP+9KNdfhUDQCUd598Lxg=";
excludes = [ "CHANGELOG.md" ];
})
];
postPatch = ''
substituteInPlace include/flatcc/portable/grisu3_print.h \
--replace-fail \
'static char hexdigits[16] = "0123456789ABCDEF";' \
"static char hexdigits[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};"
'';
nativeBuildInputs = [ cmake ];
cmakeFlags = [