From 4fc0e0e2470c4b550e1e6f57f39e0cbbbdae7d59 Mon Sep 17 00:00:00 2001 From: tracer-ysyx Date: Wed, 6 Mar 2024 12:15:20 +0800 Subject: [PATCH] =?UTF-8?q?>=20compile=20NEMU=20ysyx=5F22040000=20?= =?UTF-8?q?=E6=9D=8E=E5=BF=83=E6=9D=A8=20Linux=20calcite=206.6.18=20#1-Nix?= =?UTF-8?q?OS=20SMP=20PREEMPT=5FDYNAMIC=20Fri=20Feb=2023=2008:25:28=20UTC?= =?UTF-8?q?=202024=20x86=5F64=20GNU/Linux=20=2012:15:20=20=20up=201=20day?= =?UTF-8?q?=2015:43,=20=202=20users,=20=20load=20average:=201.21,=200.90,?= =?UTF-8?q?=200.67?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.nix | 2 +- nemu/Makefile | 2 +- nemu/default.nix | 4 +++- result | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 990d66d..6656094 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ }; in { - packages.nemu = pkgs.callPackage ./nemu {}; + packages.nemu = pkgs.callPackage ./nemu { am-kernels = self.packages.${system}.am-kernels; }; packages.am-kernels = crossPkgs.stdenv.mkDerivation rec { pname = "am-kernels"; diff --git a/nemu/Makefile b/nemu/Makefile index 928f973..55d36f1 100644 --- a/nemu/Makefile +++ b/nemu/Makefile @@ -95,4 +95,4 @@ integration-tests: $(IMAGES) test: unit-tests integration-tests @$(OBJ_DIR)/tests/expr_test -.PHONY: test integration-tests \ No newline at end of file +.PHONY: test integration-tests unit-tests \ No newline at end of file diff --git a/nemu/default.nix b/nemu/default.nix index 162a77a..e97588e 100644 --- a/nemu/default.nix +++ b/nemu/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { ]; checkInputs = [ + pkgs.check am-kernels ]; - IMAGES_PATH = "${am-kernels}/share/images" + IMAGES_PATH = "${am-kernels}/share/images"; configurePhase = '' export NEMU_HOME=$(pwd) @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { make ''; + doCheck = true; checkPhase = '' make test ''; diff --git a/result b/result index 172ba27..88d0079 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/d0jlcjdrgsb5pis8flyy5ihifdnfhms5-am-kernels-riscv32-none-elf-2024.02.18 \ No newline at end of file +/nix/store/g0h98bppypvyz3z4sv45kl9218ad2gsq-nemu-2024-03-02 \ No newline at end of file