From 25703fed9793cf0c237aafb4485b53f108698625 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Wed, 25 Nov 2020 12:50:12 +0100
Subject: [PATCH 1/2] Update niv pins for graphql-engine 1.3.3

---
 nix/sources.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index ea1c932c..bd853c79 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -13,16 +13,16 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "graphql-engine": {
-        "branch": "master",
+        "branch": "refs/tags/v1.3.3",
         "builtin": false,
         "description": "Blazing fast, instant realtime GraphQL APIs on Postgres with fine grained access control, also trigger webhooks on database events.",
         "homepage": "https://hasura.io",
         "owner": "hasura",
         "repo": "graphql-engine",
-        "rev": "de7e6d1f8472956aca2c2c0e3f6e8e6f7091c80a",
-        "sha256": "1jipygc6bp15cq4wr3yngs7knpak24w0z518fkzfzahxmd910kjh",
+        "rev": "8c9ffbeb6d60226970f69b6ef5b08d9551d944e2",
+        "sha256": "1kc0dfxww05dzj61xn0qfq977xkwlzdv51knxf22ciw9xg58c000",
         "type": "tarball",
-        "url": "https://github.com/hasura/graphql-engine/archive/de7e6d1f8472956aca2c2c0e3f6e8e6f7091c80a.tar.gz",
+        "url": "https://github.com/hasura/graphql-engine/archive/8c9ffbeb6d60226970f69b6ef5b08d9551d944e2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "graphql-parser-hs": {
@@ -69,10 +69,10 @@
         "homepage": null,
         "owner": "hasura",
         "repo": "pg-client-hs",
-        "rev": "5b112acaaae15664e2bc0817b1a17f44f04df69b",
-        "sha256": "1zn1qcx3c6sjr4fmbc165irzfxhcyyc8c1b11nsilgpwwl7brcsg",
+        "rev": "77e9ddaef5c2b6aae829d66295644beebfb55ff1",
+        "sha256": "17igykbig8yhf35sv5a3j9z2avsinf38c5nj0h2r0kvklnazm696",
         "type": "tarball",
-        "url": "https://github.com/hasura/pg-client-hs/archive/5b112acaaae15664e2bc0817b1a17f44f04df69b.tar.gz",
+        "url": "https://github.com/hasura/pg-client-hs/archive/77e9ddaef5c2b6aae829d66295644beebfb55ff1.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

From 8a8cc9b39464d12d44ed69c247be17cdc5718ccc Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Wed, 25 Nov 2020 15:04:46 +0100
Subject: [PATCH 2/2] Fix install of cli-ext to not be overriden by metadata
 apply

---
 nix/nixos/cardano-graphql-service.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nix/nixos/cardano-graphql-service.nix b/nix/nixos/cardano-graphql-service.nix
index 2f89ef59..263050d5 100644
--- a/nix/nixos/cardano-graphql-service.nix
+++ b/nix/nixos/cardano-graphql-service.nix
@@ -118,9 +118,8 @@ in {
     installHasuraCLI = ''
       # always start with no plugins so future upgrades will work
       rm -rf ~/.hasura/plugins
-      # TODO: identify how to get what's needed without the install of the broken plugin
-      hasura plugin install cli-ext
-      cp ${hasura-cli-ext}/bin/cli-ext-hasura-linux ~/.hasura/plugins/bin/hasura-cli_ext
+      mkdir -p ~/.hasura/plugins/store/cli-ext/v${hasura-cli-ext.version}
+      ln -s ${hasura-cli-ext}/bin/cli-ext-hasura-linux ~/.hasura/plugins/store/cli-ext/v${hasura-cli-ext.version}/cli-ext-hasura-linux
     '';
   in lib.mkIf cfg.enable {
     systemd.services.cardano-graphql = {