Skip to content

Switch from cabal 3.2 to 3.4 #1058

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

Merged
merged 11 commits into from
Mar 1, 2021
Merged

Switch from cabal 3.2 to 3.4 #1058

merged 11 commits into from
Mar 1, 2021

Conversation

hamishmack
Copy link
Collaborator

No description provided.

@michaelpj
Copy link
Collaborator

Does nix-tools need a version bounds relaxation too? I don't know what happens if we have a nix-tools built against 3.2 with a newer cabal-install...

@hamishmack
Copy link
Collaborator Author

Does nix-tools need a version bounds relaxation too?

Yes, we should update that too.

I don't know what happens if we have a nix-tools built against 3.2 with a newer cabal-install...

I think it would be fine as long as the .cabal files it was processing did not require 3.4.

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Feb 26, 2021
@hamishmack
Copy link
Collaborator Author

bors try-

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Feb 26, 2021
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 26, 2021

try

Build failed:

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Feb 27, 2021
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 27, 2021

try

Timed out.

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Feb 28, 2021
@@ -22,6 +22,9 @@ in { haskell-nix = prev.haskell-nix // {
# Version of of cabal-install in hackage is broken for GHC 8.10.1
(lib.optionalAttrs (version == "3.2.0.0") {
packages.cabal-install.src = final.haskell-nix.sources.cabal-32 + "/cabal-install";
})
(lib.optionalAttrs (builtins.compareVersions version "3.0.0.0" >= 0
&& builtins.compareVersions version "3.5" < 0) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Don’t we have Greater than, ge, le, lt functions? I think that would make this a lot more readable.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Maybe I am just old shcool, but I think the strcmp rule is ok. Always compare to 0 that way:

x op y <=> x y op 0

Copy link
Collaborator

@angerman angerman left a comment

Choose a reason for hiding this comment

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

Looks good to me. Could maybe use a bit of readability improvement? See the online comment.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 1, 2021

@hamishmack hamishmack merged commit 0d781c0 into master Mar 1, 2021
@iohk-bors iohk-bors bot deleted the hkm/cabal-34 branch March 1, 2021 02:42
@masaeedu
Copy link
Contributor

@hamishmack I don't really understand the infrastructure that well, but is it possible that something was missed here:

? When I depend on the hpack I end up building /nix/store/czsz7nsfi08wvgzv0b62kd44s4spb48q-Cabal-lib-Cabal-3.2.1.0.drv and a bunch of its dependencies from source.

booniepepper pushed a commit to booniepepper/haskell.nix that referenced this pull request Feb 4, 2022
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.

4 participants