flake.nix tidy & use updated names in dlang flake

- use new dlang overlay devshell flake names

3 files changed, 43 insertions, 55 deletions

diff --git a/flake.lock b/flake.lock
index f3cf02a..875a90b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772748350,
-        "narHash": "sha256-UwH0m6iqKHqFSbSc63UqjPNis2OprQ7K4h8C+OVUNtI=",
+        "lastModified": 1775708141,
+        "narHash": "sha256-MjjhikIgXjNcsEzyZmjKXHk+DaEk5ic2h15DC6w4W50=",
         "ref": "refs/heads/main",
-        "rev": "c08461dc2b99618171de1973dc2218d3d14e9fba",
-        "revCount": 28,
+        "rev": "bcb38c5014f2870ba7d6412b0b39c757ad4ae725",
+        "revCount": 29,
         "type": "git",
         "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
       },
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773628058,
-        "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=",
+        "lastModified": 1775639890,
+        "narHash": "sha256-9O9gNidrdzcb7vgKGtff7QiLtr0IsVaCi0pAXm8anhQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
+        "rev": "456e8a9468b9d46bd8c9524425026c00745bc4d2",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772750174,
-        "narHash": "sha256-VydYoUNk1nJSs47UxuUftwqf8HC3tnEXbCNrWaIJ0y0=",
+        "lastModified": 1773955194,
+        "narHash": "sha256-cJH6IS/u04Cssy9mmRHE88+kgnRWW7p+QZW7WJaIu70=",
         "ref": "refs/heads/main",
-        "rev": "7bf3e40d005f21881240a0b9c2140b5244eecd3b",
-        "revCount": 709,
+        "rev": "49c5f0f0d6c43dc6840f45554dde08d3f3fa35a9",
+        "revCount": 710,
         "type": "git",
         "url": "git://git.sisudoc.org/software/sisudoc-spine"
       },
diff --git a/flake.nix b/flake.nix
index 5808a9f..eff4871 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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,12 +60,12 @@
           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 = [
@@ -83,9 +79,6 @@
             libxml2
             html-tidy
             xmlstarlet
-            libxml2
-            html-tidy
-            xmlstarlet
             epubcheck
             ebook_tools
             epr
@@ -97,7 +90,7 @@
           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 = [
@@ -119,7 +112,7 @@
           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 = [
@@ -137,7 +130,7 @@
           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 = [
@@ -152,7 +145,7 @@
           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 = [
@@ -168,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 = [
@@ -188,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 = [
@@ -207,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;};
       });
   };
 }
diff --git a/org/config_nix.org b/org/config_nix.org
index f637c68..dfbee32 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -29,12 +29,10 @@
   inputs.spine = {
     url = "<<sisudoc_spine_nix_src>>";
     inputs.nixpkgs.follows = "nixpkgs";
-    flake = true;
   };
   inputs.d-overlay = {
     url = "<<sisudoc_dlang_nix_overlay_src>>";
     inputs.nixpkgs.follows = "nixpkgs";
-    flake = true;
   };
   outputs = {
     self,
@@ -42,7 +40,7 @@
     spine,
     d-overlay,
     ...
-  } @ inputs: let
+  }@inputs: let
     version = "<<spine_version>>";
     shell = ./shell.nix;
     devEnv = ./nixDevEnv.sh;
@@ -50,9 +48,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;
@@ -70,7 +66,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
@@ -89,12 +85,12 @@
           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-<<spine_version>> dev shell for epub output";
+          name = "spine-${version} dev shell for epub output";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -108,9 +104,6 @@
             libxml2
             html-tidy
             xmlstarlet
-            libxml2
-            html-tidy
-            xmlstarlet
             epubcheck
             ebook_tools
             epr
@@ -122,7 +115,7 @@
           inherit shellHook;
         };
         dsh-html = mkShell {
-          name = "spine-<<spine_version>> dev shell for html output";
+          name = "spine-${version} dev shell for html output";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -144,7 +137,7 @@
           inherit shellHook;
         };
         dsh-latex-pdf = mkShell {
-          name = "spine-<<spine_version>> dev shell for latex & pdf output";
+          name = "spine-${version} dev shell for latex & pdf output";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -162,7 +155,7 @@
           inherit shellHook;
         };
         dsh-sqlite = mkShell {
-          name = "spine-<<spine_version>> dev shell for sqlite3 output";
+          name = "spine-${version} dev shell for sqlite3 output";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -177,7 +170,7 @@
           inherit shellHook;
         };
         dsh-i18n = mkShell {
-          name = "spine-<<spine_version>> dev shell for internationalization, po4a";
+          name = "spine-${version} dev shell for internationalization, po4a";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -193,7 +186,7 @@
           inherit shellHook;
         };
         dsh-build-spine-generate-samples-env-defaults = mkShell {
-          name = "spine-<<spine_version>> 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 = [
@@ -213,7 +206,7 @@
           '';
         };
         dsh-build-spine-generate-samples-test = mkShell {
-          name = "spine-<<spine_version>> 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 = [
@@ -232,7 +225,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;};
       });
   };
 }