From 9a3db5c9f226181bcbffbcb6a0ca3c0e2e96e5f3 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Tue, 18 Apr 2023 02:22:10 +0300
Subject: [PATCH 01/18] ci(gh-actions): Add initial CI pipeline config

---
 .github/dependabot.yml                  | 13 ++++++++
 .github/workflows/ci.yml                | 43 +++++++++++++++++++++++++
 .github/workflows/update-flake-lock.yml | 42 ++++++++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 .github/workflows/update-flake-lock.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..1f97b0bc
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+version: 2
+updates:
+
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '00:00'
+    timezone: UTC
+  open-pull-requests-limit: 10
+  commit-message:
+      prefix: "chore"
+      include: "scope"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..2122a5fa
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,43 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  Nix:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, macos-12 ]
+        pkg:
+          - dmd
+          - ldc
+          - dub
+
+    name: Building ${{ matrix.pkg }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: cachix/install-nix-action@v23
+        with:
+          # NIX_PATH is explicitly set to a wrong value to prevent accidental
+          # usage. `nixpkgs` should be accessed only through the locked flake
+          # reference.
+          nix_path: nixpkgs=null
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+          extra_nix_config:
+            accept-flake-config = true
+
+      - uses: cachix/cachix-action@v12
+        with:
+          name: dlang-community
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+
+      - name: Build ${{ matrix.job_name }}
+        run: nix build -L --json --no-link '.#${{ matrix.pkg }}'
diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
new file mode 100644
index 00000000..d5b36674
--- /dev/null
+++ b/.github/workflows/update-flake-lock.yml
@@ -0,0 +1,42 @@
+name: Update Nix Flake lockfile
+
+on:
+  # Enable option to manually run the action:
+  workflow_dispatch:
+
+  # Run every Sunday:
+  schedule:
+    - cron: 0 0 * * 0
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: cachix/install-nix-action@v20
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run `nix flake update`
+        id: update-lockfile
+        run: ./utils/commit_flake_update.bash
+
+      - uses: tibdex/github-app-token@v1.8.0
+        id: generate-token
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          title: 'Update Nix Flake lockfile'
+          commit-message: ${{ env.COMMIT_MSG }}
+          branch: 'create-pull-request/update-flake-lockfile'
+          delete-branch: true
+          branch-suffix: timestamp
+          add-paths: flake.lock

From a97cdded455b9a7b0467a0d15fdc9c7e58990f4e Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Tue, 18 Apr 2023 05:06:52 +0300
Subject: [PATCH 02/18] build(pkgs/ldc): Define the package for more platforms

---
 pkgs/ldc/binary.nix    | 39 +++++++++++++++++++++++++++------------
 pkgs/ldc/bootstrap.nix |  9 +++++++--
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/pkgs/ldc/binary.nix b/pkgs/ldc/binary.nix
index 729599cb..13700c5f 100644
--- a/pkgs/ldc/binary.nix
+++ b/pkgs/ldc/binary.nix
@@ -10,24 +10,37 @@
   version,
   hashes,
 }: let
-  inherit (stdenv) hostPlatform;
-  OS =
-    if hostPlatform.isDarwin
-    then "osx"
-    else hostPlatform.parsed.kernel.name;
-  ARCH =
-    if hostPlatform.isDarwin && hostPlatform.isAarch64
-    then "arm64"
-    else hostPlatform.parsed.cpu.name;
+  inherit (stdenv) hostPlatform system;
+
+  systemToArchivePlatform = {
+    # FIXME: How should Android be supported?
+    # (It is not a separate Nixpkgs platform.)
+    "aarch64-android" = "android-aarch64";
+    "armv7a-android" = "android-armv7a";
+    "x86_64-freebsd" = "freebsd-x86_64";
+    "aarch64-linux" = "linux-aarch64";
+    "x86_64-linux" = "linux-x86_64";
+    "aarch64-darwin" = "osx-arm64";
+    "x86_64-darwin" = "osx-x86_64";
+    "x86_64-windows" = "windows-x64";
+    "i686-windows" = "windows-x86";
+  };
+
+  tarballSuffix =
+    if hostPlatform.isWindows
+    then "7z"
+    else "tar.xz";
+
+  archivePlatform = systemToArchivePlatform."${system}";
 in
   stdenv.mkDerivation {
     pname = "ldc-binary";
     inherit version;
 
     src = fetchurl rec {
-      name = "ldc2-${version}-${OS}-${ARCH}.tar.xz";
+      name = "ldc2-${version}-${archivePlatform}.${tarballSuffix}";
       url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}";
-      sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}");
+      sha256 = hashes."${archivePlatform}" or (throw "missing bootstrap sha256 for ${archivePlatform}");
     };
 
     dontConfigure = true;
