Merge master into staging

6 files changed, 3 insertions, 89 deletions

diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/misc/ebook2cw/configfile.patch
deleted file mode 100644
index c7aafe5227a5..000000000000
--- a/pkgs/applications/misc/ebook2cw/configfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ebook2cw.c	2017-11-08 19:52:58.298131348 -0700
-+++ b/ebook2cw.c	2017-11-08 19:53:02.588231067 -0700
-@@ -136,7 +136,7 @@
- 	char isomap[256][4]; 		/* by these strings */
- 	char utf8map[256][8];
- 
--	char configfile[1025];
-+	char configfile[2048];
- 
- 	char id3_author[80],
- 		id3_title[80],
diff --git a/pkgs/applications/misc/ebook2cw/default.nix b/pkgs/applications/misc/ebook2cw/default.nix
deleted file mode 100644
index cce10258cf3b..000000000000
--- a/pkgs/applications/misc/ebook2cw/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchsvn, lame, libvorbis }:
-
-stdenv.mkDerivation rec {
-
-  name = "ebook2cw-${version}";
-  version = "0.8.2";
-
-  src = fetchsvn {
-    url = "svn://svn.fkurz.net/ebook2cw/tags/${name}";
-    sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw";
-  };
-
-  buildInputs = [ lame libvorbis ];
-
-  patches = [ ./configfile.patch ];
-
-  postPatch = ''
-    substituteInPlace Makefile --replace gcc cc
-  '';
-
-  makeFlags = [ "DESTDIR=$(out)" ];
-
-  meta = with stdenv.lib; {
-    description = "Convert ebooks to Morse MP3s/OGGs";
-    homepage = http://fkurz.net/ham/ebook2cw.html;
-    license = licenses.gpl2;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ earldouglas ];
-  };
-
-}
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index f088016938aa..c7fcf18e4e3d 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, makeWrapper, pkgconfig,
   gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
-  configH
+  configH ? ""
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 2ae33a1eaa51..d198c5951359 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem, perlSupport, libX11, libXt, libXft,
+{ stdenv, fetchurl, makeDesktopItem, perlSupport ? true, libX11, libXt, libXft,
   ncurses, perl, fontconfig, freetype, pkgconfig, libXrender,
-  gdkPixbufSupport, gdk_pixbuf, unicode3Support }:
+  gdkPixbufSupport ? true, gdk_pixbuf, unicode3Support ? true }:
 
 let
   pname = "rxvt-unicode";
diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/misc/tqsl/cmake_lib_path.patch
deleted file mode 100644
index 5eed93834632..000000000000
--- a/pkgs/applications/misc/tqsl/cmake_lib_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt
---- tqsl-2.3.1/src/CMakeLists.txt	2017-04-17 20:53:22.000000000 -0400
-+++ tqsl-2.3.1b/src/CMakeLists.txt	2017-10-05 21:14:39.048329343 -0400
-@@ -54,7 +54,7 @@
- if(NOT APPLE AND NOT WIN32)
- set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/")
- set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h)
--install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX))
-+install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX})
- install(FILES config.xml DESTINATION share/TrustedQSL)
- install(FILES ${HEADERS_TO_INSTALL} DESTINATION include)
- endif()
diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix
deleted file mode 100644
index f001cbcaab92..000000000000
--- a/pkgs/applications/misc/tqsl/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
-
-stdenv.mkDerivation rec {
-  name = "tqsl-${version}";
-  version = "2.3.1";
-
-  src = fetchurl {
-    url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz";
-    sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [
-    cmake
-    expat
-    openssl
-    zlib
-    db
-    curl
-    wxGTK
-  ];
-
-  patches = [ ./cmake_lib_path.patch ];
-
-  meta = with stdenv.lib; {
-    description = "Software for using the ARRL Logbook of the World";
-    homepage = https://lotw.arrl.org/;
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.dpflug ];
-  };
-}