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: 5f2f9447d74e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 80913c710b70
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 14, 2019

  1. arion-compose: Enable without tests 

    This adds me as a maintainer of arion-compose, which provides the
executable for the arion package (#71092).

Note that it has a different name because it was already taken on
Hackage before arion switched to Haskell.
    @roberth
    roberth committed Oct 14, 2019
    Copy the full SHA
    b9ccd71 View commit details

  2. Merge pull request #71133 from roberth/haskellPackages-enable-arion-c… 

    …ompose

arion-compose: Enable without tests
    @peti
    peti authored Oct 14, 2019
    Copy the full SHA
    80913c7 View commit details
Showing with 7 additions and 1 deletion.
  1. +5 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +2 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
5 changes: 5 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,11 @@ with haskellLib;

self: super: {

# Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs
# itself. For instance, pkgs.path has dirty sources and puts a huge .git in the
# store. Testing is done upstream.
arion-compose = dontCheck super.arion-compose;

# This used to be a core package provided by GHC, but then the compiler
# dropped it. We define the name here to make sure that old packages which
# depend on this library still evaluate (even though they won't compile
3 changes: 2 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -2584,6 +2584,8 @@ package-maintainers:
- shakespeare
abbradar:
- Agda
roberth:
- arion-compose

unsupported-platforms:
alsa-mixer: [ x86_64-darwin ]
@@ -2972,7 +2974,6 @@ broken-packages:
- arguedit
- ariadne
- arion
- arion-compose
- arith-encode
- armada
- armor