diff options
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 36 |
1 files changed, 10 insertions, 26 deletions
@@ -6,12 +6,7 @@ inputs.nixpkgs.follows = "nixpkgs"; flake = true; }; - #inputs.spine-search-cgi = { # issue, to make usable needs local configuration on build, so, not practical to implement like so - # url = "git://git.sisudoc.org/software/sisudoc-spine-search-cgi"; - # inputs.nixpkgs.follows = "nixpkgs"; - # flake = true; - #}; - inputs.sisudoc-d-overlay = { + inputs.d-overlay = { url = "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"; inputs.nixpkgs.follows = "nixpkgs"; flake = true; @@ -20,10 +15,9 @@ self, nixpkgs, spine, - #spine-search-cgi, - sisudoc-d-overlay, + d-overlay, ... - }@inputs: let + } @ inputs: let version = "0.18.0"; shell = ./shell.nix; devEnv = ./nixDevEnv.sh; @@ -36,13 +30,9 @@ in { default = spine.packages.${system}.default; spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd; - spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc; spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd; + spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc; spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc; - #spine-search-cgi-nixpkgs-dmd = spine-search-cgi.packages.${system}.spine-search-nixpkgs-dmd; # issue, to make usable needs local configuration on build - #spine-search-cgi-nixpkgs-ldc = spine-search-cgi.packages.${system}.spine-search-nixpkgs-ldc; # issue, to make usable needs local configuration on build - #spine-search-cgi-overlay-dmd = spine-search-cgi.packages.${system}.spine-search-overlay-dmd; # issue, to make usable needs local configuration on build - #spine-search-cgi-overlay-ldc = spine-search-cgi.packages.${system}.spine-search-overlay-ldc; # issue, to make usable needs local configuration on build #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000="; }); apps = forAllSystems (system: { @@ -54,9 +44,9 @@ devShells = forAllSystems (system: let pkgs = nixpkgsFor.${system}; shellHook = '' + export DFLAGS="-O2 -boundscheck=on" 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 ./markup/pod/*"; ''; in with pkgs; { @@ -74,10 +64,10 @@ inherit shellHook; }; dsh-spine = spine.devShells.${system}.default; - dsh-overlay-dmd = sisudoc-d-overlay.devShells.${system}.dsh-overlay-dmd-dub; - dsh-nixpkgs-dmd = sisudoc-d-overlay.devShells.${system}.dsh-nixpkgs-dmd-dub; - dsh-overlay-ldc = sisudoc-d-overlay.devShells.${system}.dsh-overlay-ldc-dub; - dsh-nixpkgs-ldc = sisudoc-d-overlay.devShells.${system}.dsh-nixpkgs-ldc-dub; + dsh-overlay-dmd = d-overlay.devShells.${system}.dsh-overlay-dmd-dub; + dsh-nixpkgs-dmd = d-overlay.devShells.${system}.dsh-nixpkgs-dmd-dub; + dsh-overlay-ldc = d-overlay.devShells.${system}.dsh-overlay-ldc-dub; + dsh-nixpkgs-ldc = d-overlay.devShells.${system}.dsh-nixpkgs-ldc-dub; dsh-epub = mkShell { name = "spine-0.18.0 dev shell for epub output"; inherit shell; @@ -86,7 +76,6 @@ ldc #dmd dub - dtools gnumake sqlite libxml2 @@ -115,7 +104,6 @@ ldc #dmd dub - dtools gnumake sqlite # ❯❯ text-mode web browsers @@ -136,13 +124,11 @@ ldc #dmd dub - dtools gnumake source-sans-pro source-serif-pro source-code-pro - texliveFull - #texlive.combined.scheme-full + texlive.combined.scheme-full ]; inherit shellHook; }; @@ -154,7 +140,6 @@ ldc #dmd dub - dtools gnumake sqlite ]; @@ -168,7 +153,6 @@ ldc #dmd dub - dtools gnumake sqlite perl538Packages.Po4a |