aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xderivation.nix2
-rw-r--r--flake.lock17
-rw-r--r--flake.nix4
-rw-r--r--org/config_nix.org12
-rw-r--r--org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org56
5 files changed, 74 insertions, 17 deletions
diff --git a/derivation.nix b/derivation.nix
index b40e95a..e7a437a 100755
--- a/derivation.nix
+++ b/derivation.nix
@@ -93,7 +93,7 @@ with (
);
mkDubDerivation rec {
pname = "spine";
- version = "0.18.0";
+ version = "0.24.1";
# fetched from the same upstream the flake's `inputs.spine` points at
# (git://git.sisudoc.org/software/sisudoc-spine). Unlike flake inputs,
# builtins.fetchGit is usable from a plain (non-flake) derivation.nix.
diff --git a/flake.lock b/flake.lock
index 539683a..6096080 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,18 +22,15 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1789012029,
- "narHash": "sha256-1CBkBf+Nhggykzlx0jvXrj5rk20btl+tK8Fa8Ml/BL4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d5dfd8e6716dde34398bc14bc87c10dece9c8c68",
- "type": "github"
+ "lastModified": 1789370336,
+ "narHash": "sha256-obwZbWHP7htCIoq2Z0g/uTMcEgN6yqcMNIcOMe6P2qI=",
+ "rev": "c7def046b9a883d46974757852106483d741586f",
+ "type": "tarball",
+ "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1073483.c7def046b9a8/nixexprs.tar.zst"
},
"original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
+ "type": "tarball",
+ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst"
}
},
"root": {
diff --git a/flake.nix b/flake.nix
index eff4871..e153174 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
{
description = "spine (sisu like parser & document generator) made available to process markup samples";
- inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+ inputs.nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst";
inputs.spine = {
url = "git://git.sisudoc.org/software/sisudoc-spine";
inputs.nixpkgs.follows = "nixpkgs";
@@ -16,7 +16,7 @@
d-overlay,
...
}@inputs: let
- version = "0.18.0";
+ version = "0.24.1";
shell = ./shell.nix;
devEnv = ./nixDevEnv.sh;
supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
diff --git a/org/config_nix.org b/org/config_nix.org
index 9bc769b..4343c56 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -25,7 +25,7 @@
#+BEGIN_SRC nix
{
description = "spine (sisu like parser & document generator) made available to process markup samples";
- inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+ inputs.nixpkgs.url = "<<nixpkgs_unstable>>";
inputs.spine = {
url = "<<sisudoc_spine_nix_src>>";
inputs.nixpkgs.follows = "nixpkgs";
@@ -494,3 +494,13 @@ github:NixOS/nixpkgs/nixpkgs-unstable
#+BEGIN_SRC emacs-lisp
<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:sisudoc_dlang_nix_overlay_src()>>
#+END_SRC
+
+* nixos source
+
+#+NAME: nixpkgs_unstable
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:nixpkgs_unstable()>>
+#+END_SRC
+
+* __END__
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 a38d86f..e4eedf5 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
@@ -29,7 +29,7 @@
- Author: Ralph Amissah
[ralph.amissah@gmail.com]
- - Copyright: (C) 2015 - 2025 Ralph Amissah, All Rights Reserved.
+ - Copyright: (C) 2015 (continuously updated, current 2026) Ralph Amissah, All Rights Reserved.
- License: AGPL 3 or later:
@@ -98,14 +98,21 @@
#+NAME: spine_project_version_part_minor
#+BEGIN_SRC org
-18
+24
#+END_SRC
*** patch
#+NAME: spine_project_version_part_patch
#+BEGIN_SRC org
-0
+1
+#+END_SRC
+
+* year
+
+#+NAME: year
+#+BEGIN_SRC org
+2026
#+END_SRC
* sisudoc spine git source SET
@@ -130,3 +137,46 @@ git://git.sisudoc.org/package/dlang-nix-overlays-and-flake
#+BEGIN_SRC org
git+file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/packages/nix-flakes/dlang/dlang-nix-flakes"
#+END_SRC
+
+* ocda ssp version format
+
+#+NAME: ocda_ssp_format_version
+#+BEGIN_SRC org
+<<ocda_ssp_format_version_part_major>>.<<ocda_ssp_format_version_part_minor>>
+#+END_SRC
+
+*** major
+
+#+NAME: ocda_ssp_format_version_part_major
+#+BEGIN_SRC org
+1
+#+END_SRC
+
+*** minor
+
+#+NAME: ocda_ssp_format_version_part_minor
+#+BEGIN_SRC org
+1
+#+END_SRC
+
+* sqlite collection search db schema version
+
+#+NAME: sqlite_collection_search_db_schema_version
+#+BEGIN_SRC org
+1
+#+END_SRC
+
+* nipkgs source
+
+- github:NixOS/nixpkgs/nixpkgs-unstable
+- https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst
+
+#+NAME: nixpkgs_unstable
+#+BEGIN_SRC org
+https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst
+#+END_SRC
+
+#+BEGIN_SRC org
+github:NixOS/nixpkgs/nixpkgs-unstable
+#+END_SRC
+