From 46758c7cd833514edfda9727c3b06e8a4f7dd220 Mon Sep 17 00:00:00 2001
From: Peter Becich <peterbecich@gmail.com>
Date: Sat, 23 Mar 2024 19:26:28 -0700
Subject: [PATCH] revert Flake update to f672a3d

---
 flake.lock | 12 ++++++------
 flake.nix  | 25 +++++--------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 87a6f490..6075d613 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
     },
     "haskell-flake": {
       "locked": {
-        "lastModified": 1711149116,
-        "narHash": "sha256-tccTtjRvxrhSJkCnmNwaPrq0DDM3UsM0uiDyW4uJXXc=",
+        "lastModified": 1709467224,
+        "narHash": "sha256-xnPTkLMqq78BiTqt6WXj2TXLupclJi+NEH84HDbQSPc=",
         "owner": "srid",
         "repo": "haskell-flake",
-        "rev": "6ae8a85071adfe08d70d9963c526947403c6c070",
+        "rev": "9173cc45aeb72b7e7adfe0e5a53a425fe439e3ca",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711152738,
-        "narHash": "sha256-Rku86xQ+1mttl4taD1Ywmt5CST5ZzTDNqd30TmgyHuU=",
+        "lastModified": 1709856773,
+        "narHash": "sha256-QJ3yNJLhfDZbln1HEhIGXmPlwqCk22MbyicFNfSVs3A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "39632d3d4c3bd91cf869737f54b9d1ff940ace16",
+        "rev": "a32bb438c0219345fc535b4f910da21fa4c4aaa2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3631b7c0..a8b1d18d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,33 +19,18 @@
         # has only one.
         packages.default = config.packages.hackage-server;
         haskellProjects.default = {
-          basePackages = pkgs.haskell.packages.ghc98;
           settings = {
-            # https://github.com/srid/haskell-flake/discussions/196
             hackage-server.check = false;
-            threads.check = false;
-            # hackage-server.cabalFlags.write-ghc-environment-files = true;
-            # hackage-server.cabalFlags.write-ghc-environment = "always";
-            # hackage-server.extraConfigureFlags = [ "--write-ghc-environment=always" ];
-
+            ap-normalize.check = false;
             # https://community.flake.parts/haskell-flake/dependency#nixpkgs
             tar = { super, ... }:
-              { custom = _: super.tar_0_6_2_0; };
-            # tls = { super, ... }:
-            #   { custom = _: super.tls_2_0_1 // { check = false; }; };
-            tls.check = false;
-            tls-session-manager = { super, ... }:
-              { custom = _: super.tls-session-manager_0_0_5; };
-            tasty = { super, ... }:
-              { custom = _: super.tasty_1_5; };
-            logict.jailbreak = true;
-            integer-logarithms.jailbreak = true;
-            time-compat.jailbreak = true;
-            indexed-traversable-instances.jailbreak = true;
+              { custom = _: super.tar_0_6_1_0; };
+            # tasty = { super, ... }:
+            #   { custom = _: super.tasty_1_5; };
           };
           packages = {
             # https://community.flake.parts/haskell-flake/dependency#path
-            tls.source = "2.0.1";
+            tls.source = "1.9.0";
           };
           devShell = {
             tools = hp: {