Skip to content

Commit f77e9a2

Browse files
authored
llvmPackages_{12,13,14,15,16,17}: drop (#440273)
2 parents 944e8fd + 2dac87b commit f77e9a2

120 files changed

Lines changed: 907 additions & 6946 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

doc/release-notes/rl-2511.section.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
- GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
2828

29+
- LLVM 12, 13, 14, 15, 16, and 17 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
30+
2931
- GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.
3032

3133
- GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.

pkgs/by-name/bf/bfc/package.nix

Lines changed: 0 additions & 44 deletions
This file was deleted.

pkgs/by-name/da/dale/package.nix

Lines changed: 0 additions & 53 deletions
This file was deleted.

pkgs/by-name/ho/hobbes/package.nix

Lines changed: 0 additions & 64 deletions
This file was deleted.

pkgs/by-name/oc/oclgrind/package.nix

Lines changed: 0 additions & 42 deletions
This file was deleted.

pkgs/by-name/qr/qrscan/package.nix

Lines changed: 0 additions & 45 deletions
This file was deleted.

pkgs/by-name/sh/shader-slang/package.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
libX11,
1212
glslang,
1313
unordered_dense,
14-
llvmPackages_14,
14+
llvmPackages,
1515
versionCheckHook,
1616
gitUpdater,
1717

@@ -73,10 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
7373
libX11
7474
]
7575
++ lib.optionals withLLVM [
76-
# Slang only supports LLVM 14:
77-
# https://github.com/shader-slang/slang/blob/v2025.15/docs/building.md#llvm-support
78-
llvmPackages_14.llvm
79-
llvmPackages_14.libclang
76+
llvmPackages.llvm
77+
llvmPackages.libclang
8078
]
8179
++ lib.optionals withGlslang [
8280
# SPIRV-tools is included in glslang.
@@ -150,5 +148,8 @@ stdenv.mkDerivation (finalAttrs: {
150148
maintainers = with lib.maintainers; [ niklaskorz ];
151149
mainProgram = "slangc";
152150
platforms = lib.platforms.all;
151+
# Slang only supports LLVM 14:
152+
# https://github.com/shader-slang/slang/blob/v2025.15/docs/building.md#llvm-support
153+
broken = withLLVM;
153154
};
154155
})

pkgs/by-name/sp/spirv-llvm-translator/package.nix

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,6 @@ let
3636
rev = "v${version}";
3737
hash = "sha256-rt3RTZut41uDEh0YmpOzH3sOezeEVWtAIGMKCHLSJBw=";
3838
};
39-
"17" = rec {
40-
version = "17.0.15";
41-
rev = "v${version}";
42-
hash = "sha256-ETpTQYMMApECDfuRY87HrO/PUxZ13x9dBRJ3ychslUI=";
43-
};
44-
"16" = rec {
45-
version = "16.0.15";
46-
rev = "v${version}";
47-
hash = "sha256-30i73tGl+1KlP92XA0uxdMTydd9EtaQ4SZ0W1kdm1fQ=";
48-
};
49-
"15" = rec {
50-
version = "15.0.15";
51-
rev = "v${version}";
52-
hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ=";
53-
};
54-
"14" = rec {
55-
version = "14.0.14";
56-
rev = "v${version}";
57-
hash = "sha256-PW+5w93omLYPZXjRtU4BNY2ztZ86pcjgUQZkrktMq+4=";
58-
};
5939
};
6040

6141
branch = versions."${llvmMajor}" or (throw "Incompatible LLVM version ${llvmMajor}");
@@ -70,14 +50,8 @@ stdenv.mkDerivation {
7050
inherit (branch) rev hash;
7151
};
7252

73-
patches = lib.optionals (llvmMajor == "14") [
74-
(fetchpatch {
75-
# tries to install llvm-spirv into llvm nix store path
76-
url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch";
77-
revert = true;
78-
hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8=";
79-
})
80-
];
53+
# TODO: Remove.
54+
patches = [ ];
8155

8256
nativeBuildInputs = [
8357
pkg-config

pkgs/by-name/wa/wavm/package.nix

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)