nix: remove obsolete references to Nimbus sources
This used to be a project to integrate Nimbus with mobile, but it was abandoned. Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
bdfb7e296b
commit
179f1d26ae
2
Makefile
2
Makefile
|
@ -42,7 +42,7 @@ export NIX_CONF_DIR = $(PWD)/nix
|
|||
# Location of symlinks to derivations that should not be garbage collected
|
||||
export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-react
|
||||
# Defines which variables will be kept for Nix pure shell, use semicolon as divider
|
||||
export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE,NIMBUS_SRC_OVERRIDE
|
||||
export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE
|
||||
|
||||
# Useful for Andoird release builds
|
||||
TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
abi-include = "armeabi-v7a;arm64-v8a;x86"; # Android architectures to build for
|
||||
};
|
||||
|
||||
nimbus = { src-override = null; };
|
||||
status-go = { src-override = null; };
|
||||
};
|
||||
|
||||
|
|
|
@ -46,9 +46,6 @@ config=''
|
|||
if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
|
||||
config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
|
||||
fi
|
||||
if [[ -n "${NIMBUS_SRC_OVERRIDE}" ]]; then
|
||||
config+="status-im.nimbus.src-override=\"${NIMBUS_SRC_OVERRIDE}\";"
|
||||
fi
|
||||
config+="status-im.build-type=\"${BUILD_TYPE}\";"
|
||||
|
||||
if [[ -n "$config" ]]; then
|
||||
|
|
|
@ -1,47 +0,0 @@
|
|||
#
|
||||
# This fetches nimbus source from local folder or GitHub and
|
||||
# loads the derivation defined in the `nix/default.nix` in the repo.
|
||||
#
|
||||
|
||||
{ config, lib, stdenv, callPackage, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
inherit (lib) getConfig attrByPath strings traceValFn;
|
||||
|
||||
repo = "nimbus";
|
||||
|
||||
localPath = getConfig "nimbus.src-override" "";
|
||||
localSrc =
|
||||
# We use builtins.path so that we can name the resulting derivation.
|
||||
# Name would be taken from the checkout directory, and wouldn't be deterministic.
|
||||
builtins.path rec {
|
||||
path = traceValFn (path: ''
|
||||
Using local ${repo} sources from ${path}
|
||||
'') localPath;
|
||||
name = "${repo}-source-local";
|
||||
filter =
|
||||
# Keep this filter as restrictive as possible in order to
|
||||
# avoid unnecessary rebuilds and limit closure size
|
||||
lib.mkFilter {
|
||||
root = path;
|
||||
include = [
|
||||
"nix.*" "wrappers.*" "vendor.*"
|
||||
"Makefile" "nim.cfg" "nimbus.nimble" "default.nix"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
ghSrc = fetchFromGitHub rec {
|
||||
inherit repo;
|
||||
name = "${repo}-source-${strings.substring 0 7 rev}";
|
||||
rev = "73278f20d0bf27fb7c6c331b515abb765814f1cc";
|
||||
owner = "status-im";
|
||||
sha256 = "0myq234zqnpmqsc2452xygnyc6sjs8x1blyrpa4bi9v2cwbyap5c";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
src = if localPath != "" then localSrc else ghSrc;
|
||||
|
||||
nimbusDeriv = import "${src}/nix/default.nix";
|
||||
|
||||
in nimbusDeriv
|
|
@ -1,9 +1,9 @@
|
|||
{ config, utils, lib, callPackage, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
inherit (lib) strings traceValFn attrByPath importJSON;
|
||||
inherit (lib) strings traceValFn attrByPath importJSON getConfig;
|
||||
|
||||
srcOverride = attrByPath [ "status-im" "status-go" "src-override" ] null config;
|
||||
srcOverride = getConfig "status-go.src-override" null;
|
||||
# Warning message about using local sources
|
||||
localSrcWarn = (path: "Using local status-go sources from ${path}");
|
||||
|
||||
|
@ -27,7 +27,7 @@ let
|
|||
include = [ ".*" ];
|
||||
exclude = [
|
||||
".*/[.]git.*" ".*[.]md" ".*[.]yml" ".*/.*_test.go$"
|
||||
"_assets/.*" "build/.*"
|
||||
"VERSION" "_assets/.*" "build/.*"
|
||||
".*/.*LICENSE.*" ".*/CONTRIB.*" ".*/AUTHOR.*"
|
||||
];
|
||||
};
|
||||
|
|
|
@ -26,9 +26,6 @@ config=''
|
|||
if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
|
||||
config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
|
||||
fi
|
||||
if [[ -n "${NIMBUS_SRC_OVERRIDE}" ]]; then
|
||||
config+="status-im.nimbus.src-override=\"${NIMBUS_SRC_OVERRIDE}\";"
|
||||
fi
|
||||
if [[ "${ANDROID_APK_SIGNED}" == "true" ]]; then
|
||||
config+="status-im.android.keystore-path=\"$(must_get_env KEYSTORE_PATH)\";"
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue