diff options
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 48 |
1 files changed, 39 insertions, 9 deletions
@@ -23,7 +23,7 @@ localOverlay = (final: prev: { ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.41.0 dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.111.0 - dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.39.0 + dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.40.0 dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.110.0 #gdc = prev.callPackage ./nix-overlays/gdc { }; }); @@ -34,7 +34,8 @@ inherit system; }; preBuild = '' - export HOME=$(pwd) + export HOME=$TMPDIR + #export HOME=$(pwd) ''; installPhase = '' runHook preInstall @@ -43,7 +44,9 @@ runHook postInstall ''; 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 { @@ -131,7 +134,7 @@ spine-overlay-dmd = stdenv.mkDerivation { inherit pname; inherit version; - #name = "spine-0.18.0 dmd-2.111.0 dub-1.39.0"; + #name = "spine-0.18.0 dmd-2.111.0 dub-1.40.0"; meta.mainProgram = "spine-dmd"; executable = true; src = self; @@ -155,7 +158,7 @@ spine-overlay-ldc = stdenv.mkDerivation { inherit pname; inherit version; - #name = "spine-0.18.0 ldc-1.41.0 dub-1.39.0"; + #name = "spine-0.18.0 ldc-1.41.0 dub-1.40.0"; meta.mainProgram = "spine-ldc"; executable = true; src = self; @@ -208,14 +211,23 @@ 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 " ❯❯ ./result/bin/spine -v --source --pod --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ../sisu-spine-samples/markup/pod/*"; + echo '❯❯ nix build'; + ## 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'; ''; in with pkgs-nix; { dsh-overlay = mkShell { - name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0"; + name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.40.0 - dtools-2.110.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ @@ -225,6 +237,8 @@ dtools gnumake sqlite + gnugrep gnused + ripgrep ]; inherit shellHook; }; @@ -238,6 +252,8 @@ dtools gnumake sqlite + gnugrep gnused + ripgrep ]; inherit shellHook; }; @@ -251,11 +267,13 @@ dtools gnumake sqlite + gnugrep gnused + ripgrep ]; inherit shellHook; }; dsh-overlay-dmd = mkShell { - name = "spine-0.18.0 base dev shell, dmd-2.111.0, dub-1.39.0 - dtools-2.110.0"; + name = "spine-0.18.0 base dev shell, dmd-2.111.0, dub-1.40.0 - dtools-2.110.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ @@ -264,11 +282,13 @@ dtools gnumake sqlite + gnugrep gnused + ripgrep ]; inherit shellHook; }; dsh-overlay-ldc = mkShell { - name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0"; + name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.40.0 - dtools-2.110.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ @@ -306,6 +326,8 @@ calibre #(suite includes: ebook-viewer) koreader foliate + gnugrep gnused + ripgrep ]; inherit shellHook; }; @@ -327,6 +349,8 @@ w3m # ❯❯ light graphical #dillo + gnugrep gnused + ripgrep ]; inherit shellHook; }; @@ -344,6 +368,8 @@ source-serif-pro source-code-pro texlive.combined.scheme-full + gnugrep gnused + ripgrep ]; inherit shellHook; }; @@ -358,6 +384,8 @@ dtools gnumake sqlite + gnugrep gnused + ripgrep ]; inherit shellHook; }; @@ -373,6 +401,8 @@ gnumake sqlite perl538Packages.Po4a + gnugrep gnused + ripgrep ]; inherit shellHook; }; |