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: f156d9a01e9f
Choose a base ref
...
head repository: NixOS/cabal2nix
compare: 868cc5ee1978
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 17, 2018

  1. If both package.yaml and cabal exist, prefer package.yaml.

    This is because in a nomal workflow, you would generate the .cabal
    every now and then from the package.yaml file.
    
    If you forget to do this generation and you have an old .cabal file
    in your tree (common because for users of hpack, .cabal files are
    usually in .gitignore), then until now nix would pick up the outdated
    cabal file and you would accidentally be running against outdated cabal
    contents.
    
    So in this commit we change the logic from
    
      "if *.cabal doens't exist, check if package.yaml exist, if so use hpack"
    
    to
    
      "if package.ymal exists, use hpack, otherwise use *.cabal"
    nh2 committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    5721bed View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. Merge pull request #360 from nh2/hpack-ignore-existing-cabal-files

    If both package.yaml and cabal exist, prefer package.yaml.
    peti committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    868cc5e View commit details
    Browse the repository at this point in the history