haskellPackages.llvm-ffi: unbreak by providing matching LLVM 16
We're opting for the strategy of providing the most up to date version llvm-ffi supports which works out well enough, as nixpkgs also tries to be quite up to date with its LLVM version (and also uses LLVM 16 as the default).
This commit is contained in:
@@ -2766,10 +2766,6 @@ self: super: {
|
||||
# Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd
|
||||
tomland = doJailbreak super.tomland;
|
||||
|
||||
llvm-ffi = super.llvm-ffi.override {
|
||||
LLVM = pkgs.llvmPackages_13.libllvm;
|
||||
};
|
||||
|
||||
# libfuse3 fails to mount fuse file systems within the build environment
|
||||
libfuse3 = dontCheck super.libfuse3;
|
||||
|
||||
|
||||
@@ -3281,7 +3281,6 @@ broken-packages:
|
||||
- ll-picosat # failure in job https://hydra.nixos.org/build/233206257 at 2023-09-02
|
||||
- llsd # failure in job https://hydra.nixos.org/build/233241590 at 2023-09-02
|
||||
- llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02
|
||||
- llvm-ffi # failure in job https://hydra.nixos.org/build/237230725 at 2023-10-21
|
||||
- llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02
|
||||
- llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02
|
||||
- llvm-ht # failure in job https://hydra.nixos.org/build/233203770 at 2023-09-02
|
||||
|
||||
@@ -521,6 +521,7 @@ package-maintainers:
|
||||
- latex
|
||||
- lazyio
|
||||
- linear-programming
|
||||
- llvm-ffi
|
||||
- markov-chain
|
||||
- midi
|
||||
- midi-alsa
|
||||
|
||||
@@ -490,6 +490,17 @@ self: super: builtins.intersectAttrs super {
|
||||
# requires llvm 9 specifically https://github.com/llvm-hs/llvm-hs/#building-from-source
|
||||
llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; };
|
||||
|
||||
# llvm-ffi needs a specific version of LLVM which we hard code here. Since we
|
||||
# can't use pkg-config (LLVM has no official .pc files), we need to pass the
|
||||
# `dev` and `lib` output in, or Cabal will have trouble finding the library.
|
||||
# Since it looks a bit neater having it in a list, we circumvent the singular
|
||||
# LLVM input here.
|
||||
llvm-ffi =
|
||||
addBuildDepends [
|
||||
pkgs.llvmPackages_16.llvm.lib
|
||||
pkgs.llvmPackages_16.llvm.dev
|
||||
] (super.llvm-ffi.override { LLVM = null; });
|
||||
|
||||
# Needs help finding LLVM.
|
||||
spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe;
|
||||
|
||||
|
||||
+1
-2
@@ -190350,8 +190350,7 @@ self: {
|
||||
librarySystemDepends = [ LLVM ];
|
||||
description = "FFI bindings to the LLVM compiler toolkit";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
maintainers = [ lib.maintainers.thielema ];
|
||||
}) {LLVM = null;};
|
||||
|
||||
"llvm-ffi-tools" = callPackage
|
||||
|
||||
Reference in New Issue
Block a user