aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/config_nix.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2024-04-11 13:25:18 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2024-04-11 13:30:21 -0400
commitb797bcfe23ade3d235f41b8121cdf1c4373d7810 (patch)
tree5df96b8d9cd00b5820420176557ca481afbf085e /org/config_nix.org
parentpackage & nix update (sync with sisu spine) (diff)
sisudoc spine sync (0.16.0 dir name changes)
Diffstat (limited to 'org/config_nix.org')
-rw-r--r--org/config_nix.org39
1 files changed, 20 insertions, 19 deletions
diff --git a/org/config_nix.org b/org/config_nix.org
index 0b27d4e..80c905d 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -1,6 +1,6 @@
-*- mode: org -*-
-#+TITLE: configuration nix
-#+DESCRIPTION: makefile for spine
+#+TITLE: sisudoc spine (doc_reform) (project) configuration nix
+#+DESCRIPTION: configuration nix
#+FILETAGS: :spine:build:tools:
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
@@ -28,7 +28,7 @@
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.spine = {
- url = "git+file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/spine";
+ url = "git+file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/sisudoc-spine";
inputs.nixpkgs.follows = "nixpkgs";
flake = true;
};
@@ -44,7 +44,7 @@
spine,
d-overlay,
} @ inputs: let
- version = "<<spine_version_set>>";
+ version = "<<spine_version>>";
shell = ./shell.nix;
devEnv = ./nixDevEnv.sh;
supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
@@ -409,12 +409,12 @@ with (
runHook preInstall
mkdir -p $out/bin
cp -r "${targetOf package}" $out/bin
- #cp -rv "${targetOf package}" $out/spine-markup-samples/.
- #cp -rv ./markup $out/spine-markup-samples/.
+ #cp -rv "${targetOf package}" $out/sisudoc-spine-markup-samples/.
+ #cp -rv ./markup $out/sisudoc-spine-markup-samples/.
runHook postInstall
'';
#postInstall= ''
- # cp -rv ./markup $out/spine-markup-samples/.
+ # cp -rv ./markup $out/sisudoc-spine-markup-samples/.
#'';
meta =
lib.optionalAttrs (package ? description) {
@@ -429,7 +429,7 @@ with (
);
mkDubDerivation rec {
pname = "spine";
- version = "<<spine_version_set>>";
+ version = "<<spine_version>>";
#zipfile = "spine-0.12.0-tag-0.11.2.r107.gf89a107.tar.gz";
src = fetchTarball {
url = "<<spine_tarball_path_url>>";
@@ -452,14 +452,6 @@ with (
#src = ./.;
-** variables used SET
-*** spine version SET VERSION :version:set:project:
-
-#+NAME: spine_version_set
-#+BEGIN_SRC sh
-0.14.0
-#+END_SRC
-
#+NAME: project_path_local_out_static
#+HEADER: :noweb yes
#+BEGIN_SRC nix
@@ -481,7 +473,7 @@ file://<<spine_tarball_path>>/<<spine_tarball_filename>>
#+NAME: spine_git_file_path
#+HEADER: :noweb yes
#+BEGIN_SRC nix
-/home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/spine
+/home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/sisudoc-spine
#+END_SRC
#+NAME: nixpkgs_local
@@ -690,7 +682,7 @@ $SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUTversioned"
,*** sqlite db (shared) - populate db
,#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --sqlite-update --output="$SpineOUTversioned" $SpineDOC/spine-markup-samples/markup/pod/*
+$SpineBIN/spine --very-verbose --sqlite-update --output="$SpineOUTversioned" $SpineDOC/sisudoc-spine-markup-samples/markup/pod/*
,#+END_SRC
,*** sqlite db (shared) - drop db
@@ -785,7 +777,7 @@ webserv:
data_root_url: "https://sisudoc.org"
data_root_path: "/srv/www/spine"
images_root_part: "image"
- cgi_search_form_title: "≅ SiSU Spine search"
+ cgi_search_form_title: "≅ SiSU Spine search ፨"
cgi_http: "https"
cgi_domain: "sisudoc.org"
cgi_bin_url: "http://sisudoc.org/cgi-bin"
@@ -816,3 +808,12 @@ ls $SpineOutstatic/latex/*.tex
#echo "emacs nixNote_.org"
#echo "cat nixNote_.org"
#+END_SRC
+
+** version info SET VERSION :version:set:project:
+*** spine project VERSION :version:set:project:
+
+#+NAME: spine_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
+#+END_SRC