diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2024-12-03 17:58:47 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2024-12-03 18:47:04 -0500 |
| commit | 03ab3dbfde3a65dfa17a81b5506cc61e11c2d61d (patch) | |
| tree | 5c1f46d6bca1f73da22f9ea2245eee5fe26e7df5 | |
| parent | nix build houskeeping, version updates, incl. dmd & dub (diff) | |
nix build flake.nix fix
| -rw-r--r-- | COPYRIGHT | 1 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | org/config_nix.org | 6 | ||||
| -rw-r--r-- | org/nixpkgs_overlays_d_related.org | 10 | ||||
| -rw-r--r-- | org/spine_info.org | 1 | ||||
| -rw-r--r-- | src/COPYRIGHT | 1 | ||||
| -rw-r--r-- | src/sisudoc/COPYRIGHT | 1 |
8 files changed, 23 insertions, 9 deletions
@@ -140,6 +140,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 @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733064805, - "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=", + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "31d66ae40417bb13765b0ad75dd200400e98de84", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", "type": "github" }, "original": { @@ -89,8 +89,8 @@ src = self; inherit shell; inherit devEnv; - buildInputs = with pkgs-ovl; [sqlite]; - nativeBuildInputs = with pkgs-ovl; [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" @@ -113,7 +113,7 @@ inherit shell; inherit devEnv; buildInputs = with pkgs-nix; [sqlite]; - nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake]; + 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" diff --git a/org/config_nix.org b/org/config_nix.org index fc31bd8..eced79d 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -112,8 +112,8 @@ src = self; inherit shell; inherit devEnv; - buildInputs = with pkgs-ovl; [sqlite]; - nativeBuildInputs = with pkgs-ovl; [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" @@ -136,7 +136,7 @@ inherit shell; inherit devEnv; buildInputs = with pkgs-nix; [sqlite]; - nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake]; + 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" diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index 0190383..7abaa20 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -25,6 +25,16 @@ - https://github.com/dlang/dub/releases - https://github.com/dlang/tools/tags +- dependencies sisudoc-spine + - https://github.com/dlang-community/d2sqlite3/releases + - https://github.com/dlang-community/D-YAML + - https://github.com/tjhann/imageformats/tags + - https://github.com/dlang-community/tinyendian/releases + +- 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 a5ab360..f5013a7 100644 --- a/org/spine_info.org +++ b/org/spine_info.org @@ -1140,6 +1140,7 @@ webserv: - 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 88b66fb..2676bf1 100644 --- a/src/COPYRIGHT +++ b/src/COPYRIGHT @@ -140,6 +140,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 88b66fb..2676bf1 100644 --- a/src/sisudoc/COPYRIGHT +++ b/src/sisudoc/COPYRIGHT @@ -140,6 +140,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 |