@@ -53,6 +66,8 @@ in
       # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
       license = with licenses; [bsd3 boost mit ncsa gpl2Plus];
       maintainers = with maintainers; [ThomasMader lionello];
-      platforms = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
+      # FIXME: change to the following after the CI verifies it:
+      # platforms = builtins.attrNames systemToArchivePlatform;
+      platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
     };
   }
diff --git a/pkgs/ldc/bootstrap.nix b/pkgs/ldc/bootstrap.nix
index c8cd9127..5917e37b 100644
--- a/pkgs/ldc/bootstrap.nix
+++ b/pkgs/ldc/bootstrap.nix
@@ -3,9 +3,14 @@ callPackage ./binary.nix {
   version = "1.28.0";
   hashes = {
     # COMPILER=ldc VERSION='1.28.0' ./scripts/fetch-binary
-    "linux-x86_64" = "sha256-l4bDbE39Kd0wilDEmcEV5MIHm66t7QflrFOWxKf9Ang=";
+    "android-aarch64" = "sha256-UmZuvq7d7kAsAiy83Dm4wnBF5vqrFeU8clZLnq8yzP8=";
+    "android-armv7a" = "sha256-ybIuqE7Vc4r83xdA9QHupooyab2n4anrHxOfnE5blt4=";
+    "freebsd-x86_64" = "sha256-13YsPqfowDM3k7YN0elSroZubcSSSbMx6UDkot9D6oY=";
     "linux-aarch64" = "sha256-9zo22af/3QAK6sNy8gKFCztlgkqnmZj3H5Ud8deTdGU=";
-    "osx-x86_64" = "sha256-AkclB96YjItd2DsYnG3ztHR0FUZYlJbC/z1nPya40Jo=";
+    "linux-x86_64" = "sha256-l4bDbE39Kd0wilDEmcEV5MIHm66t7QflrFOWxKf9Ang=";
     "osx-arm64" = "sha256-+XhrjCjYrx/dMx2OuImt2AKF2+v7l+pH1d2REKffB0s=";
+    "osx-x86_64" = "sha256-AkclB96YjItd2DsYnG3ztHR0FUZYlJbC/z1nPya40Jo=";
+    "windows-x64" = "sha256-Jrs+znd073DZx0heq1+8GC1OdEEeSo0vM56bQhp28Gk=";
+    "windows-x86" = "sha256-r1RlsxbftYLe1P1vg9+gLf3YlvrW05fMU9CY47qfkoE=";
   };
 }

From 598d5b3b90559ba3ac7650622d74de6c6ca27eff Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Wed, 19 Apr 2023 18:06:27 +0300
Subject: [PATCH 03/18] refactor(shell.nix): Include `dmd` package only if the
 `hostPlatform` is x86

---
 shell.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/shell.nix b/shell.nix
