diff --git a/pkgs/by-name/ab/abc-verifier/package.nix b/pkgs/by-name/ab/abc-verifier/package.nix index be78f1d38f68..6c25ed6dd5ab 100644 --- a/pkgs/by-name/ab/abc-verifier/package.nix +++ b/pkgs/by-name/ab/abc-verifier/package.nix @@ -8,18 +8,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "abc-verifier"; - version = "0.55"; + version = "0.61"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ib6bZSPQmpI1UOsUG733TH6W6v+UnLyagdjUc8MreKw="; + hash = "sha256-j/JmEJa29mT/XQmVL/adVbj4S+AAgpga1jbEinCN16w="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; + cmakeFlags = [ + # This prevents CMake from trying to download googletest during the build + (lib.cmakeBool "ABC_SKIP_TESTS" true) + ]; + installPhase = '' runHook preInstall install -Dm755 'abc' "$out/bin/abc" @@ -30,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.rev = finalAttrs.src.rev; meta = { - description = "Tool for squential logic synthesis and formal verification"; + description = "Tool for sequential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 0b900710c785..f00f08cc080d 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -3,6 +3,7 @@ stdenv, callPackage, fetchFromGitHub, + fetchpatch, runCommandLocal, makeWrapper, replaceVars, @@ -50,6 +51,12 @@ stdenv.mkDerivation rec { libipasir = callPackage ./libipasirglucose4 { }; patches = [ + # The upstream fix for the input-files macro regression + (fetchpatch { + url = "https://github.com/acl2/acl2/commit/be39e7835f1c68008c17188d2f65eeaef61632fa.patch"; + sha256 = "sha256-pZ/r0vlyJz7ymYfrVtHDxsLdw0M/MJStBH42ZLO7Fs4="; + }) + (replaceVars ./0001-path-changes-for-nix.patch { libipasir = "${libipasir}/lib/${libipasir.libname}"; libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";