git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #102964 from LibreCybernetics/update-ldc

ldc: 1.20.1 -> 1.24.0

commit126e5c1bd15a26688b387da1a33b8b20e058b15d authorDaniël de Kok <me@danieldk.eu> dateSat 7 Nov 2020, 08:12 (6 years ago) parent3561ed6b936e6f
2 files changed+4−9
pkgs/development/compilers/ldc/default.nix+2−3 pkgs/development/compilers/ldc/generic.nix+2−6
pkgs/development/compilers/ldc/default.nix+2−3
@@ -1,5 +1,4 @@
11import ./generic.nix {
2− version = "1.20.1";
3− ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b";
2+ version = "1.24.0";
3+ ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
44}
5−
pkgs/development/compilers/ldc/generic.nix+2−6
@@ -1,5 +1,5 @@
11{ version, ldcSha256 }:
2−{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata
2+{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata
33, libconfig, lit, gdb, unzip, darwin, bash
44, callPackage, makeWrapper, runCommand, targetPackages
55, ldcBootstrap ? callPackage ./bootstrap.nix { }
@@ -56,16 +56,12 @@ stdenv.mkDerivation rec {
5656 '';
5757
5858 nativeBuildInputs = [
59− cmake ninja makeWrapper unzip ldcBootstrap lit lit.python
59+ cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip
6060 ]
6161 ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
6262 darwin.apple_sdk.frameworks.Foundation
63− # https://github.com/NixOS/nixpkgs/issues/57120
64− # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515
65− llvm_5
6663 ]
6764 ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [
68− llvm_8
6965 # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
7066 gdb
7167 ];