diff options
Diffstat (limited to 'org/config_nix.org')
| -rw-r--r-- | org/config_nix.org | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/org/config_nix.org b/org/config_nix.org index 88d61bf..a6d4360 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -31,12 +31,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 = "<<sisudoc_dlang_nix_overlay_src>>"; inputs.nixpkgs.follows = "nixpkgs"; flake = true; @@ -45,10 +40,9 @@ self, nixpkgs, spine, - #spine-search-cgi, - sisudoc-d-overlay, + d-overlay, ... - }@inputs: let + } @ inputs: let version = "<<spine_version>>"; shell = ./shell.nix; devEnv = ./nixDevEnv.sh; @@ -61,13 +55,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: { @@ -79,9 +69,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; { @@ -99,10 +89,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-<<spine_version>> dev shell for epub output"; inherit shell; @@ -111,7 +101,6 @@ ldc #dmd dub - dtools gnumake sqlite libxml2 @@ -140,7 +129,6 @@ ldc #dmd dub - dtools gnumake sqlite # ❯❯ text-mode web browsers @@ -161,13 +149,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; }; @@ -179,7 +165,6 @@ ldc #dmd dub - dtools gnumake sqlite ]; @@ -193,7 +178,6 @@ ldc #dmd dub - dtools gnumake sqlite perl538Packages.Po4a @@ -302,7 +286,7 @@ with pkgs; # ❯❯❯ nix_related #nix # if not on NixOS, this is needed direnv - nixVersions.latest #nixVersions.latest #nixVersions.git + nixVersions.latest #nixVersions.latest #nixVersions.git #nixVersions.nix_2_29 #nixVersions.nix_2_29 nix-prefetch-git validatePkgConfig nix-output-monitor @@ -313,7 +297,6 @@ with pkgs; # ❯❯❯ dev gnumake ps - dtools # ❯❯❯ d_build_related # ❯❯ package manager dub @@ -406,7 +389,7 @@ with ( exit "Error: could not find D compiler" fi echo "$DC_ used as D compiler to build $pname" - dub run --compiler=$DC --build=release --combined --skip-registry=all + dub build --compiler=$DC --build=release --combined --skip-registry=all runHook postBuild ''; checkPhase = '' @@ -485,7 +468,7 @@ file://<<spine_tarball_path>>/<<spine_tarball_filename>> #+END_SRC #+NAME: nixpkgs_local -#+BEGIN_SRC sh +#+BEGIN_SRC shell /srv/nixpkgs-dev/nixpkgs #+END_SRC |