From a1daa4fb3eb77a3b2b68444de23e22bee9327833 Mon Sep 17 00:00:00 2001 From: fr33domlover Date: Thu, 29 Nov 2018 09:48:27 +0000 Subject: [PATCH] Place dependency libraries in a 'lib' subdir instead of same dir as Vervis --- _boring | 1 + clone-deps.sh | 2 ++ stack.yaml | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/_boring b/_boring index c3faf36..28a078a 100644 --- a/_boring +++ b/_boring @@ -127,3 +127,4 @@ ^config/ssh-host-key$ ^config/ssh-host-key\.pub$ ^repos(/|$) +^lib(/|$) diff --git a/clone-deps.sh b/clone-deps.sh index 2a327fe..f3018b4 100644 --- a/clone-deps.sh +++ b/clone-deps.sh @@ -3,6 +3,8 @@ VERVIS='https://dev.angeley.es/s/fr33domlover/r' HUB='https://hub.darcs.net/fr33domlover' +mkdir -p lib +cd lib darcs clone $HUB/hit-graph darcs clone $HUB/hit-harder darcs clone $HUB/hit-network diff --git a/stack.yaml b/stack.yaml index 08e0367..d410496 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,22 +7,22 @@ resolver: lts-10.10 # Local packages, usually specified by relative directory name packages: - - '.' - - '../darcs-lights' - - '../darcs-rev' - - '../ssh' - - '../hit-graph' - - '../hit-harder' - - '../hit-network' - - '../persistent-migration' - - '../persistent-email-address' - - '../time-interval-aeson' -# - '../yesod-auth-account' + - . + - lib/darcs-lights + - lib/darcs-rev + - lib/ssh + - lib/hit-graph + - lib/hit-harder + - lib/hit-network + - lib/persistent-migration + - lib/persistent-email-address + - lib/time-interval-aeson +# - lib/yesod-auth-account - location: git: https://dev.angeley.es/s/fr33domlover/r/yesod-auth-account commit: cc9d6a5d4e0d5fb3b061a5a9ccc0ab03eea89811 extra-dep: true - - '../yesod-mail-send' + - lib/yesod-mail-send # Packages to be pulled from upstream that are not in the resolver (e.g., # acme-missiles-0.3)