From 5f50a8c39a24c48876f4953de5500c73a3869177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 16 Jun 2023 14:05:18 +0200 Subject: [PATCH] nix: upgrade interpreter from 2.11.1 to 2.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a mild upgrade that should not cause any controversy. You can read about changes here: - https://nixos.org/manual/nix/stable/release-notes/rl-2.12.html - https://nixos.org/manual/nix/stable/release-notes/rl-2.13.html - https://nixos.org/manual/nix/stable/release-notes/rl-2.14.html Relevant `infra-ci` change: - https://github.com/status-im/infra-ci/commit/e4e9796f The simplest way to upgrade to `2.14` your version locally is using: ```sh nix-channel --update nix-env -iA nixpkgs.nixVersions.nix_2_14 nixpkgs.cacert sudo systemctl daemon-reload sudo systemctl restart nix-daemon ``` For MacOS the instructions are a bit different: https://nixos.org/manual/nix/stable/installation/upgrading.html Keep in mind you should use `nixpkgs.nixVersions.nix_2_14` instead of just `nixpkgs.nix` to avoid getting newer than `2.14`. Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.android | 2 +- ci/Jenkinsfile.ios | 2 +- ci/Jenkinsfile.tests | 2 +- nix/scripts/setup.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index da58dcaed7..876c33a5f2 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -4,7 +4,7 @@ library 'status-jenkins-lib@v1.7.9' def isPRBuild = utils.isPRBuild() pipeline { - agent { label 'linux && x86_64 && nix-2.11' } + agent { label 'linux && x86_64 && nix-2.14' } options { timestamps() diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index c561c8dd21..ee2c0b251b 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -4,7 +4,7 @@ library 'status-jenkins-lib@v1.7.9' def isPRBuild = utils.isPRBuild() pipeline { - agent { label 'macos && arm64 && nix-2.11 && xcode-14.3' } + agent { label 'macos && arm64 && nix-2.14 && xcode-14.3' } parameters { string( diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests index fe5591c1d0..50b0568c9a 100644 --- a/ci/Jenkinsfile.tests +++ b/ci/Jenkinsfile.tests @@ -4,7 +4,7 @@ library 'status-jenkins-lib@v1.7.9' def isPRBuild = utils.isPRBuild() pipeline { - agent { label 'linux && x86_64 && nix-2.11' } + agent { label 'linux && x86_64 && nix-2.14' } options { timestamps() diff --git a/nix/scripts/setup.sh b/nix/scripts/setup.sh index a8e82b0968..ab56440869 100755 --- a/nix/scripts/setup.sh +++ b/nix/scripts/setup.sh @@ -6,9 +6,9 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) source "${GIT_ROOT}/nix/scripts/lib.sh" source "${GIT_ROOT}/scripts/colors.sh" -NIX_VERSION="2.11.1" +NIX_VERSION="2.14.1" NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install" -NIX_INSTALL_SHA256="4569a01dc5f62056f29f3195673bc3242fc70bf2474927fb5d8549c4d997402d" +NIX_INSTALL_SHA256="565974057264f0536f600c68d59395927cd73e9fc5a60f33c1906e8f7bc33fcf" NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}" install_nix() {