summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-11-13 19:42:20 +0300
committerMichael Raskin <7c6f434c@mail.ru>2014-11-13 19:42:20 +0300
commit221a78739e3953c5eaa86b29cbe5e7e810b388e0 (patch)
tree6f18cfc57837f4655c141da50dc69591c5fff749 /pkgs
parent76ed5698756de1074a48532ebed98ccbb8d30867 (diff)
parentd925fcf3842064b22e9ba7f98934802fcf83b326 (diff)
downloadnixpkgs-221a78739e3953c5eaa86b29cbe5e7e810b388e0.tar
nixpkgs-221a78739e3953c5eaa86b29cbe5e7e810b388e0.tar.gz
nixpkgs-221a78739e3953c5eaa86b29cbe5e7e810b388e0.tar.bz2
nixpkgs-221a78739e3953c5eaa86b29cbe5e7e810b388e0.tar.lz
nixpkgs-221a78739e3953c5eaa86b29cbe5e7e810b388e0.tar.xz
nixpkgs-221a78739e3953c5eaa86b29cbe5e7e810b388e0.tar.zst
nixpkgs-221a78739e3953c5eaa86b29cbe5e7e810b388e0.zip
Merge pull request #4964 from ehmry/qtbitcointrader
QtBitcoinTrader: 1.07.98 -> 1.08.02
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/qtbitcointrader/default.nix30
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 19 insertions, 15 deletions
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 38606d79873..8f7fc3b0e26 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, qt4 }:
+{ stdenv, fetchFromGitHub, qt }:
 
 let
-  version = "1.07.98";
+  version = "1.08.02";
 in
 stdenv.mkDerivation {
   name = "qtbitcointrader-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/bitcointrader/SRC/QtBitcoinTrader-${version}.tar.gz";
-    sha256 = "1irz17q71fx64dfkmgajlyva7d1wifv4bxgb2iwz7d69rvhzaqzx";
+  src = fetchFromGitHub {
+    owner = "JulyIGHOR";
+    repo = "QtBitcoinTrader";
+    rev = "452db3ee9447b8f9e7d63253f834b31394b23d92";
+    sha256 = "1l2a021dy2j4sr4nmq7wn27r2zli9nigwbviqzain3nlyzq9fjpg";
   };
 
-  buildInputs = [ qt4 ];
+  buildInputs = [ qt ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/src";
 
@@ -23,11 +25,11 @@ stdenv.mkDerivation {
         QtBitcoinTrader_Desktop.pro
   '';
 
-  meta = {
-    description = "Secure bitcoin trading client";
-    homepage = http://qtopentrader.com;
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.emery ];
-  };
-}
\ No newline at end of file
+  meta = with stdenv.lib;
+    { description = "Secure bitcoin trading client";
+      homepage = https://centrabit.com/;
+      license = licenses.lgpl3;
+      platforms = platforms.linux;  # arbitrary choice
+      maintainers = [ maintainers.emery ];
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d50ef76608..415e7cc5891 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11239,7 +11239,9 @@ let
 
   qgis = callPackage ../applications/gis/qgis {};
 
-  qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
+  qtbitcointrader = callPackage ../applications/misc/qtbitcointrader {
+    qt = qt4;
+  };
 
   ykpers = callPackage ../applications/misc/ykpers {};