diff options
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 48 |
1 files changed, 26 insertions, 22 deletions
@@ -4,12 +4,10 @@ inputs.spine = { url = "git://git.sisudoc.org/software/sisudoc-spine"; inputs.nixpkgs.follows = "nixpkgs"; - flake = true; }; inputs.d-overlay = { url = "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"; inputs.nixpkgs.follows = "nixpkgs"; - flake = true; }; outputs = { self, @@ -17,7 +15,7 @@ spine, d-overlay, ... - } @ inputs: let + }@inputs: let version = "0.18.0"; shell = ./shell.nix; devEnv = ./nixDevEnv.sh; @@ -25,9 +23,7 @@ forAllSystems = nixpkgs.lib.genAttrs supportedSystems; nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types in { - packages = forAllSystems (system: let - pkgs = nixpkgsFor.${system}; - in { + packages = forAllSystems (system: { default = spine.packages.${system}.default; spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd; spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd; @@ -45,7 +41,7 @@ pkgs = nixpkgsFor.${system}; shellHook = '' export DFLAGS="-O2 -boundscheck=on" - export Date=`date "+%Y%m%d"` + export Date=$(date "+%Y%m%d") ## set local values in .envrc-local (or here if you must) ''; in @@ -64,15 +60,17 @@ inherit shellHook; }; dsh-spine = spine.devShells.${system}.default; - 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-overlay-dmd = d-overlay.devShells.${system}.dsh-overlay-dmd; + dsh-nixpkgs-dmd = d-overlay.devShells.${system}.dsh-nixpkgs-dmd; + dsh-overlay-ldc = d-overlay.devShells.${system}.dsh-overlay-ldc; + dsh-nixpkgs-ldc = d-overlay.devShells.${system}.dsh-nixpkgs-ldc; dsh-epub = mkShell { - name = "spine-0.18.0 dev shell for epub output"; + name = "spine-${version} dev shell for epub output"; inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -81,9 +79,6 @@ libxml2 html-tidy xmlstarlet - libxml2 - html-tidy - xmlstarlet epubcheck ebook_tools epr @@ -95,10 +90,12 @@ inherit shellHook; }; dsh-html = mkShell { - name = "spine-0.18.0 dev shell for html output"; + name = "spine-${version} dev shell for html output"; inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -115,10 +112,12 @@ inherit shellHook; }; dsh-latex-pdf = mkShell { - name = "spine-0.18.0 dev shell for latex & pdf output"; + name = "spine-${version} dev shell for latex & pdf output"; inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -131,10 +130,12 @@ inherit shellHook; }; dsh-sqlite = mkShell { - name = "spine-0.18.0 dev shell for sqlite3 output"; + name = "spine-${version} dev shell for sqlite3 output"; inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -144,10 +145,12 @@ inherit shellHook; }; dsh-i18n = mkShell { - name = "spine-0.18.0 dev shell for internationalization, po4a"; + name = "spine-${version} dev shell for internationalization, po4a"; inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -158,7 +161,7 @@ inherit shellHook; }; dsh-build-spine-generate-samples-env-defaults = mkShell { - name = "spine-0.18.0 dev shell test build spine and generate samples env defaults"; + name = "spine-${version} dev shell test build spine and generate samples env defaults"; inherit shell; inherit devEnv; packages = [ @@ -178,7 +181,7 @@ ''; }; dsh-build-spine-generate-samples-test = mkShell { - name = "spine-0.18.0 dev shell test build spine and generate samples test"; + name = "spine-${version} dev shell test build spine and generate samples test"; inherit shell; inherit devEnv; packages = [ @@ -197,7 +200,8 @@ echo "./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod-samples/pod/*" ''; }; - default = import ./shell.nix {inherit pkgs;}; + default = self.devShells.${system}.dsh; + #default = import ./shell.nix {inherit pkgs;}; }); }; } |