profanity: 0.4.7 -> 0.5.1

(cherry picked from commit b8812df) (libmesode ported from master because it is now a dependency)
NixOS · Mar 1, 2017 · 5888067 · 5888067
1 parent c950c96
commit 5888067
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 8 deletions.
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat
-, ncurses, libotr, curl, libstrophe, readline, libuuid
+{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
+, ncurses, libotr, curl, readline, libuuid
 
 , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
 , notifySupport ? false,   libnotify ? null, gdk_pixbuf ? null
@@ -12,21 +12,19 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "profanity-${version}";
-  version = "0.4.7";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "http://www.profanity.im/profanity-${version}.tar.gz";
-    sha256 = "1p8ixvxacvf63r6lnf6iwlyz4pgiyp6widna1h2l2jg8kw14wb5h";
+    sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
   };
 
   buildInputs = [
-    automake autoconf pkgconfig readline libuuid
-    glib openssl expat ncurses libotr curl libstrophe
+    pkgconfig readline libuuid libmesode
+    glib openssl expat ncurses libotr curl
   ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
     ++ optionals notifySupport   [ libnotify gdk_pixbuf ];
 
-  preConfigure = "sh bootstrap.sh";
-
   meta = {
     description = "A console based XMPP client";
     longDescription = ''
@@ -37,5 +35,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.devhell ];
+    updateWalker = true;
   };
 }
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }:
+
+stdenv.mkDerivation rec {
+  name = "libmesode-${version}";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "boothj5";
+    repo = "libmesode";
+    rev = version;
+    sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh";
+  };
+
+  buildInputs = [ autoreconfHook openssl expat libtool pkgconfig check ];
+
+  dontDisableStatic = true;
+
+  doCheck = true;
+
+  meta = {
+    description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client";
+    longDescription = ''
+      Reasons for forking:
+
+      - Remove Windows support
+      - Support only one XML Parser implementation (expat)
+      - Support only one SSL implementation (OpenSSL)
+
+      This simplifies maintenance of the library when used in Profanity.
+      Whilst Profanity will run against libstrophe, libmesode provides extra
+      TLS functionality such as manual SSL certificate verification.
+    '';
+    homepage = http://github.com/boothj5/libmesode/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.devhell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -2433,6 +2433,8 @@ in
   libmbim = callPackage ../development/libraries/libmbim { };
 
   libmongo-client = callPackage ../development/libraries/libmongo-client { };
+
+  libmesode = callPackage ../development/libraries/libmesode { };
 
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };