From d98b19a633b96dfa9e1ec23954d0da55bc1fe7e2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 4 Jul 2024 12:09:28 -0400 Subject: nix dlang overlay ldc-1.39.0 --- README | 6 +++--- flake.lock | 6 +++--- flake.nix | 11 ++++++----- nix-overlays/ldc/default.nix | 4 ++-- org/dlang-nix-flakes.org | 30 ++++++++++++++++++++++++++---- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/README b/README index 33e7978..4227609 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.38.0 ) + - ldc ( 1.30.0 -> 1.39.0 ) - 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.38.0 ) +*** ldc OK ✓ ( 1.30.0 -> 1.39.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.38.0.tar.gz + nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.39.0.tar.gz - https://github.com/ldc-developers/ldc/issues - version in nixpkgs: diff --git a/flake.lock b/flake.lock index f7b5015..24d4009 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "lastModified": 1720058333, + "narHash": "sha256-gM2RCi5XkxmcsZ44pUkKIYBiBMfZ6u7MdcZcykmccrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "rev": "6842b061970bf96965d66fcc86a28e1f719aae95", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ea869ce..7d8baa2 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,8 @@ self, nixpkgs, flake-utils, - } @ inputs: let + ... + }@inputs: let pname = "dummy"; version = "0.1.0"; shell = ./shell.nix; @@ -20,7 +21,7 @@ runHook postCheck ''; localOverlay = (final: prev: { - ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.38.0 + ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.39.0 dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.109.0 dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.36.0 dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.103.1 @@ -85,7 +86,7 @@ in with pkgs-ovl; { dsh-overlay-dtools = mkShell { - name = "overlay - ldc-1.38.0 - dub-1.36.0 - dtools-2.103.1"; + name = "overlay - ldc-1.39.0 - dub-1.36.0 - dtools-2.103.1"; inherit shell; inherit devEnv; packages = [ @@ -97,7 +98,7 @@ inherit shellHook; }; dsh-overlay-ldc-dub = mkShell { - name = "overlay - ldc-1.38.0 - dub-1.36.0"; + name = "overlay - ldc-1.39.0 - dub-1.36.0"; inherit shell; inherit devEnv; packages = [ @@ -119,7 +120,7 @@ inherit shellHook; }; dsh-overlay-dtest-tilix = mkShell { - name = "overlay - ldc-1.38.0 - dub-1.36.0 - tilix - gtkd"; + name = "overlay - ldc-1.39.0 - 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 a6ef777..1f18529 100644 --- a/nix-overlays/ldc/default.nix +++ b/nix-overlays/ldc/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "1.38.0"; - sha256 = "sha256-ymI47+Ai40zTB2dB+KBwxqN3GWNRxhlJpIpIyZN5844="; + version = "1.39.0"; + sha256 = "sha256-g5usNvYHMxjjbwsWN2fgO9vT9X2ZJWuXSUrEObWaRWI="; } diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org index 1ff88fb..888b2e0 100644 --- a/org/dlang-nix-flakes.org +++ b/org/dlang-nix-flakes.org @@ -391,7 +391,8 @@ direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${Nix self, nixpkgs, flake-utils, - } @ inputs: let + ... + }@inputs: let pname = "dummy"; version = "0.1.0"; shell = ./shell.nix; @@ -908,17 +909,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.39 OK ✓ +***** 1.39.0 OK ✓ + +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.39.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_39_0 +#+BEGIN_SRC nix +1.39.0 +#+END_SRC + +#+NAME: ldc_hash_1_39_0 +#+BEGIN_SRC nix +sha256-g5usNvYHMxjjbwsWN2fgO9vT9X2ZJWuXSUrEObWaRWI= +#+END_SRC + +#+NAME: ldc_llvm_set_1_39_0 +#+BEGIN_SRC nix +llvm_18 #+END_SRC **** 1.38 OK ✓ -- cgit v1.2.3