From de3d6b7e444feca2891ba7cbd1f1b54b8e3e2725 Mon Sep 17 00:00:00 2001
From: Aleksandr Penskoi <aleksandr@mlabs.city>
Date: Tue, 21 Jun 2022 18:19:16 +0300
Subject: [PATCH 1/4] Add base image for nft-market-place (fix ssl problem)

---
 arion-compose.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arion-compose.nix b/arion-compose.nix
index cd734ef..6bc1f92 100644
--- a/arion-compose.nix
+++ b/arion-compose.nix
@@ -115,6 +115,7 @@ in {
         [ "${toString ./.}/data/postgres-data:/var/lib/postgresql/data" ];
     };
     nft-marketplace-server.service = {
+      image = "alpine";
       command = [
         "${nft-marketplace-server}/bin/nft-marketplace-server"
         "--db-connection"

From 1b305e1e329c0f3167e4f4d7d93a53a375d067ca Mon Sep 17 00:00:00 2001
From: Calum Sieppert <sieppertcalum@gmail.com>
Date: Sat, 23 Jul 2022 12:48:39 -0600
Subject: [PATCH 2/4] Update arion-compose.nix for new server version

---
 arion-compose.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arion-compose.nix b/arion-compose.nix
index 6bc1f92..bccd404 100644
--- a/arion-compose.nix
+++ b/arion-compose.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let
   nft-marketplace-server =
-    (pkgs.callPackage (import nft-marketplace-server/release.nix)
+    (pkgs.callPackage (import nft-marketplace-server/default.nix)
       { }).nft-marketplace-server;
   ogmios-datum-cache = (import ogmios-datum-cache/default.nix).packages.x86_64-linux.ogmios-datum-cache;
   cardano-transaction-lib-server = (import

From e1ec944091cdb5382db07063e8217fcc6de5a463 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Sat, 23 Jul 2022 13:11:04 -0600
Subject: [PATCH 3/4] Fix `nft-marketplace-server` setup

---
 arion-compose.nix      | 2 +-
 nft-marketplace-server | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arion-compose.nix b/arion-compose.nix
index bccd404..3b01a0a 100644
--- a/arion-compose.nix
+++ b/arion-compose.nix
@@ -2,7 +2,7 @@
 let
   nft-marketplace-server =
     (pkgs.callPackage (import nft-marketplace-server/default.nix)
-      { }).nft-marketplace-server;
+      { }).packages.x86_64-linux.nft-marketplace-server;
   ogmios-datum-cache = (import ogmios-datum-cache/default.nix).packages.x86_64-linux.ogmios-datum-cache;
   cardano-transaction-lib-server = (import
     cardano-transaction-lib/default.nix).packages.x86_64-linux."cardano-browser-tx-server:exe:cardano-browser-tx-server";
diff --git a/nft-marketplace-server b/nft-marketplace-server
index 543a70d..7169b63 160000
--- a/nft-marketplace-server
+++ b/nft-marketplace-server
@@ -1 +1 @@
-Subproject commit 543a70d0f86c5877a21ce12b0a13cb9f274b6a3a
+Subproject commit 7169b63c80982b1730fef8a8b82b2108772fa3fa

From 16e90e3768f106b0f28c1e5fef3a055d73e1e30c Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Mon, 25 Jul 2022 14:11:25 -0600
Subject: [PATCH 4/4] Fix but this time for real

---
 arion-compose.nix |  7 +++----
 flake.lock        | 12 ++++++------
 flake.nix         |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/arion-compose.nix b/arion-compose.nix
index 3b01a0a..b0fe036 100644
--- a/arion-compose.nix
+++ b/arion-compose.nix
@@ -1,9 +1,8 @@
 { pkgs, ... }:
 let
-  nft-marketplace-server =
-    (pkgs.callPackage (import nft-marketplace-server/default.nix)
-      { }).packages.x86_64-linux.nft-marketplace-server;
-  ogmios-datum-cache = (import ogmios-datum-cache/default.nix).packages.x86_64-linux.ogmios-datum-cache;
+  nft-marketplace-server = (import nft-marketplace-server/default.nix).packages.x86_64-linux."nft-marketplace-server:exe:nft-marketplace-server";
+  ogmios-datum-cache = (import ogmios-datum-cache/default.nix).packages.x86_64-linux."ogmios-datum-cache";
+
   cardano-transaction-lib-server = (import
     cardano-transaction-lib/default.nix).packages.x86_64-linux."cardano-browser-tx-server:exe:cardano-browser-tx-server";
 in {
diff --git a/flake.lock b/flake.lock
index 244c30c..b4acea4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,17 +69,17 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1651091005,
-        "narHash": "sha256-duSHhhqQjJ9YKBaC0FGpVM2+735cl8v1/6KOXVvOYeY=",
-        "owner": "t4ccer",
+        "lastModified": 1652893939,
+        "narHash": "sha256-hBZHQzkAYImw7Kr4BZmsLJFUeTzU7nR4v7irmRUqyBo=",
+        "owner": "hercules-ci",
         "repo": "arion",
-        "rev": "69b9109dea2b4d48f35c614456463bd0234e2e80",
+        "rev": "bd3e2fe4e372d0b5f965f25f27c5eb7c1a618c4a",
         "type": "github"
       },
       "original": {
-        "owner": "t4ccer",
+        "owner": "hercules-ci",
         "repo": "arion",
-        "rev": "69b9109dea2b4d48f35c614456463bd0234e2e80",
+        "rev": "bd3e2fe4e372d0b5f965f25f27c5eb7c1a618c4a",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index a40369e..638335c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
     flake-utils = { url = "github:numtide/flake-utils"; };
     # https://github.com/hercules-ci/arion/pull/153
     arion = {
-      url = "github:t4ccer/arion/69b9109dea2b4d48f35c614456463bd0234e2e80";
+      url = "github:hercules-ci/arion/bd3e2fe4e372d0b5f965f25f27c5eb7c1a618c4a";
     };
   };
   outputs = { self, nixpkgs, cardano-node, flake-utils, arion }: