diff options
| -rw-r--r-- | flake.nix | 34 | ||||
| -rw-r--r-- | org/config_nix.org | 34 |
2 files changed, 38 insertions, 30 deletions
@@ -34,7 +34,8 @@ inherit system; }; preBuild = '' - export HOME=$(pwd) + export HOME=$TMPDIR + #export HOME=$(pwd) ''; installPhase = '' runHook preInstall @@ -45,6 +46,7 @@ postInstall = '' echo "❯❯ ./result/bin/spine -v --source --pod --text --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ../sisu-spine-samples/markup/pod/*"; echo `ls -la $out/bin/spine` + echo "❯❯ spine-v${version} (rev: ${self.shortRev or "unknown"})" $out/bin/spine -v ''; in { @@ -209,13 +211,15 @@ pkgs-ovl = pkgsForSystem system; pkgs-nix = nixpkgsFor.${system}; shellHook = '' - export Date=`date "+%Y%m%d"` + #export Date=`date "+%Y%m%d"` ## set local values in .envrc-local (or here if you must) echo '❯❯ nix build'; - SpineProjVer=`rg "Version\((\d+), (\d+), (\d+)\)" views/version.txt | sed -E 's/.*([0-9]+), ([0-9]+), ([0-9]+).*/spine-v\1.\2.\3/'` && \ - SpineGitVer=`git describe | sed "s/^[a-z_-]\+\([0-9.]\+\)/\1/" | sed "s/\([^-]*-g\)/r\1/" | sed "s/-/./g"` && \ - SpineGitBranch=`git branch --show-current` && \ - echo "❯❯ $SpineProjVer - ($SpineGitBranch: $SpineGitVer)" + ## ImPure Nix environment + SpineGitVer=`git describe | sed "s/^[a-z_-]\+\([0-9.]\+\)/\1/" | sed "s/\([^-]*-g\)/r\1/" | sed "s/-/./g"` && \ + SpineGitBranch=`git branch --show-current` && \ + echo "❯❯ spine-v${version} - ($SpineGitBranch: $SpineGitVer)" + ## Pure Nix environment - version info from flake inputs + #echo "❯❯ spine-v${version} (rev: ${self.shortRev or "unknown"})" echo '❯❯ $SpineBIN -v --source --pod --text --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=$SpineOUT $SpinePOD/*'; echo "❯❯ $SpineBIN -v --source --pod --text --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=$SpineOUT $SpinePOD/*"; echo '❯❯ nix flake update && nix flake check && nix flake show'; @@ -233,7 +237,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -248,7 +252,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -263,7 +267,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -278,7 +282,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -322,7 +326,7 @@ calibre #(suite includes: ebook-viewer) koreader foliate - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -345,7 +349,7 @@ w3m # ❯❯ light graphical #dillo - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -364,7 +368,7 @@ source-serif-pro source-code-pro texlive.combined.scheme-full - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -380,7 +384,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -397,7 +401,7 @@ gnumake sqlite perl538Packages.Po4a - gnused + gnugrep gnused ripgrep ]; inherit shellHook; diff --git a/org/config_nix.org b/org/config_nix.org index d7e0e92..167a406 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -57,7 +57,8 @@ inherit system; }; preBuild = '' - export HOME=$(pwd) + export HOME=$TMPDIR + #export HOME=$(pwd) ''; installPhase = '' runHook preInstall @@ -68,6 +69,7 @@ postInstall = '' echo "❯❯ ./result/bin/spine -v --source --pod --text --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ../sisu-spine-samples/markup/pod/*"; echo `ls -la $out/bin/spine` + echo "❯❯ spine-v${version} (rev: ${self.shortRev or "unknown"})" $out/bin/spine -v ''; in { @@ -232,13 +234,15 @@ pkgs-ovl = pkgsForSystem system; pkgs-nix = nixpkgsFor.${system}; shellHook = '' - export Date=`date "+%Y%m%d"` + #export Date=`date "+%Y%m%d"` ## set local values in .envrc-local (or here if you must) echo '❯❯ nix build'; - SpineProjVer=`rg "Version\((\d+), (\d+), (\d+)\)" views/version.txt | sed -E 's/.*([0-9]+), ([0-9]+), ([0-9]+).*/spine-v\1.\2.\3/'` && \ - SpineGitVer=`git describe | sed "s/^[a-z_-]\+\([0-9.]\+\)/\1/" | sed "s/\([^-]*-g\)/r\1/" | sed "s/-/./g"` && \ - SpineGitBranch=`git branch --show-current` && \ - echo "❯❯ $SpineProjVer - ($SpineGitBranch: $SpineGitVer)" + ## ImPure Nix environment + SpineGitVer=`git describe | sed "s/^[a-z_-]\+\([0-9.]\+\)/\1/" | sed "s/\([^-]*-g\)/r\1/" | sed "s/-/./g"` && \ + SpineGitBranch=`git branch --show-current` && \ + echo "❯❯ spine-v${version} - ($SpineGitBranch: $SpineGitVer)" + ## Pure Nix environment - version info from flake inputs + #echo "❯❯ spine-v${version} (rev: ${self.shortRev or "unknown"})" echo '❯❯ $SpineBIN -v --source --pod --text --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=$SpineOUT $SpinePOD/*'; echo "❯❯ $SpineBIN -v --source --pod --text --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=$SpineOUT $SpinePOD/*"; echo '❯❯ nix flake update && nix flake check && nix flake show'; @@ -256,7 +260,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -271,7 +275,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -286,7 +290,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -301,7 +305,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -345,7 +349,7 @@ calibre #(suite includes: ebook-viewer) koreader foliate - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -368,7 +372,7 @@ w3m # ❯❯ light graphical #dillo - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -387,7 +391,7 @@ source-serif-pro source-code-pro texlive.combined.scheme-full - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -403,7 +407,7 @@ dtools gnumake sqlite - gnused + gnugrep gnused ripgrep ]; inherit shellHook; @@ -420,7 +424,7 @@ gnumake sqlite perl538Packages.Po4a - gnused + gnugrep gnused ripgrep ]; inherit shellHook; |