mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
ldc: 1.41.0 -> 1.42.0 (#546711)
This commit is contained in:
@@ -14,13 +14,12 @@ let
|
||||
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
|
||||
ARCH =
|
||||
if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name;
|
||||
version = "1.41.0";
|
||||
version = "1.42.0";
|
||||
hashes = {
|
||||
# Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc..
|
||||
osx-x86_64 = "sha256-W8/0i2PFakXbqs2wxb3cjqa+htSgx7LHyDGOBH9yEYE=";
|
||||
linux-x86_64 = "sha256-SkOUV/D+WeadAv1rV1Sfw8h60PVa2fueQlB7b44yfI8=";
|
||||
linux-aarch64 = "sha256-HEuVChPVM3ntT1ZDZsJ+xW1iYeIWhogNcMdIaz6Me6g=";
|
||||
osx-arm64 = "sha256-FXJnBC8QsEchBhkxSqcZtPC/iHYB6TscY0qh7LPFRuQ=";
|
||||
linux-x86_64 = "sha256-p7yclWE49VjK35yWI1L1nUHIDfbrOuP4A58lvhSmkwM=";
|
||||
linux-aarch64 = "sha256-aHcHw+IP+RBSjrLZLyepjLCWAoTeOwJua/IChKwchRE=";
|
||||
osx-arm64 = "sha256-emjiHFMFdmp09HNsyJGnlC23hCqSJmIyCVBLyFxwE4I=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
callPackage,
|
||||
makeWrapper,
|
||||
removeReferencesTo,
|
||||
@@ -11,7 +10,7 @@
|
||||
targetPackages,
|
||||
cmake,
|
||||
ninja,
|
||||
llvm_18,
|
||||
llvm_21,
|
||||
curl,
|
||||
tzdata,
|
||||
lit,
|
||||
@@ -70,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ldcBootstrap
|
||||
lit
|
||||
lit.python
|
||||
llvm_18.dev
|
||||
llvm_21.dev
|
||||
makeWrapper
|
||||
ninja
|
||||
unzip
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
diff --git a/src/abagames/tf/stuckenemy.d b/src/abagames/tf/stuckenemy.d
|
||||
index a90d1f1003..cd20d291e6 100644
|
||||
--- a/src/abagames/tf/stuckenemy.d
|
||||
+++ b/src/abagames/tf/stuckenemy.d
|
||||
@@ -217,11 +217,13 @@
|
||||
cnt++;
|
||||
int mp = 1;
|
||||
int sen = SoundManager.Se.STUCK_BONUS;
|
||||
- if (manager.mode == GameManager.Mode.EXTRA)
|
||||
- if (stuckEnemies.pullInRatio >= 1)
|
||||
- mp = 5;
|
||||
- else
|
||||
- sen = SoundManager.Se.STUCK_BONUS_PUSHIN;
|
||||
+ if (manager.mode == GameManager.Mode.EXTRA) {
|
||||
+ if (stuckEnemies.pullInRatio >= 1) {
|
||||
+ mp = 5;
|
||||
+ } else {
|
||||
+ sen = SoundManager.Se.STUCK_BONUS_PUSHIN;
|
||||
+ }
|
||||
+ }
|
||||
if (tumikiSet.fireScoreInterval > 0 &&
|
||||
(cnt % tumikiSet.fireScoreInterval) == 0 &&
|
||||
!field.checkHit(pos)) {
|
||||
@@ -43,6 +43,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(debianPatch "dlang_v2" "1isnvbl3bjnpyphji8k3fl0yd1z4869h0lai143vpwgj6518lpg4")
|
||||
(debianPatch "gdc-8" "1md0zwmv50jnak5g9d93bglv9v4z41blinjii6kv3vmgjnajapzj")
|
||||
(debianPatch "gcc12" "sha256-3ZFsI2Q4zCT591qCOu2iT2edE52DfO2pUySnMMBhNIQ=")
|
||||
|
||||
# ldc 1.42.0 gains stricter checking of ambiguous "else" clauses for if
|
||||
# statements, so we add braces in order to disambiguate.
|
||||
./ldc-1.42.0-dangling-else.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user