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.

Sign up for GitHub

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

Jump to bottom

Fix webpage revisions #100

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Fix webpage revisions #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1e0ca2
fix(website): use the correct path for cabal file revisions
andreabedini May 30, 2024
155a009
chore(nix): use the same ghc version in nix and cabal.project
andreabedini May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Foliage/CmdBuild.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ buildAction

-- all revised cabal files, with their timestamp
revcf <- for (zip [1 :: Int ..] cabalFileRevisions) $ \(revNum, (timestamp, path)) -> do
copyFileChanged cabalFilePath (outputDir </> "package" </> prettyShow pkgId </> "revision" </> show revNum <.> "cabal")
copyFileChanged path (outputDir </> "package" </> prettyShow pkgId </> "revision" </> show revNum <.> "cabal")
Copy link

Choose a reason for hiding this comment

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

Ooops

prepareIndexPkgCabal pkgId timestamp path

-- current version of the cabal file (after the revisions, if any)
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
packages: .
index-state: 2023-09-10T21:31:08Z
with-compiler: ghc-9.4.7
with-compiler: ghc-9.4.8

tests: True
test-show-details: direct
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

project = pkgs.haskell-nix.cabalProject' {
src = ./.;
compiler-nix-name = "ghc94";
compiler-nix-name = "ghc948";
shell.tools = {
cabal = "latest";
hlint = "latest";
Expand Down
Loading