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

Switch to NixOS 23.11 & LLVM 17

Browse source
This commit is contained in:
Felix Suchert 2024-01-09 10:35:35 +01:00
parent 1ff775ea2f
commit 2e409d0b84
Signed by: feliix42
GPG key ID: 24363525EA0E8A99
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704018918, "lastModified": 1704420045,
"narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"type": "indirect" "type": "indirect"
} }
}, },

20
flake.nix
View file

@ -2,7 +2,7 @@
description = "Custom-Built MLIR Tools"; description = "Custom-Built MLIR Tools";
# Nixpkgs / NixOS version to use. # Nixpkgs / NixOS version to use.
inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; inputs.nixpkgs.url = "nixpkgs/nixos-23.11";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let
@ -35,7 +35,7 @@
# A Nixpkgs overlay. # A Nixpkgs overlay.
overlays.default = final: prev: { overlays.default = final: prev: {
mlir = with final; llvmPackages_16.stdenv.mkDerivation rec { mlir = with final; llvmPackages_17.stdenv.mkDerivation rec {
name = "mlir-${version}"; name = "mlir-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -53,9 +53,9 @@
cmake cmake
ncurses ncurses
zlib zlib
llvmPackages_16.llvm llvmPackages_17.llvm
llvmPackages_16.clang llvmPackages_17.clang
llvmPackages_16.bintools llvmPackages_17.bintools
]; ];
buildInputs = [ libxml2 ]; buildInputs = [ libxml2 ];
@ -86,7 +86,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_16.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
@ -101,7 +101,7 @@
# ''; # '';
}; };
circt = with final; llvmPackages_16.stdenv.mkDerivation rec { circt = with final; llvmPackages_17.stdenv.mkDerivation rec {
name = "circt-${version}"; name = "circt-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -119,9 +119,9 @@
cmake cmake
#ncurses #ncurses
#zlib #zlib
#llvmPackages_16.llvm #llvmPackages_17.llvm
llvmPackages_16.clang llvmPackages_17.clang
llvmPackages_16.bintools llvmPackages_17.bintools
mlir mlir
lit lit
]; ];