From 866fc23f79c2d4a30ecba10d89ca6309cf30eda7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 2 Feb 2025 15:25:28 +0800 Subject: [PATCH 1/3] include time in the date of a snapshot (the time may actually be when the snapshot build started) --- src/Handler/StackageHome.hs | 4 ++-- templates/stackage-home.hamlet | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Handler/StackageHome.hs b/src/Handler/StackageHome.hs index fa0c21d..8445fc6 100644 --- a/src/Handler/StackageHome.hs +++ b/src/Handler/StackageHome.hs @@ -155,8 +155,8 @@ getStackageCabalConfigR name = track "Handler.StackageHome.getStackageCabalConfi toBuilder (pliName p) ++ constraint p -yearMonthDay :: FormatTime t => t -> String -yearMonthDay = formatTime defaultTimeLocale "%Y-%m-%d" +yearMonthDayTime :: FormatTime t => t -> String +yearMonthDayTime = formatTime defaultTimeLocale "%Y-%m-%d %H:%M %Z" getSnapshotPackagesR :: SnapName -> Handler () -- FIXME move to OldLinks? getSnapshotPackagesR name = track "Handler.StackageHome.getSnapshotPackagesR" $ diff --git a/templates/stackage-home.hamlet b/templates/stackage-home.hamlet index d28946a..ebdd075 100644 --- a/templates/stackage-home.hamlet +++ b/templates/stackage-home.hamlet @@ -3,7 +3,7 @@ $newline never

#{snapshotTitle snapshot}

- Published on #{yearMonthDay (snapshotCreated snapshot)} + Published on #{yearMonthDayTime (snapshotCreated snapshot)} View changes From ec5d5e7b92a3166fd8f64335f5d9da4a8aa4a96a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 2 Feb 2025 15:41:20 +0800 Subject: [PATCH 2/3] replace remaining references to github.com/fpco/ --- README.md | 2 +- src/Application.hs | 2 +- src/Handler/BuildPlan.hs | 2 +- src/Handler/StackageHome.hs | 2 +- static/haddock/style.css | 2 +- templates/default-layout.hamlet | 2 +- templates/home.hamlet | 8 ++++---- templates/hoogle.hamlet | 2 +- templates/package.lucius | 2 +- templates/spam-package.hamlet | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index bcf8cd9..706e580 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Server for stable, curated Haskell package sets -This repo is part of the [Stackage project](https://github.com/fpco/stackage), +This repo is part of the [Stackage project](https://github.com/commercialhaskell/stackage), and the live server can be viewed at https://www.stackage.org. ## Building locally diff --git a/src/Application.hs b/src/Application.hs index a090513..9cf1f2a 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -138,7 +138,7 @@ withFoundation appLogFunc appSettings inner = do then do fp <- runSimpleApp $ getStackageContentDir "." gitRepoDev fp loadWebsiteContent - else gitRepo "https://github.com/fpco/stackage-content.git" "master" loadWebsiteContent + else gitRepo "https://github.com/commercialhaskell/stackage-content.git" "master" loadWebsiteContent let runContentUpdates = Concurrently $ forever $ diff --git a/src/Handler/BuildPlan.hs b/src/Handler/BuildPlan.hs index 4c53e59..1b0a0a2 100644 --- a/src/Handler/BuildPlan.hs +++ b/src/Handler/BuildPlan.hs @@ -6,7 +6,7 @@ import Import getBuildPlanR :: SnapName -> Handler TypedContent getBuildPlanR _slug = track "Handler.BuildPlan.getBuildPlanR" $ do - error "temporarily disabled, please open on issue on https://github.com/fpco/stackage-server/issues/ if you need it" + error "temporarily disabled, please open on issue on https://github.com/commercialhaskell/stackage-server/issues/ if you need it" {- fullDeps <- (== Just "true") <$> lookupGetParam "full-deps" spec <- parseSnapshotSpec $ toPathPiece slug diff --git a/src/Handler/StackageHome.hs b/src/Handler/StackageHome.hs index 8445fc6..613d9c0 100644 --- a/src/Handler/StackageHome.hs +++ b/src/Handler/StackageHome.hs @@ -97,7 +97,7 @@ getStackageCabalConfigR name = track "Handler.StackageHome.getStackageCabalConfi yield $ Chunk $ toBuilder '\n' revisionsWarning = - toBuilder (asText "-- NOTE: Due to revisions, this file may not work. See:\n-- https://github.com/fpco/stackage-server/issues/232\n\n") + toBuilder (asText "-- NOTE: Due to revisions, this file may not work. See:\n-- https://github.com/commercialhaskell/stackage-server/issues/232\n\n") headerGlobal render = yield $ Chunk $ revisionsWarning ++ diff --git a/static/haddock/style.css b/static/haddock/style.css index 3577fba..64389fa 100644 --- a/static/haddock/style.css +++ b/static/haddock/style.css @@ -311,7 +311,7 @@ div#style-menu-holder { display: none; } -/* Fixes: https://github.com/fpco/stackage-server/issues/222 */ +/* Fixes: https://github.com/commercialhaskell/stackage-server/issues/222 */ /* #synopsis { */ /* display: none; */ /* } */ diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet index e434022..71d472c 100644 --- a/templates/default-layout.hamlet +++ b/templates/default-layout.hamlet @@ -13,7 +13,7 @@

  • Snapshots
  • LTS
  • Nightly -
  • FAQ +
  • FAQ
  • Blog $maybe msg <- mmsg diff --git a/templates/home.hamlet b/templates/home.hamlet index bc01a7f..2a86c38 100644 --- a/templates/home.hamlet +++ b/templates/home.hamlet @@ -17,7 +17,7 @@

    Stable Haskell package sets