diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2026-04-29 21:34:18 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2026-04-29 21:38:01 -0400 |
| commit | 9f36592169e560a6b860df9ee33e244d0d99031d (patch) | |
| tree | bf63dcebaa0fae1a49c26b34a8f7716fdcef985c /org/nixpkgs_overlays_d_related.org | |
| parent | package.nix cosmetic line-breaks for build command (diff) | |
flake devshells renames
Diffstat (limited to 'org/nixpkgs_overlays_d_related.org')
| -rw-r--r-- | org/nixpkgs_overlays_d_related.org | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index 6023565..dcf98b4 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -351,7 +351,7 @@ use flake . ]; inherit shellHook; }; - dsh-overlay-ldc-dub = mkShell { + dsh-overlay-ldc = mkShell { name = "overlay - ldc-<<ldc_version>> - dub-<<dub_version>> - dtools-<<dtools_version>>"; inherit shell; inherit devEnv; @@ -363,7 +363,7 @@ use flake . ]; inherit shellHook; }; - dsh-overlay-dmd-dub = mkShell { + dsh-overlay-dmd = mkShell { name = "overlay - dmd-<<dmd_version>> - dub-<<dub_version>> - dtools-<<dtools_version>>"; inherit shell; inherit devEnv; @@ -401,7 +401,7 @@ use flake . # ]; # inherit shellHook; #}; - dsh-nixpkgs-ldc-dub = mkShell { + dsh-nixpkgs-ldc = mkShell { name = "nixpkgs - ldc - dub"; inherit shell; inherit devEnv; @@ -413,7 +413,7 @@ use flake . ]; inherit shellHook; }; - dsh-nixpkgs-dmd-dub = mkShell { + dsh-nixpkgs-dmd = mkShell { name = "nixpkgs - ldc - dub"; inherit shell; inherit devEnv; @@ -1401,7 +1401,7 @@ stdenv.mkDerivation (finalAttrs: { @@ -616,7 +616,7 @@ void runTests(string rdmdApp, string compiler, string model) enforce(res.status == 1, res.output); } - + - version (Posix) + version (none) { @@ -1495,22 +1495,22 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69 @@ -9,9 +9,8 @@ DUB=dub WITH_DOC = no DOC = ../dlang.org - + -# Load operating system $(OS) (e.g. linux, osx, ...) and $(MODEL) (e.g. 32, 64) detection Makefile from dmd -$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 https://github.com/dlang/dmd $(DMD_DIR)) -include $(DMD_DIR)/compiler/src/osmodel.mak +# Load operating system $(OS) (e.g. linux, osx, ...) and $(MODEL) (e.g. 32, 64) detection Makefile +include osmodel.mak - + ifeq (windows,$(OS)) DOTEXE:=.exe @@ -30,7 +29,7 @@ DFLAGS = $(MODEL_FLAG) $(if $(findstring windows,$(OS)),,-fPIC) -preview=dip1000 DFLAGS += $(WARNINGS) - + # Default DUB flags (DUB uses a different architecture format) -DUBFLAGS = --arch=$(subst 32,x86,$(subst 64,x86_64,$(MODEL))) +DUBFLAGS = --arch=$(ARCH) - + TOOLS = \ $(ROOT)/catdoc$(DOTEXE) \ #+END_SRC |