M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

flake.nix: Use upstream llvmlite 0.38.0, which already has the patches

This commit is contained in:
David Nadlinger 2022-02-23 17:54:59 +00:00 committed by Sébastien Bourdeauducq
parent 338bb189b4
commit 9bfbd39fa3
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.nix
View File

@ -113,22 +113,12 @@
llvmlite-new = pkgs.python3Packages.buildPythonPackage rec { llvmlite-new = pkgs.python3Packages.buildPythonPackage rec {
pname = "llvmlite"; pname = "llvmlite";
version = "0.37.0-artiq"; version = "0.38.0";
src = pkgs.python3Packages.fetchPypi { src = pkgs.python3Packages.fetchPypi {
inherit pname; inherit pname;
version = "0.37.0"; version = "0.38.0";
sha256 = "sha256-Y5K4cM0BjsDGRda7uRjWqg7sqMYmdLqu4whi1raGWxU="; sha256 = "qZ0WbM87EW87ntI7m3C6JBVkCpyXjzqqE/rUnFj0llw=";
}; };
patches = [
(pkgs.fetchurl {
url = "https://git.m-labs.hk/M-Labs/nix-scripts/raw/branch/master/artiq-fast/pkgs/llvmlite-abiname.diff";
sha256 = "1zlss9vlhjgch6gf5gc0647kkjdwjk0833ld88xwd9vmwvkdmp3v";
})
(pkgs.fetchurl {
url = "https://git.m-labs.hk/M-Labs/nix-scripts/raw/branch/master/artiq-fast/pkgs/llvmlite-callsite.diff";
sha256 = "sha256-JrIXPnI7E7Y5NIFxswVBmRfQvv61lqKDDnNJrr+nDCg=";
})
];
nativeBuildInputs = [ pkgs.llvm_11 ]; nativeBuildInputs = [ pkgs.llvm_11 ];
# Disable static linking # Disable static linking
# https://github.com/numba/llvmlite/issues/93 # https://github.com/numba/llvmlite/issues/93