From 0652d186533e067de66451228d765a556dbc9cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 12 Apr 2021 16:07:55 +0200 Subject: [PATCH] nix: upgrade nixpkgs, keep Go at 1.14.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notable software upgrades: - Go `1.14.13` to `1.14.15` - Clojure `1.10.1.763` to `1.10.3.855` - NodeJS `12.20.1` to `12.22.1` - Git `2.29.2` to `2.31.1` - CMake `3.10.2` to `3.18.1` - Curl `7.74.0` to `7.76.1` - Android NDK `21.3.6528147` to `22.1.7171670` - Android Platform Tools `30.0.5` to `31.0.2` Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.nix-cache | 2 +- fastlane/default.nix | 4 ++-- nix/config.nix | 9 +++++++-- nix/lib/mkFilter_test.nix | 3 +-- nix/pkgs.nix | 4 ++-- nix/pkgs/android-sdk/compose.nix | 6 +++--- nix/pkgs/gomobile/default.nix | 6 +++--- nix/tools/envParser.nix | 4 ++-- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ci/Jenkinsfile.nix-cache b/ci/Jenkinsfile.nix-cache index f89f8d9859..22bd099e96 100644 --- a/ci/Jenkinsfile.nix-cache +++ b/ci/Jenkinsfile.nix-cache @@ -29,7 +29,7 @@ pipeline { stages { stage('Setup') { steps { script { - nix.shell('nix-env -i openssh', pure: false) + nix.shell('nix-env -i openssh', sandbox: false, pure: false) /* some build targets don't build on MacOS */ uname = sh(script: 'uname', returnStdout: true) } } diff --git a/fastlane/default.nix b/fastlane/default.nix index 533108e6bb..025eb9cce3 100644 --- a/fastlane/default.nix +++ b/fastlane/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, makeWrapper }: +{ stdenv, lib, bundlerEnv, ruby, makeWrapper }: let fastlane = stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ let export FASTLANE_PLUGINFILE_PATH=$STATUS_REACT_HOME/fastlane/Pluginfile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to automate building and releasing iOS and Android apps"; longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; homepage = https://github.com/fastlane/fastlane; diff --git a/nix/config.nix b/nix/config.nix index 56c3a8f7d4..4430673ce7 100644 --- a/nix/config.nix +++ b/nix/config.nix @@ -18,6 +18,11 @@ # Android SDK requires an accepted license android_sdk.accept_license = true; - # Android Env still needs old OpenSSL - permittedInsecurePackages = [ "openssl-1.0.2u" ]; + + permittedInsecurePackages = [ + # Android Env still needs old OpenSSL + "openssl-1.0.2u" + # Support for Go 1.14 ended with the release of Go 1.16 + "go-1.14.15" + ]; } diff --git a/nix/lib/mkFilter_test.nix b/nix/lib/mkFilter_test.nix index 42ada91b95..492f6a49e9 100644 --- a/nix/lib/mkFilter_test.nix +++ b/nix/lib/mkFilter_test.nix @@ -16,8 +16,7 @@ let pkgs = import { }; - lib = pkgs.stdenv.lib; - mkFilter = pkgs.callPackage ./mkFilter.nix { inherit lib; }; + mkFilter = pkgs.callPackage ./mkFilter.nix { inherit (pkgs) lib; }; absPath = "/ABS/PATH"; filter = mkFilter { root = absPath; diff --git a/nix/pkgs.nix b/nix/pkgs.nix index b7c9163eda..a21cf1f258 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -13,8 +13,8 @@ let name = "nixpkgs-source"; owner = "NixOS"; repo = "nixpkgs"; - rev = "51894963cbdc41f0cd8f571b7bcf79437d940355"; - sha256 = "13nfghpnhnr5hbbibsrq172g1rdibd8lycis7ncvf9yxd4rdlf7b"; + rev = "76f53eef48cc6c340ed063c117aac75c4652627c"; + sha256 = "0a2wn0ryq0ngd3ybc3ag70dp9z1x4w1jgy6qr4dzfnzbnn3s5246"; # To get the compressed Nix sha256, use: # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz }; diff --git a/nix/pkgs/android-sdk/compose.nix b/nix/pkgs/android-sdk/compose.nix index 8207bd0b61..a8e3d10b04 100644 --- a/nix/pkgs/android-sdk/compose.nix +++ b/nix/pkgs/android-sdk/compose.nix @@ -7,16 +7,16 @@ androidenv.composeAndroidPackages { toolsVersion = "26.1.1"; - platformToolsVersion = "30.0.5"; + platformToolsVersion = "31.0.2"; buildToolsVersions = [ "30.0.3" ]; includeEmulator = false; includeSources = false; platformVersions = [ "29" ]; includeSystemImages = false; systemImageTypes = [ "default" ]; - cmakeVersions = [ "3.10.2" ]; + cmakeVersions = [ "3.18.1" ]; includeNDK = true; - ndkVersion = "21.3.6528147"; + ndkVersion = "22.1.7171670"; useGoogleAPIs = false; useGoogleTVAddOns = false; includeExtras = [ diff --git a/nix/pkgs/gomobile/default.nix b/nix/pkgs/gomobile/default.nix index 63dd6555df..e82b686500 100644 --- a/nix/pkgs/gomobile/default.nix +++ b/nix/pkgs/gomobile/default.nix @@ -1,10 +1,10 @@ -{ stdenv, utils, callPackage, fetchgit, buildGo114Package, +{ stdenv, lib, utils, callPackage, fetchgit, buildGo114Package, ncurses5, zlib, makeWrapper, patchelf, androidPkgs, xcodeWrapper }: let inherit (stdenv) isDarwin; - inherit (stdenv.lib) optional optionalString strings; + inherit (lib) optional optionalString strings; in buildGo114Package rec { pname = "gomobile"; version = "20200622-${strings.substring 0 7 rev}"; @@ -57,7 +57,7 @@ in buildGo114Package rec { url = "https://go.googlesource.com/mobile"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for building and running mobile apps written in Go."; longDescription = "Gomobile is a tool for building and running mobile apps written in Go."; homepage = https://go.googlesource.com/mobile; diff --git a/nix/tools/envParser.nix b/nix/tools/envParser.nix index d6ca3a2fed..e0bd3b8cd4 100644 --- a/nix/tools/envParser.nix +++ b/nix/tools/envParser.nix @@ -1,9 +1,9 @@ # This Nix expression takes care of reading/parsing the correct .env configuration file and return it as an attr set -{ config, stdenv }: +{ config, stdenv, lib }: let inherit (builtins) listToAttrs head tail readFile; - inherit (stdenv.lib) attrByPath filter hasPrefix nameValuePair splitString; + inherit (lib) attrByPath filter hasPrefix nameValuePair splitString; build-type = attrByPath ["status-im" "build-type"] "" config; ci = (attrByPath ["status-im" "ci"] "" config) != "";