diff options
| author | maralorn <malte.brandy@maralorn.de> | 2021-05-07 16:40:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 16:40:06 +0200 |
| commit | eac644213ee96077526860f05e23053968291394 (patch) | |
| tree | c2ce715d07e4bf59331ff7d4cbd765df10b9736e | |
| parent | 2a11f1f5cc1c4680b49240203db18ecbb19b9cc5 (diff) | |
| parent | d36f591349bf59ac5a6e60a8c94e500917bf089b (diff) | |
| download | nixpkgs-eac644213ee96077526860f05e23053968291394.tar nixpkgs-eac644213ee96077526860f05e23053968291394.tar.gz nixpkgs-eac644213ee96077526860f05e23053968291394.tar.bz2 nixpkgs-eac644213ee96077526860f05e23053968291394.tar.lz nixpkgs-eac644213ee96077526860f05e23053968291394.tar.xz nixpkgs-eac644213ee96077526860f05e23053968291394.tar.zst nixpkgs-eac644213ee96077526860f05e23053968291394.zip | |
Merge pull request #122023 from shlok/streamly-archive
haskellPackages.streamly-archive: unbreak
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9c345f6dabc..9a94c99125b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -10656,7 +10656,6 @@ broken-packages: - streaming-sort - streaming-utils - streaming-with - - streamly-archive - streamly-fsnotify - streamly-lmdb - streamproc diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f01758f8f74..6f38c89088c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -864,4 +864,7 @@ self: super: builtins.intersectAttrs super { cpuid = overrideCabal super.cpuid { platforms = pkgs.lib.platforms.x86; }; + + # Pass the correct libarchive into the package. + streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; }; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d375f7b3eb8..bdee77f676a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -250826,8 +250826,6 @@ self: { testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {archive = null;}; "streamly-binary" = callPackage |