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: c2af5149c80a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 873465eede73
Choose a head ref
  • 6 commits
  • 1 file changed
  • 4 contributors

Commits on Jul 3, 2018

  1. Add pkgs.haskell.lib.readDirectory utility

    This adds a `readDirectory` utility that can be used to "slurp" a directory
    full of `cabal2nix`-generated files and transform them into a Haskell package
    override set.  The main use of this is so that users don't have to write:
    
    ```
    { overrides = self: super: {
        foo = self.callPackage ./path/to/foo.nix { };
    
        bar = self.callPackage ./path/to/bar.nix { };
    
        ...
      };
    }
    ```
    
    Instead, they can write:
    
    ```
    { overrides = pkgs.haskell.lib.readDirectory ./path/to;
    }
    ```
    
    This is a an alternative to `packageSourceOverrides` which primarily addresses
    the following use cases:
    
    * The desired package is not yet available in `all-cabal-hashes` (perhaps the
      user is pinned to an older revision of `nixpkgs`)
    * The default `cabal2nix` invocation used by `packageSourceOverrides`
      does not use the desired `cabal2nix` flags
    * The user wants to avoid the use of import-from-derivation
    Gabriel Gonzalez committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    e57fd11 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2018

  1. Change readDirectory to accept an attribute set

    ... as suggested by @roberth
    Gabriel Gonzalez committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    8dae831 View commit details
    Browse the repository at this point in the history
  2. Rename readDirectory to packagesFromDirectory

    ... as suggested by @roberth
    Gabriella439 committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    2c55c15 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. pkgs.haskell.lib.packagesFromDirectory: forward compatibility

    Add `...` for less painful downgrades in the future
    roberth committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    637fcd4 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2018

  1. Fix type signature

    Gabriella439 committed Jul 7, 2018
    Configuration menu
    Copy the full SHA
    05ca671 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

  1. Merge pull request #42923 from Gabriel439/gabriel/readDirectory

    Add `pkgs.haskell.lib.packagesFromDirectory` utility
    roberth committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    873465e View commit details
    Browse the repository at this point in the history