diff options
| -rw-r--r-- | .envrc-nix | 14 | ||||
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | flake.lock | 22 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | org/config_env.org | 14 | ||||
| -rw-r--r-- | org/config_nix.org | 3 | ||||
| -rw-r--r-- | org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org | 2 | ||||
| -rw-r--r-- | org/spine_info.org | 16 |
9 files changed, 40 insertions, 46 deletions
@@ -16,11 +16,11 @@ PATH_add result/bin use flake . #use flake .#default echo ' -- consider running: +• consider running: ❯❯ nix flake show ❯❯ nix flake update && nix flake check && nix flake show -- for a dev shell (development environment): +• for a dev shell (development environment): ❯❯ nix develop ❯❯ nix develop ".#" --print-build-logs -c zsh @@ -33,25 +33,25 @@ echo ' ❯❯ nix develop ".#dsh-spine" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-sqlite" --print-build-logs -c zsh -- to build project: +• to build project: ❯❯ nix build --print-build-logs ❯❯ nix build ".#" --print-build-logs -- to build project: +• to build project: ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs -- to build using dub (on nix or otherwise): +• to build using dub (on nix or otherwise): you need to be in sisudoc-spine to use source code tree directly. -- for develop environment & build options +• for develop environment & build options ❯❯ nix flake update && nix flake check && nix flake show ❯❯ nix flake show -- if on nix: build the sisudoc-spine using nix build commands above and +• if on nix: build the sisudoc-spine using nix build commands above and run the result against the sample files here in the sisudoc-spine-samples dir (assuming the appropriate paths have been set in your .envrc-local) @@ -86,9 +86,9 @@ instruction. The sources of relevant parts of the project are here: https://sisudoc.org https://git.sisudoc.org - git clone git://git.sisudoc.org/software/sisudoc-spine && \ - git clone git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ - git clone git://git.sisudoc.org/markup/sisudoc-spine-samples + git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine && \ + git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ + git clone --depth=1 git://git.sisudoc.org/markup/sisudoc-spine-samples you may wish to clone these into a directory created for the purpose, e.g. @@ -69,9 +69,9 @@ instruction. The sources of relevant parts of the project are here: https://sisudoc.org https://git.sisudoc.org - git clone git://git.sisudoc.org/software/sisudoc-spine && \ - git clone git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ - git clone git://git.sisudoc.org/markup/sisudoc-spine-samples + git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine && \ + git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ + git clone --depth=1 git://git.sisudoc.org/markup/sisudoc-spine-samples you may wish to clone these into a directory created for the purpose, e.g. @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1715403580, - "narHash": "sha256-wq/XlLtczq7BeCZPphK7fjo9MYlE8di8XavJCGayFDo=", + "lastModified": 1720109368, + "narHash": "sha256-uaoqQrDrfiyoha2Li35FBBnIEw9hmiXWzb39flsMBvc=", "ref": "refs/heads/main", - "rev": "fe1a1704a2e9d739872a0dd53756ee1b9d56da19", - "revCount": 8, + "rev": "d98b19a633b96dfa9e1ec23954d0da55bc1fe7e2", + "revCount": 10, "type": "git", "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake" }, @@ -77,11 +77,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716715802, - "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", + "lastModified": 1720058333, + "narHash": "sha256-gM2RCi5XkxmcsZ44pUkKIYBiBMfZ6u7MdcZcykmccrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", + "rev": "6842b061970bf96965d66fcc86a28e1f719aae95", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1716409313, - "narHash": "sha256-V1oggLDwjQUaPgO7P0QjCra1Tc5J/jaRmMNZ+GqxLqQ=", + "lastModified": 1720107444, + "narHash": "sha256-YGI13rUSMuDBK0VeFM4LFDmDwTbE60v3K+ji5tE43ow=", "ref": "refs/heads/main", - "rev": "9876842de60c9c0d94b47a2589623d235607050c", - "revCount": 644, + "rev": "d7e7c79253697a7b34df04f547c70669acb67ea1", + "revCount": 655, "type": "git", "url": "git://git.sisudoc.org/software/sisudoc-spine" }, @@ -18,7 +18,8 @@ flake-utils, spine, d-overlay, - } @ inputs: let + ... + }@inputs: let version = "0.16.0"; shell = ./shell.nix; devEnv = ./nixDevEnv.sh; diff --git a/org/config_env.org b/org/config_env.org index ecf4ee5..4216d00 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -72,11 +72,11 @@ PATH_add result/bin use flake . #use flake .#default echo ' -- consider running: +• consider running: ❯❯ nix flake show ❯❯ nix flake update && nix flake check && nix flake show -- for a dev shell (development environment): +• for a dev shell (development environment): ❯❯ nix develop ❯❯ nix develop ".#" --print-build-logs -c zsh @@ -89,25 +89,25 @@ echo ' ❯❯ nix develop ".#dsh-spine" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-sqlite" --print-build-logs -c zsh -- to build project: +• to build project: ❯❯ nix build --print-build-logs ❯❯ nix build ".#" --print-build-logs -- to build project: +• to build project: ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs -- to build using dub (on nix or otherwise): +• to build using dub (on nix or otherwise): you need to be in sisudoc-spine to use source code tree directly. -- for develop environment & build options +• for develop environment & build options ❯❯ nix flake update && nix flake check && nix flake show ❯❯ nix flake show -- if on nix: build the sisudoc-spine using nix build commands above and +• if on nix: build the sisudoc-spine using nix build commands above and run the result against the sample files here in the sisudoc-spine-samples dir (assuming the appropriate paths have been set in your .envrc-local) diff --git a/org/config_nix.org b/org/config_nix.org index 52e16e6..f05e712 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -43,7 +43,8 @@ flake-utils, spine, d-overlay, - } @ inputs: let + ... + }@inputs: let version = "<<spine_version>>"; shell = ./shell.nix; devEnv = ./nixDevEnv.sh; diff --git a/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org b/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org index ed7def8..28ead23 100644 --- a/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org +++ b/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org @@ -98,7 +98,7 @@ #+NAME: spine_project_version_part_minor #+BEGIN_SRC org -16 +17 #+END_SRC *** patch diff --git a/org/spine_info.org b/org/spine_info.org index cc107d4..db4571a 100644 --- a/org/spine_info.org +++ b/org/spine_info.org @@ -208,9 +208,9 @@ instruction. The sources of relevant parts of the project are here: https://sisudoc.org https://git.sisudoc.org - git clone git://git.sisudoc.org/software/sisudoc-spine && \ - git clone git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ - git clone git://git.sisudoc.org/markup/sisudoc-spine-samples + git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine && \ + git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ + git clone --depth=1 git://git.sisudoc.org/markup/sisudoc-spine-samples you may wish to clone these into a directory created for the purpose, e.g. @@ -279,14 +279,6 @@ flags and configuration options <<sisudoc_spine_samples_rights>> #+END_SRC -*** code org ./org - -#+HEADER: :tangle "../org/COPYRIGHT" -#+HEADER: :noweb yes -#+BEGIN_SRC text -<<sisudoc_spine_samples_rights>> -#+END_SRC - *** org files ./org - .org literate programming: @@ -295,7 +287,7 @@ flags and configuration options - license - dependency information -#+HEADER: :tangle "./COPYRIGHT" +#+HEADER: :tangle "../org/COPYRIGHT" #+HEADER: :noweb yes #+BEGIN_SRC text <<sisudoc_spine_samples_rights>> |