index d45fc4a7..9e6f26a6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,13 +1,16 @@
 {pkgs ? import <nixpkgs> {}}:
 with pkgs;
   mkShell {
-    buildInputs = [
-      figlet
-      nix-prefetch-git
-      dmd
-      ldc
-      dub
-    ];
+    packages =
+      [
+        figlet
+        nix-prefetch-git
+        ldc
+        dub
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isx86 [
+        dmd
+      ];
 
     shellHook = ''
       figlet "Welcome  to Dlang  Nix"

From 59624913bb81ceeea2f298821f537aa56b104d7b Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Wed, 19 Apr 2023 18:17:58 +0300
Subject: [PATCH 04/18] refactor(shell.nix): Remove nixpkgs fallback

As the shell.nix is supposed to have access to the pkgs defined by the flake.
---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index 9e6f26a6..4f9dc9d7 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 with pkgs;
   mkShell {
     packages =

From b1e943a1be8b3f0e09252d4a96ba41c1b469b865 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Wed, 19 Apr 2023 18:24:21 +0300
Subject: [PATCH 05/18] feat(shell.nix): Use pkgs instance resulting from
 applying the flake overlay

This way we can access all packages defined in this flake in the devshell.
---
 flake.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 36cd6291..9faf206d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,8 +20,8 @@
     flake-parts.lib.mkFlake {inherit inputs;} {
       systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
       imports = [./pkgs];
-      perSystem = {pkgs, ...}: {
-        devShells.default = import ./shell.nix {inherit pkgs;};
+      perSystem = {final, ...}: {
+        devShells.default = import ./shell.nix {pkgs = final;};
       };
     };
 }

From 00ab6c7bce79b712c750d8d1bfbcdaa885eff43c Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Wed, 19 Apr 2023 18:28:28 +0300
Subject: [PATCH 06/18] refactor(pkgs/default.nix): Split packages list based
 on the platform

---
 pkgs/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3a1c6122..0c301c95 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,18 +6,20 @@
     pkgs,
     ...
   }: let
-    inherit (pkgs) callPackage;
+    inherit (pkgs) callPackage lib darwin hostPlatform;
     darwinPkgs = {
-      inherit (pkgs.darwin.apple_sdk.frameworks) Foundation;
+      inherit (darwin.apple_sdk.frameworks) Foundation;
     };
   in {
     overlayAttrs = self'.packages;
-    packages = {
-      dmd = callPackage ./dmd ({} // darwinPkgs);
+    packages =
+      {
+        ldc = callPackage ./ldc {};
 
-      ldc = callPackage ./ldc {};
-
-      dub = callPackage ./dub {};
-    };
+        dub = callPackage ./dub {};
+      }
+      // lib.optionalAttrs hostPlatform.isx86 {
+        dmd = callPackage ./dmd darwinPkgs;
+      };
   };
 }

From 51483cb254596aee9d2056ea1cab6ceb9c08e148 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Fri, 21 Apr 2023 10:18:02 +0300
Subject: [PATCH 07/18] fix(dmd/binary): Ensure `autoPatchelfHook` is able to
 find `libgcc_s.so.1`

After upgrading to a recent version of Nixpkgs (2023-04-18), the build broke
with the following error:

    ...
    auto-patchelf: 6 dependencies could not be satisfied
    error: auto-patchelf could not satisfy dependency libgcc_s.so.1 wanted by
    /nix/store/kl8bjrlmlzcjz47c0n6kjsj1yxi6zpqm-dmd-binary-2.098.0/lib/libphobos2.so.0.98.0

    error: auto-patchelf could not satisfy dependency libgcc_s.so.1 wanted by
    /nix/store/kl8bjrlmlzcjz47c0n6kjsj1yxi6zpqm-dmd-binary-2.098.0/bin/rdmd

    error: auto-patchelf could not satisfy dependency libgcc_s.so.1 wanted by
    /nix/store/kl8bjrlmlzcjz47c0n6kjsj1yxi6zpqm-dmd-binary-2.098.0/bin/dub

    error: auto-patchelf could not satisfy dependency libgcc_s.so.1 wanted by
    /nix/store/kl8bjrlmlzcjz47c0n6kjsj1yxi6zpqm-dmd-binary-2.098.0/bin/dustmite

    error: auto-patchelf could not satisfy dependency libgcc_s.so.1 wanted by
    /nix/store/kl8bjrlmlzcjz47c0n6kjsj1yxi6zpqm-dmd-binary-2.098.0/bin/ddemangle

    error: auto-patchelf could not satisfy dependency libgcc_s.so.1 wanted by
    /nix/store/kl8bjrlmlzcjz47c0n6kjsj1yxi6zpqm-dmd-binary-2.098.0/bin/dmd

    auto-patchelf failed to find all the required dependencies.
    ...

After investigation, it turned out that the cuase was a recent [change in
Nixpkgs][0] after which `libgcc_s.so` is no longer part of the `glibc` package:

Before (nixpkgs @ 2022-03-30):

    > nix build --json 'github:NixOS/nixpkgs/710fed5a2483f945b14f4a58af2cd3676b42d8c8#glibc^out' \
        | jq -r '.[0].outputs.out' \
        | xargs  -I{} find {} \( -type l -or -type f \) -name '*libgcc_s*'

    /nix/store/q29bwjibv9gi9n86203s38n0577w09sx-glibc-2.33-117/lib/libgcc_s.so.1
    /nix/store/q29bwjibv9gi9n86203s38n0577w09sx-glibc-2.33-117/lib/libgcc_s.so

After (nixpkgs @ 2023-04-18):

    > nix build --json 'github:NixOS/nixpkgs/555daa9d339b3df75e58ee558a4fec98ea92521e#glibc^out' \
        | jq -r '.[0].outputs.out' \
        | xargs  -I{} find {} \( -type l -or -type f \) -name '*libgcc_s*'

    (no output)

Instead, we should use `gccForLibs.libgcc` as it includes exactly what we need:

    > nix build --json 'github:NixOS/nixpkgs/555daa9d339b3df75e58ee558a4fec98ea92521e#gccForLibs^libgcc' \
       | jq -r '.[0].outputs.libgcc' \
       | xargs  -I{} find {} \( -type l -or -type f \) -name '*libgcc_s*'

    /nix/store/5w5qpm9z3iyib615pdih6nvk9spv3jbv-gcc-12.2.0-libgcc/lib/libgcc_s.so.1
    /nix/store/5w5qpm9z3iyib615pdih6nvk9spv3jbv-gcc-12.2.0-libgcc/lib/libgcc_s.so

    This is nixpkgs again @ 2023-04-18, this time using `gccForLibs.libgcc`
    instead of `glibc.out`.

[`gccForLibs`][1] is essentially `gcc.lib`:
* an alias to `stdenv.cc.cc` if the host and target are the same and are GNU or
* an alias to `gcc.cc` when `stdenv` is LLVM based as then `stdenv.cc.cc` would
  refer to clang and the `lib` output point to libclang libs, which are very
  different from what we need.

[0]: https://github.com/NixOS/nixpkgs/pull/209870
[1]: https://github.com/NixOS/nixpkgs/pull/91293
---
 pkgs/dmd/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/dmd/binary.nix b/pkgs/dmd/binary.nix
index 21e679be..4a2ce4cf 100644
--- a/pkgs/dmd/binary.nix
+++ b/pkgs/dmd/binary.nix
@@ -6,7 +6,7 @@
   tzdata,
   autoPatchelfHook,
   fixDarwinDylibNames,
-  glibc,
+  gccForLibs,
   version,
   hashes,
 }: let
