Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haskellPackages: unbreak bson and mongoDB #122428

Closed
wants to merge 1 commit into from
Closed

haskellPackages: unbreak bson and mongoDB #122428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1898,4 +1898,19 @@ EOT
})
];

bson = overrideCabal super.bson (drv: {
# We replace 'network' by 'network-bsd' because cabal2nix cannot correctly that pick up.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# We replace 'network' by 'network-bsd' because cabal2nix cannot correctly that pick up.
# We replace 'network' by 'network-bsd' because cabal2nix cannot correctly pick that up.

libraryHaskellDepends = with pkgs.haskellPackages; [
base
binary
bytestring
cryptohash-md5
data-binary-ieee754
mtl
network-bsd # network-bsd AND NOT network
text
time
];
});
Comment on lines +1901 to +1914
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be much simpler and not require us to maintain a list of dependencies

Suggested change
bson = overrideCabal super.bson (drv: {
# We replace 'network' by 'network-bsd' because cabal2nix cannot correctly that pick up.
libraryHaskellDepends = with pkgs.haskellPackages; [
base
binary
bytestring
cryptohash-md5
data-binary-ieee754
mtl
network-bsd # network-bsd AND NOT network
text
time
];
});
bson = appendConfigureFlag (super.bson.override { network = self.network-bsd; }) "-f-_old_network";


} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super