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/cabal2nix
base: 0e482ab4fda7
Choose a base ref
...
head repository: NixOS/cabal2nix
compare: 347581f88ebc
Choose a head ref
  • 3 commits
  • 7 files changed
  • 1 contributor

Commits on Jul 23, 2018

  1. Fail with an error if the set does not contain the binding we're tryi…

    …ng to replace.
    
    The 'replace' function is used to fix bindings in 'Derivation' that the
    'resolveInNixpkgs' lookup failed to figure out. Now, one problem we encountered
    is that the (bogus) binding we assumed to be there actually doesn't exist any
    more because Nixpkgs has changed, and in such a case 'replace' silently did
    nothing, resulting in a potentially broken build.
    
    Instead, we interpret "replace old new bs" to imply that "old `elem` bs" is
    true and fail if it's not to indicate that the post-process code must be
    adapted to the new situation.
    peti committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    0e1f29c View commit details
    Browse the repository at this point in the history
  2. Fix broken Nixpkgs resolver in cabal2nix.

    Our Nixpkgs name resolver must return the top-level name 'foo' as 'pkgs.foo'
    because that is the path system packages have from the PoV of Haskell packages.
    We always did that in hackage2nix, but both cabal2nix and the regression tests
    were broken in that regard.
    
    Fixes #364.
    peti committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    8278602 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    347581f View commit details
    Browse the repository at this point in the history