From 45b431ae09df98e046bcc8271aa209bdfc87444d Mon Sep 17 00:00:00 2001
From: David Arnold <david.arnold@iohk.io>
Date: Mon, 15 May 2023 14:32:51 -0500
Subject: [PATCH] feat: bump dmerge - add prepend and fresh array-merge-rhs

---
 flake.lock | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 flake.nix  | 20 +++++++++++-------
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 00a619f9..64d7357a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -64,6 +64,8 @@
     },
     "dmerge": {
       "inputs": {
+        "haumea": "haumea",
+        "namaka": "namaka",
         "nixlib": [
           "nixpkgs"
         ],
@@ -72,16 +74,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1659548052,
-        "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=",
+        "lastModified": 1684178600,
+        "narHash": "sha256-EtSQcCHRQUBBEj4vbYU0vgPUYiKP261ero5k1QfQ3Bc=",
         "owner": "divnix",
-        "repo": "data-merge",
-        "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497",
+        "repo": "dmerge",
+        "rev": "ac9932f26325afac5baa59cf6478432d17762a4e",
         "type": "github"
       },
       "original": {
         "owner": "divnix",
-        "repo": "data-merge",
+        "ref": "0.2.0",
+        "repo": "dmerge",
         "type": "github"
       }
     },
@@ -150,6 +153,27 @@
         "type": "github"
       }
     },
+    "haumea": {
+      "inputs": {
+        "nixpkgs": [
+          "dmerge",
+          "nixlib"
+        ]
+      },
+      "locked": {
+        "lastModified": 1681176209,
+        "narHash": "sha256-bJLDun6esIyWtwRVXcsgzGbh4UKu8wJDrPgykqPyzmg=",
+        "owner": "nix-community",
+        "repo": "haumea",
+        "rev": "b915b66b27da3a595d77b139e945bb0a2fcac926",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "haumea",
+        "type": "github"
+      }
+    },
     "incl": {
       "inputs": {
         "nixlib": [
@@ -193,6 +217,32 @@
         "type": "github"
       }
     },
+    "namaka": {
+      "inputs": {
+        "haumea": [
+          "dmerge",
+          "haumea"
+        ],
+        "nixpkgs": [
+          "dmerge",
+          "nixlib"
+        ]
+      },
+      "locked": {
+        "lastModified": 1683059428,
+        "narHash": "sha256-ZTMqleCWmuNWhZE375gtF1j1JRkaKEUFN1AM43e7h4Y=",
+        "owner": "nix-community",
+        "repo": "namaka",
+        "rev": "2deba2f416454aec770bc1cc7365e39c73e6b1d7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "v0.1.1",
+        "repo": "namaka",
+        "type": "github"
+      }
+    },
     "nixago": {
       "inputs": {
         "flake-utils": [
diff --git a/flake.nix b/flake.nix
index 91ba63ba..a5b017ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,13 +18,19 @@
     paisano-mdbook-preprocessor.inputs.nixpkgs.follows = "nixpkgs";
   };
   inputs.blank.url = "github:divnix/blank";
-  inputs.yants.url = "github:divnix/yants";
-  inputs.yants.inputs.nixpkgs.follows = "nixpkgs";
-  inputs.dmerge.url = "github:divnix/data-merge";
-  inputs.dmerge.inputs.nixlib.follows = "nixpkgs";
-  inputs.dmerge.inputs.yants.follows = "yants";
-  inputs.incl.url = "github:divnix/incl";
-  inputs.incl.inputs.nixlib.follows = "nixpkgs";
+  inputs.yants = {
+    url = "github:divnix/yants";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+  inputs.dmerge = {
+    url = "github:divnix/dmerge/0.2.0";
+    inputs.nixlib.follows = "nixpkgs";
+    inputs.yants.follows = "yants";
+  };
+  inputs.incl = {
+    url = "github:divnix/incl";
+    inputs.nixlib.follows = "nixpkgs";
+  };
   /*
   Auxiliar inputs used in builtin libraries or for the dev environment.
   */