diff options
Diffstat (limited to 'org/config_nix.org')
| -rw-r--r-- | org/config_nix.org | 90 |
1 files changed, 51 insertions, 39 deletions
diff --git a/org/config_nix.org b/org/config_nix.org index 0d9a4f4..88d61bf 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -4,7 +4,7 @@ #+FILETAGS: :spine:build:tools: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+COPYRIGHT: Copyright (C) 2015 - 2024 Ralph Amissah +#+COPYRIGHT: Copyright (C) 2015 - 2025 Ralph Amissah #+LANGUAGE: en #+STARTUP: show4levels hideblocks hidestars noindent entitiespretty #+PROPERTY: header-args :exports code @@ -26,13 +26,17 @@ { description = "spine (sisu like parser & document generator) made available to process markup samples"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.spine = { url = "<<sisudoc_spine_nix_src>>"; inputs.nixpkgs.follows = "nixpkgs"; flake = true; }; - inputs.d-overlay = { + #inputs.spine-search-cgi = { # issue, to make usable needs local configuration on build, so, not practical to implement like so + # url = "git://git.sisudoc.org/software/sisudoc-spine-search-cgi"; + # inputs.nixpkgs.follows = "nixpkgs"; + # flake = true; + #}; + inputs.sisudoc-d-overlay = { url = "<<sisudoc_dlang_nix_overlay_src>>"; inputs.nixpkgs.follows = "nixpkgs"; flake = true; @@ -40,9 +44,9 @@ outputs = { self, nixpkgs, - flake-utils, spine, - d-overlay, + #spine-search-cgi, + sisudoc-d-overlay, ... }@inputs: let version = "<<spine_version>>"; @@ -56,10 +60,14 @@ pkgs = nixpkgsFor.${system}; in { default = spine.packages.${system}.default; - #spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd; + spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd; + spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc; spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd; - #spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc; spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc; + #spine-search-cgi-nixpkgs-dmd = spine-search-cgi.packages.${system}.spine-search-nixpkgs-dmd; # issue, to make usable needs local configuration on build + #spine-search-cgi-nixpkgs-ldc = spine-search-cgi.packages.${system}.spine-search-nixpkgs-ldc; # issue, to make usable needs local configuration on build + #spine-search-cgi-overlay-dmd = spine-search-cgi.packages.${system}.spine-search-overlay-dmd; # issue, to make usable needs local configuration on build + #spine-search-cgi-overlay-ldc = spine-search-cgi.packages.${system}.spine-search-overlay-ldc; # issue, to make usable needs local configuration on build #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000="; }); apps = forAllSystems (system: { @@ -91,18 +99,19 @@ inherit shellHook; }; dsh-spine = spine.devShells.${system}.default; - dsh-overlay-dmd = d-overlay.devShells.${system}.dsh-overlay-dmd-dub; - dsh-nixpkgs-dmd = d-overlay.devShells.${system}.dsh-nixpkgs-dmd-dub; - dsh-overlay-ldc = d-overlay.devShells.${system}.dsh-overlay-ldc-dub; - dsh-nixpkgs-ldc = d-overlay.devShells.${system}.dsh-nixpkgs-ldc-dub; + dsh-overlay-dmd = sisudoc-d-overlay.devShells.${system}.dsh-overlay-dmd-dub; + dsh-nixpkgs-dmd = sisudoc-d-overlay.devShells.${system}.dsh-nixpkgs-dmd-dub; + dsh-overlay-ldc = sisudoc-d-overlay.devShells.${system}.dsh-overlay-ldc-dub; + dsh-nixpkgs-ldc = sisudoc-d-overlay.devShells.${system}.dsh-nixpkgs-ldc-dub; dsh-epub = mkShell { - name = "spine dev shell for epub output"; + name = "spine-<<spine_version>> dev shell for epub output"; inherit shell; inherit devEnv; packages = [ ldc #dmd dub + dtools gnumake sqlite libxml2 @@ -124,13 +133,14 @@ inherit shellHook; }; dsh-html = mkShell { - name = "spine dev shell for latex & pdf output"; + name = "spine-<<spine_version>> dev shell for html output"; inherit shell; inherit devEnv; packages = [ ldc #dmd dub + dtools gnumake sqlite # ❯❯ text-mode web browsers @@ -144,42 +154,46 @@ inherit shellHook; }; dsh-latex-pdf = mkShell { - name = "spine dev shell for latex & pdf output"; + name = "spine-<<spine_version>> dev shell for latex & pdf output"; inherit shell; inherit devEnv; packages = [ ldc #dmd dub + dtools gnumake source-sans-pro source-serif-pro source-code-pro - texlive.combined.scheme-full + texliveFull + #texlive.combined.scheme-full ]; inherit shellHook; }; dsh-sqlite = mkShell { - name = "spine dev shell for latex & pdf output"; + name = "spine-<<spine_version>> dev shell for sqlite3 output"; inherit shell; inherit devEnv; packages = [ ldc #dmd dub + dtools gnumake sqlite ]; inherit shellHook; }; dsh-i18n = mkShell { - name = "spine dev shell internationalization, po4a"; + name = "spine-<<spine_version>> dev shell for internationalization, po4a"; inherit shell; inherit devEnv; packages = [ ldc #dmd dub + dtools gnumake sqlite perl538Packages.Po4a @@ -212,7 +226,7 @@ with pkgs; nix-output-monitor #nix-tree #jq - #alejandra + #nixfmt-rfc-style #git # ❯❯❯ dev #gnumake @@ -221,14 +235,17 @@ with pkgs; # ❯❯ package manager #dub # ❯❯ compiler + #dmd #ldc - ##rund + #rund # ❯❯ linker - ##lld - ##mold + #lld + #mold # ❯❯ builder - ##ninja - ##meson + #ninja + #meson + # ❯❯ tools + #dtools # ❯❯❯ sqlite search related #sqlite # ❯❯❯ pdf_latex_related @@ -266,6 +283,7 @@ pkgs.callPackage ./devenv.nix {} #+END_SRC * devEnv +** devenv.nix :default:devenv: nix profile install . @@ -289,12 +307,13 @@ with pkgs; validatePkgConfig nix-output-monitor nix-tree - jq - #alejandra + jq #gx + #nixfmt-rfc-style git # ❯❯❯ dev gnumake ps + dtools # ❯❯❯ d_build_related # ❯❯ package manager dub @@ -441,8 +460,6 @@ with ( } #+END_SRC -#src = ./.; - #+NAME: project_path_local_out_static #+HEADER: :noweb yes #+BEGIN_SRC nix @@ -490,12 +507,6 @@ spine-0.12.0-tag-0.11.2.r107.gf89a107.tar.gz sha256:03dr7dn7kq6arw4ry7qar13iqmi1caw70imfjwi8qr7g2j4mnk2q #+END_SRC -#+BEGIN_SRC nix -sha256:0000000000000000000000000000000000000000000000000000 -#+END_SRC - -/home/ralph/grotto/repo/git.repo/projects/project-spine/tarball - #+NAME: project_path_local_out_static_ #+BEGIN_SRC nix /var/www @@ -519,16 +530,13 @@ github:NixOS/nixpkgs/nixpkgs-unstable "nixpkgs/nixos-unstable"; #+END_SRC -#+BEGIN_SRC nix -"nixpkgs/nixos-23.05"; -#+END_SRC - #+HEADER: :noweb yes #+BEGIN_SRC nix <<nixpkgs_path_local>> #+END_SRC -** version info SET VERSION :version:set:project: +* SHARED +** version and other things shared *** spine project VERSION :version:set:project: #+NAME: spine_version @@ -537,7 +545,8 @@ github:NixOS/nixpkgs/nixpkgs-unstable <<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>> #+END_SRC -*** spine project git sources VERSION :version:set:project: +*** spine project git sources +**** spine project git sources url #+NAME: sisudoc_spine_nix_src #+HEADER: :noweb yes @@ -545,6 +554,9 @@ github:NixOS/nixpkgs/nixpkgs-unstable <<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:sisudoc_spine_nix_src()>> #+END_SRC +*** spine project git sources url +**** spine project git sources overlay url + #+NAME: sisudoc_dlang_nix_overlay_src #+HEADER: :noweb yes #+BEGIN_SRC emacs-lisp |