diff options
| -rwxr-xr-x | .envrc-nix | 8 | ||||
| -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 | 39 |
5 files changed, 32 insertions, 35 deletions
@@ -1,8 +1,8 @@ # -*- mode: nix -*- NIX_ENFORCE_PURITY=1 # - https://github.com/nix-community/nix-direnv -NixDirEnvVersion="3.0.7" -NixDirEnvSHA="sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc=" +NixDirEnvVersion="3.1.0" +NixDirEnvSHA="sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM=" if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}" fi @@ -27,7 +27,7 @@ echo ' • nix develop using nixpkgs ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh - • nix develop using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.40.0, dtools-2.110.0) + • nix develop using package overlays: (dmd-2.111.0, ldc-1.42.0, dub-1.40.0, dtools-2.110.0) ❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh ❯❯ nix flake show @@ -41,7 +41,7 @@ echo ' • nix build using nixpkgs ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs - • nix build using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.40.0, dtools-2.110.0) + • nix build using package overlays: (dmd-2.111.0, ldc-1.42.0, dub-1.40.0, dtools-2.110.0) ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1770169770, - "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=", + "lastModified": 1772674223, + "narHash": "sha256-/suKbHSaSmuC9UY7G0VRQ3aO+QKqxAQPQ19wG7QNkF8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2", + "rev": "66d9241e3dc2296726dc522e62dbfe89c7b449f3", "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..005d7f7 100644 --- a/org/nix-develop-dlang-shared.org +++ b/org/nix-develop-dlang-shared.org @@ -27,6 +27,7 @@ check for latest version: update direnv version and sha hash: - emacs org/nix-develop-dlang-shared.org +- direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.0/direnvrc re-tangle file: @@ -40,16 +41,28 @@ update flake.lock: #+NAME: direnv-version #+BEGIN_SRC org -<<direnv_version_3_0_7>> +<<direnv_version_3_1_0>> #+END_SRC #+NAME: direnv-hash #+BEGIN_SRC org -<<direnv_hash_3_0_7>> +<<direnv_hash_3_1_0>> #+END_SRC *** versions +**** 3.1.0 + +#+NAME: direnv_version_3_1_0 +#+BEGIN_SRC org +3.1.0 +#+END_SRC + +#+NAME: direnv_hash_3_1_0 +#+BEGIN_SRC org +sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM= +#+END_SRC + **** 3.0.7 #+NAME: direnv_version_3_0_7 @@ -179,35 +192,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 ✓ |