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: 66ba870c7f20
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5966c5698f8c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 13, 2018

  1. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.11.1-5-g1b0c0c3 from Hackage revision
commercialhaskell/all-cabal-hashes@2a8760e.
    @peti
    peti committed Nov 13, 2018
    Copy the full SHA
    032d610 View commit details

  2. haskell-opencv: fix build and #47595 

    The applied patch can be removed, when
LumiGuide/haskell-opencv@cd613e2
hits hackage and later nixpkgs.

Closes #50192.
Closes #47595.
    @typetetris @peti
    typetetris authored and peti committed Nov 13, 2018
    Copy the full SHA
    5966c56 View commit details
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -251,6 +251,10 @@ self: super: {
# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;

# see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60
opencv = dontCheck (appendPatch super.opencv ./patches/opencv-fix-116.patch);
opencv-extra = dontCheck (appendPatch super.opencv-extra ./patches/opencv-fix-116.patch);

# https://github.com/ekmett/structures/issues/3
structures = dontCheck super.structures;

181 changes: 127 additions & 54 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions pkgs/development/haskell-modules/patches/opencv-fix-116.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -ur opencv-0.0.2.1.bak/Setup.hs opencv-0.0.2.1/Setup.hs
--- opencv-0.0.2.1.bak/Setup.hs 2018-11-10 17:18:41.355731189 +0100
+++ opencv-0.0.2.1/Setup.hs 2018-11-10 17:18:56.901681162 +0100
@@ -3,6 +3,6 @@

main = do
args <- getArgs
- let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]
+ let args' | "configure" `elem` args = args ++ ["--with-gcc","c++"]
| otherwise = args
defaultMainArgs args'