From 168e45c3b73ed705ad665395ec1ef5ffc4dc3a6b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 23 Dec 2021 10:06:47 -0500 Subject: nix setup related but messy --- .envrc | 4 +-- derivation.nix | 9 ++++- org/config_nix.org | 65 ++++++++++++++++++++++++---------- shell.nix | 25 ++++++++----- sundry/spine_search_cgi/.envrc | 4 +-- sundry/spine_search_cgi/derivation.nix | 9 ++++- sundry/spine_search_cgi/shell.nix | 17 ++++++--- 7 files changed, 96 insertions(+), 37 deletions(-) diff --git a/.envrc b/.envrc index 72eefc7..c0adda9 100644 --- a/.envrc +++ b/.envrc @@ -3,6 +3,6 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then # https://github.com/nix-community/nix-direnv source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE=" fi -if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local - source .env/local +if [ -e .env/local ]; then + source_env_if_exists .env/local || source .env/local fi diff --git a/derivation.nix b/derivation.nix index 8244612..83b66ea 100644 --- a/derivation.nix +++ b/derivation.nix @@ -84,9 +84,16 @@ mkDubDerivation rec { src = ./.; buildInputs = with pkgs; [ nixFlakes - rund + ## package manager dub + ## compiler ldc + #rund + ## linker + #lld + #mold + ## builder + #ninja sqlite ]; meta = with pkgs.lib; { diff --git a/org/config_nix.org b/org/config_nix.org index 9763c57..0fb9cfc 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -78,8 +78,8 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then # https://github.com/nix-community/nix-direnv source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE=" fi -if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local - source .env/local +if [ -e .env/local ]; then + source_env_if_exists .env/local || source .env/local fi #+END_SRC @@ -94,8 +94,8 @@ else # fallback prevent bootstrapping problems by using direnv's builtin nix sup use nix NIX_ENFORCE_PURITY=0 fi -if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local - source .env/local +if [ -e .env/local ]; then + source_env_if_exists .env/local || source .env/local fi #+END_SRC @@ -125,9 +125,8 @@ else use nix NIX_ENFORCE_PURITY=0 fi - # source an additional user-specific .envrc in ./.env/local if [ -e .env/local ]; then - source .env/local + source_env_if_exists .env/local || source .env/local fi fi #+END_SRC @@ -563,6 +562,7 @@ mkShell { <> # <> # <> + # <> <> ]; shellHook = '' @@ -579,7 +579,7 @@ mkShell { #+NAME: shell_packages_nix_related #+BEGIN_SRC nix -# nix_related +### nix_related nixFlakes nix-prefetch-git validatePkgConfig @@ -591,10 +591,17 @@ git #+NAME: shell_packages_d_build_related #+BEGIN_SRC nix -# d_build_related -rund +### d_build_related +## package manager dub +## compiler ldc +rund +## linker +#lld +#mold +## builder +#ninja #meson #+END_SRC @@ -602,7 +609,7 @@ ldc #+NAME: shell_packages_candy #+BEGIN_SRC nix -# candy +### candy starship #+END_SRC @@ -610,7 +617,7 @@ starship #+NAME: shell_packages_search_related_sqlite #+BEGIN_SRC nix -# search related +### sqlite search related sqlite #+END_SRC @@ -618,7 +625,7 @@ sqlite #+NAME: shell_packages_pdf_latex_related #+BEGIN_SRC nix -# pdf_latex_related +### pdf_latex_related source-sans-pro source-serif-pro source-code-pro @@ -629,7 +636,7 @@ texlive.combined.scheme-full #+NAME: shell_packages_xml_and_epub_related #+BEGIN_SRC nix -# xml_and_epub_related +### xml_and_epub_related libxml2 html-tidy xmlstarlet @@ -637,10 +644,18 @@ epubcheck ebook_tools epr sigil -calibre # (ebook-viewer) +calibre #(suite includes: ebook-viewer) foliate #+END_SRC +***** packages i18n_translation related + +#+NAME: shell_packages_i18n_translation +#+BEGIN_SRC nix +### i18n translation related +perl534Packages.Po4a +#+END_SRC + **** misc #+HEADER: :NO-tangle ../shell.nix @@ -783,9 +798,16 @@ mkDubDerivation rec { src = ./.; buildInputs = with pkgs; [ nixFlakes - rund + ## package manager dub + ## compiler ldc + #rund + ## linker + #lld + #mold + ## builder + #ninja sqlite ]; <> @@ -923,8 +945,8 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then # https://github.com/nix-community/nix-direnv source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE=" fi -if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local - source .env/local +if [ -e .env/local ]; then + source_env_if_exists .env/local || source .env/local fi #+END_SRC @@ -1238,9 +1260,16 @@ mkDubDerivation rec { pkgs.sqlite ( with pkgs; [ nixFlakes - rund + ## package manager dub + ## compiler ldc + rund + ## linker + #lld + #mold + ## builder + #ninja sqlite ] ) diff --git a/shell.nix b/shell.nix index 0ac55ea..fa4c3c4 100755 --- a/shell.nix +++ b/shell.nix @@ -3,25 +3,32 @@ with pkgs; mkShell { buildInputs = [ - # nix_related + ### nix_related nixFlakes nix-prefetch-git validatePkgConfig jq git - # d_build_related - rund + ### d_build_related + ## package manager dub + ## compiler ldc + rund + ## linker + #lld + #mold + ## builder + #ninja #meson - # search related + ### sqlite search related sqlite - # # pdf_latex_related + # ### pdf_latex_related # source-sans-pro # source-serif-pro # source-code-pro # texlive.combined.scheme-full - # # xml_and_epub_related + # ### xml_and_epub_related # libxml2 # html-tidy # xmlstarlet @@ -29,9 +36,11 @@ mkShell { # ebook_tools # epr # sigil - # calibre # (ebook-viewer) + # calibre #(suite includes: ebook-viewer) # foliate - # candy + # ### i18n translation related + # perl534Packages.Po4a + ### candy starship ]; shellHook = '' diff --git a/sundry/spine_search_cgi/.envrc b/sundry/spine_search_cgi/.envrc index 72eefc7..c0adda9 100644 --- a/sundry/spine_search_cgi/.envrc +++ b/sundry/spine_search_cgi/.envrc @@ -3,6 +3,6 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then # https://github.com/nix-community/nix-direnv source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE=" fi -if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local - source .env/local +if [ -e .env/local ]; then + source_env_if_exists .env/local || source .env/local fi diff --git a/sundry/spine_search_cgi/derivation.nix b/sundry/spine_search_cgi/derivation.nix index 5bde866..596957e 100644 --- a/sundry/spine_search_cgi/derivation.nix +++ b/sundry/spine_search_cgi/derivation.nix @@ -91,9 +91,16 @@ mkDubDerivation rec { pkgs.sqlite ( with pkgs; [ nixFlakes - rund + ## package manager dub + ## compiler ldc + rund + ## linker + #lld + #mold + ## builder + #ninja sqlite ] ) diff --git a/sundry/spine_search_cgi/shell.nix b/sundry/spine_search_cgi/shell.nix index 8a73316..7ee5672 100755 --- a/sundry/spine_search_cgi/shell.nix +++ b/sundry/spine_search_cgi/shell.nix @@ -3,20 +3,27 @@ with pkgs; mkShell { buildInputs = [ - # nix_related + ### nix_related nixFlakes nix-prefetch-git validatePkgConfig jq git - # d_build_related - rund + ### d_build_related + ## package manager dub + ## compiler ldc + rund + ## linker + #lld + #mold + ## builder + #ninja #meson - # search related + ### sqlite search related sqlite - # candy + ### candy starship ]; shellHook = '' -- cgit v1.2.3