@@ -37,7 +37,7 @@ in
       lib.optional hostPlatform.isLinux autoPatchelfHook
       ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
 
-    propagatedBuildInputs = [curl tzdata] ++ lib.optional hostPlatform.isLinux glibc;
+    propagatedBuildInputs = [curl tzdata] ++ lib.optional hostPlatform.isLinux gccForLibs.libgcc;
 
     installPhase = ''
       runHook preInstall

From d7cb7fba43289a89fc73701949c57b9807493a8c Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Fri, 21 Apr 2023 16:19:03 +0300
Subject: [PATCH 08/18] fix(dmd/generic): Fix the dmd runnable_cxx parts of the
 checkPhase by using GCC11

The recent upgrade of Nixpkgs caused stdenv.cc to be upgraded from GCC11 to
GCC12, which seems to not work with DMD's `extern(C++)` test suite. What happens
is that the when GCC12 is used the `runnable_cxx/cppb.cpp.o` object file is
missing symbols:

```
export SHELL=/nix/store/zlf0f88vj30sc7567b80l52d19pbdmy2-bash-5.2-p15/bin/bash
export HOST_DMD=/nix/store/ps0lnm6z57fnghch009mkgic8k3shb3x-dmd-binary-2.098.0/bin/dmd
export CC=/nix/store/nlgyw2fv0cm8rkz8qm1jyw78vyif1bl9-gcc-wrapper-12.2.0/bin/cc
export NIX_HARDENING_ENABLE=''
export NIX_ENFORCE_PURITY=''
export MAKE=/nix/store/18gs8jn6ss6gg48r49gapplbyq3j6qny-gnumake-4.4.1/bin/make

$MAKE -C $DLANG/dmd -f posix.mak
(cd $DLANG/dmd/test && $HOST_DMD -i -run ./run.d -e runnable_cxx/cppa.d)
```

Which fails with:

```
Test 'runnable_cxx/cppa.d' failed. The logged output:
/nix/store/nlgyw2fv0cm8rkz8qm1jyw78vyif1bl9-gcc-wrapper-12.2.0/bin/cc \
  -m64 -c runnable_cxx/extra-files/cppb.cpp \
  -o $DLANG/dmd/test/test_results/runnable_cxx/cppb.cpp.o \
  -std=c++11

$DLANG/dmd/generated/linux/release/64/dmd -conf= -m64 \
  -Irunnable_cxx -checkaction=C  -fPIC -L-lstdc++ -L--no-demangle \
  -od$DLANG/dmd/test/test_results/runnable_cxx \
  -of$DLANG/dmd/test/test_results/runnable_cxx/cppa_0 \
  runnable_cxx/cppa.d \
  $DLANG/dmd/test/test_results/runnable_cxx/cppb.cpp.o

/nix/store/f4qnwzv6y0nq8lix33jr5ykkyybs6fxf-binutils-2.40/bin/ld:
$DLANG/dmd/test/test_results/runnable_cxx/cppa_0.o: in function
`_ZNSaIiE10deallocateEPim':
runnable_cxx/cppa.d:(.text._ZNSaIiE10deallocateEPim[_ZNSaIiE10deallocateEPim]+0x5):
undefined reference to `_ZN9__gnu_cxx13new_allocatorIiE10deallocateEPim'
```

