pyrox.dev
Merge pull request #34812 from ThomasMader/dlang-update
Dlang update
+4
-4
pkgs/development/compilers/dmd/default.nix
+4
-4
pkgs/development/compilers/dmd/default.nix
···
3
3
, curl, tzdata, gdb, darwin
4
4
, callPackage
5
5
, bootstrapVersion ? false
6
-
, version ? "2.078.1"
7
-
, dmdSha256 ? "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2"
8
-
, druntimeSha256 ? "16jv40m073cflpkyl0vmg1g58cianybfcsgcvwli7pfryxbgsbrr"
6
+
, version ? "2.078.2"
7
+
, dmdSha256 ? "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls"
8
+
, druntimeSha256 ? "0nfqjcmwqc490bzi3582x1c3zigkf306g4nyd1cyd3vs8lfm6x66"
9
9
, phobosSha256 ? "08ircpf4ilznz638kra272hz8fi5ccvw2cswj5hqckssl1lyqzs8"
10
10
}:
11
11
···
111
111
''
112
112
113
113
+ stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
114
-
# See https://github.com/NixOS/nixpkgs/issues/29443
114
+
# See https://github.com/dlang/phobos/pull/5960
115
115
substituteInPlace phobos/std/path.d \
116
116
--replace "\"/root" "\"${ROOT_HOME_DIR}"
117
117
'';
+11
-7
pkgs/development/tools/build-managers/dub/default.nix
+11
-7
pkgs/development/tools/build-managers/dub/default.nix
···
4
4
5
5
dubBuild = stdenv.mkDerivation rec {
6
6
name = "dubBuild-${version}";
7
-
version = "1.7.1";
7
+
version = "1.7.2";
8
8
9
9
enableParallelBuilding = true;
10
10
···
12
12
owner = "dlang";
13
13
repo = "dub";
14
14
rev = "v${version}";
15
-
sha256 = "09bcc9bq2z1rbm8sdip1l81y5p8q13r30k02lzifyasiplrnpvlv";
15
+
sha256 = "073ibvgm1gphcqs1yjrav9ryp677nh3b194nxmvicwgvdc0sb6w9";
16
16
};
17
17
18
+
postUnpack = ''
19
+
patchShebangs .
20
+
'';
21
+
18
22
patches = [
19
23
# TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354
20
24
(fetchpatch {
···
23
27
})
24
28
];
25
29
30
+
# Can be removed with https://github.com/dlang/dub/pull/1368
31
+
dubvar = "\\$DUB";
26
32
postPatch = ''
27
-
# Avoid that the version file is overwritten
28
-
substituteInPlace build.sh \
29
-
--replace source/dub/version_.d /dev/null
30
-
31
-
patchShebangs .
33
+
substituteInPlace test/fetchzip.sh \
34
+
--replace "dub remove" "\"${dubvar}\" remove"
32
35
'';
33
36
34
37
nativeBuildInputs = [ dmd libevent rsync ];
···
70
73
71
74
patches = dubBuild.patches;
72
75
76
+
postUnpack = dubBuild.postUnpack;
73
77
postPatch = dubBuild.postPatch;
74
78
75
79
nativeBuildInputs = dubBuild.nativeBuildInputs;
+3
-15
pkgs/development/tools/dtools/default.nix
+3
-15
pkgs/development/tools/dtools/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "dtools-${version}";
5
-
version = "2.078.1";
5
+
version = "2.078.2";
6
6
7
7
srcs = [
8
8
(fetchFromGitHub {
9
9
owner = "dlang";
10
10
repo = "dmd";
11
11
rev = "v${version}";
12
-
sha256 = "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2";
12
+
sha256 = "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls";
13
13
name = "dmd";
14
14
})
15
15
(fetchFromGitHub {
···
28
28
cd dtools
29
29
'';
30
30
31
-
postPatch = ''
32
-
substituteInPlace posix.mak \
33
-
--replace "../dmd/generated/\$(OS)/release/\$(MODEL)/dmd" ${dmd.out}/bin/dmd
34
-
35
-
substituteInPlace posix.mak \
36
-
--replace gcc $CC
37
-
38
-
# To fix rdmd test with newer phobos
39
-
substituteInPlace rdmd.d \
40
-
--replace " std.stdiobase," ""
41
-
'';
42
-
43
31
nativeBuildInputs = [ dmd ];
44
32
buildInputs = [ curl ];
45
33
46
34
makeCmd = ''
47
-
make -f posix.mak DMD=${dmd.out}/bin/dmd DMD_DIR=dmd
35
+
make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
48
36
'';
49
37
50
38
buildPhase = ''