From e3ced89491d3b39d29ba2ae824a474ef14ebb207 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 10 Apr 2023 15:06:06 -0400 Subject: nix org cleaning --- .env/nix-commands | 22 +- devenv.nix | 4 +- flake.nix | 14 +- org/config_nix.org | 821 +++++------------------------------------------------ shell.nix | 2 + 5 files changed, 86 insertions(+), 777 deletions(-) diff --git a/.env/nix-commands b/.env/nix-commands index 7cfa723..8a16dbf 100644 --- a/.env/nix-commands +++ b/.env/nix-commands @@ -1,20 +1,20 @@ - nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell -- nix build .#default --print-build-logs -- nix build .#spine-dmd --print-build-logs -- nix build .#spine-ldc --print-build-logs -- nix build .#spine-gdc --print-build-logs +- nix build ".#default" --print-build-logs +- nix build ".#spine-dmd" --print-build-logs +- nix build ".#spine-ldc" --print-build-logs +- nix build ".#spine-gdc" --print-build-logs - nix develop - - nix develop .#devShell --print-build-logs - - nix develop .#devShell-html --print-build-logs - - nix develop .#devShell-epub --print-build-logs - - nix develop .#devShell-latex-pdf --print-build-logs - - nix develop .#devShell-sqlite --print-build-logs - - nix develop .#devShell-i18n --print-build-logs + - nix develop ".#devShell" --print-build-logs + - nix develop ".#devShell-html" --print-build-logs + - nix develop ".#devShell-epub" --print-build-logs + - nix develop ".#devShell-latex-pdf" --print-build-logs + - nix develop ".#devShell-sqlite" --print-build-logs + - nix develop ".#devShell-i18n" --print-build-logs nix run .#default --print-build-logs -nix develop --build .#default --print-build-logs +nix develop --build ".#default" --print-build-logs nix-shell '' -A nix --pure diff --git a/devenv.nix b/devenv.nix index 9ce5344..894b0ec 100644 --- a/devenv.nix +++ b/devenv.nix @@ -10,21 +10,21 @@ with pkgs; # ❯❯❯ nix_related #nix # if not on NixOS, this is needed direnv - #cachix nixVersions.unstable #nixFlakes nix-prefetch-git validatePkgConfig nix-output-monitor nix-tree jq + alejandra git + # ❯❯❯ dev gnumake ps # ❯❯❯ d_build_related # ❯❯ package manager dub # ❯❯ compiler - dmd ldc # ❯❯❯ sqlite search related sqlite diff --git a/flake.nix b/flake.nix index 8ce5b56..126a59c 100644 --- a/flake.nix +++ b/flake.nix @@ -101,13 +101,13 @@ #spine-gdc = stdenv.mkDerivation { # inherit pname; # inherit version; - # meta.mainProgram = "spine-gdc"; - # executable = true; - # src = self; + # meta.mainProgram = "spine-gdc"; + # executable = true; + # src = self; # inherit shell; # inherit devEnv; - # buildInputs = [ sqlite ]; - # nativeBuildInputs = [ dub gdc gnumake ]; + # buildInputs = [ sqlite ]; + # nativeBuildInputs = [ dub gdc gnumake ]; # buildPhase = '' # runHook preBuild # dub build --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all @@ -163,8 +163,8 @@ name = "spine base dev shell"; inherit shell; inherit devEnv; - #buildInputs = [ sqlite ]; - #nativeBuildInputs = [ dub dmd ldc gdc gnumake ]; + #buildInputs = [ sqlite ]; + #nativeBuildInputs = [ dub dmd ldc gdc gnumake ]; packages = [ sqlite dub diff --git a/org/config_nix.org b/org/config_nix.org index 4cf9368..e57d8e6 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -16,19 +16,8 @@ #+OPTIONS: H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t * nix :nix: - -#+NAME: nixpkgs_local -#+BEGIN_SRC sh -/srv/nix/nixpkgs -#+END_SRC - -** spine - -- default.nix -- shell.nix - -*** envrc :envrc: -**** .envrc +** envrc :envrc: +*** .envrc - https://github.com/nix-community/nix-direnv - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000=" @@ -54,7 +43,7 @@ use flake . #use flake .#default #+END_SRC -**** .envrc-local CHECK MODIFY +*** .envrc-local CHECK MODIFY - bespoke modify appropriately and generate if needed @@ -80,8 +69,7 @@ export SpineCGIform='spine_search' export SpineSQLdb='spine.search.db' #+END_SRC -*** flake :flake: -**** flake.nix +** flake.nix :flake: #+HEADER: :tangle ../flake.nix #+HEADER: :noweb yes @@ -189,13 +177,13 @@ export SpineSQLdb='spine.search.db' #spine-gdc = stdenv.mkDerivation { # inherit pname; # inherit version; - # meta.mainProgram = "spine-gdc"; - # executable = true; - # src = self; + # meta.mainProgram = "spine-gdc"; + # executable = true; + # src = self; # inherit shell; # inherit devEnv; - # buildInputs = [ sqlite ]; - # nativeBuildInputs = [ dub gdc gnumake ]; + # buildInputs = [ sqlite ]; + # nativeBuildInputs = [ dub gdc gnumake ]; # buildPhase = '' # runHook preBuild # dub build --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all @@ -251,8 +239,8 @@ export SpineSQLdb='spine.search.db' name = "spine base dev shell"; inherit shell; inherit devEnv; - #buildInputs = [ sqlite ]; - #nativeBuildInputs = [ dub dmd ldc gdc gnumake ]; + #buildInputs = [ sqlite ]; + #nativeBuildInputs = [ dub dmd ldc gdc gnumake ]; packages = [ sqlite dub @@ -352,233 +340,7 @@ export SpineSQLdb='spine.search.db' } #+END_SRC -#+BEGIN_SRC nix -pname = "spine"; -version = "<>"; -shell = ./shell.nix; # ./default.nix; -devEnv = ./.envrc; # ./shell.nix; # ./default.nix; -supportedSystems = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; -forAllSystems = nixpkgs.lib.genAttrs supportedSystems; -nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); # nixpkgs instantiated for supported system types. -#+END_SRC - -*** flake :flake: -**** notes? - -- flake.nix - /srv/nix/nixpkgs - ./shell.nix - - shell.nix - ./pkgs/shell-pkgs.nix - - pkgs/shell-pkgs.nix - - default.nix - ./nix/dub.selections.nix # - - dub.selections.nix - -- nix develop - -- nix flake update - -- nix shell -f default.nix --print-build-logs -- nix shell -c default.nix - -- nix build `nix-instantiate` -- nix build -f default.nix --print-build-logs -- nix shell -f default.nix --print-build-logs -- nix develop --build -f derivation.nix -I .envrc --print-build-logs -- nix develop --profile .#default --print-build-logs --command spine -v - -- nix search --json 2>/dev/null |jq -- nix flake show -- nix show-derivation - -# nix-instantiate | nix-build - -#nix flake update -#nix flake check -#nix flake show -#nix develop -#nix build .#default --print-build-logs - -#+BEGIN_SRC nix -src = fetchTarball { - url = "file:///[path]/$(pname)-$(version).tar.gz"; - sha256 = "sha256:0000000000000000000000000000000000000000000000000000"; -}; -#+END_SRC - -**** flake parts -***** flake metadata - -#+NAME: flake_metadata -#+HEADER: :noweb yes -#+BEGIN_SRC nix -pname = "spine"; -version = "<>"; -description = "a sisu like parser and document generator"; -#+END_SRC - -***** flake inputs -****** flake inputs static - -#+NAME: flake_inputs_nix -#+HEADER: :noweb yes -#+BEGIN_SRC nix -nixpkgs.url = "github:nixos/nixpkgs"; -flake-utils.url = "github:numtide/flake-utils"; -#+END_SRC - -****** flake inputs for dub2nix - -#+NAME: flake_inputs_dub2nix -#+HEADER: :noweb yes -#+BEGIN_SRC nix -flake-utils.url = "github:numtide/flake-utils"; -nixpkgs.url = "github:nixos/nixpkgs"; -d2sqlite3-src = { url = "github:dlang-community/d2sqlite3"; flake = false; }; -tinyendian-src = { url = "github:kiith-sa/tinyendian"; flake = false; }; -dyaml-src = { url = "github:dlang-community/D-YAML"; flake = false; }; -imageformats-src = { url = "github:lgvz/imageformats"; flake = false; }; -dub2nix-src = { url = "github:lionello/dub2nix"; flake = false; }; -#+END_SRC - -***** flake outputs -****** flake outputs static - -#+NAME: flake_outputs -#+HEADER: :noweb yes -#+BEGIN_SRC nix -self, nixpkgs, flake-utils -#+END_SRC - -****** flake outputs for dub2nix - -#+NAME: flake_outputs_dub2nix -#+HEADER: :noweb yes -#+BEGIN_SRC nix -self, nixpkgs, flake-utils, dub2nix-src, d2sqlite3-src, tinyendian-src, dyaml-src, imageformats-src -#+END_SRC - -***** flake devshells - -#+NAME: flake_devshells -#+HEADER: :noweb yes -#+BEGIN_SRC nix -devShells = forAllSystems (system: - let pkgs = nixpkgsFor.${system}; - in { - default = pkgs.mkShell { - buildInputs = with pkgs; [ git dub dmd ldc sqlite ]; - }; -}); -#+END_SRC - -***** flake phases - -#+NAME: flake_phases -#+HEADER: :noweb yes -#+BEGIN_SRC nix -buildPhase = '' - runHook preBuild - HOME="$PWD" - for DC_ in dmd ldmd2 ldc2 gdc gdmd; do - echo "- check for D compiler $DC_" - DC=$(type -P $DC_ || echo "") - if [ ! "$DC" == "" ]; then break; fi - done - if [ "$DC" == "" ]; then exit "Error: could not find D compiler"; fi - echo "$DC_ used as D compiler to build $pname" - dub build --compiler=$DC --build=$DC_ --combined --skip-registry=all - runHook postBuild -''; -<> -#+END_SRC - -#+NAME: flake_phases_other_than_buildPhase -#+HEADER: :noweb yes -#+BEGIN_SRC nix -checkPhase = '' - runHook preCheck - dub test --combined --skip-registry=all - runHook postCheck -''; -installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -m755 ./bin/spine $out/bin/spine - runHook postInstall -''; -postInstall = '' - echo `ls -la $out/bin/spine` - echo " - nix build or nix develop? (suggestions): - - nix build - nix build .#default --print-build-logs - nix flake update; nix build .#default --print-build-logs - nix build --print-build-logs - - nix run - nix run .#default --print-build-logs - nix run default.nix --print-build-logs - - nix shell - nix shell .#default --print-build-logs --command spine -v - - nix develop - nix develop --profile .#default --print-build-logs --command spine -v - nix develop ; eval \"$buildPhase\" - nix develop --build -f derivation.nix -I .envrc --print-build-logs - - nix profile install . --print-build-logs - spine -v - nix-instantiate | nix show-derivation | jq - " - $out/bin/spine -v -''; -#+END_SRC - -***** d-compiler (dmd ldc gdc) - -- dmd ldc gdc - -#+NAME: d-compiler -#+HEADER: :noweb yes -#+BEGIN_SRC nix -dmd -#+END_SRC - -***** flake spine dub2nix - -#+NAME: flake_output_spine_dub2nix -#+HEADER: :noweb yes -#+BEGIN_SRC nix -packages.x86_64-linux.spine = - let - pkgs = import nixpkgs { - system = "x86_64-linux"; - }; - #targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}"; - in - pkgs.stdenv.mkDerivation { - pname = "spine"; - version = "<>"; - description = "a sisu like parser and document generator"; - inherit self; - src = self; - shell = ./shell.nix; - <> - buildInputs = [ sqlite ]; - nativeBuildInputs = with pkgs; [ dub ldc ]; - }; -#+END_SRC - -***** flake misc - -#+BEGIN_SRC nix -src = fetchTarball { - url = "file:///[path]/$(pname)-$(version).tar.gz"; - sha256 = "sha256:0000000000000000000000000000000000000000000000000000"; -}; -#+END_SRC - -*** shell.nix :shell: -**** tangle +** shell.nix :shell: #+HEADER: :tangle ../shell.nix #+HEADER: :tangle-mode (identity #o755) @@ -652,6 +414,8 @@ with pkgs; ❯❯ nix build ".#spine-dmd" --print-build-logs |& nom ❯❯ nix build ".#spine-ldc" --print-build-logs |& nom ❯❯ nix build ".#spine-gdc" --print-build-logs |& nom + + ❯❯ nix profile install . ' ''; } @@ -659,152 +423,7 @@ with pkgs; echo "ldc `${pkgs.ldc}/bin/ldc2 -v`" -**** Notes - -#+BEGIN_SRC text -#% Notes - -# - shell.nix -I .envrc -# - shell.nix -I .envrc --pure - -# [ nix-shell ] - - # - nix-shell -I nixpkgs=/srv/nix/nixpkgs --pure - # - nix-shell -p "with import /srv/nix/nixpkgs {}; ldc" --pure - # - nix-shell -p "with import /srv/nix/nixpkgs {}; [dub ldc]" --pure - - # - nix-shell -p nixVersions.unstable #nixFlakes - # - nix-shell -p nixFlakes --pure - # - nix-shell -p nixFlakes --pure -p "with import /srv/nix/nixpkgs {}; [nix dub ldc git ps]" - # - nix-shell shell.nix direnv: export +IN_NIX_SHELL - # - nix-shell shell.nix - -# [ nix-build ] - - # - nix-build -I nixpkgs=/srv/nix/nixpkgs # --pure - # - nix-build -I .envrc --pure - # - nix-build default.nix -I .envrc && result/bin/spine -v - -# [ nix-instantiate ] - - # - nix-instantiate | nix show-derivation | jq - # - nix-instantiate -I .envrc | nix show-derivation -f derivation.nix -I .envrc | jq - # - nix-instantiate | nix show-derivation --recursive | jq - # - nix-instantiate -I .envrc | nix show-derivation -f derivation.nix --recursive -I .envrc | jq - # - nix-instantiate | nix-build - # - nix-instantiate -I .envrc | nix-build -I .envrc - -# [ nix shell ] - - # - nix shell -c default.nix - # - nix shell -f default.nix --print-build-logs - -# [ nix build ] - - # - nix build -I .envrc --print-build-logs - # - nix build -f default.nix --print-build-logs - # - nix build -f derivation.nix --print-build-logs - - # - nix build `nix-instantiate` - # - nix build `nix-instantiate -I .envrc` - - # - nix build -f default.nix && ./result/bin/spine -v && noti -t "spine build" -m "see ./result/bin/spine" - # - nix build .#default - -# [ nix run ] - - # - nix run default.nix --print-build-logs - # - nix run -I .envrc default.nix --print-build-logs - # - nix run .#default - -# - nix-shell -I .envrc --pure -# - nix develop --build -f derivation.nix -I .envrc --print-build-logs - -# - nix-shell -p nixFlakes --pure -p "with import /srv/nix/nixpkgs {}; [nix dub ldc git ps]" -# - nix-build -# - nix build `nix-instantiate -I .envrc` - -# - nix develop --build -f default.nix -I .envrc - -# - nix-shell -I .envrc --pure -# - nix-build default.nix -I .envrc && result/bin/spine -v - -# - nix shell -f default.nix --print-build-logs -# - nix-instantiate -I .envrc | nix-build -I .envrc -#+END_SRC - -#+BEGIN_SRC text -#% Notes -- nix-shell - -- shell.nix --pure -- shell.nix --pure -I .envrc - -- nix-shell --pure -I nixpkgs=<> -- nix-shell --pure -p "with import <> {}; ldc" -- nix-shell --pure -p "with import /srv/nix/nixpkgs {}; [dub ldc]" - -- shell.nix direnv: export +IN_NIX_SHELL - -- nix-shell -p nixFlakes -- nix-shell -p nixFlakes --pure -- nix-shell -p nixFlakes --pure -p "with import /srv/nix/nixpkgs {}; [dub ldc]" - -- shell.nix -I .envrc -- nix-shell -I nixpkgs= -- nix-shell -I nixpkgs= --pure -- shell.nix -- nix-shell shell.nix --pure - -- nix shell -c default.nix - -- nix run default.nix --print-build-logs -- nix run -I .envrc default.nix --print-build-logs - -- nix develop - -- nix-build -I nixpkgs= -- nix-build -I .envrc - -- nix build -f default.nix --print-build-logs -- nix build -f derivation.nix --print-build-logs -- nix build -I .envrc --print-build-logs -- nix shell -f default.nix --print-build-logs -- nix develop --build -f derivation.nix -I .envrc --print-build-logs - -- buildPhase - -- nix build -f default.nix && noti -- nix build -f default.nix && ./result/bin/spine -v && noti -t "spine build" -m "see ./result/bin/spine" -- nix develop --build -f derivation.nix -I .envrc --print-build-logs - - ./result/bin/spine -#+END_SRC - -*** default.nix :default: - -- default.nix -I nixpkgs= - e.g. default.nix -I nixpkgs=/srv/nix/nixpkgs - -- nix-build -I nixpkgs= - e.g. nix-build -I nixpkgs=<> - -#+HEADER: :noweb yes -#+BEGIN_SRC sh -nix-build -I nixpkgs=<> -nix-build -I .envrc-local -nix-build -I .envrc -default.nix -I .envrc -default.nix - -nix build -f default.nix --print-build-logs -nix build -f derivation.nix --print-build-logs -nix shell -f default.nix --print-build-logs -nix develop --build -f derivation.nix -I .envrc --print-build-logs - -# nix build -f project.nix -# nix build -f spine.nix -#+END_SRC +** default.nix :default: #+HEADER: :tangle ../default.nix #+HEADER: :tangle-mode (identity #o755) @@ -814,10 +433,6 @@ nix develop --build -f derivation.nix -I .envrc --print-build-logs pkgs.callPackage ./devenv.nix {} #+END_SRC -* devEnv - -nix profile install . - ** devenv.nix #+HEADER: :tangle ../devenv.nix @@ -835,21 +450,21 @@ with pkgs; # ❯❯❯ nix_related #nix # if not on NixOS, this is needed direnv - #cachix nixVersions.unstable #nixFlakes nix-prefetch-git validatePkgConfig nix-output-monitor nix-tree jq + alejandra git + # ❯❯❯ dev gnumake ps # ❯❯❯ d_build_related # ❯❯ package manager dub # ❯❯ compiler - dmd ldc # ❯❯❯ sqlite search related sqlite @@ -994,137 +609,13 @@ installPhase = '' ''; #+END_SRC -** project meta - -#+NAME: nix_project_meta -#+HEADER: :noweb yes -#+BEGIN_SRC nix -meta = with pkgs.lib; { - pname = "spine"; - version = "<>"; - description = "a sisu like document parser"; - longDescription = '' - A sisu like parser and document generator - ''; - homepage = "https://sisudoc.org"; - license = licenses.agpl3Plus; - platforms = platforms.linux; - maintainers = [ "RalphAmissah" ]; -}; -#+END_SRC - -** dub.selections.json - -#+HEADER: :NO-tangle ../dub.selections.json -#+BEGIN_SRC nix -{ - "fileVersion": 1, - "versions": { - "d2sqlite3": "0.19.1", - "dyaml": "0.8.3", - "imageformats": "7.0.2", - "tinyendian": "0.2.0" - } -} -#+END_SRC - -*** dub.selections.nix - -#+HEADER: :NO-tangle ../nix/dub.selections.nix -#+BEGIN_SRC nix -# This file was generated by https://github.com/lionello/dub2nix v0.2.3 -[ { - fetch = { - type = "git"; - url = "https://github.com/dlang-community/d2sqlite3.git"; - rev = "v0.19.1"; - sha256 = "0rnsgla6xyr8r34knf7v6dwhacra96q1b5rhxcz9246inwhvrk5k"; - fetchSubmodules = false; - date = "2020-07-21T12:32:51+02:00"; - deepClone = false; - leaveDotGit = false; - path = "/nix/store/hsi8xvl15w6fwlqvs042m1z5i88yc72i-d2sqlite3"; - }; -} { - fetch = { - type = "git"; - url = "https://github.com/kiith-sa/tinyendian.git"; - rev = "v0.2.0"; - sha256 = "086gf5aga52wr5rj2paq54daj8lafn980x77b706vvvqaz2mlis8"; - fetchSubmodules = false; - date = "2018-06-10T11:04:28+02:00"; - deepClone = false; - leaveDotGit = false; - path = "/nix/store/9c7fsmi5am84j6dq2mp3va306x3ay291-tinyendian"; - }; -} { - fetch = { - type = "git"; - url = "https://github.com/kiith-sa/D-YAML.git"; - rev = "v0.8.3"; - sha256 = "13wy304xjbwkpgg7ilql1lkxkm83s87jm59ffnrg26slp7cx149q"; - fetchSubmodules = false; - date = "2020-09-19T23:46:57+02:00"; - deepClone = false; - leaveDotGit = false; - path = "/nix/store/3i8i56lkmw2xq3lxr5h66v909waq2mqg-D-YAML"; - }; -} { - fetch = { - type = "git"; - url = "https://github.com/lgvz/imageformats.git"; - rev = "v7.0.2"; - sha256 = "1mfbsmi4fs1xny4zqs6jyr04d5f4h03r9f6jadvkdqj5kd1k0ws7"; - fetchSubmodules = false; - date = "2019-10-10T07:54:45+03:00"; - deepClone = false; - leaveDotGit = false; - path = "/nix/store/wn554pn21nzmpvw2hs7hvv9v9y0sgarg-imageformats"; - }; -} ] -#+END_SRC - -** dub2nix & shared pkgs SHARED -*** dub2nix with pkgs shared - -#+NAME: nix_with_pkgs -#+HEADER: :noweb yes -#+BEGIN_SRC nix -with pkgs; [ - <> -] -#+END_SRC - -*** with pkgs list - -#+NAME: nix_shell_with_pkgs_list -#+BEGIN_SRC nix -nixVersions.unstable #nixFlakes -rund -dub -ldc -sqlite -nix-prefetch-git -validatePkgConfig -nix-output-monitor -nix-tree -jq -git -#+END_SRC - -** variables -*** nixpkgs path -**** selected +** variables used SET +*** nixpkgs path / url - nixpkgs_url_github - nixpkgs_url_local -#+NAME: nixpkgs_url -#+BEGIN_SRC sh -<> -#+END_SRC - -**** github official +**** github (official) #+NAME: nixpkgs_url_github #+BEGIN_SRC sh @@ -1145,267 +636,71 @@ github:NixOS/nixpkgs/nixpkgs-unstable 0.12.0 #+END_SRC -*** set names SET - -#+NAME: spine_search_db -#+BEGIN_SRC sh -spine.search.db -#+END_SRC - -#+NAME: spine_search_cgi -#+BEGIN_SRC sh -spine_search -#+END_SRC - -*** nixpkgs_path SETUP -**** nixpkgs select path SELECT - -#+NAME: nixpkgs_path -#+HEADER: :noweb yes -#+BEGIN_SRC nix -<> -#+END_SRC - -**** nixpkgs path options +*** nixpkgs path options - -#+NAME: nixpkgs_path_default -#+HEADER: :noweb yes -#+BEGIN_SRC nix - -#+END_SRC - -#+NAME: nix_path_directory -#+HEADER: :noweb yes -#+BEGIN_SRC nix -nixpkgs=<> -#+END_SRC - -#+NAME: project_path_local_project -#+HEADER: :noweb yes -#+BEGIN_SRC nix -~/grotto/repo/git.repo/projects/project-spine/doc-reform -#+END_SRC - -#+NAME: project_path_local_src -#+HEADER: :noweb yes -#+BEGIN_SRC nix -<>/src -#+END_SRC - -#+NAME: project_path_local_bin -#+HEADER: :noweb yes -#+BEGIN_SRC nix -<>/result/bin -#+END_SRC - -#+NAME: project_path_cgi_bin -#+BEGIN_SRC nix -/var/www/cgi/cgi-bin -#+END_SRC - -#+NAME: project_path_local_doc -#+BEGIN_SRC nix -~/grotto/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples -#+END_SRC - -#+NAME: project_path_local_out -#+BEGIN_SRC nix -/srv/www/spine/$SpineVER -#+END_SRC - -#+NAME: project_path_local_out_ -#+HEADER: :noweb yes -#+BEGIN_SRC nix -/tmp/spine/$SpineVER/www -#+END_SRC - -#+NAME: project_path_local_out_static #+HEADER: :noweb yes -#+BEGIN_SRC nix -/srv/www/spine -#+END_SRC - -#+NAME: project_path_local_out_static_ -#+BEGIN_SRC nix -/var/www -#+END_SRC - -#+NAME: project_path_sqlite -#+BEGIN_SRC nix -/var/www/sqlite -#+END_SRC - #+NAME: nixpkgs_url -#+BEGIN_SRC nix -github:nixos/nixpkgs +#+BEGIN_SRC sh +<> #+END_SRC -#+HEADER: :noweb yes +#+NAME: nixpkgs_url_github #+BEGIN_SRC nix -<> +github:nixos/nixpkgs #+END_SRC -- local path SET WARN - #+NAME: nixpkgs_path_local #+BEGIN_SRC nix /srv/nix/nixpkgs #+END_SRC -**** project path options - -- local path SET WARN - -#+NAME: nix_path_channel -#+BEGIN_SRC nix -/nix/var/nix/profiles/per-user/root/channels/nixos -#+END_SRC - -** texlive xetex xelatex shell.nix -*** shell.nix :shell: +* misc (remove?) +** dub.selections.json +#+HEADER: :NO-tangle ../dub.selections.json #+BEGIN_SRC nix -#!/usr/bin/env -S nix-shell --pure -{ pkgs ? import {} }: -pkgs.mkShell { - buildInputs = with pkgs; [ - nixVersions.unstable #nixFlakes - nix-prefetch-git - validatePkgConfig - nix-output-monitor - nix-tree - jq - git - fontconfig - source-sans-pro - source-serif-pro - source-code-pro - #(texlive.combine { - # inherit (texlive) scheme-tetex xetex fontspec footmisc multirow titlesec listings anysize float graphics helvetic times courier; - #}) - texlive.combined.scheme-full - dejavu_fonts dejavu_fontsEnv - liberation_ttf - evince - zathura - apvlv - ]; - #FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ - # liberation_ttf - #]; - shellHook = '' - if [[ -f ".envrc" ]]; then - source .envrc - fi - #for texfile in *.tex; do xelatex -interaction=nonstopmode $texfile; done - #for texfile in *.tex; do xelatex -interaction=batchmode $texfile; done - ''; +{ + "fileVersion": 1, + "versions": { + "d2sqlite3": "0.19.1", + "dyaml": "0.8.3", + "imageformats": "7.0.2", + "tinyendian": "0.2.0" + } } #+END_SRC -*** notes - -#+BEGIN_SRC sh -nix-shell --run 'which xetex' -echo 'for texfile in *.tex; do echo "* --> " ~ $texfile && xelatex -interaction=batchmode $texfile; rm *.aux *.log *.toc *.out; done' - -$SpineBIN/spine --latex --serial --output="$SpineOUT" $SpinePOD/* && for texfile in $SpineOUT/latex/*.tex; do xelatex -interaction=nonstopmode $texfile; done 2>&1 | tee _err.xelatex_.org; ls $SpineOUT/latex/*.{tex,pdf} - -/run/current-system/sw/share/X11/fonts/ - -kpsewhich pdftexconfig.tex -/nix/store/2r4qa8rbll085nmpx56jg1rbmbir1zkp-texlive-combined-2021/share/texmf/tex/generic/tex-ini-files/pdftexconfig.tex -/nix/store/2r4qa8rbll085nmpx56jg1rbmbir1zkp-texlive-combined-2021/share/texmf/fonts/opentype/public/ - -find: texclive-fonts.conf -fc-cache && mkfontscale && mkfontdir - -fc-match LiberationSans - -cd /nix/var/nix/profiles/system/sw/share/X11/fonts -fc-query LiberationSans-Regular.ttf | grep '^\s\+family:' | cut -d'"' -f2 -Liberation Sans -fc-query LiberationMono-Regular.ttf | grep '^\s\+family:' | cut -d'"' -f2 -Liberation Mono - -fc-query DejaVuSans.ttf | grep '^\s\+family:' | cut -d'"' -f2 - -$XDG_DATA_HOME/fonts -~/.local/share/fonts -#+END_SRC - -** NOTES -*** nix-shell - -- default.nix - -#+BEGIN_SRC sh -nix-shell -nix-build -#+END_SRC - -- project.nix - -#+BEGIN_SRC sh -nix-shell -nix-build project.nix -#+END_SRC - -*** nix-shell --pure - -- default.nix - -#+HEADER: :noweb yes -#+BEGIN_SRC sh -nix-shell --pure -nix-build -I nixpkgs=<> -nix-build -I .envrc -#+END_SRC - -#+BEGIN_SRC sh -nix build -f default.nix --print-build-logs -nix build -f derivation.nix --print-build-logs -nix shell -f default.nix --print-build-logs -# nix build -f project.nix -# nix build -f spine.nix -nix develop --build -f derivation.nix -I .envrc --print-build-logs -nix develop --profile .#default --print-build-logs --command spine -v -#+END_SRC - -*** derivation .drv - -#+BEGIN_SRC sh -nix show-derivation /nix/store/q7n14bm8j5vzm62qaraczdb4bpyf59vv-spine-0.11.1.drv -#+END_SRC - -**** .env/echo-nixNote CHECK MODIFY +** .env/echo-nixNote CHECK MODIFY +*** notes on nix commands #+HEADER: :tangle ../.env/nix-commands #+BEGIN_SRC text - nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell -- nix build .#default --print-build-logs -- nix build .#spine-dmd --print-build-logs -- nix build .#spine-ldc --print-build-logs -- nix build .#spine-gdc --print-build-logs +- nix build ".#default" --print-build-logs +- nix build ".#spine-dmd" --print-build-logs +- nix build ".#spine-ldc" --print-build-logs +- nix build ".#spine-gdc" --print-build-logs - nix develop - - nix develop .#devShell --print-build-logs - - nix develop .#devShell-html --print-build-logs - - nix develop .#devShell-epub --print-build-logs - - nix develop .#devShell-latex-pdf --print-build-logs - - nix develop .#devShell-sqlite --print-build-logs - - nix develop .#devShell-i18n --print-build-logs + - nix develop ".#devShell" --print-build-logs + - nix develop ".#devShell-html" --print-build-logs + - nix develop ".#devShell-epub" --print-build-logs + - nix develop ".#devShell-latex-pdf" --print-build-logs + - nix develop ".#devShell-sqlite" --print-build-logs + - nix develop ".#devShell-i18n" --print-build-logs nix run .#default --print-build-logs -nix develop --build .#default --print-build-logs +nix develop --build ".#default" --print-build-logs nix-shell '' -A nix --pure #+END_SRC +*** echo-nixNote + #+HEADER: :tangle ../.env/echo-nixNote #+BEGIN_SRC sh echo '-*- mode: org -*- @@ -1649,7 +944,19 @@ ls $SpineOutstatic/latex/*.tex #echo "cat nixNote_.org" #+END_SRC -*** makefile +*** db search related variables + +#+NAME: spine_search_db +#+BEGIN_SRC sh +spine.search.db +#+END_SRC + +#+NAME: spine_search_cgi +#+BEGIN_SRC sh +spine_search +#+END_SRC + +** makefile #+HEADER: :tangle ../makefile_ #+BEGIN_SRC make diff --git a/shell.nix b/shell.nix index a86bb78..af772e8 100755 --- a/shell.nix +++ b/shell.nix @@ -67,6 +67,8 @@ with pkgs; ❯❯ nix build ".#spine-dmd" --print-build-logs |& nom ❯❯ nix build ".#spine-ldc" --print-build-logs |& nom ❯❯ nix build ".#spine-gdc" --print-build-logs |& nom + + ❯❯ nix profile install . ' ''; } -- cgit v1.2.3