Merge remote-tracking branch 'upstream/master' into HEAD

7 files changed, 48 insertions, 18 deletions

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 8fb4af6d53e5..85d3c4e49f96 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,21 +1,22 @@
 { stdenv, pythonPackages, fetchFromGitHub,
 }:
 
-pythonPackages.buildPythonApplication rec {
-  version = "2.4";
+with pythonPackages; buildPythonApplication rec {
+  version = "2.5";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "0rmvlpp1pzzgn1hf87ksigj9kp60gfwkvxymb4wiz7dqa57b1q0n";
+    sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd";
   };
 
   buildInputs = [
-    pythonPackages.cryptography
-    pythonPackages.beautifulsoup4
+    cryptography
+    beautifulsoup4
   ];
+  propagatedBuildInputs = [ beautifulsoup4 ];
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 61e1f31a8c87..7b47b9fb3cb0 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.68.0";
+  version = "2.70.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0mn6wdws1xxc4yvhp5vdzb5i5c9dsmamyms1njdzs5fv754rszpm";
+    sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index e8336eac45ff..18f55698b081 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.7.8";
+  version = "2.7.9";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "0p4dx5fks68avzxkknawv094xxf7322hgm068js4v56qirvxm563";
+    sha256 = "0a3bdfcyrq5g3ihck80fqxxyzpj5k9sfax2nsmmwafmzmfqw819h";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/misc/keepassx/2.0-http.nix b/pkgs/applications/misc/keepassx/reboot.nix
index b3a84d36b1ec..f6ed251601a9 100644
--- a/pkgs/applications/misc/keepassx/2.0-http.nix
+++ b/pkgs/applications/misc/keepassx/reboot.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "keepassx2-http-unstable-${version}";
-  version = "2016-05-27";
+  name = "keepassx-reboot-${version}";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
-    owner = "droidmonkey";
-    repo = "keepassx_http";
-    rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a";
-    sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv";
+    owner = "keepassxreboot";
+    repo = "keepassx";
+    rev = "${version}-http";
+    sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv";
   };
 
   buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
-    homepage = http://www.keepassx.org/;
+    homepage = https://github.com/keepassxreboot/keepassx;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ s1lvester ];
+    maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 9fa112375c52..9da087d49692 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     harfbuzz fribidi m17n_lib openssl libssh2
   ];
 
+  patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. should be safe to remove by 3.7.3 since it's already in the trunk: https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3
+
   #bad configure.ac and Makefile.in everywhere
   preConfigure = ''
     sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
@@ -91,7 +93,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://sourceforge.net/projects/mlterm/;
+    homepage = http://mlterm.sourceforge.net/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ vrthra ramkromberg ];
     platforms = with platforms; linux;
diff --git a/pkgs/applications/misc/mlterm/x_shortcut.c.patch b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
new file mode 100644
index 000000000000..f0f929b79650
--- /dev/null
+++ b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
@@ -0,0 +1,26 @@
+--- mlterm-3.7.2/xwindow/x_shortcut.c
++++ mlterm-3.7.2/xwindow/x_shortcut.c
+@@ -292,6 +292,11 @@
+ 	/* ingoring except these masks */
+ 	state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+ 
++	if( state & button_mask)
++	{
++		state &= ~Mod2Mask ;	/* XXX NumLock */
++	}
++
+ 	if( shortcut->map[func].ksym == ksym &&
+ 	    shortcut->map[func].state ==
+ 	      ( state |
+@@ -318,6 +323,11 @@
+ 	/* ingoring except these masks */
+ 	state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+ 
++	if( state & button_mask)
++	{
++		state &= ~Mod2Mask ;	/* XXX NumLock */
++	}
++
+ 	for( count = 0 ; count < shortcut->str_map_size ; count ++)
+ 	{
+                 if( shortcut->str_map[count].ksym == ksym &&
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 738e8deb0940..d07863df0e0d 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -58,5 +58,6 @@ in stdenv.mkDerivation rec {
     '';
     maintainers = with maintainers; [ cdepillabout ];
     platforms = platforms.linux;
+    broken = true; # https://github.com/NixOS/nixpkgs/issues/19579
   };
 }