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
base: cfe8afebe5c6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f439dcd5c8ea
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 27, 2019

  1. cabal2nix: fix build

    Without this change, the build fails with:
    
    ```
    Warning:
        This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure.
          package hackage-db (hackage-db-2.0.1-AliTRXEJBGFAEMpONOEnbV) requires Cabal-2.4.0.1
          package hpack (hpack-0.32.0-1iJuukTWmC4EGkYhAiFeII) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
          package distribution-nixpkgs (distribution-nixpkgs-1.3.1-82Z2DCdLAUs8Q2gjtlPLz5) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
          package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
          package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
          package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
    ```
    mdorman committed Sep 27, 2019
    Copy the full SHA
    e7eb269 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #69640 from mdorman/cabal2nix-fix

    cabal2nix: fix build
    peti committed Sep 27, 2019
    Copy the full SHA
    f439dcd View commit details
    Browse the repository at this point in the history