feliix42/mlir.nix
1
0
Fork 0
mirror of https://github.com/Feliix42/mlir.nix.git synced 2024-11-23 19:16:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: feliix42:54bb99e4ebe56d589a76544c347bde16d1dee7d2
Branches Tags
feliix42:main
feliix42:circt
..
compare: feliix42:1c2fca6c0a5d4996f4cd29156b7ca09bc7a13683
Branches Tags
feliix42:circt
feliix42:main

No commits in common. "54bb99e4ebe56d589a76544c347bde16d1dee7d2" and "1c2fca6c0a5d4996f4cd29156b7ca09bc7a13683" have entirely different histories.
54bb99e4eb ... 1c2fca6c0a

2 changed files with 18 additions and 20 deletions
Show stats Expand all files Collapse all files

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722062969, "lastModified": 1709961763,
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
flake.nix
View file

@ -9,9 +9,9 @@
let let
# git revision to use (for version and git pull # git revision to use (for version and git pull
#llvmRevision = "llvmorg-18-init"; #llvmRevision = "llvmorg-17-init";
llvmRevision = "2ee2b6aa7a3d9ba6ba13f6881b25e26d7d12c823"; llvmRevision = "08ed557714eed7f5cde9d1c5606f58280683884a";
circtRevision = "464f177ddcd3eb737fe8a592d20a24b15f25aef6"; circtRevision = "39b4f01a665e62b8770ea66b31abe7c1b8a9bfb2";
# to work with older version of flakes # to work with older version of flakes
lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101"; lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101";
@ -36,15 +36,14 @@
# A Nixpkgs overlay. # A Nixpkgs overlay.
overlays.default = final: prev: { overlays.default = final: prev: {
mlir = with final; llvmPackages_18.stdenv.mkDerivation rec { mlir = with final; llvmPackages_17.stdenv.mkDerivation rec {
name = "mlir-${version}"; name = "mlir-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "llvm"; owner = "llvm";
repo = "llvm-project"; repo = "llvm-project";
rev = llvmRevision; rev = llvmRevision;
sha256 = "sha256-piXv4YUf8q5Lf36my0bHtVkSJTrc+NvyZpLEwLPfV7U="; # lib.fakeSha256; sha256 = "sha256-9fNCqUDWI3Rjizkps5vgLy0ZtMgFeFmyh1yCWLj8NVc="; # lib.fakeSha256;
#sha256 = lib.fakeSha256;
}; };
sourceRoot = "source/llvm"; sourceRoot = "source/llvm";
@ -55,9 +54,9 @@
cmake cmake
ncurses ncurses
zlib zlib
llvmPackages_18.llvm llvmPackages_17.llvm
llvmPackages_18.clang llvmPackages_17.clang
llvmPackages_18.bintools llvmPackages_17.bintools
]; ];
buildInputs = [ libxml2 ]; buildInputs = [ libxml2 ];
@ -88,7 +87,7 @@
"-DCMAKE_C_COMPILER=clang" "-DCMAKE_C_COMPILER=clang"
"-DCMAKE_CXX_COMPILER=clang++" "-DCMAKE_CXX_COMPILER=clang++"
"-DLLVM_ENABLE_LLD=ON" "-DLLVM_ENABLE_LLD=ON"
#"-DLLVM_USE_LINKER=${llvmPackages_18.bintools}/bin/lld" #"-DLLVM_USE_LINKER=${llvmPackages_17.bintools}/bin/lld"
# CCache can drastically speed up further rebuilds, try adding: # CCache can drastically speed up further rebuilds, try adding:
#"-DLLVM_CCACHE_BUILD=ON" #"-DLLVM_CCACHE_BUILD=ON"
# libxml2 needs to be disabled because the LLVM build system ignores its .la # libxml2 needs to be disabled because the LLVM build system ignores its .la
@ -103,15 +102,14 @@
# ''; # '';
}; };
circt = with final; llvmPackages_18.stdenv.mkDerivation rec { circt = with final; llvmPackages_17.stdenv.mkDerivation rec {
name = "circt-${version}"; name = "circt-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "llvm"; owner = "llvm";
repo = "circt"; repo = "circt";
rev = circtRevision; rev = circtRevision;
sha256 = "sha256-gl/TGZe30GAGnVrZl+iSBLTujddz7Qs6jUOq2gZ4xVI="; # lib.fakeSha256; sha256 = "sha256-/4UrcwVyQnOwJMpRn0tMfJi/zm5rmrnv9IBE7/2rOY8="; # lib.fakeSha256;
#sha256 = lib.fakeSha256;
}; };
sourceRoot = "source/"; sourceRoot = "source/";
@ -121,10 +119,10 @@
ninja ninja
cmake cmake
#ncurses #ncurses
zlib #zlib
#llvmPackages_18.llvm #llvmPackages_17.llvm
llvmPackages_18.clang llvmPackages_17.clang
llvmPackages_18.bintools llvmPackages_17.bintools
mlir mlir
lit lit
]; ];