Commit Graph

27 Commits

Author SHA1 Message Date
Jakub Sokołowski b31bebdbd9
nix: Upgrade 2.3.1 > 2.3.2
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2020-01-17 18:21:39 +01:00
Jakub Sokołowski aca703a011
major nix refactor
Changes:
- Adds a new `nix-gc` Makefile target for removing old packages
- Moves all `nix/*.sh` files to `nix/scripts/*.sh` to make things more tidy
- Renames `TARGET_OS` into `TARGET` and makes it effective only with `nix/scripts/shell.sh`
- Renames `target-os` Nix argument to just `target` and makes it effective only with `shell.nix`
- Drops `IN_CI_ENVIRONMENT` env variable which was useless
- Drops use of `target-os` argument outside of `shell.nix` (with few exceptions, but just in naming)
- `nix/platform.nix` has been made obsolete and removed
- Moves the definition of all major targets to `nix/targets.nix`
- Moves the definition of all major shells to `nix/shells.nix`
- Makes `default.nix` and `shell.nix` just thin wrappers around `nix/default.nix`
- `nix/nixpkgs-bootstrap.nix` has been moved to `nix/pkgs.nix`
- All package and tool overrides have been moved to `nix/pkgs.nix`
- Explicit passing of contents of `pkgs` has been removed in favor of `callPackage` doing it for us
- `nix/bootstrapped-shell.nix` has been moved to `nix/tools/mkShell.nix`
- A new `mergeSh` tool has been added to `pkgs` from `nix/tools/mergeSh.nix`
  - This tool is used to merge shells created using `mkShell`
- `mobile/targets/jsbundle.nix` has been moved to `mobile/android/jsbundle/default.nix`
- Moves `status-go` version sanitization to `nix/status-go/utils.nix`
- Renames version to rawVersion and versionName to cleanVersion in status-go derivation
- Ports nix/mobile/ios/install-pods-and-status-go.sh to Nix sub-shells
- Moves adjustment of `inotify/max_user_watches` out into `scripts/inotify_fix.sh`
- Makes iOS builds use the Nix version of Fastlane

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-12-12 18:51:21 +01:00
Jakub Sokołowski 261b81c8a7
nix: upgrade: 2.2.1 > 2.3.1
also drop toolversion scripts and functions

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-11-26 16:30:22 +01:00
Pedro Pombeiro 8d8ef4d263
Only bring in Android dependencies in gomobile if targetting Android 2019-07-05 13:40:31 +02:00
Jakub Sokołowski 0e8e5a51ba
refactor nix_sh to give it optional Map arguments
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-05-14 16:06:16 +02:00
Pedro Pombeiro 4041a12612
Print a friendlier message when Xcode/iPhone SDK are not installed
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-10 15:07:52 +02:00
Pedro Pombeiro 93efc0cd05
Run prepare-for-desktop.sh in an impure shell 2019-05-10 11:48:32 +02:00
Pedro Pombeiro 69b9847c5f
Don't ever try to install Nix on NixOS 2019-05-09 14:14:58 +02:00
Pedro Pombeiro 8e6b8b1ff1
Use Android SDK from nixpkgs instead of downloading 2019-04-12 13:57:38 +02:00
Pedro Pombeiro 7be77fffb0
Do not change user's profile with Nix installation
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-04-11 14:59:33 +02:00
Pedro Pombeiro 3230f00c6c
Make nix-shell implicit and add `desktop-server` target
- The makefile now defines environment variables for the Desktop debug environment that allows running side by side with release

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-04-09 16:04:16 +02:00
Jakub Sokołowski 9f601e851d
add jenkinsfile
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-03-21 13:57:00 +01:00
Pedro Pombeiro 87a7aacd68
Add Android NDK Nix expression 2019-03-21 13:56:59 +01:00
Pedro Pombeiro 2ac5ee019e
Migrate Desktop build environment to leverage Nix
- Add Conan to default.nix
- Integrate Qt5 Nix package (with forked repo for new QtWebView module)
- Fix rpaths in macOS and Linux
- Add Nix expressions to install nsis, appimagekit and linuxdeployqt
2019-03-21 13:56:58 +01:00
Pedro Pombeiro 2e7891406b
Fix problem building `sha3` node module in `make setup` 2019-03-21 13:56:57 +01:00
Pedro Pombeiro 692de32931
Migrate from installing tooling the traditional way to Nix 2019-03-21 13:56:57 +01:00
Igor Mandrigin 37ef82b04d
Use `yarn` instead of `npm` for package management. Lock dependencies.
Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
2018-11-29 16:29:57 +01:00
Pedro Pombeiro a31d10f6dc
Add support for generating Windows install program instead of zip file. Part of #6304
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2018-11-20 15:11:24 +01:00
Pedro Pombeiro 17a8d3a9c9
Unify desktop builds. Closes #5406
- Replace Linux and MacOS scripts in `ci/desktop.groovy` with calls to `scripts/create-desktop-package.sh`
- Replace use of `deployment/env` with `.env` to avoid confusion and be coherent with mobile platforms

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2018-09-26 16:45:48 +02:00
Pedro Pombeiro b7b6a252e1
Simplify setup script and fix Android build when setting up from scratch
- gradle was being called without `npm install` having had a chance to execute

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2018-09-03 10:00:37 +02:00
Aleksandr Pantiukhov 4a1c8e11a3
`setup` script updates: wget installation; updated Android SDK installer
Signed-off-by: Goran Jovic <goranjovic@gmail.com>
2018-07-31 15:13:32 +02:00
Aleksandr Pantiukhov d3b28ddbe8
re-natal completely removed from the project and replaced with clj-rn
Signed-off-by: Aleksandr Pantiukhov <alwxndr@gmail.com>
2018-07-18 23:56:39 +02:00
Pedro Pombeiro 0051b7cb9a
Install Android NDK and gradle archives during setup.
Fixes broken `make release-android` step on new machines.

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2018-07-11 18:33:34 +02:00
Aleksandr Pantiukhov 2b6ee450ae
[#4901]: Fix npm version issue
Signed-off-by: Aleksandr Pantiukhov <alwxndr@gmail.com>
2018-07-03 14:14:51 +02:00
Oleh Krehel da70ff7954
scripts/setup: Fix call to mvn
Signed-off-by: Eric Dvorsak <eric@dvorsak.fr>
2018-02-07 09:26:55 +01:00
alwxndr 03e62548a6 [#3007] Removed location command 2018-02-01 22:25:50 +01:00
David Balatero 2bd7652b5c Install all dependencies on Linux 2017-12-08 18:26:01 +01:00