diff options
| author | Shea Levy <shea@shealevy.com> | 2017-03-01 11:11:50 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-03-01 11:11:50 -0500 |
| commit | dbd7a73d0bbffe8ae2667e2184ec2e938dcd1cc9 (patch) | |
| tree | 0e9b396866fe9b140bb73bce7f03a692f9577d74 /pkgs/development | |
| parent | a27bc8b3174fa1847b5ca9f85d921c3e472cbeb1 (diff) | |
| parent | a3e432129762354c50f927eebe30d885c73ded8c (diff) | |
| download | nixlib-dbd7a73d0bbffe8ae2667e2184ec2e938dcd1cc9.tar nixlib-dbd7a73d0bbffe8ae2667e2184ec2e938dcd1cc9.tar.gz nixlib-dbd7a73d0bbffe8ae2667e2184ec2e938dcd1cc9.tar.bz2 nixlib-dbd7a73d0bbffe8ae2667e2184ec2e938dcd1cc9.tar.lz nixlib-dbd7a73d0bbffe8ae2667e2184ec2e938dcd1cc9.tar.xz nixlib-dbd7a73d0bbffe8ae2667e2184ec2e938dcd1cc9.tar.zst nixlib-dbd7a73d0bbffe8ae2667e2184ec2e938dcd1cc9.zip | |
Merge branch 'master' of github.com:NixOS/nixpkgs
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3ab5fcc015e1..30be830f6b95 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -874,4 +874,10 @@ self: super: { # fixed in unreleased (2017-03-01) https://github.com/ekmett/machines/commit/5463cf5a69194faaec2345dff36469b4b7a8aef0 machines = doJailbreak super.machines; + + # fixed in unreleased (2017-03-01) https://github.com/choener/OrderedBits/commit/7b9c6c6c61d9acd0be8b38939915d287df3c53ab + OrderedBits = doJailbreak super.OrderedBits; + + # https://github.com/haskell-distributed/rank1dynamic/issues/17 + rank1dynamic = doJailbreak super.rank1dynamic; } |