opensource/teleport
3
0
Fork 0
mirror of https://github.com/gravitational/teleport.git synced 2026-09-24 16:17:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[devbox] Speed up yarn install, unset GOROOT. (#27664)

Browse Source 
* Speed up yarn install, set GOROOT to nix go.

Yarn is now being installed via yarn's generic install script, which seems
to be much faster than the corresponding nix package. Additionally, the GOROOT
environment variable is being properly set to the nix's go installation.

* Unset goroot instead of trying to set it.
This commit is contained in:
Michael Wilson
2023-06-12 13:01:18 +00:00
committed by GitHub
parent 0961bcba79
commit cb493019bb
3 changed files with 30 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.assets/flake/flake.nix
+24
View File
@@ -53,6 +53,7 @@
nodeProtocTsVersion = "5.0.1";
grpcToolsVersion = "1.12.4";
libpcscliteVersion = "1.9.9-teleport";
yarnVersion = "1.22.19";
# Package aliases to make reusing these packages easier.
# The individual package names here have been determined by using
@@ -190,6 +191,28 @@
'';
};
# Yarn binary.
yarn = pkgs.stdenv.mkDerivation {
name = "yarn";
dontUnpack = true;
buildInputs = [
pkgs.cacert
pkgs.curl
pkgs.nodejs-16_x
];
buildPhase = ''
mkdir "$out"
export HOME="$out"
export PROFILE="$HOME/.bashrc"
touch "$PROFILE"
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version ${yarnVersion}
cd "$out/.yarn"
mv * ..
cd "$out"
rm -rf .yarn
'';
};
conditional = if pkgs.stdenv.isLinux then pkgs.stdenv.mkDerivation {
name = "conditional";
dontUnpack = true;
@@ -209,6 +232,7 @@
libpcsclite = libpcsclite;
protoc-gen-gogo = protoc-gen-gogo;
rust = rust;
yarn = yarn;
};
});
}
devbox.json
+6 -3
View File
@@ -17,17 +17,20 @@
"python@3.11.2",
"shellcheck@0.9.0",
"yamllint@1.28.0",
"yarn@1.22.19",
"path:build.assets/flake#conditional",
"path:build.assets/flake#helm",
"path:build.assets/flake#golangci-lint",
"path:build.assets/flake#grpc-tools",
"path:build.assets/flake#libpcsclite",
"path:build.assets/flake#protoc-gen-gogo",
"path:build.assets/flake#rust"
"path:build.assets/flake#rust",
"path:build.assets/flake#yarn"
],
"shell": {
"init_hook": "export TELEPORT_DEVBOX=1"
"init_hook": [
"export TELEPORT_DEVBOX=1",
"unset GOROOT"
]
},
"nixpkgs": {
"commit": "f91ee3065de91a3531329a674a45ddcb3467a650"
devbox.lock
-55
View File
@@ -9,14 +9,6 @@
"bash": {
"resolved": "github:NixOS/nixpkgs/f91ee3065de91a3531329a674a45ddcb3467a650#bash"
},
"bash@5.2-p15": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#bash",
"version": "5.2-p15"
},
"bash_5": {
"resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#bash_5"
},
"bats@1.3.0": {
"last_modified": "2021-09-01T12:51:06Z",
"resolved": "github:NixOS/nixpkgs/6cc260cfd60f094500b79e279069b499806bf6d8#bats",
@@ -27,11 +19,6 @@
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#clang",
"version": "11.1.0"
},
"gcc@12.2.0": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#gcc12",
"version": "12.2.0"
},
"gci@0.9.1": {
"last_modified": "2023-02-28T22:11:13Z",
"resolved": "github:NixOS/nixpkgs/995edc972ad3a1e291ac22d74b9610821357175f#gci",
@@ -40,29 +27,6 @@
"git": {
"resolved": "github:NixOS/nixpkgs/f91ee3065de91a3531329a674a45ddcb3467a650#git"
},
"git@2.40.1": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#git",
"version": "2.40.1"
},
"go@1.20.3": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#go",
"version": "1.20.3"
},
"go_1_20": {
"resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#go_1_20"
},
"gotestsum@latest": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#gotestsum",
"version": "1.10.0"
},
"kubernetes-helm@3.11.1": {
"last_modified": "2023-02-28T22:11:13Z",
"resolved": "github:NixOS/nixpkgs/995edc972ad3a1e291ac22d74b9610821357175f#kubernetes-helm",
"version": "3.11.1"
},
"libfido2@1.13.0": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#libfido2",
@@ -73,9 +37,6 @@
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#libiconvReal",
"version": "1.16"
},
"nodejs": {
"resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#nodejs"
},
"nodejs@16.18.1": {
"last_modified": "2023-01-02T04:31:48Z",
"resolved": "github:NixOS/nixpkgs/a4379d2b0deefedc8dba360897557707ea9ee9a7#nodejs-16_x",
@@ -86,28 +47,17 @@
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#patchelf",
"version": "0.15.0"
},
"path:build.assets/flake": {},
"path:build.assets/flake#helm": {},
"protobuf3_20@3.20.3": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#protobuf3_20",
"version": "3.20.3"
},
"protoc-gen-go@1.28.1": {
"last_modified": "2023-02-28T22:11:13Z",
"resolved": "github:NixOS/nixpkgs/995edc972ad3a1e291ac22d74b9610821357175f#protoc-gen-go",
"version": "1.28.1"
},
"python@3.11.2": {
"last_modified": "2023-03-31T22:52:29Z",
"plugin_version": "0.0.1",
"resolved": "github:NixOS/nixpkgs/242246ee1e58f54d2322227fc5eef53b4a616a31#python311",
"version": "3.11.2"
},
"rustup": {
"plugin_version": "0.0.1",
"resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#rustup"
},
"shellcheck@0.9.0": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#shellcheck",
@@ -117,11 +67,6 @@
"last_modified": "2023-02-28T22:11:13Z",
"resolved": "github:NixOS/nixpkgs/995edc972ad3a1e291ac22d74b9610821357175f#yamllint",
"version": "1.28.0"
},
"yarn@1.22.19": {
"last_modified": "2023-05-01T16:53:22Z",
"resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#yarn",
"version": "1.22.19"
}
}
}