From 6c9f81f034c330ce89b69eee69bf22fedb5339af Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 8 Sep 2025 23:46:26 +0200 Subject: [PATCH] firebird_3: 3.0.12 -> 3.0.13 --- pkgs/servers/firebird/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index c0a9e67a4ee8..629afc08b89e 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -2,8 +2,9 @@ lib, stdenv, fetchFromGitHub, + fetchDebianPatch, libedit, - autoreconfHook271, + autoreconfHook, zlib, unzip, libtommath, @@ -32,7 +33,7 @@ let ]; }; - nativeBuildInputs = [ autoreconfHook271 ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libedit @@ -52,7 +53,7 @@ let runHook preInstall mkdir -p $out cp -r gen/Release/firebird/* $out - rm $out/lib/*.a # they were just symlinks to /build/source/... + rm -f $out/lib/*.a # they were just symlinks to /build/source/... runHook postInstall ''; @@ -62,15 +63,25 @@ rec { firebird_3 = stdenv.mkDerivation ( base // rec { - version = "3.0.12"; + version = "3.0.13"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "v${version}"; - hash = "sha256-po8tMrOahfwayVXa7Eadr9+ZEmZizHlCmxi094cOJSY="; + hash = "sha256-ti3cFfByM2wxOLkAebwtFe25B5W7jOwi3f7MPYo/yUA="; }; + patches = [ + (fetchDebianPatch { + pname = "firebird3.0"; + version = "3.0.13.ds7"; + debianRevision = "2"; + patch = "no-binary-gbaks.patch"; + hash = "sha256-LXUMM38PBYeLPdgaxLPau4HWB4ItJBBnx7oGwalL6Pg="; + }) + ]; + buildInputs = base.buildInputs ++ [ zlib libtommath