nix: Move debug realm into desktop folder and use RN cli from node_modulesSigned-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>

.TOOLVERSIONS

@@ -2,6 +2,6 @@ android-sdk-build-tools;28.0.1;
 android-sdk-platform;android-27;
 android-sdk;4333796;aa190cfd7299cd6a1c687355bb2764e4
 nix;2.2.1;
-react_native_cli;2.0.1;
+node;10.15.0;
 StatusImAppImage;20181208;
 StatusIm-Windows-base-image;20181113;

derivation.nix

@@ -8,21 +8,16 @@ let
   # TODO: Try to use stdenv for iOS. The problem is with building iOS as the build is trying to pass parameters to Apple's ld that are meant for GNU's ld (e.g. -dynamiclib)
   stdenv' = pkgs.stdenvNoCC;
   gradle = pkgs.gradle_4_10;
-  statusDesktop = pkgs.callPackage ./nix/desktop { inherit target-os status-go; inherit (pkgs) darwin; nodejs = nodejs'; stdenv = stdenv'; };
+  statusDesktop = pkgs.callPackage ./nix/desktop { inherit target-os status-go pkgs; inherit (pkgs) darwin; stdenv = stdenv'; nodejs = nodejs'; };
-  statusMobile = pkgs.callPackage ./nix/mobile { inherit target-os config status-go gradle; inherit (pkgs.xcodeenv) composeXcodeWrapper; stdenv = stdenv'; };
+  statusMobile = pkgs.callPackage ./nix/mobile { inherit target-os config pkgs status-go gradle; inherit (pkgs.xcodeenv) composeXcodeWrapper; stdenv = stdenv'; nodejs = nodejs'; };
   status-go = pkgs.callPackage ./nix/status-go { inherit target-os; inherit (pkgs.xcodeenv) composeXcodeWrapper; inherit (statusMobile) xcodewrapperArgs; androidPkgs = statusMobile.androidComposition; };
   nodejs' = pkgs.nodejs-10_x;
   yarn' = pkgs.yarn.override { nodejs = nodejs'; };
-  nodeInputs = import ./nix/global-node-packages {
-    # The remaining dependencies come from Nixpkgs
-    inherit pkgs;
-    nodejs = nodejs';
-  };
   nodePkgBuildInputs = [
     nodejs'
     pkgs.python27 # for e.g. gyp
     yarn'
-  ] ++ (builtins.attrValues nodeInputs);
+  ];
   selectedSources =
     stdenv'.lib.optional platform.targetDesktop statusDesktop ++
     stdenv'.lib.optional platform.targetMobile statusMobile;

nix/desktop/cmake/qtkeychain/default.nix

@@ -29,12 +29,12 @@ let
         --replace "\"\$QTKEYCHAIN_VERSION" qtkeychain
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "Patched sources for qtkeychain, a platform-independent Qt API for storing passwords securely";
       homepage = https://github.com/status-im/qtkeychain;
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.pombeirp ];
+      maintainers = [ maintainers.pombeirp ];
-      platforms = with stdenv.lib.platforms; darwin ++ linux;
+      platforms = with platforms; darwin ++ linux;
     };
   };
 

nix/desktop/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, callPackage, target-os,
+{ stdenv, pkgs, callPackage, target-os,
   cmake, extra-cmake-modules, file, status-go,
   darwin, nodejs }:
 
@@ -15,6 +15,10 @@ let
     lib.optional platform.targetLinux linuxPlatform ++
     lib.optional platform.targetDarwin darwinPlatform ++
     lib.optional platform.targetWindows windowsPlatform;
+  nodeInputs = import ./realm-node {
+    # The remaining dependencies come from Nixpkgs
+    inherit pkgs nodejs;
+  };
 
 in
   {
@@ -24,6 +28,8 @@ in
       file
       snoreNotifySources
       qtkeychainSources
-    ] ++ lib.catAttrs "buildInputs" selectedSources;
+    ] ++ lib.catAttrs "buildInputs" selectedSources
+      ++ (builtins.attrValues nodeInputs);
+
     shellHook = lib.concatStrings (lib.catAttrs "shellHook" (selectedSources ++ [ snoreNotifySources qtkeychainSources ]));
   }

