diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/config_nix.org | 14 | ||||
| -rw-r--r-- | org/nixpkgs_overlays_d_related.org | 4 | ||||
| -rw-r--r-- | org/spine_info.org | 1 |
3 files changed, 12 insertions, 7 deletions
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 |