summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam T <pxqr.sta@gmail.com>2013-07-21 13:29:37 +0400
committerSam T <pxqr.sta@gmail.com>2013-07-21 13:29:37 +0400
commit87c20d81619b09b2e3c5d6f00b7b2cad900a67fe (patch)
tree120555bbaa2290ccd77ef3165aa43d0b3d20cd25
parent24803024ed05ded57a8cd18df610dfdb12813392 (diff)
~ Move some extensions to cabal.
-rw-r--r--bittorrent.cabal2
-rw-r--r--src/Data/Torrent.hs2
-rw-r--r--src/Network/BitTorrent/DHT/Protocol.hs2
-rw-r--r--src/Network/BitTorrent/Exchange.hs2
-rw-r--r--src/Network/BitTorrent/Exchange/Protocol.hs2
-rw-r--r--src/Network/BitTorrent/Extension.hs1
-rw-r--r--src/Network/BitTorrent/Peer.hs2
-rw-r--r--src/Network/BitTorrent/Sessions.hs2
-rw-r--r--src/Network/BitTorrent/Tracker.hs2
-rw-r--r--src/Network/BitTorrent/Tracker/HTTP.hs1
-rw-r--r--src/Network/BitTorrent/Tracker/Protocol.hs6
11 files changed, 4 insertions, 20 deletions
diff --git a/bittorrent.cabal b/bittorrent.cabal
index 508af22c..42db998a 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -130,6 +130,8 @@ library
130-- , bits-atomic >= 0.1 130-- , bits-atomic >= 0.1
131 131
132 extensions: PatternGuards 132 extensions: PatternGuards
133 , OverloadedStrings
134 , RecordWildCards
133 hs-source-dirs: src 135 hs-source-dirs: src
134 if flag(testing) 136 if flag(testing)
135 cpp-options: -DTESTING 137 cpp-options: -DTESTING
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 1dab1541..36974ccf 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -16,8 +16,6 @@
16-- <http://www.bittorrent.org/beps/bep_0003.html#metainfo-files>, 16-- <http://www.bittorrent.org/beps/bep_0003.html#metainfo-files>,
17-- <https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure> 17-- <https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure>
18-- 18--
19{-# LANGUAGE OverloadedStrings #-}
20{-# LANGUAGE RecordWildCards #-}
21{-# LANGUAGE CPP #-} 19{-# LANGUAGE CPP #-}
22{-# LANGUAGE FlexibleInstances #-} 20{-# LANGUAGE FlexibleInstances #-}
23{-# LANGUAGE BangPatterns #-} 21{-# LANGUAGE BangPatterns #-}
diff --git a/src/Network/BitTorrent/DHT/Protocol.hs b/src/Network/BitTorrent/DHT/Protocol.hs
index 5cc1722d..b0100b70 100644
--- a/src/Network/BitTorrent/DHT/Protocol.hs
+++ b/src/Network/BitTorrent/DHT/Protocol.hs
@@ -1,5 +1,3 @@
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE RecordWildCards #-}
3module Network.BitTorrent.DHT.Protocol 1module Network.BitTorrent.DHT.Protocol
4 ( 2 (
5 newNodeSession 3 newNodeSession
diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index 71be3f88..dc41b08e 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -39,10 +39,8 @@
39-- 39--
40-- Finally we get a simple event-based communication model. 40-- Finally we get a simple event-based communication model.
41-- 41--
42{-# LANGUAGE OverloadedStrings #-}
43{-# LANGUAGE GeneralizedNewtypeDeriving #-} 42{-# LANGUAGE GeneralizedNewtypeDeriving #-}
44{-# LANGUAGE MultiParamTypeClasses #-} 43{-# LANGUAGE MultiParamTypeClasses #-}
45{-# LANGUAGE RecordWildCards #-}
46{-# LANGUAGE BangPatterns #-} 44{-# LANGUAGE BangPatterns #-}
47module Network.BitTorrent.Exchange 45module Network.BitTorrent.Exchange
48 ( P2P 46 ( P2P
diff --git a/src/Network/BitTorrent/Exchange/Protocol.hs b/src/Network/BitTorrent/Exchange/Protocol.hs
index 573a6e5c..8461745a 100644
--- a/src/Network/BitTorrent/Exchange/Protocol.hs
+++ b/src/Network/BitTorrent/Exchange/Protocol.hs
@@ -25,8 +25,6 @@
25-- For more infomation see: 25-- For more infomation see:
26-- <https://wiki.theory.org/BitTorrentSpecification#Peer_wire_protocol_.28TCP.29> 26-- <https://wiki.theory.org/BitTorrentSpecification#Peer_wire_protocol_.28TCP.29>
27-- 27--
28{-# LANGUAGE OverloadedStrings #-}
29{-# LANGUAGE RecordWildCards #-}
30{-# LANGUAGE TemplateHaskell #-} 28{-# LANGUAGE TemplateHaskell #-}
31{-# OPTIONS -fno-warn-orphans #-} 29{-# OPTIONS -fno-warn-orphans #-}
32module Network.BitTorrent.Exchange.Protocol 30module Network.BitTorrent.Exchange.Protocol
diff --git a/src/Network/BitTorrent/Extension.hs b/src/Network/BitTorrent/Extension.hs
index a498bc19..c0eb058f 100644
--- a/src/Network/BitTorrent/Extension.hs
+++ b/src/Network/BitTorrent/Extension.hs
@@ -10,7 +10,6 @@
10-- See <http://www.bittorrent.org/beps/bep_0004.html> for more 10-- See <http://www.bittorrent.org/beps/bep_0004.html> for more
11-- information. 11-- information.
12-- 12--
13{-# LANGUAGE OverloadedStrings #-}
14module Network.BitTorrent.Extension 13module Network.BitTorrent.Extension
15 ( -- * Capabilities 14 ( -- * Capabilities
16 Capabilities 15 Capabilities
diff --git a/src/Network/BitTorrent/Peer.hs b/src/Network/BitTorrent/Peer.hs
index 27f9ac10..a4d026dc 100644
--- a/src/Network/BitTorrent/Peer.hs
+++ b/src/Network/BitTorrent/Peer.hs
@@ -28,8 +28,6 @@
28-- capabilities (such as supported enchancements), this should be 28-- capabilities (such as supported enchancements), this should be
29-- done using 'Network.BitTorrent.Extension'! 29-- done using 'Network.BitTorrent.Extension'!
30-- 30--
31{-# LANGUAGE OverloadedStrings #-}
32{-# LANGUAGE RecordWildCards #-}
33{-# LANGUAGE GeneralizedNewtypeDeriving #-} 31{-# LANGUAGE GeneralizedNewtypeDeriving #-}
34{-# LANGUAGE StandaloneDeriving #-} 32{-# LANGUAGE StandaloneDeriving #-}
35{-# LANGUAGE TemplateHaskell #-} 33{-# LANGUAGE TemplateHaskell #-}
diff --git a/src/Network/BitTorrent/Sessions.hs b/src/Network/BitTorrent/Sessions.hs
index 6b73dd6c..8bfa64d1 100644
--- a/src/Network/BitTorrent/Sessions.hs
+++ b/src/Network/BitTorrent/Sessions.hs
@@ -5,8 +5,6 @@
5-- Stability : experimental 5-- Stability : experimental
6-- Portability : portable 6-- Portability : portable
7-- 7--
8{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE RecordWildCards #-}
10module Network.BitTorrent.Sessions 8module Network.BitTorrent.Sessions
11 ( -- * Progress 9 ( -- * Progress
12 Progress(..), startProgress 10 Progress(..), startProgress
diff --git a/src/Network/BitTorrent/Tracker.hs b/src/Network/BitTorrent/Tracker.hs
index be5c2fb8..e1e6ea71 100644
--- a/src/Network/BitTorrent/Tracker.hs
+++ b/src/Network/BitTorrent/Tracker.hs
@@ -9,8 +9,6 @@
9-- communication. Tracker is used to discover other peers in the 9-- communication. Tracker is used to discover other peers in the
10-- network using torrent info hash. 10-- network using torrent info hash.
11-- 11--
12{-# LANGUAGE OverloadedStrings #-}
13{-# LANGUAGE RecordWildCards #-}
14{-# LANGUAGE TemplateHaskell #-} 12{-# LANGUAGE TemplateHaskell #-}
15module Network.BitTorrent.Tracker 13module Network.BitTorrent.Tracker
16 ( withTracker, completedReq 14 ( withTracker, completedReq
diff --git a/src/Network/BitTorrent/Tracker/HTTP.hs b/src/Network/BitTorrent/Tracker/HTTP.hs
index fe690b96..0ada154b 100644
--- a/src/Network/BitTorrent/Tracker/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/HTTP.hs
@@ -13,7 +13,6 @@
13-- For more information see: 13-- For more information see:
14-- <https://wiki.theory.org/BitTorrentSpecification#Tracker_HTTP.2FHTTPS_Protocol> 14-- <https://wiki.theory.org/BitTorrentSpecification#Tracker_HTTP.2FHTTPS_Protocol>
15-- 15--
16{-# LANGUAGE OverloadedStrings #-}
17module Network.BitTorrent.Tracker.HTTP 16module Network.BitTorrent.Tracker.HTTP
18 ( askTracker, leaveTracker 17 ( askTracker, leaveTracker
19 , scrapeURL 18 , scrapeURL
diff --git a/src/Network/BitTorrent/Tracker/Protocol.hs b/src/Network/BitTorrent/Tracker/Protocol.hs
index d1fff73c..ee395883 100644
--- a/src/Network/BitTorrent/Tracker/Protocol.hs
+++ b/src/Network/BitTorrent/Tracker/Protocol.hs
@@ -18,12 +18,10 @@
18-- scrape query -- which queries the state of a given torrent (or 18-- scrape query -- which queries the state of a given torrent (or
19-- a list of torrents) that the tracker is managing. 19-- a list of torrents) that the tracker is managing.
20-- 20--
21{-# OPTIONS -fno-warn-orphans #-}
22{-# LANGUAGE OverloadedStrings #-}
23{-# LANGUAGE RecordWildCards #-}
24{-# LANGUAGE GeneralizedNewtypeDeriving #-}
25{-# LANGUAGE FlexibleInstances #-} 21{-# LANGUAGE FlexibleInstances #-}
22{-# LANGUAGE GeneralizedNewtypeDeriving #-}
26{-# LANGUAGE TemplateHaskell #-} 23{-# LANGUAGE TemplateHaskell #-}
24{-# OPTIONS -fno-warn-orphans #-}
27module Network.BitTorrent.Tracker.Protocol 25module Network.BitTorrent.Tracker.Protocol
28 ( Event(..), AnnounceQuery(..), AnnounceInfo(..) 26 ( Event(..), AnnounceQuery(..), AnnounceInfo(..)
29 , defaultNumWant , defaultPorts 27 , defaultNumWant , defaultPorts