diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
commit | d4e9fd2a906b5227ae51a522a0708a0b6884ed1c (patch) | |
tree | ca6bb53bb064b71b5ad9bf94dbcc27c47c2d652c /pkgs/applications/networking/irc/weechat/default.nix | |
parent | 5c53f22492511d1d8de46ecd8f11fca20f1287fd (diff) | |
parent | 2d03fbf75202272f37bf648d06922c2c624f126a (diff) | |
download | nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.gz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.bz2 nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.lz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.xz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.zst nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.zip |
Merge recent master into staging
Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix
Diffstat (limited to 'pkgs/applications/networking/irc/weechat/default.nix')
-rw-r--r-- | pkgs/applications/networking/irc/weechat/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 954651d79e95..245619fddf07 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -3,12 +3,12 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "1.0"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/${name}.tar.gz"; - sha256 = "1sfx2j8xy6das0zis2nmzi9z41q96gzq61xaw4i0xbgag17s7ddz"; + sha256 = "1z17wyrl5fp697qp44srpmzk79w37f5hm1r0krffbmga6sbzdj3x"; }; buildInputs = @@ -17,13 +17,6 @@ stdenv.mkDerivation rec { cacert cmake ] ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; - # This patch is based on - # weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes - # freeze/crash on /exit when using nixpkgs' gnutls 3.2. The next - # weechat release (0.4.4) will include this, so it's safe to remove - # then. - patches = [ ./fix-gnutls-32.diff ]; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; postInstall = '' |