Essentially saying that in the function
`std::allocator<int>::deallocate(int*, unsigned long)` the linker was a
reference to `__gnu_cxx::new_allocator<int>::deallocate(int*, unsigned long)`
which was not found.

Since further investigation is needed and the goal is to fix the CI build, we
will explicitly set the `CC` env variable to the point to the GCC11 binary,
which appears to work without issues.
---
 pkgs/dmd/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/dmd/generic.nix b/pkgs/dmd/generic.nix
index e0218df6..e6a043e7 100644
--- a/pkgs/dmd/generic.nix
+++ b/pkgs/dmd/generic.nix
@@ -23,6 +23,7 @@
   curl,
   tzdata,
   gdb,
+  gcc11,
   Foundation,
   callPackage,
   targetPackages,
@@ -236,7 +237,7 @@ in
 
     inherit doCheck;
 
-    checkFlags = commonBuildFlags ++ ["CC=${stdenv.cc}/bin/cc" "N=$(checkJobs)"];
+    checkFlags = commonBuildFlags ++ ["CC=${gcc11}/bin/cc" "N=$(checkJobs)"];
 
     # many tests are disbled because they are failing
 

From de5bfe6238d8a471958582f65de217bff81a591d Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Fri, 21 Apr 2023 17:49:41 +0300
Subject: [PATCH 09/18] feat(pkgs): Expose `{dmd,ldc}-binary` packages

---
 pkgs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0c301c95..4fff6e60 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -14,11 +14,13 @@
     overlayAttrs = self'.packages;
     packages =
       {
+        ldc-binary = callPackage ./ldc/bootstrap.nix {};
         ldc = callPackage ./ldc {};
 
         dub = callPackage ./dub {};
       }
       // lib.optionalAttrs hostPlatform.isx86 {
+        dmd-binary = callPackage ./dmd/bootstrap.nix {};
         dmd = callPackage ./dmd darwinPkgs;
       };
   };

From f0701db47bf5639669c0b66f6175ece4e81beffa Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Fri, 21 Apr 2023 21:27:41 +0300
Subject: [PATCH 10/18] build(flake.nix/inputs): Remove `flake-utils`

As it has been replaced by flake-parts.
---
 flake.lock | 34 ----------------------------------
 flake.nix  |  1 -
 2 files changed, 35 deletions(-)

