Skip to content

Fix the OS string encoding for GNU/Hurd#11401

Merged
mergify[bot] merged 3 commits intohaskell:masterfrom
sthibaul:hurd-gnu
Apr 2, 2026
Merged

Fix the OS string encoding for GNU/Hurd#11401
mergify[bot] merged 3 commits intohaskell:masterfrom
sthibaul:hurd-gnu

Conversation

@sthibaul
Copy link
Copy Markdown
Collaborator

@sthibaul sthibaul commented Jan 10, 2026 •
edited
Loading

Following https://github.com/haskell/cabal/pull/9434/files , and as seen in the various gnu_HOST_OS usages in the ghc source code, it is expected that GNU/Hurd is advertised as "gnu", like the autotools do.

Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:

@ffaf1
Copy link
Copy Markdown
Collaborator

ffaf1 commented Jan 10, 2026

Mhhhh, I think this modifies behaviour (e.g. creating different folders).

@sthibaul
Copy link
Copy Markdown
Collaborator Author

sthibaul commented Jan 10, 2026 •
edited
Loading

Mhhhh, I think this modifies behaviour (e.g. creating different folders).

More precisely, it fixes the behavior. The folders were gnu previously. It's the way OS strings are converted that changed at some point and ended up using hurd instead of gnu, breaking the package build. (i.e. it was never actually built with the changed directory)

@ulysses4ever
Copy link
Copy Markdown
Collaborator

ulysses4ever commented Jan 10, 2026

A fix is a change of behaviour. So, it needs a different PR template which, at least, includes a changelog entry.

@sthibaul
Fix the OS string encoding for GNU/Hurd
a629feb 
Following https://github.com/haskell/cabal/pull/9434/files , and as seen
in the various gnu_HOST_OS usages in the ghc source code, it is expected that
GNU/Hurd is advertised as "gnu", like the autotools do.
@sthibaul
Copy link
Copy Markdown
Collaborator Author

sthibaul commented Jan 10, 2026

A fix is a change of behaviour. So, it needs a different PR template which, at least, includes a changelog entry.

The broken behaviour could not have been seen by users since ghc would just not compile.

Anyway, I have updated so.

ffaf1
ffaf1 approved these changes Jan 10, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@ffaf1 ffaf1 left a comment

Choose a reason for hiding this comment

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

Many thanks!

sthibaul and others added 2 commits January 10, 2026 21:32
@sthibaul @ffaf1
Update changelog.d/pr-11401
044b928 
Co-authored-by: ffaf1 <fa-ml@ariis.it>
@sthibaul
Fixups
0a64552
raspbian-autopush pushed a commit to raspbian-packages/ghc that referenced this pull request Mar 27, 2026
@iliastsi
gnu-hurd-os-string
aa04cf5 
commit 95773d289c62373772f676df91c1278b7d382e30
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat Jan 10 15:59:18 2026 +0100

    Fix the OS string encoding for GNU/Hurd
    
    Following https://github.com/haskell/cabal/pull/9434/files , and as seen
    in the various gnu_HOST_OS usages in the source code, it is expected that
    GNU/Hurd is advertised as "gnu", like the autotools do.

https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15320
haskell/cabal#11401


Gbp-Pq: Name gnu-hurd-os-string
@sthibaul
Copy link
Copy Markdown
Collaborator Author

sthibaul commented Mar 30, 2026

Mmm, is there something missing here?

@geekosaur
Copy link
Copy Markdown
Collaborator

geekosaur commented Mar 30, 2026

Since you have two approvals, you should be setting the merge me label or asking someone else to do it if you lack permissions. (That will start a 2-day cooldown announced in our Matrix and IRC channels for final comments, then merge it automatically.)

@sthibaul sthibaul added the merge me Tell Mergify Bot to merge label Mar 30, 2026
@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Mar 30, 2026
@ffaf1
Copy link
Copy Markdown
Collaborator

ffaf1 commented Mar 31, 2026

@sthibaul In this case, squash+merge me label, since you want your commits to be squashed.

@sthibaul sthibaul added squash+merge me Tell Mergify Bot to squash-merge and removed merge me Tell Mergify Bot to merge labels Mar 31, 2026
@mergify mergify bot added merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days queued labels Apr 2, 2026
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Apr 2, 2026 •
edited
Loading

Merge Queue Status

This pull request spent 1 hour 44 minutes 30 seconds in the queue, including 1 hour 32 minutes 53 seconds running CI.

Required conditions to merge
  • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • any of [🛡 GitHub branch protection]:
    • check-success = Doctest Cabal
    • check-neutral = Doctest Cabal
    • check-skipped = Doctest Cabal
  • any of [🛡 GitHub branch protection]:
    • check-success = Meta checks
    • check-neutral = Meta checks
    • check-skipped = Meta checks
  • any of [🛡 GitHub branch protection]:
    • check-success = docs/readthedocs.org:cabal
    • check-neutral = docs/readthedocs.org:cabal
    • check-skipped = docs/readthedocs.org:cabal
  • any of [🛡 GitHub branch protection]:
    • check-success = Validate post job
    • check-neutral = Validate post job
    • check-skipped = Validate post job
  • any of [🛡 GitHub branch protection]:
    • check-success = fourmolu
    • check-neutral = fourmolu
    • check-skipped = fourmolu
  • any of [🛡 GitHub branch protection]:
    • check-success = hlint
    • check-neutral = hlint
    • check-skipped = hlint
  • any of [🛡 GitHub branch protection]:
    • check-success = Bootstrap post job
    • check-neutral = Bootstrap post job
    • check-skipped = Bootstrap post job
  • any of [🛡 GitHub branch protection]:
    • check-success = whitespace
    • check-neutral = whitespace
    • check-skipped = whitespace
  • any of [🛡 GitHub branch protection]:
    • check-success = Check sdist post job
    • check-neutral = Check sdist post job
    • check-skipped = Check sdist post job
  • any of [🛡 GitHub branch protection]:
    • check-success = Changelogs
    • check-neutral = Changelogs
    • check-skipped = Changelogs

mergify bot added a commit that referenced this pull request Apr 2, 2026
@mergify
Merge of #11401
4c07cd3
@mergify mergify bot mentioned this pull request Apr 2, 2026
Closed
86 tasks
mergify bot added a commit that referenced this pull request Apr 2, 2026
@mergify
Merge of #11401
62c8ac6
mergify bot added a commit that referenced this pull request Apr 2, 2026
@mergify
Merge of #11401
b4af32f
mergify bot added a commit that referenced this pull request Apr 2, 2026
@mergify
Merge of #11401
c6335db
mergify bot added a commit that referenced this pull request Apr 2, 2026
@mergify
Merge of #11401
ac2123d
@mergify mergify bot merged commit c678634 into haskell:master Apr 2, 2026
279 of 280 checks passed
@mergify mergify bot removed the queued label Apr 2, 2026
mergify bot added a commit that referenced this pull request Apr 2, 2026
@mergify
Merge of #11401
5c713ab
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@geekosaur geekosaur geekosaur approved these changes

@ffaf1 ffaf1 ffaf1 approved these changes

Assignees

No one assigned

Labels

merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days ready and waiting Mergify is waiting out the cooldown period squash+merge me Tell Mergify Bot to squash-merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sthibaul @ffaf1 @ulysses4ever @geekosaur