status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nix: lock Go builders at 1.17.x 

If we keep using specific `buildGo117Package` we can easily forge to
upgrade when we bump the Go compiler itself. By locking those explicitly
in `overlay.nix` we make sure they all get bumped together.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2022-05-26 10:58:25 +02:00
parent 8820f458c9
commit bcf3e3205a
No known key found for this signature in database
GPG Key ID: 09AA5403E54D9931
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/overlay.nix
View File

@ -33,7 +33,6 @@ in {
gradlePropParser = callPackage ./tools/gradlePropParser.nix { }; gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
# Package version adjustments # Package version adjustments
go = super.pkgs.go_1_17;
gradle = super.pkgs.gradle_5; gradle = super.pkgs.gradle_5;
nodejs = super.pkgs.nodejs-16_x; nodejs = super.pkgs.nodejs-16_x;
openjdk = super.pkgs.openjdk8_headless; openjdk = super.pkgs.openjdk8_headless;
@ -41,6 +40,9 @@ in {
version = "13.3"; version = "13.3";
allowHigher = true; allowHigher = true;
}; };
go = super.pkgs.go_1_17;
buildGoPackage = super.pkgs.buildGo117Package;
buildGoModule = super.pkgs.buildGo117Module;
gomobile = super.gomobile.override { gomobile = super.gomobile.override {
# FIXME: No Android SDK packages for aarch64-darwin. # FIXME: No Android SDK packages for aarch64-darwin.
withAndroidPkgs = stdenv.system != "aarch64-darwin"; withAndroidPkgs = stdenv.system != "aarch64-darwin";

4
nix/pkgs/go-maven-resolver/default.nix
View File

@ -1,8 +1,8 @@
{ lib, buildGo116Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
let let
inherit (lib) strings; inherit (lib) strings;
in buildGo116Module rec { in buildGoModule rec {
pname = "go-maven-resolver"; pname = "go-maven-resolver";
version = "v1.1.2"; version = "v1.1.2";

4
nix/status-go/library/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, utils, buildGo117Package { lib, stdenv, utils, buildGoPackage
, go, xcodeWrapper , go, xcodeWrapper
# object with source attributes # object with source attributes
, meta, source}: , meta, source}:
@ -7,7 +7,7 @@ let
inherit (stdenv) isDarwin; inherit (stdenv) isDarwin;
inherit (lib) optional; inherit (lib) optional;
in buildGo117Package { in buildGoPackage {
pname = source.repo; pname = source.repo;
version = "${source.cleanVersion}-${source.shortRev}"; version = "${source.cleanVersion}-${source.shortRev}";

4
nix/status-go/mobile/build.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, utils, callPackage, buildGo116Package { lib, stdenv, utils, callPackage, buildGoPackage
, go, androidPkgs, openjdk, gomobile, xcodeWrapper , go, androidPkgs, openjdk, gomobile, xcodeWrapper
# object with source attributes # object with source attributes
, meta, source , meta, source
@ -23,7 +23,7 @@ let
# formatted for use with -target # formatted for use with -target
targetArchs = map (a: "${platform}/${a}") architectures; targetArchs = map (a: "${platform}/${a}") architectures;
in buildGo116Package { in buildGoPackage {
pname = source.repo; pname = source.repo;
version = "${source.cleanVersion}-${source.shortRev}-${platform}"; version = "${source.cleanVersion}-${source.shortRev}-${platform}";