Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PostProcess: Use lua5_4 for lua #547

Merged
merged 1 commit into from
Apr 27, 2022
Merged

PostProcess: Use lua5_4 for lua #547

merged 1 commit into from
Apr 27, 2022

Conversation

leungbk
Copy link
Member

@leungbk leungbk commented Apr 25, 2022

The latest version of haskellPackages.lua uses lua5_4.

hslua does not directly depend on pkgs.lua any longer, so it is safe
to remove the hook for the newest hslua at the time of
writing (version 2.2.0).

@@ -129,7 +129,7 @@ hooks =
, ("hoogle", set testTarget "--test-option=--no-net")
, ("hsignal < 0.2.7.4", set phaseOverrides "prePatch = \"rm -v Setup.lhs\";") -- https://github.com/amcphail/hsignal/issues/1
, ("hslua < 0.9.3", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_1")))
, ("hslua >= 0.9.3 && < 2.0.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))
, ("hslua >= 0.9.3 && < 2.2.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the cabal file for hslua-2.0.0 and hslua-2.1.0, it looks like there are no system packages needed. Is this change here correct?

For example: https://hackage.haskell.org/package/hslua-2.0.0/hslua.cabal

@@ -129,7 +129,7 @@ hooks =
, ("hoogle", set testTarget "--test-option=--no-net")
, ("hsignal < 0.2.7.4", set phaseOverrides "prePatch = \"rm -v Setup.lhs\";") -- https://github.com/amcphail/hsignal/issues/1
, ("hslua < 0.9.3", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_1")))
, ("hslua >= 0.9.3 && < 2.0.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))
, ("hslua >= 0.9.3 && < 2.2.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the cabal file for hslua-2.0.0 and hslua-2.1.0, it looks like there are no system packages needed. Is this change here correct?

For example: https://hackage.haskell.org/package/hslua-2.0.0/hslua.cabal

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, fixed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, fixed.

@@ -142,7 +142,8 @@ hooks =
, ("libxml", set (configureFlags . contains "--extra-include-dir=${libxml2.dev}/include/libxml2") True)
, ("liquid-fixpoint", set (testDepends . system . contains (pkg "z3")) True . set (testDepends . system . contains (pkg "nettools")) True . set (testDepends . system . contains (pkg "git")) True . set doCheck False)
, ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)
, ("lua >= 2.0.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))
, ("lua >= 2.0.0 && < 2.2.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))
, ("lua >= 2.2.0 && < 3.0.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_4")))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the upper bound on 3.0.0 here?

@@ -142,7 +142,8 @@ hooks =
, ("libxml", set (configureFlags . contains "--extra-include-dir=${libxml2.dev}/include/libxml2") True)
, ("liquid-fixpoint", set (testDepends . system . contains (pkg "z3")) True . set (testDepends . system . contains (pkg "nettools")) True . set (testDepends . system . contains (pkg "git")) True . set doCheck False)
, ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)
, ("lua >= 2.0.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))
, ("lua >= 2.0.0 && < 2.2.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_3")))
, ("lua >= 2.2.0 && < 3.0.0", over (libraryDepends . system) (replace (pkg "lua") (pkg "lua5_4")))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the upper bound on 3.0.0 here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I've removed it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I've removed it.

The latest version of haskellPackages.lua uses lua5_4.
@cdepillabout
Copy link
Member

LGTM, thanks!

For anyone interested, here is the changelog for the haskell package lua about 2.2.0 bumping up to lua-5.4: https://hackage.haskell.org/package/lua-2.2.0/changelog

@cdepillabout cdepillabout merged commit e2e5fff into NixOS:master Apr 27, 2022
@leungbk leungbk deleted the lua branch April 27, 2022 04:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants