From 036f056b31d463324e6aed12abff31a995a2f96e Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Wed, 30 Apr 2025 13:29:03 +0800 Subject: [PATCH] ieda: 0-unstable-2025-03-12 -> 0-unstable-2025-04-14 Signed-off-by: Qiming Chu --- pkgs/by-name/ie/ieda/package.nix | 34 ++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix index 566a66f016d7..e87b5aa8247c 100644 --- a/pkgs/by-name/ie/ieda/package.nix +++ b/pkgs/by-name/ie/ieda/package.nix @@ -35,11 +35,11 @@ let }); rootSrc = stdenv.mkDerivation { pname = "iEDA-src"; - version = "2025-03-12"; + version = "2025-04-14"; src = fetchgit { url = "https://gitee.com/oscc-project/iEDA"; - rev = "3a066726aa9521991a46d603f041831361d3ba51"; - sha256 = "sha256-iPdp1xEje8bBumI/eqhvw0llg3NAzRb8pzc3fmWMwtU="; + rev = "51d198884cde2ecda643071a1a6cb4ec0e09d881"; + sha256 = "sha256-kDVEAttSqa8l7qcRs7MQiBgPbAKBExEQvIE8tc7PLpM="; }; patches = [ @@ -47,8 +47,15 @@ let # and remove some libs or path that they hard-coded in the source code. # Should be removed after we upstream these changes. (fetchpatch { - url = "https://github.com/Emin017/iEDA/commit/0eb86754063df6e21b35fd1396363ebc75b760c5.patch"; - hash = "sha256-hdH6+g3eZUxDudWqTwbaWNKS0fwfUWJPp//dqGNJQfM="; + url = "https://github.com/Emin017/iEDA/commit/e899b432776010048b558a939ad9ba17452cb44f.patch"; + hash = "sha256-fLKsb/dgbT1mFCWEldFwhyrA1HSkKGMAbAs/IxV9pwM="; + }) + # This patch is to fix the compile error on the newer version of gcc/g++ + # which is caused by some incorrect declarations and usages of the Boost library. + # Should be removed after we upstream these changes. + (fetchpatch { + url = "https://github.com/Emin017/iEDA/commit/3a2c7e27a5bd349d72b3a7198358cd640c678802.patch"; + hash = "sha256-2YROkQ92jGOJZr+4+LrwRJKxhA39Bypb1xFdo6aftu8="; }) ]; @@ -64,7 +71,7 @@ let in stdenv.mkDerivation { pname = "iEDA"; - version = "0-unstable-2025-03-12"; + version = "0-unstable-2025-04-14"; src = rootSrc; @@ -111,8 +118,23 @@ stdenv.mkDerivation { postInstall = '' # Tests rely on hardcoded path, so they should not be included rm $out/bin/*test $out/bin/*Test $out/bin/test_* $out/bin/*_app + + # Copy scripts to the share directory for the test + mkdir -p $out/share/scripts + cp -r $src/scripts/hello.tcl $out/share/scripts/ ''; + installCheckPhase = '' + runHook preInstallCheck + + # Run the tests + $out/bin/iEDA -script $out/share/scripts/hello.tcl + + runHook postInstallCheck + ''; + + doInstallCheck = true; + enableParallelBuild = true; meta = {