git.iko.soy/typeable/cabal2nix
on master help sign in
hmatrix: disable "sed" hack for versions newer than 0.18.1.0.
0876866Peter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1
compare with master
unifiedsplit
@@ -41,7 +41,7 @@ configureCabalFlags (PackageIdentifier name version)
41 | name == "highlighting-kate" = [enable "pcre-light"]
41 | name == "highlighting-kate" = [enable "pcre-light"]
42 | name == "hlibsass" && version >= mkVersion [0,1,5]
42 | name == "hlibsass" && version >= mkVersion [0,1,5]
43 = [enable "externalLibsass"]
43 = [enable "externalLibsass"]
44− | name == "hmatrix" = [enable "openblas"]
44+ | name == "hmatrix" = [enable "openblas", enable "disable-default-paths"]
45 | name == "hslua" = [enable "system-lua"]
45 | name == "hslua" = [enable "system-lua"]
46 | name == "idris" = [enable "gmp", enable "ffi", enable "curses", ("execonly", version `withinRange` (orLaterVersion (mkVersion [1,1,1]))) ]
46 | name == "idris" = [enable "gmp", enable "ffi", enable "curses", ("execonly", version `withinRange` (orLaterVersion (mkVersion [1,1,1]))) ]
47 | name == "io-streams" = [enable "NoInteractiveTests"]
47 | name == "io-streams" = [enable "NoInteractiveTests"]
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
@@ -75,7 +75,7 @@ hooks =
75 , ("hfsevents", hfseventsOverrides)
75 , ("hfsevents", hfseventsOverrides)
76 , ("HFuse", set phaseOverrides hfusePreConfigure)
76 , ("HFuse", set phaseOverrides hfusePreConfigure)
77 , ("hlibgit2 >= 0.18.0.14", set (testDepends . tool . contains (pkg "git")) True)
77 , ("hlibgit2 >= 0.18.0.14", set (testDepends . tool . contains (pkg "git")) True)
78− , ("hmatrix", set phaseOverrides "preConfigure = \"sed -i hmatrix.cabal -e '/\\\\/usr\\\\//D'\";")
78+ , ("hmatrix < 0.18.1.1", set phaseOverrides "preConfigure = \"sed -i hmatrix.cabal -e '/\\\\/usr\\\\//D'\";")
79 , ("holy-project", set doCheck False) -- attempts to access the network
79 , ("holy-project", set doCheck False) -- attempts to access the network
80 , ("hoogle", set testTarget "--test-option=--no-net")
80 , ("hoogle", set testTarget "--test-option=--no-net")
81 , ("hsignal < 0.2.7.4", set phaseOverrides "prePatch = \"rm -v Setup.lhs\";") -- https://github.com/amcphail/hsignal/issues/1
81 , ("hsignal < 0.2.7.4", set phaseOverrides "prePatch = \"rm -v Setup.lhs\";") -- https://github.com/amcphail/hsignal/issues/1