nix/desktop/linux/base-image/default.nix

@@ -1,6 +1,4 @@
-{ pkgs, stdenv, fetchurl }:
+{ stdenv, fetchurl, unzip }:
-
-with pkgs;
 
 let
   package = stdenv.mkDerivation rec {
@@ -23,12 +21,12 @@ let
       unzip $src -d $out/src
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "A base image for Linux Status Desktop release distributions";
       homepage = https://desktop-app-files.ams3.digitaloceanspaces.com/;
-      license = stdenv.lib.licenses.gpl3;
+      license = licenses.gpl3;
-      maintainers = [ stdenv.lib.maintainers.pombeirp ];
+      maintainers = [ maintainers.pombeirp ];
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   };
 

nix/desktop/macos/base-image/default.nix

@@ -1,9 +1,7 @@
-{ pkgs, stdenv, fetchurl }:
+{ stdenv, fetchurl, unzip }:
-
-with pkgs;
 
 let
-    package = stdenv.mkDerivation rec {
+  package = stdenv.mkDerivation rec {
     name = "StatusImAppBundle";
     version = "20190515";
 
@@ -23,12 +21,12 @@ let
       unzip $src -d $out/src
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "A base image for macOS Status Desktop release distributions";
       homepage = https://desktop-app-files.ams3.digitaloceanspaces.com/;
-      license = stdenv.lib.licenses.gpl3;
+      license = licenses.gpl3;
-      maintainers = [ stdenv.lib.maintainers.pombeirp ];
+      maintainers = [ maintainers.pombeirp ];
-      platforms = stdenv.lib.platforms.darwin;
+      platforms = platforms.darwin;
     };
   };
 

nix/desktop/realm-node/default.nix

@@ -1,8 +1,13 @@
 { pkgs, nodejs }:
 
-let nodePackages = import ./output { inherit pkgs; inherit nodejs; };
+#
+# This expression builds the realm executable that is used for debugging the desktop app (used by ubuntu-server.js)
+#
+
+let nodePackages = import ./output { inherit pkgs nodejs; };
     realm-version = "5.12.1";
-    realm-patched-name = "realm-git+https://github.com/status-im/realm-js.git#heads/v2.20.1";
+    realm-patched-name = "realm-https://github.com/status-im/realm-js/archive/v2.20.1.tar.gz";
+    # We download ${realm-core-src} to ${realm-dest-dir} in order to avoid having realm try to download these files on its own (which is disallowed by Nix)
     realm-core-src = pkgs.fetchurl (
       if builtins.currentSystem == "x86_64-darwin" then {
         url = "https://static.realm.io/downloads/core/realm-core-Release-v${realm-version}-Darwin-devel.tar.gz";
@@ -13,8 +18,8 @@ let nodePackages = import ./output { inherit pkgs; inherit nodejs; };
       }
     );
     realm-dest-dir = if builtins.currentSystem == "x86_64-darwin" then
