diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index ffb55f28ca28..69179a6b7eec 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -78,10 +78,11 @@ buildPythonPackage rec { ]; # test_calibration.py generates a divide by zero error on darwin + # and fails on Linux after updates of dependenceis # https://github.com/scikit-rf/scikit-rf/issues/972 - disabledTestPaths = lib.optional ( - stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin - ) "skrf/calibration/tests/test_calibration.py"; + disabledTestPaths = [ + "skrf/calibration/tests/test_calibration.py" + ]; pythonImportsCheck = [ "skrf" ]; diff --git a/pkgs/development/python-modules/verilogae/default.nix b/pkgs/development/python-modules/verilogae/default.nix index b5d96cb29fab..b56db61dc137 100644 --- a/pkgs/development/python-modules/verilogae/default.nix +++ b/pkgs/development/python-modules/verilogae/default.nix @@ -6,9 +6,8 @@ rustPlatform, cargo, rustc, - autoPatchelfHook, pkg-config, - llvmPackages_15, + llvmPackages, libxml2, ncurses, zlib, @@ -16,26 +15,26 @@ buildPythonPackage rec { pname = "verilogae"; - version = "1.0.0"; + version = "24.0.0mob-unstable-2025-07-21"; pyproject = true; + stdenv = llvmPackages.stdenv; + src = fetchFromGitHub { - owner = "pascalkuthe"; - repo = "OpenVAF"; - rev = "VerilogAE-v${version}"; - hash = "sha256-TILKKmgSyhyxp88sdflDXAoH++iP6CMpdoXN1/1fsjU="; + owner = "OpenVAF"; + repo = "OpenVAF-Reloaded"; + rev = "d878f5519b1767b64c6ebeb4d67e29e7cd46e60b"; + hash = "sha256-TDE2Ewokhm2KSKe+sunUbV8KD3kaTSd5dB3CLCWGJ9U="; }; postPatch = '' - substituteInPlace openvaf/llvm/src/initialization.rs \ - --replace-fail "i8" "libc::c_char" substituteInPlace openvaf/osdi/build.rs \ --replace-fail "-fPIC" "" ''; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-/gSqaxqOZUkUmJJ5PGMkAG/5PSeAjwDjT2ce+tL7xmY"; + hash = "sha256-5SLrVL3h6+tptHv3GV7r8HUTrYQC9VdF68O2/Uct3xA="; }; nativeBuildInputs = [ @@ -44,15 +43,13 @@ buildPythonPackage rec { rustPlatform.bindgenHook cargo rustc - autoPatchelfHook pkg-config - llvmPackages_15.clang - llvmPackages_15.llvm + llvmPackages.llvm ]; buildInputs = [ libxml2.dev - llvmPackages_15.libclang + llvmPackages.libclang ncurses zlib ]; @@ -71,7 +68,7 @@ buildPythonPackage rec { jasonodoom jleightcap ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; }