nix build flake.nix fix

8 files changed, 54 insertions, 46 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 09e40a4..d933768 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -81,6 +81,7 @@
 
   - code: cgi.d
     aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d
+    aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d
 
     - License: BSL-1.0
       Boost Software License 1.0
diff --git a/flake.lock b/flake.lock
index 995efc3..25a8cf7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,36 +1,15 @@
 {
   "nodes": {
-    "d-overlay": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1714710163,
-        "narHash": "sha256-n8zU0sLfLOJRG5LjLJ3+nKKYm7OtMJsXRYb3D5z98wQ=",
-        "ref": "refs/heads/main",
-        "rev": "13c0d60e6822f6799c9bf9a36641945268a7cbfb",
-        "revCount": 4,
-        "type": "git",
-        "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
-      },
-      "original": {
-        "type": "git",
-        "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -44,11 +23,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -59,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715037484,
-        "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
+        "lastModified": 1733097829,
+        "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
+        "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a",
         "type": "github"
       },
       "original": {
@@ -75,9 +54,30 @@
     },
     "root": {
       "inputs": {
-        "d-overlay": "d-overlay",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "spine-d-overlay": "spine-d-overlay"
+      }
+    },
+    "spine-d-overlay": {
+      "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733184371,
+        "narHash": "sha256-K9MQf+ZD6OntayLaJcniYvOiiBxOl7hBrbltjSMmPP4=",
+        "ref": "refs/heads/main",
+        "rev": "115001db9ca4382c4ddfea3a636bde30abe5c459",
+        "revCount": 11,
+        "type": "git",
+        "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
+      },
+      "original": {
+        "type": "git",
+        "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 1df2424..c2c18d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "a sisu like document parser search form";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.d-overlay = {
+  inputs.spine-d-overlay = {
     url = "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
@@ -11,7 +11,7 @@
     self,
     nixpkgs,
     flake-utils,
-    d-overlay,
+    spine-d-overlay,
     ...
   }@inputs: let
     pname = "spine_search";
@@ -93,8 +93,8 @@
           src = self;
           inherit shell;
           inherit devEnv;
-          buildInputs = [sqlite];
-          nativeBuildInputs = [dub dmd gnumake];
+          buildInputs = with pkgs-nix; [sqlite];
+          nativeBuildInputs = with pkgs-nix; [dub dmd gnumake];
           buildPhase = ''
             runHook preBuild
             buildCMD="dub run --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
@@ -116,8 +116,8 @@
           src = self;
           inherit shell;
           inherit devEnv;
-          buildInputs = [sqlite];
-          nativeBuildInputs = [dub ldc gnumake];
+          buildInputs = with pkgs-nix; [sqlite];
+          nativeBuildInputs = with pkgs-nix; [dub ldc gnumake];
           buildPhase = ''
             runHook preBuild
             buildCMD="dub run --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
@@ -208,7 +208,7 @@
       '';
     in
       with pkgs-nix; {
-        dsh-d-overlay = d-overlay.devShells.${system}.default;
+        dsh-d-overlay = spine-d-overlay.devShells.${system}.default;
         dsh-overlay = mkShell {
           name = "spine base dev shell";
           inherit shell;
diff --git a/org/config_nix.org b/org/config_nix.org
index 351e696..60d92ee 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -25,7 +25,7 @@
   description = "a sisu like document parser search form";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.d-overlay = {
+  inputs.spine-d-overlay = {
     url = "<<sisudoc_dlang_nix_overlay_src>>";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
@@ -34,7 +34,7 @@
     self,
     nixpkgs,
     flake-utils,
-    d-overlay,
+    spine-d-overlay,
     ...
   }@inputs: let
     pname = "spine_search";
@@ -116,8 +116,8 @@
           src = self;
           inherit shell;
           inherit devEnv;
-          buildInputs = [sqlite];
-          nativeBuildInputs = [dub dmd gnumake];
+          buildInputs = with pkgs-nix; [sqlite];
+          nativeBuildInputs = with pkgs-nix; [dub dmd gnumake];
           buildPhase = ''
             runHook preBuild
             buildCMD="dub run --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
@@ -139,8 +139,8 @@
           src = self;
           inherit shell;
           inherit devEnv;
-          buildInputs = [sqlite];
-          nativeBuildInputs = [dub ldc gnumake];
+          buildInputs = with pkgs-nix; [sqlite];
+          nativeBuildInputs = with pkgs-nix; [dub ldc gnumake];
           buildPhase = ''
             runHook preBuild
             buildCMD="dub run --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
@@ -231,7 +231,7 @@
       '';
     in
       with pkgs-nix; {
-        dsh-d-overlay = d-overlay.devShells.${system}.default;
+        dsh-d-overlay = spine-d-overlay.devShells.${system}.default;
         dsh-overlay = mkShell {
           name = "spine base dev shell";
           inherit shell;
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index 0190383..54c30f4 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -25,6 +25,10 @@
 - https://github.com/dlang/dub/releases
 - https://github.com/dlang/tools/tags
 
+- dependencies sisudoc-spine-search-cgi
+  -  https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d
+  -  https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d
+
 ** README
 
 #+HEADER: :tangle "../nix-overlays/README"
diff --git a/org/spine_info.org b/org/spine_info.org
index f37e66c..6201bad 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -518,6 +518,7 @@ web-server is configured to find it.
 
   - code: cgi.d
     aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d
+    aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d
 
     - License: BSL-1.0
       Boost Software License 1.0
diff --git a/src/COPYRIGHT b/src/COPYRIGHT
index 09e40a4..d933768 100644
--- a/src/COPYRIGHT
+++ b/src/COPYRIGHT
@@ -81,6 +81,7 @@
 
   - code: cgi.d
     aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d
+    aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d
 
     - License: BSL-1.0
       Boost Software License 1.0
diff --git a/src/sisudoc/COPYRIGHT b/src/sisudoc/COPYRIGHT
index 09e40a4..d933768 100644
--- a/src/sisudoc/COPYRIGHT
+++ b/src/sisudoc/COPYRIGHT
@@ -81,6 +81,7 @@
 
   - code: cgi.d
     aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d
+    aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d
 
     - License: BSL-1.0
       Boost Software License 1.0