f144800 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

hslua: fix post-processing failure caused by use of 'each'

We have to commit to which BuildInfo attribute we expect the "lua" system dependency in. Using "each" no longer works now that replace fails if the expected binding does not exist.

commitf1448006ce288f0d43fd7448a829ed3ed7294523 authorPeter Simons <simons@cryp.to> dateMon 23 Jul 2018, 12:46 (8 years ago) parent347581f

2 files changed+3−3

compare with master

unifiedsplit

src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2

src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1

@@ -46,7 +46,7 @@ configureCabalFlags' (PackageIdentifier name version)

4646 | name == "hlibsass" && version >= mkVersion [0,1,5]

4747 = [enable "externalLibsass"]

4848 | name == "hmatrix" = [enable "openblas", enable "disable-default-paths"]

49− | name == "hslua" = [enable "system-lua"]

49+ | name == "hslua" = [enable "system-lua", disable "use-pkgconfig"]

5050 | name == "idris" = [enable "gmp", enable "ffi", enable "curses", ("execonly", version `withinRange` orLaterVersion (mkVersion [1,1,1])) ]

5151 | name == "io-streams" = [enable "NoInteractiveTests"]

5252 | name == "liquid-fixpoint" = [enable "build-external"]

src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2

@@ -117,8 +117,8 @@ hooks =

117117 , ("holy-project", set doCheck False) -- attempts to access the network

118118 , ("hoogle", set testTarget "--test-option=--no-net")

119119 , ("hsignal < 0.2.7.4", set phaseOverrides "prePatch = \"rm -v Setup.lhs\";") -- https://github.com/amcphail/hsignal/issues/1

120− , ("hslua < 0.9.3", over (libraryDepends . each) (replace (pkg "lua") (pkg "lua5_1")))

121− , ("hslua >= 0.9.3", over (libraryDepends . each) (replace (pkg "lua") (pkg "lua5_3")))

120+ , ("hslua < 0.9.3", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_1")))

121+ , ("hslua >= 0.9.3", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))

122122 , ("hspec-core >= 2.4.4", hspecCoreOverrides)

123123 , ("http-client", set doCheck False) -- attempts to access the network

124124 , ("http-client-openssl >= 0.2.0.1", set doCheck False) -- attempts to access the network