public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102964 from LibreCybernetics/update-ldc

Browse Source 
ldc: 1.20.1 -> 1.24.0
This commit is contained in:
Daniël de Kok 2020-11-07 08:12:01 +01:00 committed by GitHub
commit 126e5c1bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/ldc/default.nix
View File

@ -1,5 +1,4 @@
import ./generic.nix { import ./generic.nix {
version = "1.20.1"; version = "1.24.0";
ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
} }

8
pkgs/development/compilers/ldc/generic.nix
View File

@ -1,5 +1,5 @@
{ version, ldcSha256 }: { 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 , libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, runCommand, targetPackages , callPackage, makeWrapper, runCommand, targetPackages
, ldcBootstrap ? callPackage ./bootstrap.nix { } , ldcBootstrap ? callPackage ./bootstrap.nix { }
@ -56,16 +56,12 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ 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 [ ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Foundation 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) [ ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [
llvm_8
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
gdb gdb
]; ];