-      "$out/lib/node_modules/realm/vendor/realm-darwin-x64" else
+      "$out/lib/node_modules/realm/compiled/node-v64_darwin_x64/realm.node" else
-      "$out/lib/node_modules/realm/vendor/realm-linux-x64";
+      "$out/lib/node_modules/realm/compiled/node-v64_linux_x64/realm.node";
 in nodePackages // {
   ${realm-patched-name} = nodePackages.${realm-patched-name}.override(oldAttrs: {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.nodePackages.node-pre-gyp ];
@@ -22,7 +27,7 @@ in nodePackages // {
     preRebuild = ''
       # Do not attempt to do any http calls!
       substituteInPlace $out/lib/node_modules/realm/scripts/download-realm.js \
-        --replace "return acquire(requirements, realmDir)" ""
+        --replace "!shouldSkipAcquire(realmDir, requirements, options.force)" "false"
       mkdir -p ${realm-dest-dir}
       tar -xzf ${realm-core-src} -C ${realm-dest-dir}
     '';

nix/desktop/realm-node/generate-nix.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+#
+# Run this file to regenerate the Nix files in ./output.
+# Prerequisites: Node, npm, and node2nix (installed with npm i -g https://github.com/svanderburg/node2nix)
+#
+
 GIT_ROOT=$(git rev-parse --show-toplevel)
 SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 toolversion="${GIT_ROOT}/scripts/toolversion"
@@ -8,18 +13,18 @@ input="${dir}/output/node-packages.json"
 output_dir="${dir}/output"
 
 rm -rf $output_dir && mkdir -p $output_dir
-react_native_cli_required_version=$($toolversion react_native_cli)
+# Specify the package.json file containing the dependencies to install
 cat << EOF > $input
 [
-    { "react-native-cli": "${react_native_cli_required_version}",
+    { "realm": "https://github.com/status-im/realm-js/archive/v2.20.1.tar.gz" }
-      "realm": "git+https://github.com/status-im/realm-js.git#heads/v2.20.1" }
 ]
 EOF
 
 node_required_version=$($toolversion node)
 node_major_version=$(echo $node_required_version | cut -d. -f1,1)
 
-node2nix --nodejs-${node_major_version} -i $input \
+node2nix --nodejs-${node_major_version} --bypass-cache \
+         -i $input \
          -o $output_dir/node-packages.nix \
          -c $output_dir/default.nix \
          -e $output_dir/node-env.nix

nix/desktop/realm-node/output/node-packages.nix

@@ -31,15 +31,6 @@ let
         sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
-    "ansi-styles-2.2.1" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
-      };
-    };
     "aproba-1.2.0" = {
       name = "aproba";
       packageName = "aproba";
@@ -103,15 +94,6 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "async-0.2.10" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
-      };
-    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -256,15 +238,6 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
-      };
-    };
     "chownr-1.1.1" = {
       name = "chownr";
       packageName = "chownr";
@@ -283,22 +256,13 @@ let
         sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
       };
     };
-    "colors-0.6.2" = {
+    "combined-stream-1.0.8" = {
-      name = "colors";
-      packageName = "colors";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
-        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
-      };
-    };
-    "combined-stream-1.0.7" = {
       name = "combined-stream";
       packageName = "combined-stream";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
-        sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
+        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
       };
     };
     "command-line-args-4.0.7" = {
@@ -355,15 +319,6 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "cycle-1.0.3" = {
-      name = "cycle";
-      packageName = "cycle";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
-        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
-      };
-    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -373,13 +328,13 @@ let
         sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
-    "debug-2.6.9" = {
+    "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.9";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
-        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
       };
     };
     "decompress-4.2.0" = {
@@ -427,15 +382,6 @@ let
         sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69";
       };
     };
-    "deep-equal-1.0.1" = {
-      name = "deep-equal";
-      packageName = "deep-equal";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
-        sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
-      };
-    };
     "deep-extend-0.6.0" = {
       name = "deep-extend";
       packageName = "deep-extend";
@@ -508,15 +454,6 @@ let
         sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
       };
     };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
-      };
-    };
     "extend-3.0.2" = {
       name = "extend";
       packageName = "extend";
@@ -535,15 +472,6 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "eyes-0.1.8" = {
-      name = "eyes";
-      packageName = "eyes";
-      version = "0.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
-        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
-      };
-    };
     "fast-deep-equal-2.0.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
@@ -643,13 +571,13 @@ let
         sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
       };
     };
-    "fs-minipass-1.2.5" = {
+    "fs-minipass-1.2.6" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz";
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz";
-        sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==";
+        sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -688,13 +616,13 @@ let
         sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
       };
     };
-    "glob-7.1.3" = {
+    "glob-7.1.4" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.3";
+      version = "7.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
-        sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
+        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
       };
     };
     "graceful-fs-4.1.15" = {
@@ -733,15 +661,6 @@ let
         sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
       };
     };
-    "has-ansi-2.0.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
-        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
-      };
-    };
     "has-unicode-2.0.1" = {
       name = "has-unicode";
       packageName = "has-unicode";
@@ -778,15 +697,6 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "i-0.3.6" = {
-      name = "i";
-      packageName = "i";
-      version = "0.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz";
-        sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
-      };
-    };
     "iconv-lite-0.4.24" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
