summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README6
-rw-r--r--flake.lock6
-rw-r--r--flake.nix26
-rw-r--r--nix-overlays/ldc/package.nix4
-rw-r--r--org/dlang-nix-flakes.org20
-rw-r--r--org/nix-develop-dlang-shared.org33
6 files changed, 66 insertions, 29 deletions
diff --git a/README b/README
index 31e4073..bd9cb6c 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 )
+ - ldc ( 1.30.0 -> 1.40.1 )
- 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 )
+*** ldc OK ✓ ( 1.30.0 -> 1.40.1 )
- 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.tar.gz
+ nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.1.tar.gz
- https://github.com/ldc-developers/ldc/issues
- version in nixpkgs:
diff --git a/flake.lock b/flake.lock
index 9e20410..58ff03b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1741310760,
- "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=",
+ "lastModified": 1742456341,
+ "narHash": "sha256-yvdnTnROddjHxoQqrakUQWDZSzVchczfsuuMOxg476c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "de0fe301211c267807afd11b12613f5511ff7433",
+ "rev": "7344a3b78128f7b1765dba89060b015fb75431a7",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 88d2993..b5d4782 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
+ ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.40.1
dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.110.0
dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.38.1
dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.103.1
@@ -85,49 +85,52 @@
in
with pkgs-ovl; {
dsh-overlay-dtools = mkShell {
- name = "overlay - ldc-1.40.0 - dub-1.38.1 - dtools-2.103.1";
+ name = "overlay - ldc-1.40.1 - dub-1.38.1 - dtools-2.103.1";
inherit shell;
inherit devEnv;
packages = [
- gnumake
ldc
dub
dtools
+ gnumake
];
inherit shellHook;
};
dsh-overlay-ldc-dub = mkShell {
- name = "overlay - ldc-1.40.0 - dub-1.38.1";
+ name = "overlay - ldc-1.40.1 - dub-1.38.1 - dtools-2.103.1";
inherit shell;
inherit devEnv;
packages = [
- gnumake
ldc
dub
+ dtools
+ gnumake
];
inherit shellHook;
};
dsh-overlay-dmd-dub = mkShell {
- name = "overlay - dmd-2.110.0 - dub-1.38.1";
+ name = "overlay - dmd-2.110.0 - dub-1.38.1 - dtools-2.103.1";
inherit shell;
inherit devEnv;
packages = [
- gnumake
dmd
dub
+ dtools
+ gnumake
];
inherit shellHook;
};
dsh-overlay-dtest-tilix = mkShell {
- name = "overlay - ldc-1.40.0 - dub-1.38.1 - tilix - gtkd";
+ name = "overlay - ldc-1.40.1 - dub-1.38.1 - tilix - gtkd";
inherit shell;
inherit devEnv;
packages = [
- gnumake
ldc
gtkd
tilix
dub
+ dtools
+ gnumake
];
inherit shellHook;
};
@@ -136,9 +139,10 @@
# inherit shell;
# inherit devEnv;
# packages = [
- # gnumake
# gdc
# dub
+ # dtools
+ # gnumake
# ];
# inherit shellHook;
#};
@@ -149,6 +153,7 @@
packages = with pkgs-nix; [
ldc
dub
+ dtools
gnumake
];
inherit shellHook;
@@ -160,6 +165,7 @@
packages = with pkgs-nix; [
dmd
dub
+ dtools
gnumake
];
inherit shellHook;
diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index c20084c..69a6457 100644
--- a/nix-overlays/ldc/package.nix
+++ b/nix-overlays/ldc/package.nix
@@ -30,13 +30,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "ldc";
- version = "1.40.0";
+ version = "1.40.1";
src = fetchFromGitHub {
owner = "ldc-developers";
repo = "ldc";
rev = "v${finalAttrs.version}";
- hash = "sha256-LT85DlAebecPpBUgZP0ayKTVrTUqN6DMJVEWTatLOxY=";
+ hash = "sha256-WdnwdH25A5oMNNY3uWG2hxnaAT+S1hNuP7LElH3uuuk=";
fetchSubmodules = true;
};
diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org
index 9ffdf60..d975188 100644
--- a/org/dlang-nix-flakes.org
+++ b/org/dlang-nix-flakes.org
@@ -432,32 +432,34 @@ use flake .
inherit shell;
inherit devEnv;
packages = [
- gnumake
ldc
dub
dtools
+ gnumake
];
inherit shellHook;
};
dsh-overlay-ldc-dub = mkShell {
- name = "overlay - ldc-<<ldc_version>> - dub-<<dub_version>>";
+ name = "overlay - ldc-<<ldc_version>> - dub-<<dub_version>> - dtools-<<dtools_version>>";
inherit shell;
inherit devEnv;
packages = [
- gnumake
ldc
dub
+ dtools
+ gnumake
];
inherit shellHook;
};
dsh-overlay-dmd-dub = mkShell {
- name = "overlay - dmd-<<dmd_version>> - dub-<<dub_version>>";
+ name = "overlay - dmd-<<dmd_version>> - dub-<<dub_version>> - dtools-<<dtools_version>>";
inherit shell;
inherit devEnv;
packages = [
- gnumake
dmd
dub
+ dtools
+ gnumake
];
inherit shellHook;
};
@@ -466,11 +468,12 @@ use flake .
inherit shell;
inherit devEnv;
packages = [
- gnumake
ldc
gtkd
tilix
dub
+ dtools
+ gnumake
];
inherit shellHook;
};
@@ -479,9 +482,10 @@ use flake .
# inherit shell;
# inherit devEnv;
# packages = [
- # gnumake
# gdc
# dub
+ # dtools
+ # gnumake
# ];
# inherit shellHook;
#};
@@ -492,6 +496,7 @@ use flake .
packages = with pkgs-nix; [
ldc
dub
+ dtools
gnumake
];
inherit shellHook;
@@ -503,6 +508,7 @@ use flake .
packages = with pkgs-nix; [
dmd
dub
+ dtools
gnumake
];
inherit shellHook;
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index b1611a4..04a0e82 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -94,24 +94,44 @@ sha256 = "<<ldc-hash>>";
#+NAME: ldc-version
#+BEGIN_SRC org
-<<ldc_version_1_40_0>>
+<<ldc_version_1_40_1>>
#+END_SRC
#+NAME: ldc-hash
#+BEGIN_SRC org
-<<ldc_hash_1_40_0>>
+<<ldc_hash_1_40_1>>
#+END_SRC
#+NAME: ldc-llvm-set
#+BEGIN_SRC org
-<<ldc_llvm_set_1_40_0>>
+<<ldc_llvm_set_1_40_1>>
#+END_SRC
*** versions
**** 1.40 OK ✓
+***** 1.40.1 OK ✓
+
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.1.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_40_1
+#+BEGIN_SRC nix
+1.40.1
+#+END_SRC
+
+#+NAME: ldc_hash_1_40_1
+#+BEGIN_SRC nix
+sha256-WdnwdH25A5oMNNY3uWG2hxnaAT+S1hNuP7LElH3uuuk=
+#+END_SRC
+
+#+NAME: ldc_llvm_set_1_40_1
+#+BEGIN_SRC nix
+llvm_19
+#+END_SRC
+
***** 1.40.0 OK ✓
- - 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
- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz
#+NAME: ldc_version_1_40_0
@@ -557,6 +577,11 @@ sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b
#+NAME: blank_hash
#+BEGIN_SRC nix
+<<sha256-blank>>
+#+END_SRC
+
+#+NAME: sha256-blank
+#+BEGIN_SRC nix
sha256-0000000000000000000000000000000000000000000=
#+END_SRC
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 14:40:47 +0000