Merge pull request #7 from katrinafyi/regehr-update

Update flake for alive2-regehr
katrinafyi · Jul 9, 2024 · 66d86a3 · 66d86a3
2 parents 16ade72 + b9bc672
commit 66d86a3
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 13 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/gtirb/overlay.nix b/gtirb/overlay.nix
@@ -4,7 +4,9 @@ final: prev:
   ddisasm-deterministic = prev.ddisasm.deterministic;
 
   gtirb = prev.callPackage ./gtirb.nix { };
-  python-gtirb = prev.callPackage ./python-gtirb.nix { };
+  python-gtirb = prev.callPackage ./python-gtirb.nix {
+    python3Packages = final.python311Packages;
+  };
   python-retypd = prev.callPackage ./python-retypd.nix { };
   gtirb-pprinter = prev.callPackage ./gtirb-pprinter.nix { };
   capstone-grammatech = prev.callPackage ./capstone-grammatech.nix { };
@@ -13,7 +15,9 @@ final: prev:
 
   overlay_ocamlPackages = ofinal: oprev: {
     ocaml-hexstring = ofinal.callPackage ./ocaml-hexstring.nix { };
-    gtirb-semantics = ofinal.callPackage ./gtirb-semantics.nix { };
+    gtirb-semantics = ofinal.callPackage ./gtirb-semantics.nix {
+      python3Packages = final.python311Packages;
+    };
   };
 
   inherit (final.ocamlPackages_pac) gtirb-semantics;

diff --git a/llvm-translator/alive2-aslp.nix b/llvm-translator/alive2-aslp.nix
@@ -1,12 +1,13 @@
 { lib
 , alive2-regehr
+, llvmPackages
 , fetchFromGitHub
 , aslp-cpp
 , antlr
 , jre
 }:
 
-alive2-regehr.overrideAttrs (prev: {
+(alive2-regehr.override { inherit llvmPackages; }).overrideAttrs (prev: {
   pname = "alive2-aslp";
   version = "unstable-2024-03-12";
 

diff --git a/llvm-translator/alive2-regehr.nix b/llvm-translator/alive2-regehr.nix
@@ -1,17 +1,17 @@
 { alive2
-, fetchFromGitHub
 , llvmPackages
+, fetchFromGitHub
 }:
 
 (alive2.override { inherit llvmPackages; }).overrideAttrs (prev: {
   pname = "alive2-regehr";
-  version = "unstable-2024-03-06";
+  version = "unstable-2024-07-08";
 
   src = fetchFromGitHub {
     owner = "regehr";
     repo = "alive2";
-    rev = "53976b3d73adb161c98ee16026800108335276c0";
-    hash = "sha256-pt+Y0xp1TsNl4gi9tf1G9lHTH0ASdBuZrLEg9zPRdlw=";
+    rev = "4e353ccea4e1d40902f81b186cf3d7056a955d56";
+    hash = "sha256-INSVCPmY0Pxo5PFASKN8ClsiN4tBOZkC0d9yFmlj4ak=";
   };
 
   patches = [ ];

diff --git a/llvm-translator/llvm-custom.nix b/llvm-translator/llvm-custom.nix
@@ -9,7 +9,8 @@ let
       cmakeFlags = prev.cmakeFlags ++ [
         "-DLLVM_ENABLE_RTTI=ON"
         "-DLLVM_ENABLE_EH=ON"
-        "-DLLVM_TARGETS_TO_BUILD=X86;AArch64;ARM"
+        "-DLLVM_ENABLE_ASSERTIONS=ON"  # alive2 needs NDEBUG unset
+        "-DLLVM_TARGETS_TO_BUILD=AArch64;ARM"
       ];
       doCheck = false;
 

diff --git a/llvm-translator/remill.nix b/llvm-translator/remill.nix
@@ -138,4 +138,6 @@ stdenv.mkDerivation (self:
     # "-DREMILL_BUILD_SPARC32_RUNTIME=False"
   ];
 
+  hardeningDisable = [ "zerocallusedregs" ];
+
 })
diff --git a/overlay.nix b/overlay.nix
@@ -22,15 +22,18 @@ let
       retdec-uq-pac = prev.callPackage ./llvm-translator/retdec-uq-pac.nix { retdec = final.retdec5; };
 
       llvm-custom-15 = prev.callPackage ./llvm-translator/llvm-custom.nix { llvmPackages = final.llvmPackages_15; };
-      llvm-custom-git = prev.callPackage ./llvm-translator/llvm-custom.nix { llvmPackages = final.llvmPackages_18; };
+      llvm-custom-18 = prev.callPackage ./llvm-translator/llvm-custom.nix { llvmPackages = final.llvmPackages_18; };
+      llvm-custom-git = prev.callPackage ./llvm-translator/llvm-custom.nix { llvmPackages = final.llvmPackages_git; };
 
       alive2 = prev.callPackage ./llvm-translator/alive2.nix {
         llvmPackages = final.llvm-custom-15;
       };
       alive2-regehr = prev.callPackage ./llvm-translator/alive2-regehr.nix {
         llvmPackages = final.llvm-custom-git;
       };
-      alive2-aslp = prev.callPackage ./llvm-translator/alive2-aslp.nix { };
+      alive2-aslp = prev.callPackage ./llvm-translator/alive2-aslp.nix {
+        llvmPackages = final.llvm-custom-18;
+      };
       xed2022 = prev.xed.overrideAttrs rec {
         version = "2022.08.11";
         src = prev.fetchFromGitHub {
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,4 +138,6 @@ stdenv.mkDerivation (self: @@
         # "-DREMILL_BUILD_SPARC32_RUNTIME=False"
       ];
+      hardeningDisable = [ "zerocallusedregs" ];
     })