Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 311945c16c1c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be8f0063ba43
Choose a head ref
  • 1 commit
  • 2 files changed
  • 2 contributors

Commits on Oct 8, 2019

  1. haskellPackages: fix barbly (#70222) 

    * haskellPackages: fix barbly

Co-Authored-By: Dennis Gosnell <cdep.illabout@gmail.com>
    @luke-clifton @cdepillabout @peti
    2 people authored and peti committed Oct 8, 2019
    Copy the full SHA
    be8f006 View commit details
Showing with 3 additions and 1 deletion.
  1. +2 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +1 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -145,6 +145,8 @@ self: super: {
then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
else super.halive;

barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit;

# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
hakyll = if pkgs.stdenv.isDarwin
then dontCheck (overrideCabal super.hakyll (drv: {
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -2586,6 +2586,7 @@ unsupported-platforms:
alsa-pcm: [ x86_64-darwin ]
alsa-seq: [ x86_64-darwin ]
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ]
barbly: [ i686-linux, x86_64-linux ]
bindings-directfb: [ x86_64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3111,7 +3112,6 @@ broken-packages:
- Bang
- bank-holiday-usa
- banwords
- barbly
- barchart
- barcodes-code128
- barecheck