Skip to content

Fix generation and display of revisions - #110

Merged
angerman merged 12 commits into
input-output-hk:mainfrom
neilmayhew:Cabal-3.16
Feb 4, 2026
Merged

Fix generation and display of revisions#110
angerman merged 12 commits into
input-output-hk:mainfrom
neilmayhew:Cabal-3.16

Conversation

@neilmayhew

@neilmayhew neilmayhew commented Dec 30, 2025

Copy link
Copy Markdown
Contributor

This supersedes #109 and #108, and includes the commits from both of them. See those PRs for a full description of the changes.

Fixes #106

@neilmayhew

Copy link
Copy Markdown
Contributor Author

This does produce changes in the output, but only in the html pages, not in the repo itself. The newer version of Cabal leaves out a space where there used to be one between grouped sublibs in the rendering of the build-depends field.

@neilmayhew

Copy link
Copy Markdown
Contributor Author

I forgot to raise the lower bound on Cabal. I'll do that next week.

github-actions Bot and others added 11 commits January 4, 2026 00:42
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/c1dfcf0' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc' (2024-11-13)
• Updated input 'haskell-nix':
    'github:input-output-hk/haskell.nix/a2f75fc' (2024-10-19)
  → 'github:input-output-hk/haskell.nix/cad2645' (2026-01-03)
• Removed input 'haskell-nix/ghc-8.6.5-iohk'
• Updated input 'haskell-nix/hackage':
    'github:input-output-hk/hackage.nix/4988994' (2024-10-19)
  → 'github:input-output-hk/hackage.nix/05797dd' (2026-01-03)
• Added input 'haskell-nix/hackage-for-stackage':
    'github:input-output-hk/hackage.nix/fba3874' (2026-01-03)
• Added input 'haskell-nix/hackage-internal':
    'github:input-output-hk/hackage.nix/f7867ba' (2025-06-19)
• Added input 'haskell-nix/hls':
    'github:haskell/haskell-language-server/682d689' (2025-03-10)
• Added input 'haskell-nix/hls-2.10':
    'github:haskell/haskell-language-server/2318c61' (2025-03-27)
• Added input 'haskell-nix/hls-2.11':
    'github:haskell/haskell-language-server/46ef452' (2025-05-15)
• Updated input 'haskell-nix/hls-2.9':
    'github:haskell/haskell-language-server/0c1817c' (2024-07-03)
  → 'github:haskell/haskell-language-server/90319a7' (2024-07-03)
• Removed input 'haskell-nix/hydra'
• Removed input 'haskell-nix/hydra/nix'
• Removed input 'haskell-nix/hydra/nix/lowdown-src'
• Removed input 'haskell-nix/hydra/nix/nixpkgs'
• Removed input 'haskell-nix/hydra/nix/nixpkgs-regression'
• Removed input 'haskell-nix/hydra/nixpkgs'
• Updated input 'haskell-nix/iserv-proxy':
    'github:stable-haskell/iserv-proxy/2ed3400' (2024-06-04)
  → 'github:stable-haskell/iserv-proxy/1506051' (2025-08-15)
• Removed input 'haskell-nix/nixpkgs-2003'
• Removed input 'haskell-nix/nixpkgs-2105'
• Removed input 'haskell-nix/nixpkgs-2111'
• Removed input 'haskell-nix/nixpkgs-2205'
• Removed input 'haskell-nix/nixpkgs-2211'
• Updated input 'haskell-nix/nixpkgs-2405':
    'github:NixOS/nixpkgs/086b448' (2024-09-16)
  → 'github:NixOS/nixpkgs/1e7a8f3' (2024-12-30)
• Added input 'haskell-nix/nixpkgs-2411':
    'github:NixOS/nixpkgs/5ab036a' (2025-06-30)
• Added input 'haskell-nix/nixpkgs-2505':
    'github:NixOS/nixpkgs/6c8f0cc' (2025-12-01)
• Added input 'haskell-nix/nixpkgs-2511':
    'github:NixOS/nixpkgs/b0924ea' (2025-12-01)
• Updated input 'haskell-nix/nixpkgs-unstable':
    'github:NixOS/nixpkgs/658e722' (2024-09-17)
  → 'github:NixOS/nixpkgs/c1cb7d0' (2025-12-01)
• Updated input 'haskell-nix/stackage':
    'github:input-output-hk/stackage.nix/df1d8f0' (2024-10-16)
  → 'github:input-output-hk/stackage.nix/8a7333a' (2026-01-03)
@neilmayhew

Copy link
Copy Markdown
Contributor Author

I updated the lower bound to 3.14 and rebased on fix-revisions to include the latest flake.lock updates

@neilmayhew
neilmayhew force-pushed the Cabal-3.16 branch 2 times, most recently from 3225b90 to 8d29aaf Compare January 8, 2026 22:35
@andreabedini

Copy link
Copy Markdown
Collaborator

@neilmayhew sorry for the delay. I just asked @qnikst to test this out as he needed updated dependencies too. I'd be happy to merge afterwards.

@qnikst

qnikst commented Jan 29, 2026

Copy link
Copy Markdown

I've tested on by scenarios, everything worked great!

@neilmayhew

Copy link
Copy Markdown
Contributor Author

Thanks, @andreabedini and @qnikst.

This PR builds on two other PRs, which have their own explanation and discussions. Would you mind approving both of those so I can merge them separately?

@neilmayhew neilmayhew changed the title Upgrade to Cabal 3.16 Fix generation and display of revisions Feb 3, 2026
@angerman
angerman merged commit 06f7c54 into input-output-hk:main Feb 4, 2026
5 checks passed
@neilmayhew
neilmayhew deleted the Cabal-3.16 branch February 4, 2026 01:19
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.

Revisions on the website are in reverse order

4 participants