nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-30 09:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #229832 from shlok/streamly-archive-unbreak-improvement

Browse Source 
haskellPackages.streamly-archive: improve unbreak
This commit is contained in:
Dennis Gosnell 2023-05-08 07:39:40 +09:00 committed by GitHub
commit 7b401e3584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -412,6 +412,14 @@ self: super: {
# 2022-02-14: Strict upper bound: https://github.com/psibi/streamly-bytestring/issues/30
streamly-bytestring = dontCheck (doJailbreak super.streamly-bytestring);
# The package requires streamly == 0.9.*.
# (We can remove this once the assert starts failing.)
streamly-archive = super.streamly-archive.override {
streamly =
assert (builtins.compareVersions pkgs.haskellPackages.streamly.version "0.9.0" < 0);
pkgs.haskellPackages.streamly_0_9_0;
};
# The package requires streamly == 0.9.*.
# (We can remove this once the assert starts failing.)
streamly-lmdb = super.streamly-lmdb.override {

12
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -903,16 +903,8 @@ self: super: builtins.intersectAttrs super {
})
(self.generateOptparseApplicativeCompletions [ "pnbackup" ] super.pinboard-notes-backup);
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;
};
# Pass the correct libarchive into the package.
streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; };
# Pass the correct lmdb into the package.
streamly-lmdb = super.streamly-lmdb.override { lmdb = pkgs.lmdb; };