Merge pull request #33653 from flokli/electrum-ltc

electrum-ltc: 2.9.3.1 -> 3.0.5.1

4 files changed, 38 insertions, 34 deletions

diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix
index a4d900f40729..10b2aacbf8cb 100644
--- a/pkgs/applications/misc/electrum-ltc/default.nix
+++ b/pkgs/applications/misc/electrum-ltc/default.nix
@@ -1,34 +1,34 @@
 { stdenv
 , fetchurl
-, python2Packages
+, python3Packages
 }:
 
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   name = "electrum-ltc-${version}";
-  version = "2.9.3.1";
+  version = "3.0.5.1";
 
   src = fetchurl {
     url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
-    sha256 = "d931a5376b7f38fba7221b01b1010f172c4d662668adae5c38885a646d5ee530";
+    sha256 = "1acsgzmd83cz6ha5fw63mi7123fr6gbiq537p5lxxfs2i8zrl63r";
   };
 
-  propagatedBuildInputs = with python2Packages; [
-    pyqt4
+  propagatedBuildInputs = with python3Packages; [
+    pyaes
     ecdsa
     pbkdf2
     requests
     qrcode
-    ltc_scrypt
+    py_scrypt
+    pyqt5
     protobuf
     dnspython
-    jsonrpclib
-    pyaes
+    jsonrpclib-pelix
     pysocks
   ];
 
   preBuild = ''
     sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
-    pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+    pyrcc5 icons.qrc -o gui/qt/icons_rc.py
     # Recording the creation timestamps introduces indeterminism to the build
     sed -i '/Created: .*/d' gui/qt/icons_rc.py
   '';
@@ -48,7 +48,7 @@ python2Packages.buildPythonApplication rec {
     '';
     homepage = https://electrum-ltc.org/;
     license = licenses.mit;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ asymmetric ];
   };
 }
diff --git a/pkgs/development/python-modules/ltc_scrypt/default.nix b/pkgs/development/python-modules/ltc_scrypt/default.nix
deleted file mode 100644
index 273571c66e1f..000000000000
--- a/pkgs/development/python-modules/ltc_scrypt/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "ltc_scrypt";
-  version = "1.0";
-  name = "${pname}-${version}";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1h90hh3iw4i7zs7jgskdjlk8gi97b3v2zqsxdfwdvhrrnhpvv856";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Bindings for scrypt proof of work used by Litecoin";
-    homepage = https://pypi.python.org/pypi/ltc_scrypt;
-    maintainers = with maintainers; [ asymmetric ];
-    license = licenses.bsd2;
-  };
-}
diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix
new file mode 100644
index 000000000000..bf6300b84119
--- /dev/null
+++ b/pkgs/development/python-modules/py_scrypt/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, openssl
+}:
+
+buildPythonPackage rec {
+  pname = "scrypt";
+  version = "0.8.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0830r3q8f8mc4738ngcvwhv9kih5c6zf87mzkdifzf2h6kss99fl";
+  };
+
+  buildInputs = [ openssl ];
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Bindings for scrypt key derivation function library";
+    homepage = https://pypi.python.org/pypi/scrypt;
+    maintainers = with maintainers; [ asymmetric ];
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47563ac163b3..06f83371509c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9992,7 +9992,7 @@ in {
     };
   });
 
-  ltc_scrypt = callPackage ../development/python-modules/ltc_scrypt/default.nix { };
+  py_scrypt = callPackage ../development/python-modules/py_scrypt/default.nix { };
 
   python_magic = buildPythonPackage rec {
     name = "python-magic-0.4.10";