talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cowsql: 1.15.8 -> 1.15.9 (#424434)

Browse Source
This commit is contained in:
Adam C. Stephens 2025-07-15 17:13:49 -04:00 committed by GitHub
commit c523da2ac5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pkgs/by-name/co/cowsql/37.patch
View File

@ -1,57 +0,0 @@
From c0d7c99632ea2ee01066988708cbb41f335cbdc3 Mon Sep 17 00:00:00 2001
From: Brahmajit Das <listout@listout.xyz>
Date: Sat, 14 Jun 2025 00:18:38 +0530
Subject: [PATCH] src/lib/serialize.h: don't define double as float_t
libuv with commit 85b526f makes uv.h include math.h for the definitions
of NAN/INFINITY. That header also defines the ISO C standard float_t
type. Now that that definition is in scope, the cowsql definition in
src/lib/serialize.h conflicts with it.
Fixes: 451cff63b29366237a9502823299b05bbff8662b
Closes: https://github.com/cowsql/cowsql/issues/35
Signed-off-by: Brahmajit Das <listout@listout.xyz>
---
src/lib/serialize.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/serialize.h b/src/lib/serialize.h
index 9fbd49c..a7f9147 100644
--- a/src/lib/serialize.h
+++ b/src/lib/serialize.h
@@ -37,7 +37,7 @@ static_assert(sizeof(double) == sizeof(uint64_t),
* Basic type aliases to used by macro-based processing.
*/
typedef const char *text_t;
-typedef double float_t;
+typedef double cowsql_float;
typedef uv_buf_t blob_t;
/**
@@ -143,7 +143,7 @@ COWSQL_INLINE size_t int64__sizeof(const int64_t *value)
return sizeof(int64_t);
}
-COWSQL_INLINE size_t float__sizeof(const float_t *value)
+COWSQL_INLINE size_t float__sizeof(const cowsql_float *value)
{
(void)value;
return sizeof(double);
@@ -190,7 +190,7 @@ COWSQL_INLINE void int64__encode(const int64_t *value, void **cursor)
*cursor += sizeof(int64_t);
}
-COWSQL_INLINE void float__encode(const float_t *value, void **cursor)
+COWSQL_INLINE void float__encode(const cowsql_float *value, void **cursor)
{
*(uint64_t *)(*cursor) = ByteFlipLe64(*(uint64_t *)value);
*cursor += sizeof(uint64_t);
@@ -273,7 +273,7 @@ COWSQL_INLINE int int64__decode(struct cursor *cursor, int64_t *value)
return 0;
}
-COWSQL_INLINE int float__decode(struct cursor *cursor, float_t *value)
+COWSQL_INLINE int float__decode(struct cursor *cursor, cowsql_float *value)
{
size_t n = sizeof(double);
if (n > cursor->cap) {

10
pkgs/by-name/co/cowsql/package.nix
View File

@ -13,21 +13,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cowsql";
version = "1.15.8";
version = "1.15.9";
src = fetchFromGitHub {
owner = "cowsql";
repo = "cowsql";
tag = "v${finalAttrs.version}";
hash = "sha256-rwTa9owtnkyI9OpUKLk6V7WbAkqlYucpGzPnHHvKW/A=";
hash = "sha256-7djVcozWklI/0KhDC20df+H3YQbodUZaXBnQT4Ug8oI=";
};
patches = [
# fix libuv changes. review removal in > 1.15.8
# https://github.com/cowsql/cowsql/pull/37
./37.patch
];
nativeBuildInputs = [
autoreconfHook
pkg-config