git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115265 from ThomasMader/dlang-update

Dlang update

commitb2d43c403826f5dfa0b47399e69aca15533f0696 authoradisbladis <adisbladis@gmail.com> dateThu 18 Mar 2021, 18:22 (6 years ago) parent3daa8ad7e05c58
10 files changed+127−55
pkgs/applications/audio/cheesecutter/default.nix+3−3 pkgs/applications/networking/sync/onedrive/default.nix+2−2 pkgs/applications/science/biology/sambamba/default.nix+4−4 pkgs/applications/terminal-emulators/tilix/default.nix+8−6 pkgs/development/compilers/dmd/default.nix+14−16 pkgs/development/compilers/ldc/default.nix+2−2 pkgs/development/libraries/gtkd/default.nix+2−2 pkgs/development/tools/build-managers/dub/default.nix+81−8 pkgs/development/tools/dtools/default.nix+6−7 pkgs/development/tools/literate-programming/Literate/default.nix+5−5
pkgs/applications/audio/cheesecutter/default.nix+3−3
@@ -8,13 +8,13 @@
88}:
99stdenv.mkDerivation rec {
1010 pname = "cheesecutter";
11− version = "unstable-2020-04-03";
11+ version = "unstable-2021-02-27";
1212
1313 src = fetchFromGitHub {
1414 owner = "theyamo";
1515 repo = "CheeseCutter";
16− rev = "68d6518f0e6249a2a5d122fc80201578337c1277";
17− sha256 = "0xspzjhc6cp3m0yd0mwxncg8n1wklizamxvidrnn21jgj3mnaq2q";
16+ rev = "84450d3614b8fb2cabda87033baab7bedd5a5c98";
17+ sha256 = "sha256:0q4a791nayya6n01l0f4kk497rdq6kiq0n72fqdpwqy138pfwydn";
1818 };
1919
2020 patches = [
pkgs/applications/networking/sync/onedrive/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "onedrive";
7− version = "2.4.7";
7+ version = "2.4.10";
88
99 src = fetchFromGitHub {
1010 owner = "abraunegg";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn";
13+ sha256 = "sha256:0dvxjkni66g82j9wr6yy07sn7d7yr7bbc0py89pxybvsbid88l65";
1414 };
1515
1616 nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
pkgs/applications/science/biology/sambamba/default.nix+4−4
@@ -1,18 +1,18 @@
1−{ lib, stdenv, fetchFromGitHub, python3, which, dmd, ldc, zlib }:
1+{ lib, stdenv, fetchFromGitHub, python3, which, ldc, zlib }:
22
33stdenv.mkDerivation rec {
44 pname = "sambamba";
5− version = "0.7.1";
5+ version = "0.8.0";
66
77 src = fetchFromGitHub {
88 owner = "biod";
99 repo = "sambamba";
1010 rev = "v${version}";
11− sha256 = "0k5wy06zrbsc40x6answgz7rz2phadyqwlhi9nqxbfqanbg9kq20";
11+ sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9";
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ which python3 dmd ldc ];
15+ nativeBuildInputs = [ which python3 ldc ];
1616 buildInputs = [ zlib ];
1717
1818 # Upstream's install target is broken; copy manually
pkgs/applications/terminal-emulators/tilix/default.nix+8−6
@@ -5,7 +5,7 @@
55, ninja
66, python3
77, pkg-config
8−, dmd
8+, ldc
99, dconf
1010, dbus
1111, gsettings-desktop-schemas
@@ -16,17 +16,18 @@
1616, glib
1717, wrapGAppsHook
1818, libunwind
19+, appstream
1920}:
2021
21−stdenv.mkDerivation {
22+stdenv.mkDerivation rec {
2223 pname = "tilix";
23− version = "unstable-2019-10-02";
24+ version = "1.9.4";
2425
2526 src = fetchFromGitHub {
2627 owner = "gnunn1";
2728 repo = "tilix";
28− rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f";
29− sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq";
29+ rev = "${version}";
30+ sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9";
3031 };
3132
3233 # Default upstream else LDC fails to link
@@ -36,12 +37,13 @@ stdenv.mkDerivation {
3637
3738 nativeBuildInputs = [
3839 desktop-file-utils
39− dmd
40+ ldc
4041 meson
4142 ninja
4243 pkg-config
4344 python3
4445 wrapGAppsHook
46+ appstream
4547 ];
4648
4749 buildInputs = [
pkgs/development/compilers/dmd/default.nix+14−16
@@ -4,10 +4,10 @@
44, targetPackages, fetchpatch, bash
55, dmdBootstrap ? callPackage ./bootstrap.nix { }
66, HOST_DMD ? "${dmdBootstrap}/bin/dmd"
7−, version ? "2.091.1"
8−, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr"
9−, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl"
10−, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs"
7+, version ? "2.095.1"
8+, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk"
9+, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha"
10+, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl"
1111}:
1212
1313let
@@ -53,18 +53,6 @@ stdenv.mkDerivation rec {
5353 })
5454 ];
5555
56− patchFlags = [ "--directory=dmd" "-p1" "-F3" ];
57− patches = [
58− (fetchpatch {
59− url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch";
60− sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2";
61− })
62− (fetchpatch {
63− url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch";
64− sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs";
65− })
66− ];
67−
6856 sourceRoot = ".";
6957
7058 # https://issues.dlang.org/show_bug.cgi?id=19553
@@ -76,6 +64,16 @@ stdenv.mkDerivation rec {
7664
7765 postPatch = ''
7866 substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
67+
68+ rm dmd/test/runnable/gdb1.d
69+ rm dmd/test/runnable/gdb10311.d
70+ rm dmd/test/runnable/gdb14225.d
71+ rm dmd/test/runnable/gdb14276.d
72+ rm dmd/test/runnable/gdb14313.d
73+ rm dmd/test/runnable/gdb14330.d
74+ rm dmd/test/runnable/gdb15729.sh
75+ rm dmd/test/runnable/gdb4149.d
76+ rm dmd/test/runnable/gdb4181.d
7977 ''
8078 + lib.optionalString stdenv.hostPlatform.isLinux ''
8179 substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
pkgs/development/compilers/ldc/default.nix+2−2
@@ -1,4 +1,4 @@
11import ./generic.nix {
2− version = "1.24.0";
3− ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
2+ version = "1.25.1";
3+ ldcSha256 = "sha256-DjcW/pknvpEmTR/eXEEHECb2xEJic16evaU4CJthLUA=";
44}
pkgs/development/libraries/gtkd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
1+{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg
22, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
33
44let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
1515 stripRoot = false;
1616 };
1717
18− nativeBuildInputs = [ dmd pkg-config which ];
18+ nativeBuildInputs = [ ldc pkg-config which ];
1919 propagatedBuildInputs = [
2020 atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
2121 libgda libpeas librsvg pango vte
pkgs/development/tools/build-managers/dub/default.nix+81−8
@@ -1,4 +1,6 @@
1−{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
1+{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc, dcompiler ? ldc }:
2+
3+assert dcompiler != null;
24
35stdenv.mkDerivation rec {
46 pname = "dub";
@@ -24,12 +26,23 @@ stdenv.mkDerivation rec {
2426 --replace "dub remove" "\"${dubvar}\" remove"
2527 '';
2628
27− nativeBuildInputs = [ dmd libevent rsync ];
29+ nativeBuildInputs = [ dcompiler libevent rsync ];
2830 buildInputs = [ curl ];
2931
3032 buildPhase = ''
31− export DMD=${dmd.out}/bin/dmd
32− ./build.sh
33+ for dc_ in dmd ldmd2 gdmd; do
34+ echo "... check for D compiler $dc_ ..."
35+ dc=$(type -P $dc_ || echo "")
36+ if [ ! "$dc" == "" ]; then
37+ break
38+ fi
39+ done
40+ if [ "$dc" == "" ]; then
41+ exit "Error: could not find D compiler"
42+ fi
43+ echo "$dc_ found and used as D compiler to build $pname"
44+ $dc ./build.d
45+ ./build
3346 '';
3447
3548 doCheck = !stdenv.isDarwin;
@@ -37,7 +50,8 @@ stdenv.mkDerivation rec {
3750 checkPhase = ''
3851 export DUB=$NIX_BUILD_TOP/source/bin/dub
3952 export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
40− export DC=${dmd.out}/bin/dmd
53+ export DC=${dcompiler.out}/bin/${dcompiler.pname}
54+ echo "DC out --> $DC"
4155 export HOME=$TMP
4256
4357 rm -rf test/issue502-root-import
@@ -46,7 +60,6 @@ stdenv.mkDerivation rec {
4660 rm test/issue990-download-optional-selected.sh
4761 rm test/issue877-auto-fetch-package-on-run.sh
4862 rm test/issue1037-better-dependency-messages.sh
49− rm test/issue1040-run-with-ver.sh
5063 rm test/issue1416-maven-repo-pkg-supplier.sh
5164 rm test/issue1180-local-cache-broken.sh
5265 rm test/issue1574-addcommand.sh
@@ -62,13 +75,73 @@ stdenv.mkDerivation rec {
6275 rm test/version-spec.sh
6376 rm test/0-init-multi.sh
6477 rm test/0-init-multi-json.sh
78+ rm test/4-describe-data-1-list.sh
79+ rm test/4-describe-data-3-zero-delim.sh
80+ rm test/4-describe-import-paths.sh
81+ rm test/4-describe-string-import-paths.sh
82+ rm test/4-describe-json.sh
83+ rm test/5-convert-stdout.sh
84+ rm test/issue1003-check-empty-ld-flags.sh
85+ rm test/issue103-single-file-package.sh
86+ rm test/issue1040-run-with-ver.sh
87+ rm test/issue1091-bogus-rebuild.sh
88+ rm test/issue1194-warn-wrong-subconfig.sh
89+ rm test/issue1277.sh
90+ rm test/issue1372-ignore-files-in-hidden-dirs.sh
91+ rm test/issue1447-build-settings-vars.sh
92+ rm test/issue1531-toolchain-requirements.sh
93+ rm test/issue346-redundant-flags.sh
94+ rm test/issue361-optional-deps.sh
95+ rm test/issue564-invalid-upgrade-dependency.sh
96+ rm test/issue586-subpack-dep.sh
97+ rm test/issue616-describe-vs-generate-commands.sh
98+ rm test/issue686-multiple-march.sh
99+ rm test/issue813-fixed-dependency.sh
100+ rm test/issue813-pure-sub-dependency.sh
101+ rm test/issue820-extra-fields-after-convert.sh
102+ rm test/issue923-subpackage-deps.sh
103+ rm test/single-file-sdl-default-name.sh
104+ rm test/subpackage-common-with-sourcefile-globbing.sh
105+ rm test/issue934-path-dep.sh
106+ rm -r test/1-dynLib-simple
107+ rm -r test/1-exec-simple-package-json
108+ rm -r test/1-exec-simple
109+ rm -r test/1-staticLib-simple
110+ rm -r test/2-dynLib-dep
111+ rm -r test/2-staticLib-dep
112+ rm -r test/2-dynLib-with-staticLib-dep
113+ rm -r test/2-sourceLib-dep/
114+ rm -r test/3-copyFiles
115+ rm -r test/custom-source-main-bug487
116+ rm -r test/custom-unittest
117+ rm -r test/issue1262-version-inheritance-diamond
118+ rm -r test/issue1003-check-empty-ld-flags
119+ rm -r test/ignore-hidden-1
120+ rm -r test/ignore-hidden-2
121+ rm -r test/issue1427-betterC
122+ rm -r test/issue130-unicode-*
123+ rm -r test/issue1262-version-inheritance
124+ rm -r test/issue1372-ignore-files-in-hidden-dirs
125+ rm -r test/issue1350-transitive-none-deps
126+ rm -r test/issue1775
127+ rm -r test/issue1447-build-settings-vars
128+ rm -r test/issue1408-inherit-linker-files
129+ rm -r test/issue1551-var-escaping
130+ rm -r test/issue754-path-selection-fail
131+ rm -r test/issue1788-incomplete-string-import-override
132+ rm -r test/subpackage-ref
133+ rm -r test/issue777-bogus-path-dependency
134+ rm -r test/issue959-path-based-subpack-dep
135+ rm -r test/issue97-targettype-none-nodeps
136+ rm -r test/issue97-targettype-none-onerecipe
137+ rm -r test/path-subpackage-ref
138+ rm -r test/sdl-package-simple
65139
66140 ./test/run-unittest.sh
67141 '';
68142
69143 installPhase = ''
70− mkdir $out
71− mkdir $out/bin
144+ mkdir -p $out/bin
72145 cp bin/dub $out/bin
73146 '';
74147
pkgs/development/tools/dtools/default.nix+6−7
@@ -1,22 +1,22 @@
1−{stdenv, lib, fetchFromGitHub, dmd, curl}:
1+{stdenv, lib, fetchFromGitHub, ldc, curl}:
22
33stdenv.mkDerivation rec {
44 pname = "dtools";
5− version = "2.085.1";
5+ version = "2.095.1";
66
77 srcs = [
88 (fetchFromGitHub {
99 owner = "dlang";
1010 repo = "dmd";
1111 rev = "v${version}";
12− sha256 = "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660";
12+ sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk";
1313 name = "dmd";
1414 })
1515 (fetchFromGitHub {
1616 owner = "dlang";
1717 repo = "tools";
1818 rev = "v${version}";
19− sha256 = "1x85w4k2zqgv2bjbvhschxdc6kq8ygp89h499cy8rfqm6q23g0ws";
19+ sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
2020 name = "dtools";
2121 })
2222 ];
@@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
2727 mv dmd dtools
2828 cd dtools
2929
30− substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" ""
3130 '';
3231
33− nativeBuildInputs = [ dmd ];
32+ nativeBuildInputs = [ ldc ];
3433 buildInputs = [ curl ];
3534
3635 makeCmd = ''
37− make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
36+ make -f posix.mak all DMD_DIR=dmd DMD=${ldc.out}/bin/ldmd2 CC=${stdenv.cc}/bin/cc
3837 '';
3938
4039 buildPhase = ''
pkgs/development/tools/literate-programming/Literate/default.nix+5−5
@@ -1,16 +1,16 @@
1−{ lib, stdenv, fetchgit, dmd, dub }:
1+{ lib, stdenv, fetchgit, ldc, dub }:
22
33stdenv.mkDerivation {
44 pname = "Literate";
5− version = "unstable-2020-09-02";
5+ version = "unstable-2021-01-22";
66
77 src = fetchgit {
88 url = "https://github.com/zyedidia/Literate.git";
9− rev = "533991cca6ec7a608a778396d32d51b35182d944";
10− sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49";
9+ rev = "7004dffec0cff3068828514eca72172274fd3f7d";
10+ sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs";
1111 };
1212
13− buildInputs = [ dmd dub ];
13+ buildInputs = [ ldc dub ];
1414
1515 installPhase = "install -D bin/lit $out/bin/lit";
1616