summaryrefslogtreecommitdiffhomepage
path: root/org/config_nix.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2023-12-17 19:52:01 -0500
committerRalph Amissah <ralph.amissah@gmail.com>2023-12-17 19:52:01 -0500
commit7894f38e03e6b0b14f1ecb672bcb5e8d139a8011 (patch)
tree69bb0dc6c488801215aa73452c3a0e58e3e5c5da /org/config_nix.org
parentupdates incl. ldc-1.35.0, direnv-2.4.0 (diff)
0.14.0, spine sync
Diffstat (limited to 'org/config_nix.org')
-rw-r--r--org/config_nix.org30
1 files changed, 8 insertions, 22 deletions
diff --git a/org/config_nix.org b/org/config_nix.org
index c209cc5..a3bb2d2 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -41,9 +41,9 @@
d-overlay,
} @ inputs: let
pname = "spine_search";
- version = "<<spine_version_set>>";
+ version = "<<spine_version>>";
shell = ./shell.nix;
- devEnv = ./.envrc;
+ devEnv = ./nixDevEnv.sh;
supportedSystems = ["x86_64-linux"];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types
@@ -292,21 +292,6 @@ with pkgs;
#aria #wget #curl
];
shellHook = ''
- echo '
- shell.nix echo ❯❯
-
- ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh
-
- ❯❯ nix develop
- ❯❯ nix develop -c zsh
-
- ❯❯ nix build
- ❯❯ nix build ".#default" --print-build-logs
- ❯❯ nix build ".#spine-search-dmd" --print-build-logs |& nom
- ❯❯ nix build ".#spine-search-ldc" --print-build-logs |& nom
-
- ❯❯ dub build --compiler=ldmd --build=release --combined --skip-registry=all
- '
'';
}
#+END_SRC
@@ -501,7 +486,7 @@ with (
];
meta = with pkgs.lib; {
pname = "spine-search";
- version = "<<spine_version_set>>";
+ version = "<<spine_version>>";
homepage = "https://sisudoc.org";
description = "cgi sqlite search form for document object search";
longDescription = ''
@@ -527,11 +512,12 @@ installPhase = ''
#+END_SRC
** variables used SET
-*** spine version SET VERSION :version:set:project:
+*** spine project VERSION :version:set:project:
-#+NAME: spine_version_set
-#+BEGIN_SRC sh
-0.12.0
+#+NAME: spine_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
#+END_SRC
*** nixpkgs path / url