From 85d99f1f53c9ef6eac13daceb91afd324f7f44fe Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack.kelly@bellroy.com>
Date: Fri, 5 Jul 2024 14:54:42 +1000
Subject: [PATCH] Use simplified bellroy-nix-foss flake

---
 flake.nix                    | 19 ++++++++-----------
 servant-activeresource.cabal | 20 +++++++++++++-------
 servant-activeresource.nix   | 19 -------------------
 3 files changed, 21 insertions(+), 37 deletions(-)
 delete mode 100644 servant-activeresource.nix

diff --git a/flake.nix b/flake.nix
index d05f5cf..e45d2db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,17 +5,14 @@
 
   outputs = inputs:
     inputs.bellroy-nix-foss.lib.haskellProject {
-      cabalPackages = [
-        {
-          name = "servant-activeresource";
-          path = ./servant-activeresource.nix;
-        }
+      supportedCompilers = [
+        "ghc810"
+        "ghc90"
+        "ghc92"
+        "ghc94"
+        "ghc96"
+        "ghc98"
       ];
-      supportedCompilers = [ "ghc810" "ghc90" "ghc92" "ghc94" "ghc96" ];
-      defaultCompiler = "ghc92";
-      haskellPackagesOverride = { haskellLib, prev, ... }: {
-        servant = haskellLib.doJailbreak prev.servant;
-        servant-server = haskellLib.doJailbreak prev.servant-server;
-      };
+      defaultCompiler = "ghc96";
     };
 }
diff --git a/servant-activeresource.cabal b/servant-activeresource.cabal
index 456c446..d49796c 100644
--- a/servant-activeresource.cabal
+++ b/servant-activeresource.cabal
@@ -23,7 +23,17 @@ extra-doc-files:
   CHANGELOG.md
   README.md
 
-tested-with:     GHC ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.5 || ==9.6.2
+tested-with:
+  GHC ==8.10.7
+   || ==9.0.2
+   || ==9.2.4
+   || ==9.4.5
+   || ==9.6.4
+   || ==9.8.2
+
+source-repository head
+  type:     git
+  location: https://github.com/bellroy/servant-activeresource.git
 
 common opts
   default-language: Haskell2010
@@ -37,12 +47,12 @@ common opts
 common deps
   build-depends:
     , aeson             ^>=2.1.1.0 || ^>=2.2
-    , base              >=4.14     && <4.19
+    , base              >=4.14     && <4.20
     , bytestring        >=0.10.12  && <0.13
     , containers        ^>=0.6     || ^>=0.7
     , servant           >=0.19     && <0.21
     , servant-server    >=0.19     && <0.21
-    , template-haskell  >=2.16     && <2.21
+    , template-haskell  >=2.16     && <2.22
     , text              ^>=1.2     || >=2.0  && <=2.2
 
 library
@@ -56,7 +66,3 @@ test-suite spec
   hs-source-dirs: th-test
   main-is:        Main.hs
   build-depends:  servant-activeresource
-
-source-repository head
-  type:     git
-  location: https://github.com/bellroy/servant-activeresource.git
diff --git a/servant-activeresource.nix b/servant-activeresource.nix
deleted file mode 100644
index 3720b63..0000000
--- a/servant-activeresource.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, containers, lib, servant
-, servant-server, template-haskell, text
-}:
-mkDerivation {
-  pname = "servant-activeresource";
-  version = "0.1.0.0";
-  src = ./.;
-  libraryHaskellDepends = [
-    aeson base bytestring containers servant servant-server
-    template-haskell text
-  ];
-  testHaskellDepends = [
-    aeson base bytestring containers servant servant-server
-    template-haskell text
-  ];
-  homepage = "https://github.com/bellroy/servant-activeresource";
-  description = "Servant endpoints compatible with Rails's ActiveResources";
-  license = lib.licenses.bsd3;
-}