@@ -796,13 +706,13 @@ let
         sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
       };
     };
-    "ieee754-1.1.12" = {
+    "ieee754-1.1.13" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.12";
+      version = "1.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
-        sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==";
+        sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
     "ignore-walk-3.0.1" = {
@@ -976,22 +886,22 @@ let
         sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
       };
     };
-    "mime-db-1.38.0" = {
+    "mime-db-1.40.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.38.0";
+      version = "1.40.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
-        sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==";
+        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
       };
     };
-    "mime-types-2.1.22" = {
+    "mime-types-2.1.24" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.22";
+      version = "2.1.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
-        sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==";
+        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
       };
     };
     "minimatch-3.0.4" = {
@@ -1048,49 +958,31 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "ms-2.0.0" = {
+    "ms-2.1.1" = {
       name = "ms";
       packageName = "ms";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
-        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+        sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
       };
     };
-    "mute-stream-0.0.8" = {
+    "nan-2.14.0" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz";
-        sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==";
-      };
-    };
-    "nan-2.13.1" = {
       name = "nan";
       packageName = "nan";
-      version = "2.13.1";
+      version = "2.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz";
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
-        sha512 = "I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==";
+        sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
       };
     };
-    "ncp-0.4.2" = {
+    "needle-2.4.0" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
-        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
-      };
-    };
-    "needle-2.2.4" = {
       name = "needle";
       packageName = "needle";
-      version = "2.2.4";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz";
+        url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
-        sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==";
+        sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==";
       };
     };
     "node-fetch-1.7.3" = {
@@ -1282,24 +1174,6 @@ let
         sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "pkginfo-0.3.1" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
-        sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
-      };
-    };
-    "pkginfo-0.4.1" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz";
-        sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff";
-      };
-    };
     "process-nextick-args-2.0.0" = {
       name = "process-nextick-args";
       packageName = "process-nextick-args";
@@ -1327,15 +1201,6 @@ let
         sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
       };
     };
-    "prompt-0.2.14" = {
-      name = "prompt";
-      packageName = "prompt";
-      version = "0.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
-        sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
-      };
-    };
     "prop-types-15.7.2" = {
       name = "prop-types";
       packageName = "prop-types";
@@ -1381,13 +1246,13 @@ let
         sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
-    "querystringify-2.1.0" = {
+    "querystringify-2.1.1" = {
       name = "querystringify";
       packageName = "querystringify";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz";
+        url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz";
-        sha512 = "sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==";
+        sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==";
       };
     };
     "rc-1.2.8" = {
@@ -1399,22 +1264,13 @@ let
         sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
       };
     };
-    "react-is-16.8.4" = {
+    "react-is-16.8.6" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.8.4";
+      version = "16.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz";
+        url = "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz";
-        sha512 = "PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==";
+        sha512 = "aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==";
-      };
-    };
-    "read-1.0.7" = {
-      name = "read";
-      packageName = "read";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz";
-        sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
       };
     };
     "readable-stream-2.3.6" = {
@@ -1444,15 +1300,6 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "revalidator-0.1.8" = {
-      name = "revalidator";
-      packageName = "revalidator";
-      version = "0.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
-        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
-      };
-    };
     "rimraf-2.6.3" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -1498,13 +1345,13 @@ let
         sha1 = "cfe917cb3d274bcffac792758af53173eb1fabdc";
       };
     };
-    "semver-5.6.0" = {
+    "semver-5.7.0" = {
       name = "semver";
       packageName = "semver";
-      version = "5.6.0";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz";
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
-        sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
+        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -1534,15 +1381,6 @@ let
         sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
-    "stack-trace-0.0.10" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
-        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
-      };
-    };
     "stream-counter-1.0.0" = {
       name = "stream-counter";
       packageName = "stream-counter";
@@ -1597,15 +1435,6 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "supports-color-2.0.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
-        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
-      };
-    };
     "sync-request-3.0.1" = {
       name = "sync-request";
       packageName = "sync-request";
@@ -1741,13 +1570,13 @@ let
         sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
       };
     };
