bbcode is orthogonal to thermoprint

5 files changed, 17 insertions, 13 deletions

diff --git a/bbcode/thermoprint-bbcode.cabal b/bbcode/bbcode.cabal
index f25ffdf..d2f4932 100644
--- a/bbcode/thermoprint-bbcode.cabal
+++ b/bbcode/bbcode.cabal
@@ -1,9 +1,9 @@
 -- Initial thermoprint-bbcode.cabal generated by cabal init.  For further 
 -- documentation, see http://haskell.org/cabal/users-guide/
 
-name:                thermoprint-bbcode
+name:                bbcode
 version:             0.0.0
-synopsis:            A parser for a subset of bbcode compatible with thermoprint-spec
+synopsis:            A parser for bbcode
 -- description:         
 homepage:            http://dirty-haskell.org/tags/thermoprint.html
 license:             PublicDomain
@@ -36,7 +36,7 @@ Test-Suite tests
   main-is:             Spec.hs
   ghc-options:         -threaded -with-rtsopts=-N
   build-depends:       base >=4.8.1 && <5
-                     , thermoprint-bbcode -any
+                     , bbcode -any
                      , hspec >=2.2.1 && <3
                      , QuickCheck >=2.8.1 && <3
                      , quickcheck-instances >=0.3.11 && <1
diff --git a/bbcode/thermoprint-bbcode.nix b/bbcode/bbcode.nix
index 896bb04..82ba2f4 100644
--- a/bbcode/thermoprint-bbcode.nix
+++ b/bbcode/bbcode.nix
@@ -2,7 +2,7 @@
 , hspec, QuickCheck, quickcheck-instances, rosezipper, stdenv, text
 }:
 mkDerivation {
-  pname = "thermoprint-bbcode";
+  pname = "bbcode";
   version = "0.0.0";
   src = ./.;
   libraryHaskellDepends = [
@@ -12,6 +12,6 @@ mkDerivation {
     attoparsec base hspec QuickCheck quickcheck-instances text
   ];
   homepage = "http://dirty-haskell.org/tags/thermoprint.html";
-  description = "A parser for a subset of bbcode compatible with thermoprint-spec";
+  description = "A parser for bbcode";
   license = stdenv.lib.licenses.publicDomain;
 }
diff --git a/default.nix b/default.nix
index 40034c6..867ac5b 100644
--- a/default.nix
+++ b/default.nix
@@ -2,6 +2,8 @@
 }:
 
 rec {
-  thermoprint-spec = pkgs.haskellPackages.callPackage ./spec/thermoprint-spec.nix {};
-  thermoprint-bbcode = pkgs.haskellPackages.callPackage ./bbcode/thermoprint-bbcode.nix {};
+  thermoprint-spec = pkgs.haskellPackages.callPackage ./spec/thermoprint-spec.nix {
+    inherit bbcode;
+  };
+  bbcode = pkgs.haskellPackages.callPackage ./bbcode/bbcode.nix {};
 }
diff --git a/spec/thermoprint-spec.cabal b/spec/thermoprint-spec.cabal
index b9f7fd6..40978c3 100644
--- a/spec/thermoprint-spec.cabal
+++ b/spec/thermoprint-spec.cabal
@@ -19,6 +19,7 @@ cabal-version:       >=1.10
 library
   hs-source-dirs:      src
   exposed-modules:     Thermoprint.Printout
+                     , Thermoprint.Printout.BBCode
                      , Thermoprint.Identifiers
                      , Thermoprint.API
   -- other-modules:       
@@ -27,6 +28,7 @@ library
                      , DeriveAnyClass
                      , OverloadedStrings
   build-depends:       base >=4.8.1 && <5
+                     , bbcode -any
                      , containers >=0.5.6 && <1
                      , text >=1.2.1 && <2
                      , bytestring >=0.10.6 && <1
diff --git a/spec/thermoprint-spec.nix b/spec/thermoprint-spec.nix
index 2da5d86..368f3a9 100644
--- a/spec/thermoprint-spec.nix
+++ b/spec/thermoprint-spec.nix
@@ -1,15 +1,15 @@
-{ mkDerivation, aeson, base, base64-bytestring, bytestring, Cabal
-, cabal-test-quickcheck, containers, deepseq, encoding, hspec
-, QuickCheck, quickcheck-instances, servant, stdenv, text
+{ mkDerivation, aeson, base, base64-bytestring, bbcode, bytestring
+, Cabal, cabal-test-quickcheck, containers, deepseq, encoding
+, hspec, QuickCheck, quickcheck-instances, servant, stdenv, text
 }:
 mkDerivation {
   pname = "thermoprint-spec";
   version = "1.0.0";
   src = ./.;
   libraryHaskellDepends = [
-    aeson base base64-bytestring bytestring Cabal cabal-test-quickcheck
-    containers deepseq encoding QuickCheck quickcheck-instances servant
-    text
+    aeson base base64-bytestring bbcode bytestring Cabal
+    cabal-test-quickcheck containers deepseq encoding QuickCheck
+    quickcheck-instances servant text
   ];
   testHaskellDepends = [
     aeson base hspec QuickCheck quickcheck-instances