From f11c25efa02f39bbc1b3747a828caeeb167f7360 Mon Sep 17 00:00:00 2001
From: Shlok Datye <shlok@quant.is>
Date: Tue, 2 May 2023 20:52:06 +0200
Subject: [PATCH] haskellPackages.streamly-archive: unbreak

---
 .../configuration-hackage2nix/broken.yaml            |  1 -
 .../haskell-modules/configuration-nix.nix            | 12 ++++++++++--
 .../development/haskell-modules/hackage-packages.nix |  2 --
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index b6cce1ca3586..f57f085e9a61 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -5106,7 +5106,6 @@ broken-packages:
   - streaming-png
   - streaming-postgresql-simple
   - streaming-sort
-  - streamly-archive
   - streamly-binary
   - streamly-cassava
   - streamly-examples
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a001be5035d2..5330433cf199 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -903,8 +903,16 @@ self: super: builtins.intersectAttrs super {
     })
     (self.generateOptparseApplicativeCompletions [ "pnbackup" ] super.pinboard-notes-backup);
 
-  # Pass the correct libarchive into the package.
-  streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; };
+  streamly-archive = super.streamly-archive.override {
+    # The package requires streamly == 0.9.*.
+    # (We can remove this once the assert starts failing.)
+    streamly =
+      assert (builtins.compareVersions pkgs.haskellPackages.streamly.version "0.9.0" < 0);
+        pkgs.haskellPackages.streamly_0_9_0;
+
+    # Pass the correct libarchive into the package.
+    archive = pkgs.libarchive;
+  };
 
   hlint = overrideCabal (drv: {
     postInstall = ''
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c2cca47b9ccf..3fe2984fab1d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -278564,9 +278564,7 @@ self: {
        testSystemDepends = [ archive ];
        description = "Stream data from archives using the streamly library";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = [ lib.maintainers.shlok ];
-       broken = true;
      }) {archive = null;};
 
   "streamly-binary" = callPackage