From c9f169fae44c78af259996290755d46e0a837025 Mon Sep 17 00:00:00 2001 From: rina Date: Fri, 20 Dec 2024 10:19:26 +1000 Subject: [PATCH 1/2] alive2-aslp: 0-unstable-2024-12-16 -> 0-unstable-2024-12-17 Diff: https://github.com/katrinafyi/alive2/compare/a41421eecbfb786925c936c1b4131f33937b615c...e51f11b74c77682700bdd8e886c56a562a338b69 --- llvm-translator/alive2-aslp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm-translator/alive2-aslp.nix b/llvm-translator/alive2-aslp.nix index ab9892f..f4ca69a 100644 --- a/llvm-translator/alive2-aslp.nix +++ b/llvm-translator/alive2-aslp.nix @@ -13,7 +13,7 @@ (alive2-regehr.override { inherit llvmPackages; }).overrideAttrs (prev: { pname = "alive2-aslp"; - version = "0-unstable-2024-12-16"; + version = "0-unstable-2024-12-17"; buildInputs = prev.buildInputs ++ [ aslp-cpp antlr.runtime.cpp ]; nativeBuildInputs = prev.nativeBuildInputs ++ [ jre makeWrapper ]; @@ -21,8 +21,8 @@ src = fetchFromGitHub { owner = "katrinafyi"; repo = "alive2"; - rev = "a41421eecbfb786925c936c1b4131f33937b615c"; - hash = "sha256-+8Q1m4QX0/jA6AJ5gWaCytzCB6UOMAHE0SZo/wnmogg="; + rev = "e51f11b74c77682700bdd8e886c56a562a338b69"; + hash = "sha256-fvcvC/SJOtLq0tR0h/GT983ScHZnXbjui9PwutJtnsA="; }; cmakeFlags = prev.cmakeFlags From 3345c04351c26bb90a4b4414393d367b10fab3f4 Mon Sep 17 00:00:00 2001 From: rina Date: Fri, 20 Dec 2024 10:21:54 +1000 Subject: [PATCH 2/2] alive2: -Wno-error=deprecated-declarations --- llvm-translator/alive2-aslp.nix | 2 ++ llvm-translator/alive2.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/llvm-translator/alive2-aslp.nix b/llvm-translator/alive2-aslp.nix index f4ca69a..499ae59 100644 --- a/llvm-translator/alive2-aslp.nix +++ b/llvm-translator/alive2-aslp.nix @@ -25,6 +25,8 @@ hash = "sha256-fvcvC/SJOtLq0tR0h/GT983ScHZnXbjui9PwutJtnsA="; }; + CXXFLAGS = (prev.CXXFLAGS or "") + " -Wno-error=deprecated-declarations"; + cmakeFlags = prev.cmakeFlags ++ [ (lib.cmakeFeature "ANTLR4_JAR_LOCATION" "${antlr.jarLocation}") ]; diff --git a/llvm-translator/alive2.nix b/llvm-translator/alive2.nix index 902b52f..b6e4586 100644 --- a/llvm-translator/alive2.nix +++ b/llvm-translator/alive2.nix @@ -40,7 +40,7 @@ buildStdenv.mkDerivation { buildInputs = [ z3 zlib ncurses llvmPackages.libllvm ]; cmakeFlags = [ "-DBUILD_TV=1" "-DGIT_EXECUTABLE=${git-am-shim}" ]; - CXXFLAGS = "-Wno-error=cpp -Wno-error=deprecated"; + CXXFLAGS = "-Wno-error=cpp"; postPatch = '' substituteInPlace scripts/alivecc.in \