summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock24
-rw-r--r--flake.nix4
-rw-r--r--nix-overlays/README14
-rw-r--r--nix-overlays/dub/default.nix5
-rw-r--r--nix-overlays/ldc/default.nix4
-rw-r--r--org/config_nix.org4
-rw-r--r--org/nixpkgs_overlays_d_related.org115
7 files changed, 140 insertions, 30 deletions
diff --git a/flake.lock b/flake.lock
index 6c93737..6e35d42 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,8 +8,10 @@
]
},
"locked": {
- "lastModified": 1688832064,
- "narHash": "sha256-k2XxsBmRBgPFXqmrTjJ59hJGMbbIIDNSw/PRkhmjuFY=",
+ "dirtyRev": "e0a47b6196c8e5808617cf3e4faebc5a511ea65c-dirty",
+ "dirtyShortRev": "e0a47b6-dirty",
+ "lastModified": 1690898297,
+ "narHash": "sha256-8R/m+65RlIlCmhT4nkf0Sob2+nNqCU0aXTGl2AopRkI=",
"type": "git",
"url": "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/packages/nix-flakes/dlang/dlang-nix-flakes"
},
@@ -23,11 +25,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1687709756,
- "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+ "lastModified": 1689068808,
+ "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+ "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
@@ -41,11 +43,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1689068808,
- "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+ "lastModified": 1692799911,
+ "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+ "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github"
},
"original": {
@@ -56,11 +58,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1690441914,
- "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=",
+ "lastModified": 1693844670,
+ "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f",
+ "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index ab001a9..b7fc400 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,7 +81,7 @@
inherit installPhase;
inherit postInstall;
};
- spine-search-ovl-dmd = stdenv.mkDerivation {
+ spine-search-ovlerlay-dmd = stdenv.mkDerivation {
inherit pname;
inherit version;
meta.mainProgram = "spine_search-dmd";
@@ -101,7 +101,7 @@
inherit installPhase;
inherit postInstall;
};
- spine-search-ovl-ldc = stdenv.mkDerivation {
+ spine-search-ovlerlay-ldc = stdenv.mkDerivation {
inherit pname;
inherit version;
meta.mainProgram = "spine_search-ldc";
diff --git a/nix-overlays/README b/nix-overlays/README
index 4a0b069..729b1f5 100644
--- a/nix-overlays/README
+++ b/nix-overlays/README
@@ -16,8 +16,8 @@ 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.33.0 )
- - dub ( 1.23.0 -> 1.33.1 ) [for nix versions 1.31.0 ... 1.33.0 broken]
+ - ldc ( 1.30.0 -> 1.34.0 )
+ - dub ( 1.23.0 -> 1.34.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]
- dtools ( 2.095.1 -> 2.103.1 )
- dmd ( 2.100.2 -> 2.104.0 ) KO ✗
@@ -49,13 +49,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.33.0 )
+*** ldc OK ✓ ( 1.30.0 -> 1.34.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.33.0.tar.gz
+ nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.34.0.tar.gz
- https://github.com/ldc-developers/ldc/issues
- version in nixpkgs:
@@ -90,13 +90,13 @@ not yet provided in nixpkgs with gcc12, no attempt made
- https://github.com/D-Programming-GDC/gdc
** build tool
-*** dub ( 1.23.0 -> 1.33.1 )
+*** dub ( 1.23.0 -> 1.34.0 )
- https://code.dlang.org/packages/dub
- https://github.com/dlang/dub
- https://github.com/dlang/dub/releases
- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.33.1.tar.gz
+ nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.34.0.tar.gz
- https://github.com/dlang/dub/issues
- version in nixpkgs:
@@ -104,7 +104,7 @@ not yet provided in nixpkgs with gcc12, no attempt made
- dub nixpkg overlay is updated and runs most dub tests correctly
-- dub OK ✓ ( 1.30.0 -> 1.33.1 )
+- dub OK ✓ ( 1.30.0 -> 1.34.0 )
from v1.31.0 requires seeting of pwd in buildPhase else fails to build
packages with nix tools that previous version of dub built;
diff --git a/nix-overlays/dub/default.nix b/nix-overlays/dub/default.nix
index 3993f8d..40fbb28 100644
--- a/nix-overlays/dub/default.nix
+++ b/nix-overlays/dub/default.nix
@@ -4,7 +4,7 @@ assert dcompiler != null;
stdenv.mkDerivation rec {
pname = "dub";
- version = "1.33.1";
+ version = "1.34.0";
enableParallelBuilding = true;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "dlang";
repo = "dub";
rev = "v${version}";
- sha256 = "sha256-QFgUsO04VRXBDjGI5QQs7u9XrexG7/V34TMgJP1D8yA=";
+ sha256 = "sha256-hC46XKE6lLLMLGMGl4vDnLDBQy6P/Z7o3ayDJj0Sois=";
};
#postUnpack = ''
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
rm test/dpath-variable.sh
rm -rf test/git-dependency
rm -rf test/use-c-sources # added to build v1.33.0
+ rm -rf test/pr2642-cache-db # added to build v1.34.0
./test/run-unittest.sh
'';
diff --git a/nix-overlays/ldc/default.nix b/nix-overlays/ldc/default.nix
index 3d56515..2e34ac8 100644
--- a/nix-overlays/ldc/default.nix
+++ b/nix-overlays/ldc/default.nix
@@ -1,4 +1,4 @@
import ./generic.nix {
- version = "1.33.0";
- sha256 = "sha256-g0wbCMX1s6mPnvuvhjLw03fRfawcFxDkg8nuaEZYw6g=";
+ version = "1.34.0";
+ sha256 = "sha256-MAXG6ceSWFOMg5eXZnZ6WePXTzy5CsLLDc5ddXO+txk=";
}
diff --git a/org/config_nix.org b/org/config_nix.org
index 048b25b..c209cc5 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -108,7 +108,7 @@
inherit installPhase;
inherit postInstall;
};
- spine-search-ovl-dmd = stdenv.mkDerivation {
+ spine-search-ovlerlay-dmd = stdenv.mkDerivation {
inherit pname;
inherit version;
meta.mainProgram = "spine_search-dmd";
@@ -128,7 +128,7 @@
inherit installPhase;
inherit postInstall;
};
- spine-search-ovl-ldc = stdenv.mkDerivation {
+ spine-search-ovlerlay-ldc = stdenv.mkDerivation {
inherit pname;
inherit version;
meta.mainProgram = "spine_search-ldc";
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index 3536d26..4b88f1a 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -759,15 +759,59 @@ sha256 = "<<ldc_hash>>";
#+NAME: ldc_version
#+BEGIN_SRC nix
-<<ldc_version_1_33_0>>
+<<ldc_version_1_34_0>>
#+END_SRC
#+NAME: ldc_hash
#+BEGIN_SRC nix
-<<ldc_hash_1_33_0>>
+<<ldc_hash_1_34_0>>
+#+END_SRC
+
+**** 1.34.0 OK ✓
+***** 1.34.0 OK ✓
+
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.34.0.tar.gz
+
+#+NAME: ldc_version_1_34_0
+#+BEGIN_SRC nix
+1.34.0
+#+END_SRC
+
+#+NAME: ldc_hash_1_34_0
+#+BEGIN_SRC nix
+sha256-MAXG6ceSWFOMg5eXZnZ6WePXTzy5CsLLDc5ddXO+txk=
+#+END_SRC
+
+***** 1.34.0-beta2
+
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.34.0-beta2.tar.gz
+
+#+NAME: ldc_version_1_34_0-beta2
+#+BEGIN_SRC nix
+1.34.0-beta2
+#+END_SRC
+
+#+NAME: ldc_hash_1_34_0-beta2
+#+BEGIN_SRC nix
+sha256-CEXWI6c8DxsdxproagfztW8Zt0ND5kddPZQefrggSQA=
+#+END_SRC
+
+***** 1.34.0-beta1
+
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.34.0-beta1.tar.gz
+
+#+NAME: ldc_version_1_34_0-beta1
+#+BEGIN_SRC nix
+1.34.0-beta1
+#+END_SRC
+
+#+NAME: ldc_hash_1_34_0-beta1
+#+BEGIN_SRC nix
+sha256-rrkjDwi0hvEwEzQLzAbz9IZQsmENTWNIy8kzYm1NQ6I=
#+END_SRC
**** 1.33.0 OK ✓
+***** 1.33.0 OK ✓
- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.33.0.tar.gz
@@ -781,6 +825,34 @@ sha256 = "<<ldc_hash>>";
sha256-g0wbCMX1s6mPnvuvhjLw03fRfawcFxDkg8nuaEZYw6g=
#+END_SRC
+***** 1.33.0-beta2
+
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.33.0-beta2.tar.gz
+
+#+NAME: ldc_version_1_33_0-beta2
+#+BEGIN_SRC nix
+1.33.0-beta2
+#+END_SRC
+
+#+NAME: ldc_hash_1_33_0-beta2
+#+BEGIN_SRC nix
+sha256-ICtIrLItQsvhCHFh3l7Ki1x154xI6ygmAbw+pmlFTlY=
+#+END_SRC
+
+***** 1.33.0-beta1
+
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.33.0-beta1.tar.gz
+
+#+NAME: ldc_version_1_33_0-beta1
+#+BEGIN_SRC nix
+1.33.0-beta1
+#+END_SRC
+
+#+NAME: ldc_hash_1_33_0-beta1
+#+BEGIN_SRC nix
+sha256-axyjDAWwxHmG2yPhL6P8cF6XvVvapfw0AWLjUrVRoug=
+#+END_SRC
+
**** 1.32.2 OK ✓
- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.32.1.tar.gz
@@ -1381,6 +1453,7 @@ stdenv.mkDerivation rec {
rm test/dpath-variable.sh
rm -rf test/git-dependency
rm -rf test/use-c-sources # added to build v1.33.0
+ rm -rf test/pr2642-cache-db # added to build v1.34.0
./test/run-unittest.sh
'';
@@ -1405,12 +1478,41 @@ stdenv.mkDerivation rec {
#+NAME: dub_version
#+BEGIN_SRC nix
-<<dub_version_1_33_1>>
+<<dub_version_1_34_0>>
#+END_SRC
#+NAME: dub_hash
#+BEGIN_SRC nix
-<<dub_hash_1_33_1>>
+<<dub_hash_1_34_0>>
+#+END_SRC
+
+**** 1.34.0
+***** 1.34.0
+
+- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.34.0.tar.gz
+
+#+NAME: dub_version_1_34_0
+#+BEGIN_SRC nix
+1.34.0
+#+END_SRC
+
+#+NAME: dub_hash_1_34_0
+#+BEGIN_SRC nix
+sha256-hC46XKE6lLLMLGMGl4vDnLDBQy6P/Z7o3ayDJj0Sois=
+#+END_SRC
+
+***** 1.34.0-beta.1
+
+- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.34.0-beta.1.tar.gz
+
+#+NAME: dub_version_1_34_0-beta.1
+#+BEGIN_SRC nix
+1.34.0-beta.1
+#+END_SRC
+
+#+NAME: dub_hash_1_34_0-beta.1
+#+BEGIN_SRC nix
+sha256-ibINxUDGWUNnWQyhZqCwoDrdx3N3AWNI3LLrXHi7Gcg=
#+END_SRC
**** 1.33.1 OK ✓
@@ -1668,6 +1770,11 @@ sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b
** sha256 blank_hash
+#+NAME: sha256-blank
+#+BEGIN_SRC nix
+sha256-0000000000000000000000000000000000000000000=
+#+END_SRC
+
#+NAME: blank_hash
#+BEGIN_SRC nix
sha256-0000000000000000000000000000000000000000000=
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:08:25 +0000