summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2024-12-15 14:08:05 -0500
committerRalph Amissah <ralph.amissah@gmail.com>2024-12-15 14:08:05 -0500
commit664c8a2c6450aca19b9c84c1a5c4b42d5d5a1f9f (patch)
tree331283bade502f11431e149c8766c49684c9fdf8
parentflake.nix ldc2-1.40.0-beta6 & removed flake-utils (diff)
flake.nix ldc2-1.40.0HEADmain
-rw-r--r--README6
-rw-r--r--flake.lock6
-rw-r--r--flake.nix8
-rw-r--r--nix-overlays/ldc/package.nix8
-rw-r--r--org/dlang-nix-flakes.org6
5 files changed, 17 insertions, 17 deletions
diff --git a/README b/README
index 14530e8..4d5d132 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.40.0-beta6 )
+ - ldc ( 1.30.0 -> 1.40.0 )
- dub ( 1.23.0 -> 1.38.1 ) [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.40.0-beta6 )
+*** ldc OK ✓ ( 1.30.0 -> 1.40.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.40.0-beta6.tar.gz
+ nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.0.tar.gz
- https://github.com/ldc-developers/ldc/issues
- version in nixpkgs:
diff --git a/flake.lock b/flake.lock
index 7c409a4..06eb482 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1733656523,
- "narHash": "sha256-w0FXPfpGhOihoJDiwMsyN1EzpsXi2F8VQ+NVZQSMtys=",
+ "lastModified": 1734126203,
+ "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "93dc9803a1ee435e590b02cde9589038d5cc3a4e",
+ "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 2818f6a..18aba65 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
runHook postCheck
'';
localOverlay = (final: prev: {
- ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.40.0-beta6
+ ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.40.0
dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.109.1
dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.38.1
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.40.0-beta6 - dub-1.38.1 - dtools-2.103.1";
+ name = "overlay - ldc-1.40.0 - dub-1.38.1 - dtools-2.103.1";
inherit shell;
inherit devEnv;
packages = [
@@ -97,7 +97,7 @@
inherit shellHook;
};
dsh-overlay-ldc-dub = mkShell {
- name = "overlay - ldc-1.40.0-beta6 - dub-1.38.1";
+ name = "overlay - ldc-1.40.0 - dub-1.38.1";
inherit shell;
inherit devEnv;
packages = [
@@ -119,7 +119,7 @@
inherit shellHook;
};
dsh-overlay-dtest-tilix = mkShell {
- name = "overlay - ldc-1.40.0-beta6 - dub-1.38.1 - tilix - gtkd";
+ name = "overlay - ldc-1.40.0 - dub-1.38.1 - tilix - gtkd";
inherit shell;
inherit devEnv;
packages = [
diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index 54b3fcc..c20084c 100644
--- a/nix-overlays/ldc/package.nix
+++ b/nix-overlays/ldc/package.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, cmake
, ninja
-, llvm_18
+, llvm_19
, curl
, tzdata
, lit
@@ -30,13 +30,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "ldc";
- version = "1.40.0-beta6";
+ version = "1.40.0";
src = fetchFromGitHub {
owner = "ldc-developers";
repo = "ldc";
rev = "v${finalAttrs.version}";
- hash = "sha256-ErwbOw69HX9epUe8rxzL8Px7iAlZUnfrB9Erq124JnE=";
+ hash = "sha256-LT85DlAebecPpBUgZP0ayKTVrTUqN6DMJVEWTatLOxY=";
fetchSubmodules = true;
};
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
nativeBuildInputs = [
- cmake ldcBootstrap lit lit.python llvm_18.dev makeWrapper ninja unzip
+ cmake ldcBootstrap lit lit.python llvm_19.dev makeWrapper ninja unzip
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Foundation
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org
index 97fb894..e41d492 100644
--- a/org/dlang-nix-flakes.org
+++ b/org/dlang-nix-flakes.org
@@ -967,17 +967,17 @@ sha256 = "<<ldc_hash>>";
#+NAME: ldc_version_1_40_0
#+BEGIN_SRC nix
-1.40.0-beta6
+1.40.0
#+END_SRC
#+NAME: ldc_hash_1_40_0
#+BEGIN_SRC nix
-sha256-ErwbOw69HX9epUe8rxzL8Px7iAlZUnfrB9Erq124JnE=
+sha256-LT85DlAebecPpBUgZP0ayKTVrTUqN6DMJVEWTatLOxY=
#+END_SRC
#+NAME: ldc_llvm_set_1_40_0
#+BEGIN_SRC nix
-llvm_18
+llvm_19
#+END_SRC
**** 1.39 OK ✓