status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-23 08:08:33 +00:00
Code Issues Projects Releases Wiki Activity

nix: fix warnings and upgrade to 2.24.11 (#21547)

Browse Source 
These warnings are fixed:

```
warning: ignoring the client-specified setting 'keep-derivations', because it is a restricted setting and you are not a trusted user
warning: ignoring the client-specified setting 'keep-outputs', because it is a restricted setting and you are not a trusted user
warning: ignoring the client-specified setting 'sandbox', because it is a restricted setting and you are not a trusted user
warning: ignoring the client-specified setting 'stalled-download-timeout', because it is a restricted setting and you are not a trusted user
warning: ignoring the client-specified setting 'trusted-public-keys', because it is a restricted setting and you are not a trusted user
warning: ignoring the client-specified setting 'trusted-substituters', because it is a restricted setting and you are not a trusted user
```
This commit is contained in:
Siddarth Kumar 2025-01-14 09:42:14 +05:30 committed by GitHub
parent f56bd54fd3
commit 6ffdaa4e25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -43,8 +43,6 @@ 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
# Our custom config is located in nix/nix.conf
export NIX_USER_CONF_FILES = $(PWD)/nix/nix.conf
# Location of symlinks to derivations that should not be garbage collected # Location of symlinks to derivations that should not be garbage collected
export _NIX_GCROOTS = ./.nix-gcroots export _NIX_GCROOTS = ./.nix-gcroots
# Defines which variables will be kept for Nix pure shell, use semicolon as divider # Defines which variables will be kept for Nix pure shell, use semicolon as divider

2
ci/Jenkinsfile.android
View File

@ -5,7 +5,7 @@ library 'status-jenkins-lib@v1.9.13'
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()
pipeline { pipeline {
agent { label 'linux && x86_64 && nix-2.19' } agent { label 'linux && x86_64 && nix-2.24' }
options { options {
timestamps() timestamps()

2
ci/Jenkinsfile.ios
View File

@ -5,7 +5,7 @@ library 'status-jenkins-lib@v1.9.13'
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()
pipeline { pipeline {
agent { label 'macos && arm64 && nix-2.19 && xcode-15.1' } agent { label 'macos && arm64 && nix-2.24 && xcode-15.1' }
parameters { parameters {
string( string(

2
ci/Jenkinsfile.tests
View File

@ -5,7 +5,7 @@ library 'status-jenkins-lib@v1.9.13'
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()
pipeline { pipeline {
agent { label 'linux && x86_64 && nix-2.19' } agent { label 'linux && x86_64 && nix-2.24' }
options { options {
timestamps() timestamps()

4
nix/scripts/lib.sh
View File

@ -38,8 +38,8 @@ nix_install_type() {
"${UID}") echo "single";; "${UID}") echo "single";;
"(${UID})") echo "single";; "(${UID})") echo "single";;
"") echo "none"; "") echo "none";
echo "No Nix installtion detected!" >&2;; echo "No Nix installation detected!" >&2;;
*) echo "Unknown Nix installtion type!" >&2; exit 1;; *) echo "Unknown Nix installation type!" >&2; exit 1;;
esac esac
fi fi
} }

6
nix/scripts/version.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export NIX_VERSION="2.19.3" export NIX_VERSION="2.24.11"
export NIX_PACKAGE="nixVersions.nix_2_19" export NIX_PACKAGE="nixVersions.nix_2_24"
export NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install" export NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
export NIX_INSTALL_SHA256="73d47b0ab783fddca1b2d44a03d52a74c97c28a1fc8ff5a29419079302ef9c3d" export NIX_INSTALL_SHA256="5c610a0e97c8a2dd48c1a630608502e43fdecd7d2572463dd4166126106d9188"
export NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}" export NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"

3
nix/shell.nix
View File

@ -38,6 +38,9 @@ in mkShell {
LANG="en_US.UTF-8"; LANG="en_US.UTF-8";
LANGUAGE="en_US.UTF-8"; LANGUAGE="en_US.UTF-8";
# Important to load our own Nix binary cache.
NIX_CONFIG = builtins.readFile ./nix.conf;
# just a nicety for easy access to node scripts # just a nicety for easy access to node scripts
shellHook = '' shellHook = ''
export STATUS_MOBILE_HOME=$(git rev-parse --show-toplevel) export STATUS_MOBILE_HOME=$(git rev-parse --show-toplevel)