Merge pull request #33483 from ThomasMader/dmd2.078.0

dmd: 2.075.1 -> 2.078.0
This commit is contained in:
Graham Christensen 2018-01-05 21:17:19 -05:00 committed by GitHub
commit 95ffb2087b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,10 +3,10 @@
, curl, tzdata, gdb, darwin , curl, tzdata, gdb, darwin
, callPackage , callPackage
, bootstrapVersion ? false , bootstrapVersion ? false
, version ? "2.075.1" , version ? "2.078.0"
, dmdSha256 ? "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5" , dmdSha256 ? "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr"
, druntimeSha256 ? "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j" , druntimeSha256 ? "0inyvcjc5qn8277d1zlfvgdgiss86rkjg9mhkw5l31hix8yan372"
, phobosSha256 ? "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04" , phobosSha256 ? "1vb5xnysja9l8hvv9gy4c05vihmblz7ga005761jbazxkmlfirj4"
}: }:
let let
@ -125,10 +125,6 @@ let
# Use proper C++ compiler # Use proper C++ compiler
substituteInPlace ${dmdPath}/posix.mak \ substituteInPlace ${dmdPath}/posix.mak \
--replace g++ $CXX --replace g++ $CXX
# TODO
substituteInPlace druntime/src/core/memory.d \
--replace "assert(z is null);" "//assert(z is null);"
'' ''
+ stdenv.lib.optionalString (!bootstrapVersion) '' + stdenv.lib.optionalString (!bootstrapVersion) ''