summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-12-05 13:18:25 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-12-05 13:18:25 -0400
commit1ab83a4c71e8f06405c02eb1b75e3e9387f2f4f2 (patch)
tree8628d4a1b5b4395f08275fdbd7dac76359b16050
parentc6893038719619dcbc4e640d4a3cc96b4cd24d27 (diff)
Removed no longer needed dependency on yesod-default.
This commit was sponsored by Nick Daly on Patreon.
-rw-r--r--CHANGELOG1
-rw-r--r--debian/control1
-rw-r--r--doc/bugs/yesod-default_appears_no_longer_necessary.mdwn2
-rw-r--r--git-annex.cabal1
-rw-r--r--stack-windows.yaml1
-rw-r--r--stack.yaml1
6 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 090a41797..30c7785c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ git-annex (6.20171125) UNRELEASED; urgency=medium
of speed, but can't be used for urls with embedded videos.
* importfeed now downloads things linked to by feeds, even when they are
not media files.
+ * Removed no longer needed dependency on yesod-default.
-- Joey Hess <id@joeyh.name> Tue, 28 Nov 2017 13:48:44 -0400
diff --git a/debian/control b/debian/control
index a20506002..db050d17a 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,6 @@ Build-Depends:
libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
- libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-clientsession-dev [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-warp-dev (>= 3.0.0.5) [i386 amd64 arm64 armel armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
diff --git a/doc/bugs/yesod-default_appears_no_longer_necessary.mdwn b/doc/bugs/yesod-default_appears_no_longer_necessary.mdwn
index 8c5e79528..50c439ef8 100644
--- a/doc/bugs/yesod-default_appears_no_longer_necessary.mdwn
+++ b/doc/bugs/yesod-default_appears_no_longer_necessary.mdwn
@@ -19,3 +19,5 @@ Just build from source.
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Sure, this is not really a "problem" anyway.
+
+> Thanks for noticing this, I've made the changes. [[done]] --[[Joey]]
diff --git a/git-annex.cabal b/git-annex.cabal
index 4e2269a51..1337581c9 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -448,7 +448,6 @@ Executable git-annex
if flag(Webapp)
Build-Depends:
yesod (>= 1.2.6),
- yesod-default (>= 1.2.0),
yesod-static (>= 1.2.4),
yesod-form (>= 1.3.15),
yesod-core (>= 1.2.19),
diff --git a/stack-windows.yaml b/stack-windows.yaml
index c7e39b625..6550fc1a3 100644
--- a/stack-windows.yaml
+++ b/stack-windows.yaml
@@ -30,7 +30,6 @@ extra-deps:
- aws-0.17.1
- bloomfilter-2.0.1.0
- torrent-10000.1.1
-- yesod-default-1.2.0
- Win32-2.6.1.0
- directory-1.3.1.5
- process-1.6.2.0
diff --git a/stack.yaml b/stack.yaml
index d84c4682e..e82bc2be3 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -20,7 +20,6 @@ extra-deps:
- aws-0.17.1
- bloomfilter-2.0.1.0
- torrent-10000.1.1
-- yesod-default-1.2.0
explicit-setup-deps:
git-annex: true
resolver: lts-9.9