summaryrefslogtreecommitdiffhomepage
path: root/flake.nix
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2023-04-29 23:19:51 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2023-04-29 23:28:36 -0400
commit0796fe7d60519f22d0ada2e48561d4abc3d953aa (patch)
tree6391dcfde7a4d9cc16fbf1a74ef61713068e5dd0 /flake.nix
parentcgi search, cosmetic on sisu spine info (diff)
nix dev + update direnv 2.2.1 => 2.3.0
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix37
1 files changed, 9 insertions, 28 deletions
diff --git a/flake.nix b/flake.nix
index e5dded3..7a0b1b5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,13 +99,13 @@
#spine-search-gdc = stdenv.mkDerivation {
# inherit pname;
# inherit version;
- # meta.mainProgram = "spine_search-gdc";
- # executable = true;
- # src = self;
+ # meta.mainProgram = "spine_search-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
@@ -122,26 +122,7 @@
shellHook = ''
export DFLAGS="-O2 -inline -boundscheck=on -color=on"
export Date=`date "+%Y%m%d"`
- export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
- ### set local values in .envrc-local (or modify here if you must)
- # export SpinePROJ=~/grotto/repo/git.repo/projects/doc-reform/code/software/spine
- # export SpineDOC=~/grotto/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
- # export SpineOUT=/srv/www/spine
- export SpineDBpath=/var/www/sqlite
- # export SpineDBpath=/srv/www/spine/sqlite
- export SpineSRC=$SpinePROJ/src
- export SpineBIN=$SpinePROJ/result/bin
- export SpinePOD=$SpineDOC/markup/pod
- export SpineSearchActionLocal='http://localhost/spine_search'
- # export SpineSearchActionRemote='https://sisudoc.org/spine_search'
- export SpineCGIform='spine_search'
- export SpineSQLdb='spine.search.db'
- export PROG_VER_GIT="`git describe --long --tags | sed -e 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g'`"
- export spineNixHelp="cat ./.env/nix-commands"
- export spineHtml="spine --very-verbose --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename=\"spine.search.db\" --cgi-sqlite-search-filename=\"spine_search\" --sqlite-db-path=\"\$SpineDBpath\" --output=\"\$SpineOUT\" $SpinePOD/*"
- export spineSqliteCreateDB="spine --very-verbose --sqlite-db-recreate --sqlite-db-path=\"$SpineDBpath\" --sqlite-db-filename=\"spine.search.db\""
- export spineSqlite="spine --very-verbose --sqlite-discrete --sqlite-db-path=\"$SpineDBpath\" --sqlite-db-filename=\"spine.search.db\" --output=\"\$SpineOUT\" $SpinePOD/*"
- #export spineSqlite="spine --very-verbose --sqlite-update --sqlite-db-path=\"$SpineDBpath\" --sqlite-db-filename=\"spine.search.db\" --output=\"\$SpineOUT\" $SpinePOD/*"
+ ## set local values in .envrc-local (or here if you must)
'';
in
with pkgs; {
@@ -149,8 +130,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
@@ -166,7 +147,7 @@
inherit devEnv;
packages = [
dub
- dmd
+ #dmd
ldc
gnumake
sqlite