Merge branch 'master' into staging-next

There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299

pkgs/applications/networking/irc/irssi/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }:
+{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
@@ -10,12 +10,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ncurses glib openssl perl libintl ];
+  buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ];
 
   configureFlags = [
     "--with-proxy"
     "--with-bot"
     "--with-perl=yes"
+    "--with-otr=yes"
     "--enable-true-color"
   ];
 

pkgs/applications/networking/irc/irssi/otr/default.nix

@@ -1,27 +0,0 @@
-{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  pname = "irssi-otr";
-  version = "1.0.2";
-
-  src = fetchFromGitHub {
-    owner = "cryptodotis";
-    repo = "irssi-otr";
-    rev = "v${version}";
-    sha256 = "0c5wb2lg9q0i1jdhpyb5vpvxaa2xx00gvp3gdk93ix9v68gq1ppp";
-  };
-
-  preConfigure = "sh ./bootstrap";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libotr automake autoconf libtool glib irssi ];
-
-  NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/";
-
-  meta = {
-    homepage = https://github.com/cryptodotis/irssi-otr;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}