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: 7bcb58ad712a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7422bb0ceb05
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 19, 2017

  1. haskellPackages.lentil: no longer needs overrides

    @rvl
    rvl committed Feb 19, 2017
    Copy the full SHA
    1078758 View commit details

  2. Merge pull request #22995 from rvl/lentil 

    haskellPackages.lentil: no longer needs overrides
    @peti
    peti authored Feb 19, 2017
    Copy the full SHA
    7422bb0 View commit details
Showing with 0 additions and 6 deletions.
  1. +0 −6 pkgs/development/haskell-modules/configuration-common.nix
6 changes: 0 additions & 6 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -808,12 +808,6 @@ self: super: {
# No upstream issue tracker
hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff;

lentil = super.lentil.overrideScope (self: super: {
pipes = self.pipes_4_3_2;
# https://github.com/roelvandijk/terminal-progress-bar/issues/14
terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1;
});

# https://github.com/basvandijk/lifted-base/issues/34
lifted-base = doJailbreak super.lifted-base;