diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-28 00:12:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 00:12:51 +0000 |
| commit | 6ff45cf4434564fd562ffd30a91596ea66066b72 (patch) | |
| tree | 351f1a908eee0c47dd179bae55f35fe777211be3 /pkgs/development/haskell-modules | |
| parent | 06c7ab84445d3ef9ed127c0480e129d29542de79 (diff) | |
| parent | c76b72caa421e31d998e4a05387ebd3b40454327 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
4 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 2dbfac30da5a..e306884cf4fd 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -123,6 +123,14 @@ self: super: ({ __darwinAllowLocalNetworking = true; }); + hidapi = + addExtraLibraries [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.CoreFoundation + ] + (super.hidapi.override { systemd = null; }); + hmatrix = addBuildDepend darwin.apple_sdk.frameworks.Accelerate super.hmatrix; blas-hs = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index eb323003ef34..f824cfbf22a8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -640,7 +640,6 @@ unsupported-platforms: haskell-snake: [ platforms.darwin ] hcwiid: [ platforms.darwin ] HDRUtils: [ platforms.darwin ] - hidapi: [ platforms.darwin ] hinotify-bytestring: [ platforms.darwin ] honk: [ platforms.darwin ] HSoM: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9be592b6efb9..3f7672fb8e18 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -625,8 +625,6 @@ self: super: builtins.intersectAttrs super { # https://github.com/haskell-fswatch/hfsnotify/issues/62 fsnotify = dontCheck super.fsnotify; - hidapi = addExtraLibrary pkgs.udev super.hidapi; - hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; discount = super.discount.override { markdown = pkgs.discount; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 11388de30917..5da024f5c9c7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -146274,7 +146274,6 @@ self: { librarySystemDepends = [ systemd ]; description = "Haskell bindings to HIDAPI"; license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) systemd;}; "hidden-char" = callPackage |