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

Commits on Oct 19, 2018

  1. Copy the full SHA
    2ebc303 View commit details

Commits on Nov 2, 2018

  1. Merge pull request #48697 from ElvishJerricco/jailbreak-cabal-helper

    haskellPackages.cabal-helper: Jailbreak restrictive bounds.
    peti authored Nov 2, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    82822c6 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/development/haskell-modules/configuration-common.nix
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
@@ -1150,4 +1150,7 @@ self: super: {
# https://github.com/danfran/cabal-macosx/issues/13
cabal-macosx = dontCheck super.cabal-macosx;

# https://github.com/DanielG/cabal-helper/issues/59
cabal-helper = doJailbreak super.cabal-helper;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super