Remove nix

expo · Apr 13, 2020 · ef80677 · ef80677
1 parent 399e3fd
commit ef80677
Show file tree

Hide file tree

Showing 35 changed files with 130 additions and 1,228 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.envrc b/.envrc
@@ -1,8 +1,9 @@
 PATH_add bin
 
+layout ruby
+
 export EXPO_ROOT_DIR=`pwd`
 export ANDROID_HOME=$ANDROID_SDK
-export NIX_PATH=expo=`pwd`/nix:$NIX_PATH
 
 source_local() {
   file=./.envrc.local

diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,9 @@ node_modules
 npm-debug.log
 yarn-error.log
 
+# Ruby
+.direnv
+
 # Emacs
 *~
 

diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.6.3
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,10 +29,7 @@ Manual smoke tests are included in `apps/native-component-list`, this is a good
 ## 📦 Download and Setup
 
 1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device. (`git remote add upstream git@github.com:expo/expo.git` 😉)
-2. Prepare for Nix installation: `./scripts/create-nix-volume`.
-3. Restart your computer
-4. Install Nix: `curl https://nixos.org/nix/install | sh`
-5. Run the setup script with: `npm run setup:native` (if you just want to contribute to the docs, you can run `npm run setup:docs`). This command does the following for you:
+1. Run the setup script with: `npm run setup:native` (if you just want to contribute to the docs, you can run `npm run setup:docs`). This command does the following for you:
 
    <!-- TODO(Bacon): Split this into 2 scripts so people can contribute to docs without installing React Native -->
 

diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
diff --git a/nix/fastlane/Gemfile.lock → Gemfile.lock b/nix/fastlane/Gemfile.lock → Gemfile.lock
@@ -5,10 +5,10 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.295.0)
-    aws-sdk-core (3.93.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.296.0)
+    aws-sdk-core (3.94.0)
+      aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
@@ -173,7 +173,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fastlane (~> 2.145.0)
+  fastlane
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/android/.envrc b/android/.envrc
diff --git a/android/shell.nix b/android/shell.nix
diff --git a/bin/aws b/bin/aws
diff --git a/bin/aws_bash_completer b/bin/aws_bash_completer
diff --git a/bin/aws_completer b/bin/aws_completer
diff --git a/bin/fastlane b/bin/fastlane
diff --git a/bin/git-crypt b/bin/git-crypt
diff --git a/bin/git-lfs b/bin/git-lfs
diff --git a/bin/git-lfs-test-server-api b/bin/git-lfs-test-server-api
diff --git a/bin/gulp b/bin/gulp
diff --git a/bin/jq b/bin/jq
diff --git a/bin/nix-binstubs b/bin/nix-binstubs
diff --git a/bin/node b/bin/node
diff --git a/bin/npm b/bin/npm
diff --git a/bin/npx b/bin/npx
diff --git a/bin/pod b/bin/pod
diff --git a/bin/xcpretty b/bin/xcpretty
diff --git a/bin/yarn b/bin/yarn
diff --git a/bin/yarnpkg b/bin/yarnpkg
diff --git a/nix/all-packages.nix b/nix/all-packages.nix
diff --git a/nix/default.nix b/nix/default.nix
diff --git a/nix/fastlane/.bundle/config b/nix/fastlane/.bundle/config
diff --git a/nix/fastlane/.gitignore b/nix/fastlane/.gitignore
diff --git a/nix/fastlane/Gemfile b/nix/fastlane/Gemfile