From f6a48e7b02d78a44a453b6bdc895e522f09f4342 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Mon, 13 Feb 2023 13:23:27 +0100
Subject: [PATCH] Remove overrides

---
 flake.lock                | 6 +++---
 packages/flake-module.nix | 9 ++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9f28927c..45faa17a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -279,11 +279,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1676110339,
-        "narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=",
+        "lastModified": 1676202775,
+        "narHash": "sha256-gV/RnfVZkGLHn+5rmX2GSh5aquVHpWOJw1cnpEV03tQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8",
+        "rev": "d917136f550a8c36efb1724390c7245105f79023",
         "type": "github"
       },
       "original": {
diff --git a/packages/flake-module.nix b/packages/flake-module.nix
index baff5cb6..85e441ba 100644
--- a/packages/flake-module.nix
+++ b/packages/flake-module.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   pkgs = inputs.nixos-unstable.legacyPackages.x86_64-linux;
-  inherit (pkgs.haskell.lib.compose) unmarkBroken doJailbreak dontCheck appendPatch;
+  inherit (pkgs.haskell.lib.compose) appendPatch;
   includePatterns = [
     ".hs"
     ".cabal"
@@ -25,11 +25,7 @@
   haskellPackagesOverlay = final: prev:
     lib.mapAttrs (_: package: package final) myHaskellPackages
     // {
-      # For kassandra
-      clay = unmarkBroken (doJailbreak prev.clay);
-      streamly-bytestring =
-        unmarkBroken (dontCheck prev.streamly-bytestring);
-      # For nixpkgs-bot
+      # For nixpkgs-bot, this patch is already merged upstream and can be removed on the next release
       matrix-client =
         appendPatch (pkgs.fetchpatch {
           url = "https://github.com/softwarefactory-project/matrix-client-haskell/commit/97cb1918fcdf9b0249c6c8e70c7bfc664d718022.patch";
@@ -37,7 +33,6 @@
           relative = "matrix-client";
         })
         prev.matrix-client;
-      aeson-schemas = unmarkBroken (dontCheck prev.aeson-schemas);
     };
   selectHaskellPackages = attrs: lib.mapAttrs (name: _: attrs.${name}) myHaskellPackages;
   myHaskellPackages = {