diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-29 00:12:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 00:12:49 +0000 |
| commit | c2791e85dedb9672f95e34dc1ec39d77b79c86c1 (patch) | |
| tree | fb3393e09178ff5d924ee2d9caa4fc8a69cd31b1 /pkgs/development/haskell-modules | |
| parent | bc838f6bd7a7ceaa6cf8f7cad4815716d052fe81 (diff) | |
| parent | 6c4a1e1db7872993fbf2f293771dec61a1e54440 (diff) | |
| download | nixlib-c2791e85dedb9672f95e34dc1ec39d77b79c86c1.tar nixlib-c2791e85dedb9672f95e34dc1ec39d77b79c86c1.tar.gz nixlib-c2791e85dedb9672f95e34dc1ec39d77b79c86c1.tar.bz2 nixlib-c2791e85dedb9672f95e34dc1ec39d77b79c86c1.tar.lz nixlib-c2791e85dedb9672f95e34dc1ec39d77b79c86c1.tar.xz nixlib-c2791e85dedb9672f95e34dc1ec39d77b79c86c1.tar.zst nixlib-c2791e85dedb9672f95e34dc1ec39d77b79c86c1.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 74cf3a36f545..d045da36579a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -496,9 +496,6 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - # 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. |