diff options
author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2020-11-05 14:38:19 -0600 |
---|---|---|
committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2020-11-06 11:05:20 -0600 |
commit | b936e6f3b3070c98ba2e76a4a961b5b406fce405 (patch) | |
tree | c9742a2d8d2c0b1c9f877c2c17483a3b059dc06e /pkgs/development/compilers/ldc | |
parent | da09d6550270e2258e7304452bfc1dc71e67731c (diff) |
ldc: 1.20.1 -> 1.24.0
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 ]; |