NixOS · Mar 12, 2019 · Mar 12, 2019 · Mar 13, 2019 · Mar 14, 2019 · Mar 14, 2019
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages, qtbase, makeWrapper, lib }:
+{ lib, fetchurl, python3Packages, qtbase, makeWrapper }:
 
 let
 
@@ -7,14 +7,14 @@ let
 in
 
 python3Packages.buildPythonApplication rec {
-  version = "3.3.2";
-  name = "electron-cash-${version}";
+  pname = "electron-cash";
+  version = "3.3.6";
 
   src = fetchurl {
-    url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz";
+    url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
     # Verified using official SHA-1 and signature from
     # https://github.com/fyookball/keys-n-hashes
-    sha256 = "4538044cfaa4f87a847635849e0733f32b183ac79abbd2797689c86dc3cb0d53";
+    sha256 = "ac435f2bf98b9b50c4bdcc9e3fb2ff19d9c66f8cce5df852f3a4727306bb0a84";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -30,6 +30,7 @@ python3Packages.buildPythonApplication rec {
     qrcode
     requests
     tlslite-ng
+    qdarkstyle
 
     # plugins
     keepkey
@@ -40,25 +41,18 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = [ makeWrapper ];
 
   postPatch = ''
-    # Remove pyqt5 check
-    sed -i '/pyqt5/d' setup.py
-  '';
+    substituteInPlace contrib/requirements/requirements.txt \
+      --replace "qdarkstyle<2.6" "qdarkstyle<3"
 
-  preBuild = ''
-    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
+    substituteInPlace setup.py \
+      --replace "(share_dir" "(\"share\""
   '';
 
   doCheck = false;
 
   postInstall = ''
-    # These files are installed under $out/homeless-shelter ...
-    mv $out/${python.sitePackages}/homeless-shelter/.local/share $out
-    rm -rf $out/${python.sitePackages}/homeless-shelter
-
     substituteInPlace $out/share/applications/electron-cash.desktop \
-      --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
+      --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"
 
     # Please remove this when #44047 is fixed
     wrapProgram $out/bin/electron-cash \
@@ -70,17 +64,17 @@ python3Packages.buildPythonApplication rec {
     $out/bin/electron-cash help >/dev/null
   '';
 
-  meta = with stdenv.lib; {
-    description = "A lightweight Bitcoin wallet";
+  meta = with lib; {
+    description = "A Bitcoin Cash SPV Wallet";
     longDescription = ''
-      An easy-to-use Bitcoin client featuring wallets generated from
+      An easy-to-use Bitcoin Cash client featuring wallets generated from
       mnemonic seeds (in addition to other, more advanced, wallet options)
       and the ability to perform transactions without downloading a copy
       of the blockchain.
     '';
     homepage = https://www.electroncash.org/;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ lassulus ];
+    maintainers = with maintainers; [ lassulus nyanloutre ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
 
 stdenv'.mkDerivation rec {
   name = "xmr-stak-${version}";
-  version = "2.8.3";
+  version = "2.10.1";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
     rev = "${version}";
-    sha256 = "1yanyaz6gh5wbccj9mfd39pyrg69gb4jn6sjvx1k63pkjrwr2ap3";
+    sha256 = "0381r4nr5cx0zv3dhsvld4ibpp5gq911815h03v92688za3swhng";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
@@ -2,7 +2,7 @@
 
 let
   stableVersion = "2.1.14";
-  previewVersion = "2.2.0a1";
+  previewVersion = "2.2.0a2";
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
         branch = if args.stable then "stable" else "preview";
@@ -18,7 +18,7 @@ in {
   };
   guiPreview = mkGui {
     stable = false;
-    sha256Hash = "16jjgfbdi7b3349wrqalf40qcaqzw3d4vdjbwcy8dbqblg48hn5w";
+    sha256Hash = "1lvdff4yfavfkjmdbhxqfxdd5nq77c2vyy2wnsdliwnmdh3fhm28";
   };
 
   serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
   };
   serverPreview = mkServer {
     stable = false;
-    sha256Hash = "0bcsjljy947grfn3y9xyi3dbzdw5wkljq1nr66cqfkidx9f4fzni";
+    sha256Hash = "033bi1bcw5ss6g380qnam1qqyi4bz1cykbb3lparb8hryikicdb9";
   };
 }
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
@@ -53,7 +53,7 @@ in python.pkgs.buildPythonPackage {
     aiohttp-cors yarl aiohttp multidict
     jinja2 psutil zipstream raven jsonschema
     (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
-  ] ++ stdenv.lib.optional (!stable) python.pkgs.distro;
+  ] ++ stdenv.lib.optional (!stable) [ distro async_generator aiofiles ];
 
   # Requires network access
   doCheck = false;

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,5 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
+    version = "1.5.17";
+    sha256Hash = "092p83s2h3rfc3vvhv1hnp08gph6y6r5b4j0vshw3z2v7lhwpzyf";
   });
 }
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchurl, perl, nettools, java, polyml, z3 }:
+{ stdenv, fetchurl, perl, nettools, java, polyml, z3, rlwrap }:
 # nettools needed for hostname
 
-let
-  dirname = "Isabelle2017";
-in
+stdenv.mkDerivation rec {
+  pname = "isabelle";
+  version = "2018";
 
-stdenv.mkDerivation {
-  name = "isabelle-2017";
-  inherit dirname;
+  dirname = "Isabelle${version}";
 
   src = if stdenv.isDarwin
     then fetchurl {
       url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg";
-      sha256 = "1awgg39i72pivwfijdwffvil3glnpimjz2x04qbl5la2j6la48nb";
+      sha256 = "0jwnvsf5whklq14ihaxs7b9nbic94mm56nvxljrdbvl6y628j9r5";
     }
     else fetchurl {
       url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
-      sha256 = "01v1zrajyfamjq5b8v18qr3ffivjckifsvvx2vs13di6wsnmm9gw";
+      sha256 = "1928lwrw1v1p9s23kix30ncpqm8djmrnjixj82f3ni2a8sc3hrsp";
     };
 
   buildInputs = [ perl polyml z3 ]
@@ -25,26 +23,33 @@ stdenv.mkDerivation {
   sourceRoot = dirname;
 
   postPatch = ''
-    ENV=$(type -p env)
-    patchShebangs "."
-    substituteInPlace lib/Tools/env \
-      --replace /usr/bin/env $ENV
-    substituteInPlace lib/Tools/install \
-      --replace /usr/bin/env $ENV
-    sed -i 's|isabelle_java java|${java}/bin/java|g' lib/Tools/java
-    substituteInPlace etc/settings \
-      --subst-var-by ML_HOME "${polyml}/bin"
-    substituteInPlace contrib/jdk/etc/settings \
-      --replace ISABELLE_JDK_HOME= '#ISABELLE_JDK_HOME='
-    substituteInPlace contrib/polyml-*/etc/settings \
-      --replace '$POLYML_HOME/$ML_PLATFORM' ${polyml}/bin \
-      --replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly
-    substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version \
-      --replace '$ML_HOME/poly' ${polyml}/bin/poly
-    substituteInPlace contrib/z3*/etc/settings \
-      --replace '$Z3_HOME/z3' '${z3}/bin/z3'
+    patchShebangs .
 
-    for comp in contrib/jdk contrib/polyml*; do
+    cat >contrib/z3*/etc/settings <<EOF
+      Z3_HOME=${z3}
+      Z3_VERSION=${z3.version}
+      Z3_SOLVER=${z3}/bin/z3
+      Z3_INSTALLED=yes
+    EOF
+
+    cat >contrib/polyml-*/etc/settings <<EOF
+      ML_SYSTEM_64=true
+      ML_SYSTEM=${polyml.name}
+      ML_PLATFORM=${stdenv.system}
+      ML_HOME=${polyml}/bin
+      ML_OPTIONS="--minheap 1000"
+      POLYML_HOME="\$COMPONENT"
+      ML_SOURCES="\$POLYML_HOME/src"
+    EOF
+
+    cat >contrib/jdk/etc/settings <<EOF
+      ISABELLE_JAVA_PLATFORM=${stdenv.system}
+      ISABELLE_JDK_HOME=${java}
+    EOF
+
+    echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
+
+    for comp in contrib/jdk contrib/polyml-* contrib/z3-*; do
       rm -rf $comp/x86*
     done
     '' + (if ! stdenv.isLinux then "" else ''

diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -60,7 +60,10 @@ let
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
-    qtwebengine = [ ./qtwebengine-no-build-skip.patch ];
+    qtwebengine = [
+      ./qtwebengine-no-build-skip.patch
+      ./qtwebengine-CVE-2019-5786.patch
+    ];
     qtwebkit = [ ./qtwebkit.patch ]
       ++ optionals stdenv.isDarwin [
         ./qtwebkit-darwin-no-readline.patch

diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
@@ -0,0 +1,26 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
+@@ -135,14 +135,16 @@
+   if (!raw_data_ || error_code_)
+     return nullptr;
+
+-  DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
+-  if (finished_loading_) {
+-    array_buffer_result_ = result;
+-    AdjustReportedMemoryUsageToV8(
+-        -1 * static_cast<int64_t>(raw_data_->ByteLength()));
+-    raw_data_.reset();
++  if (!finished_loading_) {
++    return DOMArrayBuffer::Create(
++        ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength()));
+   }
+-  return result;
++  array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
++  AdjustReportedMemoryUsageToV8(-1 *
++                                static_cast<int64_t>(raw_data_->ByteLength()));
++
++  raw_data_.reset();
++  return array_buffer_result_;
+ }
+
+ String FileReaderLoader::StringResult() {
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, setuptools_scm }:
+
+buildPythonPackage rec {
+  pname = "cbor2";
+  version = "4.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bp9l3wdj0wm15xlmlcwbgv6hc6vcfx39nssikj8fkwnd7d1bdhp";
+  };
+
+  nativeBuildInputs = [ setuptools_scm ];
+  checkInputs = [ pytest pytestcov ];
+
+  checkPhase = "pytest";
+
+  meta = with lib; {
+    description = "Pure Python CBOR (de)serializer with extensive tag support";
+    homepage = https://github.com/agronholm/cbor2;
+    license = licenses.mit;
+    maintainers = with maintainers; [ taneb ];
+  };
+}
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
@@ -4,23 +4,25 @@ buildPythonPackage rec {
   pname = "distro";
   version = "1.4.0";
 
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0mrg75w4ap7mdzyga75yaid9n8bgb345ih5mwjp3plj6v1jxwb9n";
+  };
+
+  # TODO: Enable more tests on NixOS (20 out of 173 are failing, 10 due to the
+  # missing lsb_release binary):
+  patches = [ ./nixos.patch ];
+
   checkInputs = [ pytest pytestcov ];
 
   checkPhase = ''
     py.test
   '';
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "362dde65d846d23baee4b5c058c8586f219b5a54be1cf5fc6ff55c4578392f57";
-  };
-
   meta = with stdenv.lib; {
     homepage = https://github.com/nir0s/distro;
     description = "Linux Distribution - a Linux OS platform information API.";
     license = licenses.asl20;
     maintainers = with maintainers; [ nand0p ];
-    # Many failing tests
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/distro/nixos.patch b/pkgs/development/python-modules/distro/nixos.patch
@@ -0,0 +1,31 @@
+diff --git a/tests/test_distro.py b/tests/test_distro.py
+index 5521068..4e1bab8 100644
+--- a/tests/test_distro.py
++++ b/tests/test_distro.py
+@@ -432,7 +432,7 @@ class TestOSRelease:
+         self._test_outcome(desired_outcome)
+
+
+-@pytest.mark.skipif(not IS_LINUX, reason='Irrelevant on non-linux')
++@pytest.mark.skip(reason='lsb_release is not available and would return exit code 3')
+ class TestLSBRelease(DistroTestCase):
+
+     def setup_method(self, test_method):
+@@ -919,7 +919,7 @@ class TestDistroRelease:
+         self._test_outcome(desired_outcome, 'cloudlinux', '7', 'redhat')
+
+
+-@pytest.mark.skipif(not IS_LINUX, reason='Irrelevant on non-linux')
++@pytest.mark.skip(reason='Unknown (TODO)')
+ class TestOverall(DistroTestCase):
+     """Test a LinuxDistribution object created with default arguments.
+
+@@ -1618,7 +1618,7 @@ def _bad_os_listdir(path='.'):
+     raise OSError()
+
+
+-@pytest.mark.skipIf(not IS_LINUX, reason='Irrelevant on non-linx')
++@pytest.mark.skip(reason='Unknown (TODO)')
+ class TestOverallWithEtcNotReadable(TestOverall):
+     def setup_method(self, test_method):
+         self._old_listdir = os.listdir
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
@@ -8,18 +8,21 @@
 , iana-etc
 , libredirect
 , aiohttp
+, websockets
+, websocket_client
+, requests
 , tornado
 }:
 
 buildPythonPackage rec {
   pname = "python-engineio";
-  version = "3.0.0";
+  version = "3.4.3";
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-engineio";
     rev = "v${version}";
-    sha256 = "1v510fhn0li808ar2cmwh5nijacy5x60q9x4gm0b34j6mkmc59ph";
+    sha256 = "0wk81rqigw47z087f5kc7b9iwqggypxc62q8q818qyzqwb93ysxf";
   };
 
   propagatedBuildInputs = [
@@ -30,7 +33,10 @@ buildPythonPackage rec {
     eventlet
     mock
     aiohttp
+    websockets
+    websocket_client
     tornado
+    requests
   ];
 
   # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
@@ -44,6 +50,7 @@ buildPythonPackage rec {
     description = "Engine.IO server";
     homepage = http://github.com/miguelgrinberg/python-engineio/;
     license = licenses.mit;
+    platforms = platforms.linux;
     maintainers = [ maintainers.mic92 ];
   };
 }