lol

Merge pull request #312541 from alexfmpe/reflex-dom

haskellPackages.reflex-dom: platform fixes

authored by

Naïm Favier and committed by
GitHub
b21e7b31 154bc6bf

+10 -4
+6
pkgs/development/haskell-modules/configuration-common.nix
··· 3098 3098 tasty-quickcheck = super.tasty-quickcheck_0_10_3; 3099 3099 }); 3100 3100 3101 + # Fixes build on some platforms: https://github.com/obsidiansystems/commutative-semigroups/pull/18 3102 + commutative-semigroups = appendPatch (fetchpatch { 3103 + url = "https://github.com/obsidiansystems/commutative-semigroups/commit/e031495dd24ae73ffb808eca34e993f5df8e8d76.patch"; 3104 + hash = "sha256-d7AwvGGUJlh/sOXaAbfQLCay6+JyNInb73TTGKkBDz8="; 3105 + }) super.commutative-semigroups; 3106 + 3101 3107 # Too strict bounds on text. Can be removed after https://github.com/alx741/currencies/pull/3 is merged 3102 3108 currencies = doJailbreak super.currencies; 3103 3109
+4 -2
pkgs/development/haskell-modules/configuration-darwin.nix
··· 317 317 # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 318 318 zip = dontCheck super.zip; 319 319 320 - # cabal lib set as unbuildable in linux so callCabal2nix generates a dummy derivation 321 320 jsaddle-wkwebview = overrideCabal (drv: { 322 321 libraryFrameworkDepends = with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ Cocoa WebKit ]; 323 - libraryHaskellDepends = with self; [ aeson data-default jsaddle ]; 322 + libraryHaskellDepends = with self; [ aeson data-default jsaddle ]; # cabal2nix doesn't add darwin-only deps 324 323 }) super.jsaddle-wkwebview; 324 + reflex-dom = overrideCabal (drv: { 325 + libraryHaskellDepends = with self; [ base bytestring jsaddle-wkwebview reflex reflex-dom-core text ]; # cabal2nix doesn't add darwin-only deps 326 + }) super.reflex-dom; 325 327 326 328 } // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin 327 329
-1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
··· 669 669 Raincat: [ platforms.darwin ] 670 670 reactive-balsa: [ platforms.darwin ] # depends on alsa-core 671 671 reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ] 672 - reflex-dom: [ platforms.darwin ] 673 672 reflex-localize-dom: [ platforms.darwin, aarch64-linux ] 674 673 rsi-break: [ platforms.darwin ] # depends on monomer 675 674 rtlsdr: [ platforms.darwin ]
-1
pkgs/development/haskell-modules/hackage-packages.nix
··· 255323 255323 ]; 255324 255324 description = "Functional Reactive Web Apps with Reflex"; 255325 255325 license = lib.licenses.bsd3; 255326 - badPlatforms = lib.platforms.darwin; 255327 255326 maintainers = [ lib.maintainers.maralorn ]; 255328 255327 }) {}; 255329 255328