From e6654828b8be4e89cd1ef01424aca412b009d87a Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 26 Sep 2021 16:45:46 -0700 Subject: [PATCH] bashdb: 4.4-1.0.0 -> 5.0-1.1.2, fix build with bash 5.1 --- .../development/tools/misc/bashdb/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index 72ec8c96be34..918dd90aa83f 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -1,14 +1,30 @@ -{ lib, stdenv, fetchurl, makeWrapper, python3Packages }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, makeWrapper +, python3Packages +}: stdenv.mkDerivation rec { pname = "bashdb"; - version = "4.4-1.0.0"; + version = "5.0-1.1.2"; src = fetchurl { url = "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2"; - sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml"; + sha256 = "sha256-MBdtKtKMWwCy4tIcXqGu+PuvQKj52fcjxnxgUx87czA="; }; + patches = [ + # Enable building with bash 5.1/5.2 + # Remove with any upstream 5.1-x.y.z release + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/569fbb806d9ee813afa8b27d2098a44f93433922/devel/bashdb/files/patch-configure"; + sha256 = "19zfzcnxavndyn6kfxp775kjcd0gigsm4y3bnh6fz5ilhnnbbbgr"; + }) + ]; + patchFlags = "-p0"; + nativeBuildInputs = [ makeWrapper ];