summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2024-12-15 14:11:38 -0500
committerRalph Amissah <ralph.amissah@gmail.com>2024-12-15 14:11:38 -0500
commit8b1daf5cb52046af57615d3e8aaf4537e1cad414 (patch)
tree970e42ce8b60084f5f7b66122198aa04c2135462
parentflake.nix, removed flake-utils (diff)
flake.nix ldc2-1.40.0HEADmain
-rw-r--r--flake.lock48
-rw-r--r--nix-overlays/README6
-rw-r--r--nix-overlays/ldc/package.nix8
-rw-r--r--org/nixpkgs_overlays_d_related.org12
4 files changed, 20 insertions, 54 deletions
diff --git a/flake.lock b/flake.lock
index 19272c1..28ed6ef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,30 +1,12 @@
{
"nodes": {
- "flake-utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
- "lastModified": 1733229606,
- "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
+ "lastModified": 1734126203,
+ "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
+ "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
"type": "github"
},
"original": {
@@ -42,17 +24,16 @@
},
"spine-d-overlay": {
"inputs": {
- "flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1733285550,
- "narHash": "sha256-dI2dWqiHq+RDv7jUC8AOeMOKXzSF3P7qKh2/tb0TF9Y=",
+ "lastModified": 1734289685,
+ "narHash": "sha256-nfnmDNn0OWIAPKAi7Lo9bCk6AhS7knUOp68AYwLhVAM=",
"ref": "refs/heads/main",
- "rev": "87b9f3fa58479e96a5beb3fcaa87c9750339338c",
- "revCount": 13,
+ "rev": "664c8a2c6450aca19b9c84c1a5c4b42d5d5a1f9f",
+ "revCount": 16,
"type": "git",
"url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
},
@@ -60,21 +41,6 @@
"type": "git",
"url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
}
- },
- "systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/nix-overlays/README b/nix-overlays/README
index ff0b5bb..f23f837 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.39.0 )
+ - 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 )
@@ -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.39.0 )
+*** 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.39.0.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/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index 112a9ee..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.39.0";
+ version = "1.40.0";
src = fetchFromGitHub {
owner = "ldc-developers";
repo = "ldc";
rev = "v${finalAttrs.version}";
- hash = "sha256-ZiG0ATsY6Asu2nus3Y404fvqIwtKYoHl1JRUDU5A6mo=";
+ 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/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index aba78be..2f414e8 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -836,17 +836,17 @@ sha256 = "<<ldc_hash>>";
#+NAME: ldc_version
#+BEGIN_SRC nix
-<<ldc_version_1_39_0>>
+<<ldc_version_1_40_0>>
#+END_SRC
#+NAME: ldc_hash
#+BEGIN_SRC nix
-<<ldc_hash_1_39_0>>
+<<ldc_hash_1_40_0>>
#+END_SRC
#+NAME: ldc_llvm_set
#+BEGIN_SRC nix
-<<ldc_llvm_set_1_39_0>>
+<<ldc_llvm_set_1_40_0>>
#+END_SRC
**** 1.40 OK ✓
@@ -857,17 +857,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 ✓