Skip to content

Commit

Permalink
Merge pull request #29 from katrinafyi/llvm-git-november
Browse files Browse the repository at this point in the history
llvm-custom to 20.0.0-unstable-2024-11-15 and bump alive2's
  • Loading branch information
katrinafyi authored Dec 16, 2024
2 parents f2e89e1 + 2f4017a commit fbc90bd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions llvm-translator/alive2-aslp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@

(alive2-regehr.override { inherit llvmPackages; }).overrideAttrs (prev: {
pname = "alive2-aslp";
version = "0-unstable-2024-10-30";
version = "0-unstable-2024-12-16";

buildInputs = prev.buildInputs ++ [ aslp-cpp antlr.runtime.cpp ];
nativeBuildInputs = prev.nativeBuildInputs ++ [ jre makeWrapper ];

src = fetchFromGitHub {
owner = "katrinafyi";
repo = "alive2";
rev = "ade1c3bd01c8b37fdfeeac7fbab168f020f20a8f";
hash = "sha256-q+v4jKfDDL0kblrZQHp5wyRDX/P/DS4PWx6QiK0c8Ao=";
rev = "1349cf0088ffbda974de3e16245889d0a613790e";
hash = "sha256-+n0HT/RgFV3c7lOFLV5/xK/rW8UGzihI0tVjE+QvgKo=";
};

cmakeFlags = prev.cmakeFlags
Expand Down
6 changes: 3 additions & 3 deletions llvm-translator/alive2-regehr.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

(alive2.override { inherit llvmPackages; }).overrideAttrs (prev: {
pname = "alive2-regehr";
version = "0-unstable-2024-11-06";
version = "0-unstable-2024-12-15";

src = fetchFromGitHub {
owner = "regehr";
repo = "alive2";
rev = "1ee0262b3da36b54cc6cffc94df7dcf4d0875f61";
hash = "sha256-tUIMt3nmcdlBg9u6v3J+6yhs06zHkNCEkKx7pmgZ8J8=";
rev = "e13bc8b6c4100b70bf3bab7a71de734d0b6fabd7";
hash = "sha256-LmHRTEqTFQBVTrein+X+PtOp7Mqk41nnZFF4vRIH/8U=";
};

patches = [ ];
Expand Down
8 changes: 4 additions & 4 deletions overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ let
llvmPackages = final.llvmPackages_git.override (p: {
gitRelease =
prev.lib.throwIfNot
(prev.lib.versionOlder prev.llvmPackages_git.llvm.version "20.0.0-unstable-2024-10-30")
(prev.lib.versionOlder prev.llvmPackages_git.llvm.version "20.0.0-unstable-2024-11-15")
"llvmPackages_git seems to have updated, is this override no longer needed?"
{
rev = "62ff85f0799560b42754ef77b5f64ca2c7feeff7";
rev-version = "20.0.0-unstable-2024-10-30";
sha256 = "sha256-vE1N81PtykTIwVF26pE6ewbi18RI+KEAvDg+ZEI8tfo=";
rev = "35710ab392b50c815765f03c12409147502dfb86";
rev-version = "20.0.0-unstable-2024-11-15";
sha256 = "sha256-n3YpwHT/ptCKgrDLqsZJb60/MZhUJk+g889APhAz9a8=";
};
});
};
Expand Down

0 comments on commit fbc90bd

Please sign in to comment.