Loading pkgs/by-name/gi/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patchdeleted 100644 → 0 +0 −25 Original line number Diff line number Diff line From 687b5424128fd637555be4a0d18c72c4e870bd6f Mon Sep 17 00:00:00 2001 From: Alfie <30699769+AHSauge@users.noreply.github.com> Date: Sat, 11 May 2024 13:11:08 +0200 Subject: [PATCH] Fix incorrect order of argument to calloc (#345) --- src/zip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zip.c b/src/zip.c index b14f9e3..a7e5ef8 100644 --- a/test/dep/zip/src/zip.c +++ b/test/dep/zip/src/zip.c @@ -1874,7 +1874,7 @@ ssize_t zip_stream_copy(struct zip_t *zip, void **buf, size_t *bufsize) { *bufsize = n; } - *buf = calloc(sizeof(unsigned char), n); + *buf = calloc(n, sizeof(unsigned char)); memcpy(*buf, zip->archive.m_pState->m_pMem, n); return (ssize_t)n; -- 2.47.0 pkgs/by-name/gi/gittyup/package.nix +6 −12 Original line number Diff line number Diff line Loading @@ -11,27 +11,21 @@ ninja, openssl, pkg-config, libsForQt5, qt6, }: stdenv.mkDerivation (finalAttrs: { pname = "gittyup"; version = "1.4.0"; version = "2.0.0"; src = fetchFromGitHub { owner = "Murmele"; repo = "Gittyup"; rev = "gittyup_v${finalAttrs.version}"; hash = "sha256-anyjHSF0ZCBJTuqNdH49iwngt3zeJZat5XGDsKbiwPE="; hash = "sha256-A4+t0glZC8vi+E3+WcTMZ0cdUhHaZZrcP2MGPk45X0g="; fetchSubmodules = true; }; patches = [ # Fix GCC 14 build error (remove for next update) # https://github.com/Murmele/Gittyup/pull/759 ./0001-Fix-incorrect-order-of-argument-to-calloc-345.patch ]; cmakeFlags = let inherit (lib) cmakeBool; Loading @@ -54,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { cmark ninja pkg-config libsForQt5.wrapQtAppsHook qt6.wrapQtAppsHook ]; buildInputs = [ Loading @@ -64,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: { libssh2 lua5_4 openssl libsForQt5.qtbase libsForQt5.qttools qt6.qtbase qt6.qttools ]; postInstall = '' Loading Loading
pkgs/by-name/gi/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patchdeleted 100644 → 0 +0 −25 Original line number Diff line number Diff line From 687b5424128fd637555be4a0d18c72c4e870bd6f Mon Sep 17 00:00:00 2001 From: Alfie <30699769+AHSauge@users.noreply.github.com> Date: Sat, 11 May 2024 13:11:08 +0200 Subject: [PATCH] Fix incorrect order of argument to calloc (#345) --- src/zip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zip.c b/src/zip.c index b14f9e3..a7e5ef8 100644 --- a/test/dep/zip/src/zip.c +++ b/test/dep/zip/src/zip.c @@ -1874,7 +1874,7 @@ ssize_t zip_stream_copy(struct zip_t *zip, void **buf, size_t *bufsize) { *bufsize = n; } - *buf = calloc(sizeof(unsigned char), n); + *buf = calloc(n, sizeof(unsigned char)); memcpy(*buf, zip->archive.m_pState->m_pMem, n); return (ssize_t)n; -- 2.47.0
pkgs/by-name/gi/gittyup/package.nix +6 −12 Original line number Diff line number Diff line Loading @@ -11,27 +11,21 @@ ninja, openssl, pkg-config, libsForQt5, qt6, }: stdenv.mkDerivation (finalAttrs: { pname = "gittyup"; version = "1.4.0"; version = "2.0.0"; src = fetchFromGitHub { owner = "Murmele"; repo = "Gittyup"; rev = "gittyup_v${finalAttrs.version}"; hash = "sha256-anyjHSF0ZCBJTuqNdH49iwngt3zeJZat5XGDsKbiwPE="; hash = "sha256-A4+t0glZC8vi+E3+WcTMZ0cdUhHaZZrcP2MGPk45X0g="; fetchSubmodules = true; }; patches = [ # Fix GCC 14 build error (remove for next update) # https://github.com/Murmele/Gittyup/pull/759 ./0001-Fix-incorrect-order-of-argument-to-calloc-345.patch ]; cmakeFlags = let inherit (lib) cmakeBool; Loading @@ -54,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { cmark ninja pkg-config libsForQt5.wrapQtAppsHook qt6.wrapQtAppsHook ]; buildInputs = [ Loading @@ -64,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: { libssh2 lua5_4 openssl libsForQt5.qtbase libsForQt5.qttools qt6.qtbase qt6.qttools ]; postInstall = '' Loading