diff --git a/pkgs/by-name/ki/kicad/libraries.nix b/pkgs/by-name/ki/kicad/libraries.nix index c0026d382dc85..5a4504e1120d4 100644 --- a/pkgs/by-name/ki/kicad/libraries.nix +++ b/pkgs/by-name/ki/kicad/libraries.nix @@ -3,6 +3,7 @@ stdenv, cmake, libSrc, + compressStep, stepreduce, parallel, zip, @@ -27,9 +28,9 @@ let postInstall = lib.optionalString (name == "packages3d") '' - find $out -type f -name '*.step' | parallel 'stepreduce {} {} && zip -9 {.}.stpZ {} && rm {}' + find $out -type f -name '*.step' | parallel 'stepreduce {} {} ${lib.optionalString compressStep "&& zip -9 {.}.stpZ {} && rm {}"}' '' - + lib.optionalString (name == "footprints") '' + + lib.optionalString ((name == "footprints") && compressStep) '' grep -rl '\.step' $out | xargs sed -i 's/\.step/.stpZ/g' ''; diff --git a/pkgs/by-name/ki/kicad/package.nix b/pkgs/by-name/ki/kicad/package.nix index 284c39c69cb49..80b1acb7b60ee 100644 --- a/pkgs/by-name/ki/kicad/package.nix +++ b/pkgs/by-name/ki/kicad/package.nix @@ -23,6 +23,7 @@ pname ? "kicad", stable ? true, + compressStep ? true, testing ? false, withNgspice ? !stdenv.hostPlatform.isDarwin, libngspice, @@ -177,7 +178,7 @@ in stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. - passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; + passthru.libraries = callPackages ./libraries.nix { inherit libSrc compressStep; }; passthru.callPackage = newScope { inherit addonPath python3; }; base = callPackage ./base.nix { inherit stable testing; diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix index 33f61e9271f34..1a2fe52c21112 100644 --- a/pkgs/by-name/op/openroad/package.nix +++ b/pkgs/by-name/op/openroad/package.nix @@ -118,7 +118,8 @@ stdenv.mkDerivation rec { # Upstream uses vendored package versions for some dependencies, so regression testing is prudent # to see if there are any breaking changes in unstable that should be vendored as well. - doCheck = !stdenv.hostPlatform.isDarwin; # it seems to hang on darwin + doCheck = + !(stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)); # it seems to hang on darwin and linux-aarch64 checkPhase = '' make test ../test/regression diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index 462cdd5811155..b82e20016a043 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { btor2tools ]; - doCheck = true; + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); # timeout tests fail on linux-aarch64 checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/si/silice/package.nix b/pkgs/by-name/si/silice/package.nix index eda8ada65570b..0e50623c659df 100644 --- a/pkgs/by-name/si/silice/package.nix +++ b/pkgs/by-name/si/silice/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "silice"; - version = "0-unstable-2025-07-03"; + version = "0-unstable-2025-10-02"; src = fetchFromGitHub { owner = "sylefeb"; repo = "silice"; - rev = "656632ec300f8be3636cfd9bca5be954fc9c9120"; - hash = "sha256-0awHQrGm4ggWE9+69ova1cXAaesaMNihbzpgAytRTks="; + rev = "73bebc454ef36cf447a99b5c50409af171675279"; + hash = "sha256-GsIOs41wUjq1IYZcrASMEHAvS2/vJeJRK7I/cqSgzYY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/yo/yosys/fix-clang-build.patch b/pkgs/by-name/yo/yosys/fix-clang-build.patch deleted file mode 100644 index 63cec283ad656..0000000000000 --- a/pkgs/by-name/yo/yosys/fix-clang-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/tests/cxxrtl/run-test.sh b/tests/cxxrtl/run-test.sh -index ee299fc82..595cd3f88 100755 ---- a/tests/cxxrtl/run-test.sh -+++ b/tests/cxxrtl/run-test.sh -@@ -5,7 +5,7 @@ set -ex - run_subtest () { - local subtest=$1; shift - -- ${CC:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++ -+ ${CXX:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++ - ./cxxrtl-test-${subtest} - } - -@@ -14,4 +14,4 @@ run_subtest value_fuzz - - # Compile-only test. - ../../yosys -p "read_verilog test_unconnected_output.v; select =*; proc; clean; write_cxxrtl cxxrtl-test-unconnected_output.cc" --${CC:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc -+${CXX:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc -diff --git a/tests/fmt/run-test.sh b/tests/fmt/run-test.sh -index 998047f83..2a4a59f01 100644 ---- a/tests/fmt/run-test.sh -+++ b/tests/fmt/run-test.sh -@@ -51,7 +51,7 @@ test_cxxrtl () { - local subtest=$1; shift - - ../../yosys -p "read_verilog ${subtest}.v; proc; clean; write_cxxrtl -print-output std::cerr yosys-${subtest}.cc" -- ${CC:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++ -+ ${CXX:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++ - ./yosys-${subtest} 2>yosys-${subtest}.log - iverilog -o iverilog-${subtest} ${subtest}.v ${subtest}_tb.v - ./iverilog-${subtest} |grep -v '\$finish called' >iverilog-${subtest}.log -@@ -69,7 +69,7 @@ diff iverilog-always_full.log iverilog-always_full-1.log - - ../../yosys -p "read_verilog display_lm.v" >yosys-display_lm.log - ../../yosys -p "read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc" --${CC:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++ -+${CXX:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++ - ./yosys-display_lm_cc >yosys-display_lm_cc.log - for log in yosys-display_lm.log yosys-display_lm_cc.log; do - grep "^%l: \\\\bot\$" "$log" diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix index 477b3cebdfa40..9eab3516826c6 100644 --- a/pkgs/by-name/yo/yosys/package.nix +++ b/pkgs/by-name/yo/yosys/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, # nativeBuildInputs bison, @@ -87,13 +86,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.55"; + version = "0.58"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; tag = "v${finalAttrs.version}"; - hash = "sha256-GddNbAtH5SPm7KTa5kCm/vGq4xOczx+jCnOSQl55gUI="; + hash = "sha256-UAivGDi7omNTS5Qb9Yx8vMiAzbu7ezR8sa/8dag3AlY="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' @@ -135,16 +134,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ]; patches = [ - # Backport fix amaranth code compilation - # TODO remove when updating to 0.56 - # https://github.com/YosysHQ/yosys/pull/5182 - (fetchpatch2 { - name = "treat-zero-width-constant-as-zero.patch"; - url = "https://github.com/YosysHQ/yosys/commit/478b6a2b3fbab0fd4097b841914cbe8bb9f67268.patch"; - hash = "sha256-KeLoZfkXMk2KIPN9XBQdqWqohywQONlWUIvrGwgphKs="; - }) ./plugin-search-dirs.patch - ./fix-clang-build.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/yosys/plugins/synlig.nix b/pkgs/development/compilers/yosys/plugins/synlig.nix index c596835ecb56a..479ddc8ff6272 100644 --- a/pkgs/development/compilers/yosys/plugins/synlig.nix +++ b/pkgs/development/compilers/yosys/plugins/synlig.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hzeller ]; platforms = lib.platforms.all; + broken = true; # expected headers not found in yosys 0.58 }; })