colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #296925 from mpscholten/fix-double-conversion

Browse Source 
haskellPackages.double-conversion: fix broken patch
This commit is contained in:
maralorn 2024-03-18 22:44:04 +01:00 committed by GitHub
commit d09feae3fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,21 +160,6 @@ self: super: {
# 2023-06-28: Test error: https://hydra.nixos.org/build/225565149
orbits = dontCheck super.orbits;
# Fixes the build if Cabal >= 3.10.2 is used for Setup.hs, as it got stricter
# about c- vs. cxx-sources: https://github.com/haskell/double-conversion/issues/43
double-conversion = overrideCabal (drv: {
patches = drv.patches or [ ] ++ [
(pkgs.fetchpatch {
name = "double-conversion-c-to-cxx-sources.patch";
url = "https://github.com/haskell/double-conversion/pull/44/commits/d480fb057c5387251b8cfdeb3666b24087811219.patch";
sha256 = "0jw2i2cybmv190bhab0afhz2v3zva2chazhmngh884fsq2p3j1cv";
})
];
prePatch = drv.prePatch or "" + ''
${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
'';
}) super.double-conversion;
# Too strict bounds on hspec < 2.11
http-api-data = doJailbreak super.http-api-data;
tasty-discover = doJailbreak super.tasty-discover;