diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:33:52 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:33:52 +0100 |
| commit | 20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c (patch) | |
| tree | 3165b4e84ec25ad34e2e40995c3fb10fad17f1d5 /pkgs/development/compilers/ldc | |
| parent | 099bb158f91ff67a3c2fa637cb533b44cf17a7da (diff) | |
| parent | f77eb9bb4d5d9ff34c6b1c18274e50d0bdddb652 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/ldc')
| -rw-r--r-- | pkgs/development/compilers/ldc/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/ldc/generic.nix | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 5a4baabcf8d87..e0a689c7fa053 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,5 +1,4 @@ import ./generic.nix { - version = "1.20.1"; - ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; + version = "1.24.0"; + ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"; } - diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index c93d423945cbd..214d64cfa76bf 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -1,5 +1,5 @@ { version, ldcSha256 }: -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -56,16 +56,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ninja makeWrapper unzip ldcBootstrap lit lit.python + cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ - llvm_8 # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb ]; |