status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-24 18:00:45 +00:00
Code Issues Projects Releases Wiki Activity

nix: upgrade nixpkgs to latest nixos-unstable

Browse Source 
Notable upgrades:

* Go `1.17.11` to `1.18.6`
* NodeJS `16.15.0` to `16.17.1`
* Clojure `1.11.1.1139` to `1.11.1.1165`
* Ruby Gem `3.2.26` to `3.3.20`
* Bundler `2.3.9` to `2.3.22`
* Git `2.36.1` to `2.37.3`
* Curl `7.83.1` to `7.85.0`
* OpenSSL `1.1.1o` to `3.0.5`
* PatchELF `0.14.5` to `0.15.0`
* Android SDK Platform Tools `33.0.1` to `33.0.2`

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2022-09-01 01:30:35 +02:00
parent 6a23f64550
commit d6a8f912ea
No known key found for this signature in database
GPG Key ID: 09AA5403E54D9931
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -36,6 +36,8 @@ endif
export TMPDIR = /tmp/tmp-status-mobile-$(BUILD_TAG) export TMPDIR = /tmp/tmp-status-mobile-$(BUILD_TAG)
# This has to be specified for both the Node.JS server process and the Qt process. # This has to be specified for both the Node.JS server process and the Qt process.
export REACT_SERVER_PORT ?= 5001 export REACT_SERVER_PORT ?= 5001
# Fix for ERR_OSSL_EVP_UNSUPPORTED error.
export NODE_OPTIONS += --openssl-legacy-provider
# The path can be anything, but home is usually safest. # The path can be anything, but home is usually safest.
export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore

3
nix/mobile/android/release.nix
View File

@ -72,6 +72,9 @@ in stdenv.mkDerivation rec {
ANDROID_SDK_ROOT = "${androidPkgs.sdk}"; ANDROID_SDK_ROOT = "${androidPkgs.sdk}";
ANDROID_NDK_ROOT = "${androidPkgs.ndk}"; ANDROID_NDK_ROOT = "${androidPkgs.ndk}";
# Fix for ERR_OSSL_EVP_UNSUPPORTED error.
NODE_OPTIONS = "--openssl-legacy-provider";
# Used by the Android Gradle build script in android/build.gradle # Used by the Android Gradle build script in android/build.gradle
STATUS_GO_ANDROID_LIBDIR = status-go; STATUS_GO_ANDROID_LIBDIR = status-go;

15
nix/overlay.nix
View File

@ -33,18 +33,19 @@ in {
gradlePropParser = callPackage ./tools/gradlePropParser.nix { }; gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
# Package version adjustments # Package version adjustments
gradle = super.pkgs.gradle_5; gradle = super.gradle_5;
nodejs = super.pkgs.nodejs-16_x; nodejs = super.nodejs-16_x;
openjdk = super.pkgs.openjdk8_headless; yarn = super.yarn.override { nodejs = super.nodejs-16_x; };
openjdk = super.openjdk8_headless;
xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } { xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
version = "13.3"; version = "13.3";
allowHigher = true; allowHigher = true;
}; };
go = super.pkgs.go_1_17; go = super.go_1_18;
buildGoPackage = super.pkgs.buildGo117Package; buildGoPackage = super.buildGo118Package;
buildGoModule = super.pkgs.buildGo117Module; buildGoModule = super.buildGo118Module;
gomobile = (super.gomobile.overrideAttrs (old: { gomobile = (super.gomobile.overrideAttrs (old: {
patches = self.pkgs.fetchurl { # https://github.com/golang/mobile/pull/84 patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch"; url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y="; sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
}; };

4
nix/pkgs.nix
View File

@ -13,8 +13,8 @@ let
name = "nixpkgs-source"; name = "nixpkgs-source";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "280d485b6f94d5ee8645aaf098c61a5def5df2be"; rev = "579238da5f431b7833a9f0681663900aaf0dd1e8";
sha256 = "sha256-8ZWWJEDypkTCrzIWUxpin7CS2M3uPjjbl/8mpcVZQ9I"; sha256 = "sha256-cDwASlAf/h0fsHtDm9yNBHEHK0uq6do+mIUEgh1i5yg=";
# To get the compressed Nix sha256, use: # To get the compressed Nix sha256, use:
# nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
}; };

2
nix/pkgs/android-sdk/compose.nix
View File

@ -9,7 +9,7 @@
# by setting android_sdk.accept_license = true. # by setting android_sdk.accept_license = true.
androidenv.composeAndroidPackages { androidenv.composeAndroidPackages {
toolsVersion = "26.1.1"; toolsVersion = "26.1.1";
platformToolsVersion = "33.0.1"; platformToolsVersion = "33.0.2";
buildToolsVersions = [ "31.0.0" ]; buildToolsVersions = [ "31.0.0" ];
platformVersions = [ "31" ]; platformVersions = [ "31" ];
cmakeVersions = [ "3.18.1" ]; cmakeVersions = [ "3.18.1" ];