flake.nix, removed flake-utils, + touchHEADmain

3 files changed, 41 insertions, 143 deletions

diff --git a/flake.lock b/flake.lock
index d628f82..331cb38 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,87 +1,12 @@
 {
   "nodes": {
-    "d-overlay": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733184371,
-        "narHash": "sha256-K9MQf+ZD6OntayLaJcniYvOiiBxOl7hBrbltjSMmPP4=",
-        "ref": "refs/heads/main",
-        "rev": "115001db9ca4382c4ddfea3a636bde30abe5c459",
-        "revCount": 11,
-        "type": "git",
-        "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
-      },
-      "original": {
-        "type": "git",
-        "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733064805,
-        "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=",
+        "lastModified": 1733656523,
+        "narHash": "sha256-w0FXPfpGhOihoJDiwMsyN1EzpsXi2F8VQ+NVZQSMtys=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "31d66ae40417bb13765b0ad75dd200400e98de84",
+        "rev": "93dc9803a1ee435e590b02cde9589038d5cc3a4e",
         "type": "github"
       },
       "original": {
@@ -93,76 +18,49 @@
     },
     "root": {
       "inputs": {
-        "d-overlay": "d-overlay",
-        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs",
+        "sisudoc-d-overlay": "sisudoc-d-overlay",
         "spine": "spine"
       }
     },
-    "spine": {
+    "sisudoc-d-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1733185130,
-        "narHash": "sha256-ybEmskOn1M5i2v667Vil1bKarcgADrYzqKS5aeF9/Z8=",
+        "lastModified": 1733786416,
+        "narHash": "sha256-Ejxfj7zFVxi2z5Es+7BTM1cDNwiOeM1dZir7gh/wOxM=",
         "ref": "refs/heads/main",
-        "rev": "01b97ab40ec20a0ad73d2271b1397122e7b1bed5",
-        "revCount": 658,
+        "rev": "995c0384108997e599534c1e3373cf8619bd7ce1",
+        "revCount": 15,
         "type": "git",
-        "url": "git://git.sisudoc.org/software/sisudoc-spine"
+        "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
       },
       "original": {
         "type": "git",
-        "url": "git://git.sisudoc.org/software/sisudoc-spine"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
+        "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
+    "spine": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
+        "lastModified": 1733786820,
+        "narHash": "sha256-AmjtVGWQbLvQH6kIHgdUSv9SZQ0AOxpLM5PP2KQ0zHo=",
+        "ref": "refs/heads/main",
+        "rev": "843a265999df3422e2a9098d61da4401ad04cb6c",
+        "revCount": 662,
+        "type": "git",
+        "url": "git://git.sisudoc.org/software/sisudoc-spine"
       },
       "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
+        "type": "git",
+        "url": "git://git.sisudoc.org/software/sisudoc-spine"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index c082faf..75e3492 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,13 +1,13 @@
 {
   description = "spine (sisu like parser & document generator) made available to process markup samples";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  #inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.spine = {
     url = "git://git.sisudoc.org/software/sisudoc-spine";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
   };
-  inputs.d-overlay = {
+  inputs.sisudoc-d-overlay = {
     url = "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
@@ -15,9 +15,9 @@
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
+    #flake-utils,
     spine,
-    d-overlay,
+    sisudoc-d-overlay,
     ...
   }@inputs: let
     version = "0.17.0";
@@ -66,10 +66,10 @@
           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 = 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-epub = mkShell {
           name = "spine dev shell for epub output";
           inherit shell;
diff --git a/org/config_nix.org b/org/config_nix.org
index 0d9a4f4..68f9b5c 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -26,13 +26,13 @@
 {
   description = "spine (sisu like parser & document generator) made available to process markup samples";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  #inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.spine = {
     url = "<<sisudoc_spine_nix_src>>";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
   };
-  inputs.d-overlay = {
+  inputs.sisudoc-d-overlay = {
     url = "<<sisudoc_dlang_nix_overlay_src>>";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
@@ -40,9 +40,9 @@
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
+    #flake-utils,
     spine,
-    d-overlay,
+    sisudoc-d-overlay,
     ...
   }@inputs: let
     version = "<<spine_version>>";
@@ -91,10 +91,10 @@
           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 = 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-epub = mkShell {
           name = "spine dev shell for epub output";
           inherit shell;