From 09f11d6bfcc588238c2db61c953733d6e57015d1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 27 Oct 2020 17:25:16 -0400
Subject: ldc-1.23.0 overlay for nixos 20.09

---
 nixDevEnv/overlays/ldcVersion.nix |  6 +++---
 org/spine_build_scaffold.org      | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/nixDevEnv/overlays/ldcVersion.nix b/nixDevEnv/overlays/ldcVersion.nix
index c241a1f..688394d 100644
--- a/nixDevEnv/overlays/ldcVersion.nix
+++ b/nixDevEnv/overlays/ldcVersion.nix
@@ -1,9 +1,9 @@
 self: super: rec {
+  pname   = "ldc";
   version = "1.23.0";
-  sha256 = "1fdgj222x29as466vdxy9c0m82zzlsb7vnvvh89n2riszcrx463d";
+  sha256  = "1fdgj222x29as466vdxy9c0m82zzlsb7vnvvh89n2riszcrx463d";
   ldc = super.ldc.overrideAttrs(oldAttrs: rec {
-    inherit version sha256;
-    pname = oldAttrs.pname;
+    inherit pname version sha256;
     name = "${pname}-${version}";
     src = super.fetchurl {
       url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org
index c36cb1e..a10929b 100644
--- a/org/spine_build_scaffold.org
+++ b/org/spine_build_scaffold.org
@@ -1895,7 +1895,7 @@ buildInputs = with pkgs; [
 ];
 #+END_SRC
 
-*** dmd & ldc
+*** shell with dmd & ldc
 
 #+NAME: nix_shell_with_compilers_dmd_and_ldc
 #+BEGIN_SRC nix
@@ -2233,10 +2233,10 @@ in {
 
 #+BEGIN_SRC nix :tangle ../nixDevEnv/overlays/ldcVersion.nix
 self: super: rec {
+  pname   = "ldc";
   <<ldc_version_info>>
   ldc = super.ldc.overrideAttrs(oldAttrs: rec {
-    inherit version sha256;
-    pname = oldAttrs.pname;
+    inherit pname version sha256;
     name = "${pname}-${version}";
     src = super.fetchurl {
       url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
@@ -2272,16 +2272,36 @@ self: super: rec {
 #+END_SRC
 
 ** version info TODO
-https://dlang.org/download.html
+
+- https://dlang.org/download.html
 
 *** compilers (set latest versions) TODO
 **** ldc
-https://github.com/ldc-developers/ldc/releases
+
+- https://github.com/ldc-developers/ldc/releases
+
+***** 1.24.0
+
+- https://github.com/ldc-developers/ldc/releases/tag/v1.24.0
+  - nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.24.0/ldc-1.24.0-src.tar.gz
+
+#+BEGIN_SRC nix
+version = "1.24.0";
+sha256  = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
+#+END_SRC
+
+- ldc-1.24.0 overlay does not build with latest nixos version, nixos-20.09
+  nixos at ldc-1.20.0
+
+***** 1.23.0
+
+- https://github.com/ldc-developers/ldc/releases/tag/v1.23.0
+  - nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.23.0/ldc-1.23.0-src.tar.gz
 
 #+NAME: ldc_version_info
 #+BEGIN_SRC nix
 version = "1.23.0";
-sha256 = "1fdgj222x29as466vdxy9c0m82zzlsb7vnvvh89n2riszcrx463d";
+sha256  = "1fdgj222x29as466vdxy9c0m82zzlsb7vnvvh89n2riszcrx463d";
 #+END_SRC
 
 **** dmd
@@ -2293,8 +2313,8 @@ http://downloads.dlang.org/releases/2.x/
 #+NAME: dmd_version_info
 #+BEGIN_SRC nix
 version = "2.094.0";
-sha256 = "0xhm8m46ahfx3hcibi3vws02zaplny3226f3x8cd8584gzfqyzxp";
-year = "2020";
+sha256  = "0xhm8m46ahfx3hcibi3vws02zaplny3226f3x8cd8584gzfqyzxp";
+year    = "2020";
 #+END_SRC
 
 * .gitignore                                                      :gitignore:
-- 
cgit v1.2.3