Merge pull request #229443 from shlok/haskell-updates

haskellPackages.streamly-archive: unbreak

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

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 = ''

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