Skip to content

haskell.compiler: stop reliance on LLVM 6 & 7; haskell.compiler.ghc884: remove at 8.8.4; llvmPackages_7: remove at 7.1.0 #268509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sternenseemann merged 8 commits into from
Dec 5, 2023
Merged

haskell.compiler: stop reliance on LLVM 6 & 7; haskell.compiler.ghc884: remove at 8.8.4; llvmPackages_7: remove at 7.1.0 #268509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46f14d3
haskell.compiler.ghc884: remove at 8.8.4
sternenseemann Nov 19, 2023
01052ab
cone: unstable-2021-07-25 -> unstable-2022-12-12
sternenseemann Nov 19, 2023
ae29d06
llvmPackages_7: remove at 7.1.0
sternenseemann Nov 19, 2023
ea7faf9
haskell.compiler.ghc865Binary: clean up unused aarch64-linux src
sternenseemann Nov 19, 2023
bd151aa
haskell.compiler.ghc865Binary: correct useLLVM condition
sternenseemann Nov 19, 2023
274c1f0
haskell.compiler.ghc865Binary: don't pass llvmPackages_6
sternenseemann Nov 19, 2023
bb5dbaa
maude: remove clang version special casing
sternenseemann Nov 22, 2023
8c59811
root5: broken with clang
sternenseemann Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/science/misc/root/5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
homepage = "https://root.cern.ch/";
description = "A data analysis framework";
platforms = platforms.unix;
broken = !stdenv.isx86_64;
broken = !stdenv.isx86_64 || stdenv.cc.isClang or false;
maintainers = with maintainers; [ veprbl ];
license = licenses.lgpl21;
};
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/cone/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

llvmPackages.stdenv.mkDerivation rec {
pname = "cone";
version = "unstable-2021-07-25";
version = "unstable-2022-12-12";

src = fetchFromGitHub {
owner = "jondgoodwin";
repo = pname;
rev = "5feaabc342bcff3755f638a7e25155cd12127592";
sha256 = "CTDS83AWtuDY5g6NDn7O2awrYsKFf3Kp35FkMEjfbVw=";
rev = "698bd6afc75777eabbc8ef576d64d683c6a1c5ab";
sha256 = "0y2s9xgkci8n72v6gnc1i7shr2y3g2sa8fbr25gpxa9ipiq9khg7";
};

nativeBuildInputs = [ cmake ];
Expand All @@ -21,10 +21,10 @@ llvmPackages.stdenv.mkDerivation rec {
llvmPackages.llvm
];

# M68k is an experimental target, so not enabled by default
postPatch = ''
sed -i CMakeLists.txt \
-e 's/LLVM 7/LLVM/' \
-e '/AVR/d'
-e '/M68k/d'
'';

installPhase = ''
Expand Down
17 changes: 10 additions & 7 deletions pkgs/development/compilers/ghc/8.6.5-binary.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
assert stdenv.targetPlatform == stdenv.hostPlatform;

let
useLLVM = !stdenv.targetPlatform.isx86;
useLLVM = !(stdenv.targetPlatform.isx86
|| stdenv.targetPlatform.isPower
|| stdenv.targetPlatform.isSparc);

useNcurses6 = stdenv.hostPlatform.system == "x86_64-linux"
|| (with stdenv.hostPlatform; isPower64 && isLittleEndian);
Expand Down Expand Up @@ -38,7 +40,7 @@ let
targetPackages.stdenv.cc.bintools
coreutils # for cat
]
++ lib.optionals useLLVM [
++ lib.optionals (assert useLLVM -> !(llvmPackages == null); useLLVM) [
(lib.getBin llvmPackages.llvm)
]
# On darwin, we need unwrapped bintools as well (for otool)
Expand Down Expand Up @@ -66,10 +68,6 @@ stdenv.mkDerivation rec {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz";
sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g";
};
aarch64-linux = {
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz";
sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq";
};
x86_64-darwin = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz";
Expand Down Expand Up @@ -216,7 +214,12 @@ stdenv.mkDerivation rec {

meta = rec {
license = lib.licenses.bsd3;
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "powerpc64le-linux" ];
platforms = [
"x86_64-linux"
"i686-linux"
"x86_64-darwin"
"powerpc64le-linux"
];
# build segfaults, use ghc8102Binary which has proper musl support instead
broken = stdenv.hostPlatform.isMusl;
maintainers = with lib.maintainers; [
Expand Down
Loading