-    "url-parse-1.4.4" = {
+    "url-parse-1.4.7" = {
       name = "url-parse";
       packageName = "url-parse";
-      version = "1.4.4";
+      version = "1.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz";
+        url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz";
-        sha512 = "/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==";
+        sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -1759,15 +1588,6 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "utile-0.2.1" = {
-      name = "utile";
-      packageName = "utile";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
-        sha1 = "930c88e99098d6220834c356cbd9a770522d90d7";
-      };
-    };
     "uuid-3.3.2" = {
       name = "uuid";
       packageName = "uuid";
@@ -1795,15 +1615,6 @@ let
         sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
-    "winston-0.8.3" = {
-      name = "winston";
-      packageName = "winston";
-      version = "0.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
-        sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
-      };
-    };
     "wrappy-1.0.2" = {
       name = "wrappy";
       packageName = "wrappy";
@@ -1843,80 +1654,14 @@ let
   };
 in
 {
-  "react-native-cli-2.0.1" = nodeEnv.buildNodePackage {
+  "realm-https://github.com/status-im/realm-js/archive/v2.20.1.tar.gz" = nodeEnv.buildNodePackage {
-    name = "react-native-cli";
-    packageName = "react-native-cli";
-    version = "2.0.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/react-native-cli/-/react-native-cli-2.0.1.tgz";
-      sha1 = "f2cd3c7aa1b83828cdfba630e2dfd817df766d54";
-    };
-    dependencies = [
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."async-0.2.10"
-      sources."balanced-match-1.0.0"
-      sources."brace-expansion-1.1.11"
-      sources."chalk-1.1.3"
-      sources."colors-0.6.2"
-      sources."concat-map-0.0.1"
-      sources."cycle-1.0.3"
-      sources."deep-equal-1.0.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."eyes-0.1.8"
-      sources."fs.realpath-1.0.0"
-      sources."glob-7.1.3"
-      sources."has-ansi-2.0.0"
-      sources."i-0.3.6"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."isstream-0.1.2"
-      sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      sources."mute-stream-0.0.8"
-      sources."ncp-0.4.2"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."pkginfo-0.4.1"
-      sources."prompt-0.2.14"
-      sources."read-1.0.7"
-      sources."revalidator-0.1.8"
-      sources."rimraf-2.6.3"
-      sources."semver-5.6.0"
-      sources."stack-trace-0.0.10"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."utile-0.2.1"
-      (sources."winston-0.8.3" // {
-        dependencies = [
-          sources."pkginfo-0.3.1"
-        ];
-      })
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "The React Native CLI tools";
-      homepage = "https://github.com/facebook/react-native#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  "realm-git+https://github.com/status-im/realm-js.git#heads/v2.20.1" = nodeEnv.buildNodePackage {
     name = "realm";
     packageName = "realm";
     version = "2.20.1";
-    src = fetchgit {
+    src = fetchurl {
-      url = "https://github.com/status-im/realm-js.git";
+      name = "realm-2.20.1.tar.gz";
-      rev = "433b2d66294fcd3a28e867438b48c9643acdb18a";
+      url = https://codeload.github.com/status-im/realm-js/tar.gz/v2.20.1;
-      sha256 = "01i05kf7d4qyiqy7shy9vdym69mz5m07s8cgw2533w501nhbv303";
+      sha256 = "7525a4407c919e64e7b7c21eb810c98b5d00268fe42efe11e2f7eba5936188b4";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -1945,7 +1690,7 @@ in
       sources."caseless-0.12.0"
       sources."chownr-1.1.1"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.7"
+      sources."combined-stream-1.0.8"
       sources."command-line-args-4.0.7"
       sources."commander-2.8.1"
       sources."concat-map-0.0.1"
@@ -1953,7 +1698,7 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
+      sources."debug-3.2.6"
       sources."decompress-4.2.0"
       sources."decompress-tar-4.1.1"
       (sources."decompress-tarbz2-4.1.1" // {
@@ -1990,12 +1735,12 @@ in
       sources."form-data-2.3.3"
       sources."fs-constants-1.0.0"
       sources."fs-extra-4.0.3"
-      sources."fs-minipass-1.2.5"
+      sources."fs-minipass-1.2.6"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
       sources."get-stream-2.3.1"
       sources."getpass-0.1.7"
-      sources."glob-7.1.3"
+      sources."glob-7.1.4"
       sources."graceful-fs-4.1.15"
       sources."graceful-readlink-1.0.1"
       sources."har-schema-2.0.0"
@@ -2009,7 +1754,7 @@ in
       sources."http-response-object-1.1.0"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.12"
+      sources."ieee754-1.1.13"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -2033,16 +1778,16 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."mime-db-1.38.0"
+      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.22"
+      sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minipass-2.3.5"
       sources."minizlib-1.2.1"
       sources."mkdirp-0.5.1"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
-      sources."nan-2.13.1"
+      sources."nan-2.14.0"
-      sources."needle-2.2.4"
+      sources."needle-2.4.0"
       sources."node-fetch-1.7.3"
       sources."node-machine-id-1.1.10"
       sources."node-pre-gyp-0.11.0"
@@ -2070,13 +1815,13 @@ in
       sources."psl-1.1.31"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."querystringify-2.1.0"
+      sources."querystringify-2.1.1"
       (sources."rc-1.2.8" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."react-is-16.8.4"
+      sources."react-is-16.8.6"
       sources."readable-stream-2.3.6"
       sources."request-2.88.0"
       sources."requires-port-1.0.0"
@@ -2085,7 +1830,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."seek-bzip-1.0.5"
-      sources."semver-5.6.0"
+      sources."semver-5.7.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."sshpk-1.16.1"
@@ -2122,7 +1867,7 @@ in
       sources."unbzip2-stream-1.3.3"
       sources."universalify-0.1.2"
       sources."uri-js-4.2.2"
-      sources."url-parse-1.4.4"
+      sources."url-parse-1.4.7"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.3.2"
       sources."verror-1.10.0"
@@ -2142,4 +1887,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
+}

nix/desktop/windows/base-image/default.nix

@@ -1,6 +1,4 @@
-{ pkgs, stdenv, fetchurl }:
+{ stdenv, fetchurl, unzip }:
-
-with pkgs;
 
 assert stdenv.isLinux;
 
@@ -33,12 +31,12 @@ let
       runHook postInstall
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "A base image for Windows Status Desktop release distributions";
       homepage = https://desktop-app-files.ams3.digitaloceanspaces.com/;
-      license = stdenv.lib.licenses.gpl3;
+      license = licenses.gpl3;
-      maintainers = [ stdenv.lib.maintainers.pombeirp ];
+      maintainers = [ maintainers.pombeirp ];
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   };
 

nix/mobile/default.nix

@@ -1,5 +1,5 @@
-{ config, stdenv, callPackage, target-os,
+{ config, stdenv, pkgs, callPackage, target-os,
-  gradle, status-go, composeXcodeWrapper }:
+  gradle, status-go, composeXcodeWrapper, nodejs }:
 
 with stdenv;
 

nix/shell.sh

@@ -25,7 +25,7 @@ if command -v "nix" >/dev/null 2>&1; then
   platform=${TARGET_OS:=all}
   if [ "$platform" != 'all' ]; then
     # This is a dirty workaround to the fact that 'yarn install' is an impure operation, so we need to call it from an impure shell. Hopefull we'll be able to fix this later on with something like yarn2nix
-    nix-shell --show-trace --argstr target-os ${TARGET_OS} --run "scripts/prepare-for-platform.sh $platform"
+    nix-shell --show-trace --argstr target-os ${TARGET_OS} --run "scripts/prepare-for-platform.sh $platform" || exit
   fi
   if [[ $@ == "ENTER_NIX_SHELL" ]]; then
     echo -e "${GREEN}Configuring Nix shell for target '${TARGET_OS}'...${NC}"

shell.nix

@@ -38,6 +38,7 @@ in mkShell' {
     set -e
 
     STATUS_REACT_HOME=$(git rev-parse --show-toplevel)
+    export PATH=$STATUS_REACT_HOME/node_modules/.bin:$PATH
 
     ${projectDeps.shellHook}
     ${lib.optionalString useFastlanePkg fastlane'.shellHook}