Fix CI toolchain selection
This commit is contained in:
parent
06375ba328
commit
8e95014840
3 changed files with 36 additions and 11 deletions
21
flake.nix
21
flake.nix
|
|
@ -2,7 +2,7 @@
|
|||
description = "Burrow development shell and forge host configuration";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "tarball+https://codeload.github.com/NixOS/nixpkgs/tar.gz/nixos-unstable";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
flake-utils.url = "tarball+https://codeload.github.com/numtide/flake-utils/tar.gz/main";
|
||||
agenix = {
|
||||
url = "github:ryantm/agenix";
|
||||
|
|
@ -39,17 +39,28 @@
|
|||
};
|
||||
lib = pkgs.lib;
|
||||
bazelPkg =
|
||||
if lib.hasAttr "bazel_7" pkgs then
|
||||
pkgs.bazel_7
|
||||
if lib.hasAttr "bazelisk" pkgs then
|
||||
pkgs.bazelisk
|
||||
else if lib.hasAttr "bazel_9" pkgs then
|
||||
pkgs.bazel_9
|
||||
else if lib.hasAttr "bazel" pkgs then
|
||||
pkgs.bazel
|
||||
else
|
||||
pkgs.bazelisk;
|
||||
pkgs.bazel_7;
|
||||
buildifierPkg =
|
||||
if lib.hasAttr "buildifier" pkgs then
|
||||
pkgs.buildifier
|
||||
else
|
||||
pkgs.bazel-buildtools;
|
||||
nodejsPkg =
|
||||
if lib.hasAttr "nodejs_22" pkgs then
|
||||
pkgs.nodejs_22
|
||||
else if lib.hasAttr "nodejs_24" pkgs then
|
||||
pkgs.nodejs_24
|
||||
else if lib.hasAttr "nodejs" pkgs then
|
||||
pkgs.nodejs
|
||||
else
|
||||
pkgs.nodejs_20;
|
||||
optionalPackage = name: lib.optional (lib.hasAttr name pkgs) (lib.getAttr name pkgs);
|
||||
googleKmsPkcs11Package =
|
||||
if pkgs.stdenv.hostPlatform.isx86_64 && pkgs.stdenv.isLinux then
|
||||
|
|
@ -125,7 +136,7 @@ EOF
|
|||
opentofu
|
||||
curl
|
||||
jq
|
||||
nodejs_20
|
||||
nodejsPkg
|
||||
python3
|
||||
openssl
|
||||
rsync
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue