diff options
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | nix-overlays/README | 6 | ||||
| -rw-r--r-- | nix-overlays/ldc/package.nix | 8 | ||||
| -rw-r--r-- | org/nix-develop-dlang-shared.org | 22 |
4 files changed, 13 insertions, 29 deletions
@@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1770169770, - "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=", + "lastModified": 1772173633, + "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2", + "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6", "type": "github" }, "original": { diff --git a/nix-overlays/README b/nix-overlays/README index 8494080..de281c7 100644 --- a/nix-overlays/README +++ b/nix-overlays/README @@ -16,7 +16,7 @@ compiler and build tools: ldc, dub and dtools, than exist in nixpkgs at the time of publishing, in some cases with additional fixes. nix overlays for (updates nixpkgs, more recent versions of): - - ldc ( 1.30.0 -> 1.42.0-beta2 ) + - ldc ( 1.30.0 -> 1.42.0 ) - dub ( 1.23.0 -> 1.40.0 ) [for nix versions 1.31.0 ... 1.33.0 broken] - dtools ( 2.095.1 -> 2.110.0 ) @@ -47,13 +47,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.42.0-beta2 ) +*** ldc OK ✓ ( 1.30.0 -> 1.42.0 ) - 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.42.0-beta2.tar.gz + nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.42.0.tar.gz - https://github.com/ldc-developers/ldc/issues - version in nixpkgs: diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix index 5b778d4..75eb898 100644 --- a/nix-overlays/ldc/package.nix +++ b/nix-overlays/ldc/package.nix @@ -11,7 +11,7 @@ targetPackages, cmake, ninja, - llvm_20, + llvm_21, curl, tzdata, lit, @@ -32,13 +32,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ldc"; - version = "1.42.0-beta2"; + version = "1.42.0"; src = fetchFromGitHub { owner = "ldc-developers"; repo = "ldc"; rev = "v${finalAttrs.version}"; - hash = "sha256-O605SQftca34ZzQnKiu8VkQPUSv3bU9m884FqXyFoAs="; + hash = "sha256-adA14tx/bruGvHVoODz13f8h/U2ol1lK0ytxnypsLv8="; fetchSubmodules = true; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_20.dev makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_21.dev makeWrapper ninja unzip ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org index ca8650b..fec2815 100644 --- a/org/nix-develop-dlang-shared.org +++ b/org/nix-develop-dlang-shared.org @@ -179,35 +179,19 @@ sha256 = "<<ldc-hash>>"; - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.42.0.tar.gz - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz -****** beta2 - #+NAME: ldc_version_1_42_0 #+BEGIN_SRC nix -1.42.0-beta2 +1.42.0 #+END_SRC #+NAME: ldc_hash_1_42_0 #+BEGIN_SRC nix -sha256-O605SQftca34ZzQnKiu8VkQPUSv3bU9m884FqXyFoAs= +sha256-adA14tx/bruGvHVoODz13f8h/U2ol1lK0ytxnypsLv8= #+END_SRC #+NAME: ldc_llvm_set_1_42_0 #+BEGIN_SRC nix -llvm_20 -#+END_SRC - -****** beta1 - -#+BEGIN_SRC nix -1.42.0-beta1 -#+END_SRC - -#+BEGIN_SRC nix -sha256-kWuCdMKRQGzu+pO+dgmqrO37J6hxN5+lu6N0gHFanlg= -#+END_SRC - -#+BEGIN_SRC nix -llvm_20 +llvm_21 #+END_SRC **** 1.41 OK ✓ |