From 1549c89c748f44ab11d82950a3afcb11bcc066b2 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 15 Sep 2022 13:37:21 -0400
Subject: [PATCH 1/3] Update Haskell.nix to a version with nixpkgs 22.05

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

diff --git a/nix/sources.json b/nix/sources.json
index a4fb79f..9952dcc 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "e95a1f0dacbc64603c31d11e36e4ba1af8f0eb43",
-        "sha256": "160cf7ha2c5wkbymy3h4skzw1l3x4i8dhj2arvq3bdz92gg1d6cb",
+        "rev": "4e01f345439c89bc2a5616ceda08a979a01bc15e",
+        "sha256": "02n3ag3zcig60x93hh9v2vnhyw6qmzr9qg8dpnr4ac4ym8cyifc9",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/e95a1f0dacbc64603c31d11e36e4ba1af8f0eb43.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/4e01f345439c89bc2a5616ceda08a979a01bc15e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "libchallenge_bypass_ristretto_ffi": {

From d81bde067c02e26ac681d4a2a3d3664ec7e8d14a Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 15 Sep 2022 13:37:57 -0400
Subject: [PATCH 2/3] Update to Haskell.nix's nixpkgs 22.05

---
 nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/default.nix b/nix/default.nix
index 4f4457d..cafdd6c 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -21,7 +21,7 @@ let
     # haskell.nix provides access to the nixpkgs pins which are used by our CI,
     # hence you will be more likely to get cache hits when using these.
     # But you can also just use your own, e.g. '<nixpkgs>'.
-    haskellNix.sources.nixpkgs-2111
+    haskellNix.sources.nixpkgs-2205
     # These arguments passed to nixpkgs, include some patches and also
     # the haskell.nix functionality itself as an overlay.
     (haskellNix.nixpkgsArgs // { overlays = allOverlays; });

From eb7d592b084eac05f58612b4dbc1f761abd43c0d Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 15 Sep 2022 14:01:07 -0400
Subject: [PATCH 3/3] Update to LTS-18.28

Remove the Stripe "extra-deps" because they're satisfied from the LTS package
set now (I think).
---
 nix/materialized.paymentserver/PaymentServer.nix | 4 +---
 nix/materialized.paymentserver/default.nix       | 5 +----
 stack.yaml                                       | 5 +----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/nix/materialized.paymentserver/PaymentServer.nix b/nix/materialized.paymentserver/PaymentServer.nix
index 842157c..a5702ec 100644
--- a/nix/materialized.paymentserver/PaymentServer.nix
+++ b/nix/materialized.paymentserver/PaymentServer.nix
@@ -142,6 +142,4 @@
           };
         };
       };
-    } // rec {
-    src = (pkgs.lib).mkDefault ./.;
-    }
\ No newline at end of file
+    } // rec { src = (pkgs.lib).mkDefault ./.; }
\ No newline at end of file
diff --git a/nix/materialized.paymentserver/default.nix b/nix/materialized.paymentserver/default.nix
index 0408f47..dcaf7f6 100644
--- a/nix/materialized.paymentserver/default.nix
+++ b/nix/materialized.paymentserver/default.nix
@@ -2,14 +2,11 @@
   extras = hackage:
     {
       packages = {
-        "stripe-core" = (((hackage.stripe-core)."2.5.0").revisions).default;
-        "stripe-haskell" = (((hackage.stripe-haskell)."2.5.0").revisions).default;
-        "stripe-http-client" = (((hackage.stripe-http-client)."2.5.0").revisions).default;
         PaymentServer = ./PaymentServer.nix;
         servant-prometheus = ./.stack-to-nix.cache.0;
         };
       };
-  resolver = "lts-14.2";
+  resolver = "lts-18.28";
   modules = [
     ({ lib, ... }:
       { packages = {}; })
diff --git a/stack.yaml b/stack.yaml
index d3514f5..51e3489 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-14.2
+resolver: lts-18.28
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -38,9 +38,6 @@ packages:
 # using the same syntax as the packages field.
 # (e.g., acme-missiles-0.3)
 extra-deps:
-  - "stripe-core-2.5.0"
-  - "stripe-haskell-2.5.0"
-  - "stripe-http-client-2.5.0"
   - github: "PrivateStorageio/servant-prometheus"
     commit: "b9461cbf689b47506b2eee973136706092b74968"
     # https://input-output-hk.github.io/haskell.nix/tutorials/source-repository-hashes/#stack