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

haskellPackages.ghcjs-dom-hello: fix on darwin

Browse Source
This commit is contained in:
Alexandre Esteves 2024-05-31 01:35:17 +01:00 committed by sternenseemann
parent 78e2348b11
commit 9036501ab5
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1560,6 +1560,21 @@ self: super: {
doJailbreak
];
ghcjs-dom-hello = appendPatches [
(fetchpatch {
url = "https://github.com/ghcjs/ghcjs-dom-hello/commit/53991df6a4eba9f1e9633eb22f6a0486a79491c3.patch";
sha256 = "sha256-HQeUgjvzYyY14+CDYiMahAMn7fBcy2d7p8/kqGq+rnI=";
})
(fetchpatch {
url = "https://github.com/ghcjs/ghcjs-dom-hello/commit/d766d937121f7ea5c4c154bd533a1eae47f531c9.patch";
sha256 = "sha256-QTkH+L+JMwGyuoqzHBnrokT7KzpHC4YiAWoeiaFBLUw=";
})
(fetchpatch {
url = "https://github.com/ghcjs/ghcjs-dom-hello/commit/831464d995f4033c9aa84f9ed9fb37a268f34d4e.patch";
sha256 = "sha256-hQMy+78geTuxd3kbdiyYqoAFrauu90HbpPi0EEKjMzM=";
})
] super.ghcjs-dom-hello;
# Needs https://github.com/ghcjs/jsaddle-hello/pull/5 and hackage release
jsaddle-hello = appendPatches [
(fetchpatch {
@ -1576,8 +1591,6 @@ self: super: {
})
] super.jsaddle-hello;
ghcjs-dom-hello = doJailbreak super.ghcjs-dom-hello;
# Too strict upper bounds on text
lsql-csv = doJailbreak super.lsql-csv;

5
pkgs/development/haskell-modules/configuration-darwin.nix
View File

@ -327,6 +327,11 @@ self: super: ({
__darwinAllowLocalNetworking = true;
});
ghcjs-dom-hello = overrideCabal (drv: {
libraryHaskellDepends = with self; [ jsaddle jsaddle-warp ];
executableHaskellDepends = with self; [ ghcjs-dom jsaddle-wkwebview ];
}) super.ghcjs-dom-hello;
jsaddle-hello = overrideCabal (drv: {
libraryHaskellDepends = with self; [ jsaddle lens ];
executableHaskellDepends = with self; [ jsaddle-warp jsaddle-wkwebview ];

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -671,7 +671,6 @@ unsupported-platforms:
freenect: [ platforms.darwin ]
FTGL: [ platforms.darwin ]
fuzzytime: [ platforms.darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
ghcjs-dom-hello: [ platforms.darwin ]
ghc-gc-hook: [ platforms.darwin ] # requires C11 threads which Apple doesn't support
gi-adwaita: [ platforms.darwin ]
gi-dbusmenugtk3: [ platforms.darwin ]

1
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -121415,7 +121415,6 @@ self: {
];
description = "GHCJS DOM Hello World, an example package";
license = lib.licenses.mit;
badPlatforms = lib.platforms.darwin;
maintainers = [ lib.maintainers.alexfmpe ];
}) {};