From 78440ca37d75039d5eadd52eafbcd1751daba70a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Aug 2022 15:21:00 -0400 Subject: [PATCH] move assistant and webapp build-depends into main build-depends For some reason, cabal 3.4.1.0 builds w/o the assistant and webapp, even when the flag is explicitly turned on. Moving the build-depends from inside the if flag section to the main build-depends somehow fixes this. Since the webapp build deps are thus always available, there is no reason not to build the webapp when building the assistant. So, got rid of the webapp build flag. Kept the assistant build flag for now, since building without it does at least still speed up the build. Sponsored-by: Brock Spratlen on Patreon --- CHANGELOG | 7 ++ .../Webapp_won__180__t_start_on_MacOS.mdwn | 2 + ..._2c7d2e81cbe943fe9154830fdf958181._comment | 16 +++ doc/bugs/cabal_builds_without_assistant.mdwn | 2 + git-annex.cabal | 117 ++++++++---------- stack.yaml | 1 - standalone/linux/stack-i386ancient.yaml | 1 - 7 files changed, 82 insertions(+), 64 deletions(-) create mode 100644 doc/bugs/Webapp_won__180__t_start_on_MacOS/comment_5_2c7d2e81cbe943fe9154830fdf958181._comment diff --git a/CHANGELOG b/CHANGELOG index a82263e365..b387ebe52b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +git-annex (10.20220823) UNRELEASED; urgency=medium + + * Include the assistant and webapp when building with cabal 3.4.1.0. + * Merged the webapp build flag into the assistant build flag. + + -- Joey Hess Mon, 29 Aug 2022 15:03:04 -0400 + git-annex (10.20220822) upstream; urgency=medium * v8 repositories now automatically upgrade to v9, which will in turn diff --git a/doc/bugs/Webapp_won__180__t_start_on_MacOS.mdwn b/doc/bugs/Webapp_won__180__t_start_on_MacOS.mdwn index a60ee2bd25..1210fd1c96 100644 --- a/doc/bugs/Webapp_won__180__t_start_on_MacOS.mdwn +++ b/doc/bugs/Webapp_won__180__t_start_on_MacOS.mdwn @@ -311,3 +311,5 @@ I had tons of luck using git-annex. I am a non-programmer person and I could eas I can cut and export now from every available computer in my home. I have a central server on my LAN and git-annex also helps me to back up every episode. My next goal is to use it for my personal documents like scans of invoices, letter and so on. I think an archive repo will help me with this. So I can have all the stuff in one big folder. Thanks for inventing such a nice tool + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/Webapp_won__180__t_start_on_MacOS/comment_5_2c7d2e81cbe943fe9154830fdf958181._comment b/doc/bugs/Webapp_won__180__t_start_on_MacOS/comment_5_2c7d2e81cbe943fe9154830fdf958181._comment new file mode 100644 index 0000000000..d1ec499a92 --- /dev/null +++ b/doc/bugs/Webapp_won__180__t_start_on_MacOS/comment_5_2c7d2e81cbe943fe9154830fdf958181._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 5""" + date="2022-08-29T19:21:22Z" + content=""" +I've committed a workaround to that cabal problem, so assuming that was +the cause of your problem, it will be fixed by the next git-annex release. + +If something else caused it, the next git-annex release would +probably fail to build on homebrew. Which the homebrew developers will +follow up on. + +So, I don't think this bug needs to be kept open any longer. Although you +will need to wait, or install git-annex by another means than homebrew, in +the meantime.. +"""]] diff --git a/doc/bugs/cabal_builds_without_assistant.mdwn b/doc/bugs/cabal_builds_without_assistant.mdwn index 7c19d4bb34..feab883c71 100644 --- a/doc/bugs/cabal_builds_without_assistant.mdwn +++ b/doc/bugs/cabal_builds_without_assistant.mdwn @@ -10,3 +10,5 @@ I tried moving the build-depends out of the `if flag(Assistant)` section to the main build-depends section. It was able to install all the build depends, so it's not some dependency issue making it decide to turn off that build flag. --[[Joey]] + +> [[fixed|done]] by moving the dependencies into the main block. --[[Joey]] diff --git a/git-annex.cabal b/git-annex.cabal index 257d1ceeff..3e6fa86d55 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -256,10 +256,8 @@ Extra-Source-Files: Utility/libkqueue.h Flag Assistant - Description: Enable git-annex assistant and watch command - -Flag Webapp - Description: Enable git-annex webapp + Description: Enable git-annex assistant, webapp, and watch command + Default: True Flag Pairing Description: Enable pairing @@ -376,7 +374,21 @@ Executable git-annex aws (>= 0.20), DAV (>= 1.0), network (>= 3.0.0.0), - network-bsd + network-bsd, + mountpoints, + yesod (>= 1.4.3), + yesod-static (>= 1.5.1), + yesod-form (>= 1.4.8), + yesod-core (>= 1.6.0), + path-pieces (>= 0.2.1), + warp (>= 3.2.8), + warp-tls (>= 3.2.2), + wai, + wai-extra, + blaze-builder, + clientsession, + template-haskell, + shakespeare (>= 2.0.11) CC-Options: -Wall GHC-Options: -Wall -fno-warn-tabs -Wincomplete-uni-patterns Default-Language: Haskell2010 @@ -416,8 +428,7 @@ Executable git-annex Other-Modules: Utility.GitLFS if flag(Assistant) && ! os(solaris) && ! os(gnu) - Build-Depends: mountpoints - CPP-Options: -DWITH_ASSISTANT + CPP-Options: -DWITH_ASSISTANT -DWITH_WEBAPP Other-Modules: Assistant Assistant.Alert @@ -436,6 +447,7 @@ Executable git-annex Assistant.Install.AutoStart Assistant.Install.Menu Assistant.MakeRemote + Assistant.MakeRepo Assistant.Monad Assistant.NamedThread Assistant.Pairing @@ -458,6 +470,7 @@ Executable git-annex Assistant.Threads.Merger Assistant.Threads.MountWatcher Assistant.Threads.NetWatcher + Assistant.Threads.PairListener Assistant.Threads.ProblemFixer Assistant.Threads.Pusher Assistant.Threads.RemoteControl @@ -469,6 +482,7 @@ Executable git-annex Assistant.Threads.UpgradeWatcher Assistant.Threads.Upgrader Assistant.Threads.Watcher + Assistant.Threads.WebApp Assistant.TransferQueue Assistant.TransferSlots Assistant.Types.Alert @@ -489,11 +503,44 @@ Executable git-annex Assistant.Types.UrlRenderer Assistant.Unused Assistant.Upgrade + Assistant.WebApp + Assistant.WebApp.Common + Assistant.WebApp.Configurators + Assistant.WebApp.Configurators.AWS + Assistant.WebApp.Configurators.Delete + Assistant.WebApp.Configurators.Edit + Assistant.WebApp.Configurators.Fsck + Assistant.WebApp.Configurators.IA + Assistant.WebApp.Configurators.Local + Assistant.WebApp.Configurators.Pairing + Assistant.WebApp.Configurators.Preferences + Assistant.WebApp.Configurators.Ssh + Assistant.WebApp.Configurators.Unused + Assistant.WebApp.Configurators.Upgrade + Assistant.WebApp.Configurators.WebDAV + Assistant.WebApp.Control + Assistant.WebApp.DashBoard + Assistant.WebApp.Documentation + Assistant.WebApp.Form + Assistant.WebApp.Gpg + Assistant.WebApp.MakeRemote + Assistant.WebApp.Notifications + Assistant.WebApp.OtherRepos + Assistant.WebApp.Page + Assistant.WebApp.Pairing + Assistant.WebApp.Repair + Assistant.WebApp.RepoId + Assistant.WebApp.RepoList + Assistant.WebApp.SideBar + Assistant.WebApp.Types Command.Assistant Command.Watch + Command.WebApp Utility.Mounts Utility.OSX - + Utility.Yesod + Utility.WebApp + if os(linux) Build-Depends: hinotify (>= 0.3.10) CPP-Options: -DWITH_INOTIFY @@ -516,60 +563,6 @@ Executable git-annex Includes: Utility/libkqueue.h Other-Modules: Utility.DirWatcher.Kqueue - if flag(Webapp) - Build-Depends: - yesod (>= 1.4.3), - yesod-static (>= 1.5.1), - yesod-form (>= 1.4.8), - yesod-core (>= 1.6.0), - path-pieces (>= 0.2.1), - warp (>= 3.2.8), - warp-tls (>= 3.2.2), - wai, - wai-extra, - blaze-builder, - clientsession, - template-haskell, - shakespeare (>= 2.0.11) - CPP-Options: -DWITH_WEBAPP - Other-Modules: - Command.WebApp - Assistant.Threads.WebApp - Assistant.Threads.PairListener - Assistant.WebApp - Assistant.WebApp.Common - Assistant.WebApp.Configurators - Assistant.WebApp.Configurators.AWS - Assistant.WebApp.Configurators.Delete - Assistant.WebApp.Configurators.Edit - Assistant.WebApp.Configurators.Fsck - Assistant.WebApp.Configurators.IA - Assistant.WebApp.Configurators.Local - Assistant.WebApp.Configurators.Pairing - Assistant.WebApp.Configurators.Preferences - Assistant.WebApp.Configurators.Ssh - Assistant.WebApp.Configurators.Unused - Assistant.WebApp.Configurators.Upgrade - Assistant.WebApp.Configurators.WebDAV - Assistant.WebApp.Control - Assistant.WebApp.DashBoard - Assistant.WebApp.Documentation - Assistant.WebApp.Form - Assistant.WebApp.Gpg - Assistant.WebApp.MakeRemote - Assistant.WebApp.Notifications - Assistant.WebApp.OtherRepos - Assistant.WebApp.Page - Assistant.WebApp.Pairing - Assistant.WebApp.Repair - Assistant.WebApp.RepoId - Assistant.WebApp.RepoList - Assistant.WebApp.SideBar - Assistant.WebApp.Types - Assistant.MakeRepo - Utility.Yesod - Utility.WebApp - if flag(Dbus) if (os(linux)) Build-Depends: dbus (>= 0.10.7), fdo-notify (>= 0.3) diff --git a/stack.yaml b/stack.yaml index 0da838187a..7dbfb657ac 100644 --- a/stack.yaml +++ b/stack.yaml @@ -4,7 +4,6 @@ flags: assistant: true pairing: true torrentparser: true - webapp: true magicmime: false dbus: false debuglocks: false diff --git a/standalone/linux/stack-i386ancient.yaml b/standalone/linux/stack-i386ancient.yaml index 3712ce6829..6b3e79cc31 100644 --- a/standalone/linux/stack-i386ancient.yaml +++ b/standalone/linux/stack-i386ancient.yaml @@ -4,7 +4,6 @@ flags: assistant: true pairing: true torrentparser: true - webapp: true magicmime: false dbus: false debuglocks: false