diff --git a/flake.lock b/flake.lock
index c1e6a246..21481a70 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,24 +20,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1681828457,
@@ -57,24 +39,8 @@
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 9faf206d..b9f18728 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
-    flake-utils.url = github:numtide/flake-utils;
 
     flake-parts = {
       url = "github:hercules-ci/flake-parts";

From 153e35234c3669f647886cf193758a0fb490ae24 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Mon, 24 Apr 2023 23:42:43 +0300
Subject: [PATCH 11/18] fix(dmd/generic): Set `CC` env variable for both the
 build and the check phase

---
 pkgs/dmd/generic.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/dmd/generic.nix b/pkgs/dmd/generic.nix
index e6a043e7..8d0d5c4e 100644
--- a/pkgs/dmd/generic.nix
+++ b/pkgs/dmd/generic.nix
@@ -79,6 +79,7 @@
     "-fposix.mak"
     "SHELL=${bash}/bin/bash"
     "DMD=$(NIX_BUILD_TOP)/dmd/${buildPath}/dmd"
+    "CC=${if stdenv.isDarwin then stdenv.cc else gcc11}/bin/cc"
     "HOST_DMD=${HOST_DMD}"
     "PIC=1"
     "BUILD=${buildMode}"
@@ -237,7 +238,9 @@ in
 
     inherit doCheck;
 
-    checkFlags = commonBuildFlags ++ ["CC=${gcc11}/bin/cc" "N=$(checkJobs)"];
+    checkInputs = lib.optional stdenv.isDarwin Foundation;
+
+    checkFlags = commonBuildFlags ++ ["N=$(checkJobs)"];
 
     # many tests are disbled because they are failing
 

From c18e696924556b21d68524744f69666f38c4a0c0 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Mon, 1 May 2023 12:15:30 +0300
Subject: [PATCH 12/18] config(flake.nix): Add Cachix binary cache settings

---
 flake.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/flake.nix b/flake.nix
index b9f18728..55d1e933 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,11 @@
 {
   description = "Nix packages for D projects";
 
+  nixConfig = {
+    extra-substituters = "https://dlang-community.cachix.org";
+    extra-trusted-public-keys = "dlang-community.cachix.org-1:eAX1RqX4PjTDPCAp/TvcZP+DYBco2nJBackkAJ2BsDQ=";
+  };
+
   inputs = {
     nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
 

From 5e77184a3c4d7703ad2ea147d254eccade3383fd Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Sat, 6 May 2023 15:25:29 +0300
Subject: [PATCH 13/18] fix(scripts/fetch-binary): Allow skipping missing
 binary packages

---
 scripts/fetch-binary | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/fetch-binary b/scripts/fetch-binary
index d9b84dc6..ab7d75ee 100755
--- a/scripts/fetch-binary
+++ b/scripts/fetch-binary
@@ -19,7 +19,7 @@ main() {
   echo "-----"
   for platform in "${platforms[@]}"; do
     url="$(getUrl "$platform")"
-    hash="$(prefech "$url")"
+    hash="$(prefech "$url")" || continue
     hashes[$platform]="$hash"
   done
 
@@ -28,7 +28,11 @@ main() {
   echo
 
   for platform in "${platforms[@]}"; do
-    echo "\"${platform}\" = \"${hashes[$platform]}\";"
+    if [[ -v 'hashes[$platform]' ]]; then
+      echo "\"${platform}\" = \"${hashes[$platform]}\";"
+    else
+      echo "# \"${platform}\" = \"<not available>\";"
+    fi
   done
 }
 

From 319c5e0c6123a9931c662a53ee69c5f50b6ad625 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Sat, 6 May 2023 15:26:42 +0300
Subject: [PATCH 14/18] feat(ldc/bootstrap): Upgrade to 1.32.1

---
 pkgs/ldc/bootstrap.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/ldc/bootstrap.nix b/pkgs/ldc/bootstrap.nix
index 5917e37b..422da9db 100644
--- a/pkgs/ldc/bootstrap.nix
+++ b/pkgs/ldc/bootstrap.nix
@@ -1,16 +1,16 @@
 {callPackage}:
 callPackage ./binary.nix {
-  version = "1.28.0";
+  version = "1.32.1";
   hashes = {
-    # COMPILER=ldc VERSION='1.28.0' ./scripts/fetch-binary
-    "android-aarch64" = "sha256-UmZuvq7d7kAsAiy83Dm4wnBF5vqrFeU8clZLnq8yzP8=";
-    "android-armv7a" = "sha256-ybIuqE7Vc4r83xdA9QHupooyab2n4anrHxOfnE5blt4=";
-    "freebsd-x86_64" = "sha256-13YsPqfowDM3k7YN0elSroZubcSSSbMx6UDkot9D6oY=";
-    "linux-aarch64" = "sha256-9zo22af/3QAK6sNy8gKFCztlgkqnmZj3H5Ud8deTdGU=";
-    "linux-x86_64" = "sha256-l4bDbE39Kd0wilDEmcEV5MIHm66t7QflrFOWxKf9Ang=";
-    "osx-arm64" = "sha256-+XhrjCjYrx/dMx2OuImt2AKF2+v7l+pH1d2REKffB0s=";
-    "osx-x86_64" = "sha256-AkclB96YjItd2DsYnG3ztHR0FUZYlJbC/z1nPya40Jo=";
-    "windows-x64" = "sha256-Jrs+znd073DZx0heq1+8GC1OdEEeSo0vM56bQhp28Gk=";
-    "windows-x86" = "sha256-r1RlsxbftYLe1P1vg9+gLf3YlvrW05fMU9CY47qfkoE=";
+    # COMPILER=ldc VERSION=1.32.1 ./scripts/fetch-binary
+    "android-aarch64" = "sha256-VT64VTqr4IfVXThw1Ycf0Wrx3ICJkm4ofuGG+gCJfDQ=";
+    "android-armv7a" = "sha256-wdEuHjD9NwtQ0goeiB1ExrzFE2X4Vnk1GhVZrleL4vU=";
+    # "freebsd-x86_64" = "<not available>";
+    "linux-aarch64" = "sha256-VZJFDzsiEuf/L8VbFWd+KtEyrkHp0mX2i9TuKC6zcTM=";
+    "linux-x86_64" = "sha256-IRW4A689ysDCXbHJvFuQRMgkW1CI7UPzKChe1uLrkgk=";
+    "osx-arm64" = "sha256-b1+9tgFmaeEdE82PqXAwpLIxarrpgMP9pq+5IvdyUVM=";
+    "osx-x86_64" = "sha256-uoQi4QqHFB/o7QSVCZZVnkacTn4VIP6ywc30ikRRX6A=";
+    "windows-x64" = "sha256-toR9xnw5B4H8/8tG2zo3mp93cdQHnY0cS3AujGenUBo=";
+    "windows-x86" = "sha256-ffQnS+HbtN6STK+wQ7jfS77m8BO+DwsevOAnhKy0jz4=";
   };
 }

From 6da7f89b2736c1b5ea365b12620a334f59559e35 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Mon, 4 Sep 2023 12:42:52 +0300
Subject: [PATCH 15/18] feat(scripts): Add D-based implementation of
 fetch_binary script

---
 scripts/fetch_binary.d | 101 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100755 scripts/fetch_binary.d

diff --git a/scripts/fetch_binary.d b/scripts/fetch_binary.d
new file mode 100755
index 00000000..deaf884f
--- /dev/null
+++ b/scripts/fetch_binary.d
@@ -0,0 +1,101 @@
+#!/usr/bin/env -S rdmd -preview=shortenedMethods
+
+import std.algorithm : map, startsWith;
+import std.format : format;
+import std.stdio : writeln, writefln;
+import std.getopt : getopt, defaultGetoptPrinter;
+import std.parallelism : parallel;
+import std.string : strip;
+import std.typecons : tuple;
+
+enum Compiler { dmd, ldc };
+alias Version = string;
+alias Platform = string;
+alias Hash = string;
+alias Url = string;
+
+alias UrlFormatter = Url function(Platform platform, Version compilerVersion);
+
+struct CompilerInfo { UrlFormatter urlFormatter; Platform[] platforms; }
+
+string suffix(Platform p) => p.startsWith("windows") ? "7z" : "tar.xz";
+
+enum CompilerInfo[Compiler] supportedPlatforms = [
+    Compiler.dmd: CompilerInfo(
+        (platform, compilerVersion) => "http://downloads.dlang.org/releases/2.x/%s/dmd.%s.%s.%s"
+            .format(compilerVersion, compilerVersion, platform, suffix(platform)),
+        [
+            "linux", "osx", "freebsd-64", "windows"
+        ],
+    ),
+    Compiler.ldc: CompilerInfo(
+        (platform, compilerVersion) => "https://github.com/ldc-developers/ldc/releases/download/v%s/ldc2-%s-%s.%s"
+            .format(compilerVersion, compilerVersion, platform, suffix(platform)),
+        [
+            "android-aarch64", "android-armv7a",
+            "freebsd-x86_64",
+            "linux-aarch64", "linux-x86_64",
+            "osx-arm64", "osx-x86_64",
+            "windows-x64", "windows-x86"
+        ],
+    ),
+];
+
+void main(string[] args) {
+    Version compilerVersion;
+    Compiler compiler = Compiler.ldc;
+    bool dryRun = true;
+
+    auto help = args.getopt(
+        "version", &compilerVersion,
+        "compiler", &compiler,
+        "dry-run", &dryRun,
+    );
+
+    compilerVersion = compilerVersion
+        ? compilerVersion
+        : compiler == Compiler.ldc
+        ? "1.34.0"
+        : "2.105.0";
+
+    if (help.helpWanted)
+        defaultGetoptPrinter("Some information about the program.", help.options);
+
+    const compilerInfo = supportedPlatforms[compiler];
+    const platforms = compilerInfo.platforms;
+    const getUrl = compilerInfo.urlFormatter;
+
+    writefln("Prefetching %s v%s for %s:", compiler, compilerVersion, platforms);
+    writeln("-----");
+
+    Hash[Platform] hashes;
+
+    foreach (platform; platforms.parallel) {
+        const url = getUrl(platform, compilerVersion);
+        if (const hash = prefech(dryRun, url))
+            hashes[platform] = hash;
+    }
+
+    writeln("-----");
+    writeln("All done!\n");
+
+    foreach (platform, hash; platforms.map!(p => tuple(p, p in hashes)))
+       `"%s" = "%s";`.writefln(
+            platform,
+            hash ? *hash : "<not available>"
+        );
+}
+
+Hash prefech(bool dryRun, Url url) =>
+    executeCommand(
+        dryRun,
+        `nix store prefetch-file --json "%s" | jq -r '.hash'`.format(url)
+    ).strip;
+
+string executeCommand(bool dryRun, string command) {
+    `> %s`.writefln(command);
+    import std.process : executeShell;
+    if (dryRun) return null;
+    const result = executeShell(command);
+    return result.status == 0 ? result.output : null;
+}

From dd52030108bba6365a48472bda93cc98253d17d1 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Wed, 20 Sep 2023 19:30:25 +0300
Subject: [PATCH 16/18] fix(pkgs/dmd/generic): Disable failing macos tests

---
 pkgs/dmd/generic.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/dmd/generic.nix b/pkgs/dmd/generic.nix
index 8d0d5c4e..85717223 100644
--- a/pkgs/dmd/generic.nix
+++ b/pkgs/dmd/generic.nix
@@ -199,6 +199,9 @@ in
         substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
       ''
       + lib.optionalString stdenv.isDarwin ''
+        rm dmd/test/runnable/{test13117.d,test13117b.d}
+        rm dmd/test/runnable_cxx/{cpp11.d,cppa.d,cpp_stdlib.d}
+
         substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
       '';
 

From b9b6bc26df9d68c40cc27900df1064ed414eaea9 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Wed, 20 Sep 2023 20:30:59 +0300
Subject: [PATCH 17/18] feat(ldc/bootstrap): Upgrade to 1.34.0

---
 pkgs/ldc/bootstrap.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/ldc/bootstrap.nix b/pkgs/ldc/bootstrap.nix
index 422da9db..09d67295 100644
--- a/pkgs/ldc/bootstrap.nix
+++ b/pkgs/ldc/bootstrap.nix
@@ -1,16 +1,16 @@
 {callPackage}:
 callPackage ./binary.nix {
-  version = "1.32.1";
+  version = "1.34.0";
   hashes = {
-    # COMPILER=ldc VERSION=1.32.1 ./scripts/fetch-binary
-    "android-aarch64" = "sha256-VT64VTqr4IfVXThw1Ycf0Wrx3ICJkm4ofuGG+gCJfDQ=";
-    "android-armv7a" = "sha256-wdEuHjD9NwtQ0goeiB1ExrzFE2X4Vnk1GhVZrleL4vU=";
-    # "freebsd-x86_64" = "<not available>";
-    "linux-aarch64" = "sha256-VZJFDzsiEuf/L8VbFWd+KtEyrkHp0mX2i9TuKC6zcTM=";
-    "linux-x86_64" = "sha256-IRW4A689ysDCXbHJvFuQRMgkW1CI7UPzKChe1uLrkgk=";
-    "osx-arm64" = "sha256-b1+9tgFmaeEdE82PqXAwpLIxarrpgMP9pq+5IvdyUVM=";
-    "osx-x86_64" = "sha256-uoQi4QqHFB/o7QSVCZZVnkacTn4VIP6ywc30ikRRX6A=";
-    "windows-x64" = "sha256-toR9xnw5B4H8/8tG2zo3mp93cdQHnY0cS3AujGenUBo=";
-    "windows-x86" = "sha256-ffQnS+HbtN6STK+wQ7jfS77m8BO+DwsevOAnhKy0jz4=";
+    # ./scripts/fetch_binary.d --compiler=ldc --version=1.34.0 --dry-run=false
+    "android-aarch64" = "sha256-SJRdpd5tzhLPhJuY6rhN7r0Z2gCvEVDZxDMj0+tufUc=";
+    "android-armv7a" = "sha256-1URd7kpVA5m8DOPLO+6M3xhKvztHwIvNj2oka8TFcYw=";
+    "freebsd-x86_64" = "sha256-vI/ubxF0wyw/KdyoVzv7g4/6JiyJOdwgb/N7T6rne14=";
+    "linux-aarch64" = "sha256-LRD817uG0XMf6i+GaqCi/vDuURU4WInhFCeU+dAtHaE=";
+    "linux-x86_64" = "sha256-cnmsxGlsElSE2iVQcs+KVHKsKMv6XYin4N+XhUFt/BU=";
+    "osx-arm64" = "sha256-W45AEOW1EPsxizCgJYUOZyq7MhotN62xobsEAbr2/tU=";
+    "osx-x86_64" = "sha256-93aJN7ZNOLrQmKd6z/435trWg5F6B3XfOmKU/j5M5ig=";
+    "windows-x64" = "sha256-WrZnrDo/8hnsOsY2Ih8txErDz3OaNhVzwFFXsPJCEFM=";
+    "windows-x86" = "sha256-Vu/W9z7cB7VrcBqrlClknCYYni+GCDB4baGZOT6JS54=";
   };
 }

From e5384d99dca0db8eedd469ea924a494073a566d8 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Wed, 20 Sep 2023 23:23:55 +0300
Subject: [PATCH 18/18] ci(gh-actions): Allow ldc on macos to fail

---
 .github/workflows/ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2122a5fa..9a83046d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,14 +13,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        experimental: [false]
         os: [ ubuntu-latest, macos-12 ]
         pkg:
           - dmd
           - ldc
           - dub
+        include:
+          - { experimental: true, pkg: ldc, os: macos-12 }
+        exclude:
+          - { experimental: false, pkg: ldc, os: macos-12 }
 
-    name: Building ${{ matrix.pkg }} on ${{ matrix.os }}
+    name: ${{ matrix.pkg }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+
     steps:
       - uses: actions/checkout@v4