From 823a4a0005f04d6d8647dc2d55bbb356a14f8ee0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 8 May 2024 23:10:05 -0400 Subject: ldc-1.38.0-beta1 (DMD v2.108.0, LLVM 18.1.5) --- README | 6 +++--- flake.nix | 8 ++++---- nix-overlays/ldc/default.nix | 4 ++-- nix-overlays/ldc/generic.nix | 4 ++-- org/dlang-nix-flakes.org | 27 ++++++++++++++++++++++++--- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/README b/README index eb33807..dc88fca 100644 --- a/README +++ b/README @@ -35,7 +35,7 @@ nix control files - flake.nix nix overlays for (updates nixpkgs, more recent versions of): - - ldc ( 1.30.0 -> 1.37.0 ) + - ldc ( 1.30.0 -> 1.38.0-beta1 ) - dub ( 1.23.0 -> 1.36.0 ) [for nix versions 1.31.0 ... 1.33.0 broken] - dtools ( 2.095.1 -> 2.103.1 ) @@ -73,13 +73,13 @@ search nixpkgs here: - https://search.nixos.org/packages?channel=unstable&from=0&size=100&sort=relevance&query= ** compilers -*** ldc OK ✓ ( 1.30.0 -> 1.37.0 ) +*** ldc OK ✓ ( 1.30.0 -> 1.38.0-beta1 ) - https://wiki.dlang.org/LDC - https://github.com/ldc-developers/ldc - https://github.com/ldc-developers/ldc/releases - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.37.0.tar.gz + nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.38.0-beta1.tar.gz - https://github.com/ldc-developers/ldc/issues - version in nixpkgs: diff --git a/flake.nix b/flake.nix index 07f2edc..17e7be7 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ runHook postCheck ''; localOverlay = (final: prev: { - ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.37.0 + ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.38.0-beta1 dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.108.0 dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.36.0 dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.103.1 @@ -85,7 +85,7 @@ in with pkgs-ovl; { dsh-overlay-dtools = mkShell { - name = "overlay - ldc-1.37.0 - dub-1.36.0 - dtools-2.103.1"; + name = "overlay - ldc-1.38.0-beta1 - dub-1.36.0 - dtools-2.103.1"; inherit shell; inherit devEnv; packages = [ @@ -97,7 +97,7 @@ inherit shellHook; }; dsh-overlay-ldc-dub = mkShell { - name = "overlay - ldc-1.37.0 - dub-1.36.0"; + name = "overlay - ldc-1.38.0-beta1 - dub-1.36.0"; inherit shell; inherit devEnv; packages = [ @@ -119,7 +119,7 @@ inherit shellHook; }; dsh-overlay-dtest-tilix = mkShell { - name = "overlay - ldc-1.37.0 - dub-1.36.0 - tilix - gtkd"; + name = "overlay - ldc-1.38.0-beta1 - dub-1.36.0 - tilix - gtkd"; inherit shell; inherit devEnv; packages = [ diff --git a/nix-overlays/ldc/default.nix b/nix-overlays/ldc/default.nix index 2e194e4..184f3e2 100644 --- a/nix-overlays/ldc/default.nix +++ b/nix-overlays/ldc/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "1.37.0"; - sha256 = "sha256-UOgK48Q2yQY3wsPUDzktwotyH3qrOh48o79PnCjboGQ="; + version = "1.38.0-beta1"; + sha256 = "sha256-E/IJvQJrSbeajv2qTMi0rTQmupO7p0r4b/EJ4BHKBnc="; } diff --git a/nix-overlays/ldc/generic.nix b/nix-overlays/ldc/generic.nix index 2fd779a..bc21974 100644 --- a/nix-overlays/ldc/generic.nix +++ b/nix-overlays/ldc/generic.nix @@ -1,5 +1,5 @@ { version, sha256 }: -{ lib, stdenv, fetchurl, cmake, ninja, llvm_17, curl, tzdata +{ lib, stdenv, fetchurl, cmake, ninja, llvm_18, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_17.dev makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_18.dev makeWrapper ninja unzip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org index a23efec..55a62a6 100644 --- a/org/dlang-nix-flakes.org +++ b/org/dlang-nix-flakes.org @@ -908,17 +908,38 @@ sha256 = "<>"; #+NAME: ldc_version #+BEGIN_SRC nix -<> +<> #+END_SRC #+NAME: ldc_hash #+BEGIN_SRC nix -<> +<> #+END_SRC #+NAME: ldc_llvm_set #+BEGIN_SRC nix -<> +<> +#+END_SRC + +**** 1.38 +***** 1.38.0 (beta) + +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.38.0.tar.gz +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz + +#+NAME: ldc_version_1_38_0 +#+BEGIN_SRC nix +1.38.0-beta1 +#+END_SRC + +#+NAME: ldc_hash_1_38_0 +#+BEGIN_SRC nix +sha256-E/IJvQJrSbeajv2qTMi0rTQmupO7p0r4b/EJ4BHKBnc= +#+END_SRC + +#+NAME: ldc_llvm_set_1_38_0 +#+BEGIN_SRC nix +llvm_18 #+END_SRC **** 1.37 OK ✓ -- cgit v1.2.3