Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nix] update shellHook to use coursier internal env #977

Merged
merged 1 commit into from
Feb 25, 2025
Merged

[nix] update shellHook to use coursier internal env #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
- name: "Check Scala code format"
run: |
echo "$JAVA_OPTS" | tr ' ' '\n' > "$HOME/.mill-java-opts"
export MILL_JVM_OPTS_PATH="$HOME/.mill-java-opts"
nix run ".#t1.elaborator.format" check
export JAVA_TOOL_OPTIONS="$JAVA_OPTS"
nix develop ".#t1.elaborator" -c mill -i _.checkFormat
- name: "Check difftest code format"
run: |
nix shell '.#cargo' '.#rustfmt' -c bash -c 'cd difftest && cargo fmt --check'
Expand Down
98 changes: 42 additions & 56 deletions nix/t1/mill-modules.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, fetchMillDeps
, makeWrapper
, runCommand
, jdk21

# chisel deps
Expand All @@ -20,6 +21,29 @@

let
t1MillDeps = mill-ivy-fetcher.deps-builder ../../dependencies/ivys/t1/_sources/generated.nix;

coursierEnvInputs = with submodules; [
ivy-arithmetic.setupHook
ivy-chisel.setupHook
ivy-chisel-panama.setupHook
ivy-chisel-interface.setupHook
ivy-rvdecoderdb.setupHook
ivy-hardfloat.setupHook
] ++ t1MillDeps.ivyDepsList;

coursierEnv = runCommand "build-coursier-env"
{
buildInputs = coursierEnvInputs;
passthru = {
inherit coursierEnvInputs;
};
} ''
runHook preUnpack
runHook postUnpack
runHook prePatch
cp -r "$NIX_MILL_HOME" "$out"
'';

self = stdenv.mkDerivation {
name = "t1-all-mill-modules";

Expand All @@ -40,15 +64,9 @@ let
];
};

buildInputs = with submodules; [
ivy-arithmetic.setupHook
ivy-chisel.setupHook
ivy-chisel-panama.setupHook
ivy-chisel-interface.setupHook
ivy-rvdecoderdb.setupHook
ivy-hardfloat.setupHook
riscv-opcodes
] ++ t1MillDeps.ivyDepsList;
buildInputs = [
submodules.riscv-opcodes
] ++ coursierEnvInputs;

nativeBuildInputs = [
mill
Expand All @@ -67,17 +85,22 @@ let
};

shellHook = ''
export NIX_COURSIER_HOME="$(mktemp -d -t 'coursier_repo_XXX')"
mkdir -p "$NIX_COURSIER_HOME/local"
if [[ ! -d ".git" || ! -f "build.mill" ]]; then
echo "Not in project root, exit" >&2
exit 1
fi

export NIX_COURSIER_HOME="$PWD/out/.nixCoursierHome"
export COURSIER_REPOSITORIES="ivy2Local|central"
export COURSIER_CACHE="$NIX_COURSIER_HOME/cache"
export JAVA_TOOL_OPTIONS="-Dcoursier.ivy.home=$NIX_COURSIER_HOME $JAVA_TOOL_OPTIONS"
mkdir -p "$NIX_COURSIER_HOME" "$COURSIER_CACHE"

cp -rT "${coursierEnv}/.ivy2/local" "$NIX_COURSIER_HOME/local"
cp -r ${coursierEnv}/.cache/coursier/v1/* "$COURSIER_CACHE/"

lndir ${submodules.ivy-arithmetic}/.ivy2/local "$NIX_COURSIER_HOME/local"
lndir ${submodules.ivy-chisel}/.ivy2/local "$NIX_COURSIER_HOME/local"
lndir ${submodules.ivy-chisel-panama}/.ivy2/local "$NIX_COURSIER_HOME/local"
lndir ${submodules.ivy-chisel-interface}/.ivy2/local "$NIX_COURSIER_HOME/local"
lndir ${submodules.ivy-rvdecoderdb}/.ivy2/local "$NIX_COURSIER_HOME/local"
lndir ${submodules.ivy-hardfloat}/.ivy2/local "$NIX_COURSIER_HOME/local"
chown -R $USER:nobody "$NIX_COURSIER_HOME"
chmod -R u+w "$NIX_COURSIER_HOME"
'';

outputs = [ "out" "omreader" "elaborator" ];
Expand Down Expand Up @@ -123,45 +146,8 @@ let
--add-flags "-cp $out/share/java/omreader.jar"
'';

passthru.format = writeShellApplication {
name = "mill-format-for-t1";
runtimeInputs = [ mill ];
text = ''
subcmd="''${1:-}"
[[ -z "$subcmd" ]] && \
echo "no subcmd specify, available: (check, run)" >&2 && exit 1

_targetsToCheck=(
"elaborator"
"omreader"
"omreaderlib"
"rocketv"
"t1"
"t1emu"
"t1rocket"
"t1rocketemu"
)

case "$subcmd" in
check)
for _t in "''${_targetsToCheck[@]}"; do
if ! mill -i "$_t".checkFormat; then
echo "[ERROR] Please run 'mill -i $_t.reformat' before elaborate!" >&2
exit 1
fi
done
;;
run)
for _t in "''${_targetsToCheck[@]}"; do
mill -i "$_t".reformat || true
done
;;
*)
echo "Invalid subcmd $subcmd, available: (check, run)" >&2
exit 1
;;
esac
'';
passthru = {
inherit coursierEnv;
};
};
in
Expand Down