From bbf3381838655caaf733eaf804b14554801350bc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 19 Feb 2019 02:19:18 +0100 Subject: [PATCH] weechat: 2.3 -> 2.4 https://weechat.org/files/releasenotes/ReleaseNotes-devel.html#v2.4 Also applied a patch from the 2.5 branch in order to fix the darwin build: https://github.com/weechat/weechat/issues/1308 --- .../applications/networking/irc/weechat/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index d52d8b6b31e..6bdade7198a 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -10,6 +10,7 @@ , rubySupport ? true, ruby , tclSupport ? true, tcl , extraBuildInputs ? [] +, fetchpatch }: let @@ -27,14 +28,22 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.3"; + version = "2.4"; name = "weechat-${version}"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w"; + sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1"; }; + patches = [ + (fetchpatch { + url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch; + sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp"; + excludes = [ "ChangeLog.adoc" ]; + }) + ]; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; enableParallelBuilding = true;