use nix shell for nix-update-* targets

Signed-off-by: Jakub Sokołowski <jakub@status.im>

Makefile

@@ -60,19 +60,15 @@ nix-purge: SHELL := /bin/sh
 nix-purge: ##@nix Completely remove the complete Nix setup
 	sudo rm -rf /nix ~/.nix-profile ~/.nix-defexpr ~/.nix-channels ~/.cache/nix ~/.status .nix-gcroots
 
-nix-add-gcroots: SHELL := /bin/sh
 nix-add-gcroots: ##@nix Add Nix GC roots to avoid status-react expressions being garbage collected
 	scripts/add-nix-gcroots.sh
 
-nix-update-npm: SHELL := /bin/sh
 nix-update-npm: ##@nix Update node2nix expressions based on current package.json
 	nix/desktop/realm-node/generate-nix.sh
 
-nix-update-gradle: SHELL := /bin/sh
 nix-update-gradle: ##@nix Update maven nix expressions based on current gradle setup
 	nix/mobile/android/maven-and-npm-deps/maven/generate-nix.sh
 
-nix-update-lein: SHELL := /bin/sh
 nix-update-lein: ##@nix Update maven nix expressions based on current lein setup
 	nix/tools/lein/generate-nix.sh nix/lein
 

ci/Jenkinsfile.nix-cache

@@ -8,6 +8,8 @@ pipeline {
     NIX_CACHE_USER = 'nix-cache'
     NIX_CACHE_HOST = 'master-01.do-ams3.ci.misc.statusim.net'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
+    /* build cache for all platforms */
+    TARGET_OS ='all'
   }
 
   options {
@@ -39,13 +41,12 @@ pipeline {
         ['android', 'desktop', 'ios'].each { os ->
           nix.build(
             attr: "targets.status-go.${os}.buildInputs",
-            args: ['target-os': 'all'],
             link: false
           )
         }
       } }
     }
-    stage('Build jsbundle') {
+    stage('Build android jsbundle') {
       steps { script {
         /* build/fetch things required to produce a js-bundle for android
          * (e.g. maven and node repos) */
@@ -71,10 +72,8 @@ pipeline {
     stage('Build nix shell deps') {
       steps { script {
         /* build/fetch things required to instantiate shell.nix for TARGET_OS=all */
-        nix.shell("nix-build ${args.join(' ')}", pure: false)
         nix.build(
           attr: 'shell',
-          args: ['target-os': 'all'],
           link: false
         )
       } }
@@ -83,9 +82,8 @@ pipeline {
       steps { script {
         sshagent(credentials: ['nix-cache-ssh']) {
           nix.shell("""
-              find /nix/store/ -mindepth 1 -maxdepth 1 \
-                -not -name '.links' -and -not -name '*.lock' \
-                -and -not -name '*-status-react-*' \
+              find /nix/store/ -mindepth 1 -maxdepth 1 -type d \
+                -not -name '*.links' -and -not -name '*-status-react-*' \
                 | xargs nix-copy-closure -v --to ${NIX_CACHE_USER}@${NIX_CACHE_HOST}
             """,
             pure: false

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

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if [[ -z "${IN_NIX_SHELL}" ]]; then
+    echo "Remember to call 'make shell'!"
+    exit 1
+fi
+
 #
 # 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)
@@ -38,6 +43,11 @@ EOF
 node_required_version=$($toolversion node)
 node_major_version=$(echo $node_required_version | cut -d. -f1,1)
 
+if ! which node2nix > /dev/null; then
+    echo "Installing node2nix..."
+    nix-env -f '<nixpkgs>' -iA nodePackages.node2nix
+fi
+
 node2nix --nodejs-${node_major_version} --bypass-cache \
          --input             $input \
          --output            $output_dir/node-packages.nix \

nix/mobile/android/maven-and-npm-deps/default.nix

@@ -31,7 +31,7 @@ let
       reactNativeDepsDir = "$NIX_BUILD_TOP/deps"; # Use local writable deps, otherwise (probably due to some interaction between Nix sandboxing and Java) gradle will fail copying directly from the nix store
     in 
       stdenv.mkDerivation {
-        name = "gradle-install-android-archives-and-patched-npm-modules";
+        name = "android-gradle-and-npm-modules";
         src =
           let path = ./../../../..; # Import the root /android and /mobile_files folders clean of any build artifacts
           in builtins.path { # We use builtins.path so that we can name the resulting derivation, otherwise the name would be taken from the checkout directory, which is outside of our control

nix/mobile/android/maven-and-npm-deps/maven/generate-nix.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if [[ -z "${IN_NIX_SHELL}" ]]; then
+    echo "Remember to call 'make shell'!"
+    exit 1
+fi
+
 #
 # This script takes care of generating/updating the maven-sources.nix file
 # representing the offline Maven repo containing the dependencies
@@ -8,8 +13,6 @@
 
 set -Eeu
 
-. ~/.nix-profile/etc/profile.d/nix.sh
-
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 current_dir=$(cd "${BASH_SOURCE%/*}" && pwd)
 inputs_file_path="${current_dir}/maven-inputs.txt"

nix/tools/lein/generate-nix.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if [[ -z "${IN_NIX_SHELL}" ]]; then
+    echo "Remember to call 'make shell'!"
+    exit 1
+fi
+
 # This script takes care of generating/updating the nix files in the directory passed as a single argument.
 # For this, we start with a clean cache (in ./.m2~/repository/) and call cljsbuild
 #  to cause it to download all the artifacts. At the same time, we note them
@@ -8,8 +13,6 @@
 
 set -Eeuo pipefail
 
-. ~/.nix-profile/etc/profile.d/nix.sh
-
 output_dir=$1
 mkdir -p $output_dir
 

scripts/add-nix-gcroots.sh

@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 
-set -Eeu
+if [[ -z "${IN_NIX_SHELL}" ]]; then
+    echo "Remember to call 'make shell'!"
+    exit 1
+fi
 
-. ~/.nix-profile/etc/profile.d/nix.sh
+set -Eeu
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)