forked from M-Labs/artiq
flake: switch to upstream llvmlite
This commit is contained in:
parent
19b8d28a2e
commit
286f151d9a
6
flake.lock
generated
6
flake.lock
generated
@ -57,11 +57,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1665132027,
|
||||
"narHash": "sha256-zoHPqSQSENt96zTk6Mt1AP+dMNqQDshXKQ4I6MfjP80=",
|
||||
"lastModified": 1666056570,
|
||||
"narHash": "sha256-e7EkIY68Tp7NKyp9JSHh6CgPPdsKYYWxiL4wZQN8Cwg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9ecc270f02b09b2f6a76b98488554dd842797357",
|
||||
"rev": "47edaa313fc3767ce3026037a5b62352f22f3602",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
26
flake.nix
26
flake.nix
@ -112,28 +112,6 @@
|
||||
'';
|
||||
};
|
||||
|
||||
llvmlite-new = pkgs.python3Packages.buildPythonPackage rec {
|
||||
pname = "llvmlite";
|
||||
version = "0.38.0";
|
||||
src = pkgs.python3Packages.fetchPypi {
|
||||
inherit pname;
|
||||
version = "0.38.0";
|
||||
sha256 = "qZ0WbM87EW87ntI7m3C6JBVkCpyXjzqqE/rUnFj0llw=";
|
||||
};
|
||||
nativeBuildInputs = [ pkgs.llvm_11 ];
|
||||
# Disable static linking
|
||||
# https://github.com/numba/llvmlite/issues/93
|
||||
postPatch = ''
|
||||
substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
|
||||
substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"
|
||||
'';
|
||||
# Set directory containing llvm-config binary
|
||||
preConfigure = ''
|
||||
export LLVM_CONFIG=${pkgs.llvm_11.dev}/bin/llvm-config
|
||||
'';
|
||||
doCheck = false; # FIXME
|
||||
};
|
||||
|
||||
artiq-upstream = pkgs.python3Packages.buildPythonPackage rec {
|
||||
pname = "artiq";
|
||||
version = artiqVersion;
|
||||
@ -147,8 +125,8 @@
|
||||
|
||||
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
|
||||
# keep llvm_x and lld_x in sync with llvmlite
|
||||
propagatedBuildInputs = [ pkgs.llvm_11 pkgs.lld_11 llvmlite-new sipyco.packages.x86_64-linux.sipyco pythonparser artiq-comtools.packages.x86_64-linux.artiq-comtools ]
|
||||
++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial python-Levenshtein h5py pyqt5 qasync tqdm ]);
|
||||
propagatedBuildInputs = [ pkgs.llvm_11 pkgs.lld_11 sipyco.packages.x86_64-linux.sipyco pythonparser artiq-comtools.packages.x86_64-linux.artiq-comtools ]
|
||||
++ (with pkgs.python3Packages; [ llvmlite pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial python-Levenshtein h5py pyqt5 qasync tqdm ]);
|
||||
|
||||
dontWrapQtApps = true;
|
||||
postFixup = ''
|
||||
|
Loading…
Reference in New Issue
Block a user