Merge pull request #241 from haskell-nix/srk/split

Split core into multiple packages

Author: sorki

.gitignore

@@ -1,7 +1,10 @@
 dist
 dist-newstyle
 .ghc.environment*
+.ghci
+.ghci_history
 .direnv
+.envrc
 cabal.project.local~
 cabal.project.local
 attic

cabal.project

@@ -2,6 +2,7 @@ packages:
   ./hnix-store-core/hnix-store-core.cabal
   ./hnix-store-db/hnix-store-db.cabal
   ./hnix-store-remote/hnix-store-remote.cabal
+  ./hnix-store-tests/hnix-store-tests.cabal
 
 -- till https://github.com/obsidiansystems/dependent-sum/pull/80
 allow-newer:

cabal.project.local.ci

@@ -8,3 +8,6 @@ package hnix-store-db
 
 package hnix-store-remote
   ghc-options: -Wunused-packages -Wall -Werror
+
+package hnix-store-tests
+  ghc-options: -Wunused-packages -Wall -Werror

default.nix

@@ -22,7 +22,8 @@ in {
   inherit (haskellPackages)
     hnix-store-core
     hnix-store-db
-    hnix-store-remote;
+    hnix-store-remote
+    hnix-store-tests;
   haskellPackages = lib.dontRecurseIntoAttrs haskellPackages;
   pkgs = lib.dontRecurseIntoAttrs pkgs;
 }

hnix-store-core/.envrc

@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                hnix-store-core
-version:             0.7.0.0
+version:             0.8.0.0
 synopsis:            Core effects for interacting with the Nix store.
 description:
   This package contains types and functions needed to describe
@@ -38,7 +38,6 @@ common commons
     , FlexibleContexts
     , FlexibleInstances
     , GADTs
-    , StandaloneDeriving
     , ScopedTypeVariables
     , StandaloneDeriving
     , RecordWildCards
@@ -80,8 +79,8 @@ library
       base >=4.12 && <5
     , attoparsec
     , algebraic-graphs >= 0.5 && < 0.8
-    , base16-bytestring
-    , base64-bytestring
+    , base16-bytestring >= 1.0
+    , base64-bytestring >= 1.2.1
     , bytestring
     , case-insensitive
     , cereal
@@ -90,7 +89,6 @@ library
     , data-default-class
     , dependent-sum > 0.7
     , dependent-sum-template > 0.1.1 && < 0.3
-    , generic-arbitrary < 1.1
     -- Required for cryptonite low-level type convertion
     , memory
     , cryptonite
@@ -101,8 +99,6 @@ library
     , monad-control
     , mtl
     , nix-derivation >= 1.1.1 && <2
-    , QuickCheck
-    , quickcheck-instances
     , saltine >= 0.2 && < 0.3
     , some > 1.0.5 && < 2
     , time
@@ -125,11 +121,8 @@ test-suite format-tests
   main-is: Driver.hs
   other-modules:
     Derivation
-    DerivedPath
-    ContentAddress
     NarFormat
     Hash
-    StorePath
   hs-source-dirs:
     tests
   build-tool-depends:
@@ -148,7 +141,6 @@ test-suite format-tests
     , directory
     , filepath
     , process
-    , nix-derivation >= 1.1.1 && <2
     , tasty
     , tasty-golden
     , hspec

hnix-store-core/.ghci

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 module System.Nix.Base
   ( BaseEncoding(Base16,NixBase32,Base64)
   , encodeWith
@@ -19,7 +17,8 @@ import qualified System.Nix.Base32 -- Nix has own Base32 encoding
 data BaseEncoding
   = NixBase32
   -- | ^ Nix has a special map of Base32 encoding
-  -- Placed first, since it determines Haskell optimizations of pattern matches, & NixBase seems be the most widely used in Nix.
+  -- Placed first, since it determines Haskell optimizations of pattern matches,
+  -- & NixBase seems be the most widely used in Nix.
   | Base16
   | Base64
 
@@ -35,18 +34,9 @@ encodeWith Base64 =
 
 -- | Take the input & @Base@ encoding witness -> decode into @Text@.
 decodeWith :: BaseEncoding -> Text -> Either String ByteString
-#if MIN_VERSION_base16_bytestring(1,0,0)
 decodeWith Base16 =
-  Data.ByteString.Base16.decode 
+  Data.ByteString.Base16.decode
   . Data.Text.Encoding.encodeUtf8
-#else
-decodeWith Base16 = lDecode  -- this tacit sugar simply makes GHC pleased with number of args
- where
-  lDecode t =
-    case Data.ByteString.Base16.decode (Data.Text.Encoding.encodeUtf8 t) of
-      (x, "") -> pure $ x
-      _       -> Left $ "Unable to decode base16 string" <> toString t
-#endif
 decodeWith NixBase32 =  System.Nix.Base32.decode
 decodeWith Base64 =
   Data.ByteString.Base64.decode

hnix-store-core/hnix-store-core.cabal

@@ -1,5 +1,3 @@
--- due to recent generic-arbitrary
-{-# OPTIONS_GHC -fconstraint-solver-iterations=0 #-}
 {-|
 Description : Build related types
 Maintainer  : srk <[email protected]>
@@ -14,15 +12,11 @@ module System.Nix.Build
 import Data.Time (UTCTime)
 import Data.Text (Text)
 import GHC.Generics (Generic)
-import Test.QuickCheck (Arbitrary(..))
-import Test.QuickCheck.Arbitrary.Generic (GenericArbitrary(..))
-import Test.QuickCheck.Instances ()
 
 -- keep the order of these Enums to match enums from reference implementations
 -- src/libstore/store-api.hh
 data BuildMode = Normal | Repair | Check
   deriving (Eq, Generic, Ord, Enum, Show)
-  deriving Arbitrary via GenericArbitrary BuildMode
 
 data BuildStatus =
     Built
@@ -41,7 +35,6 @@ data BuildStatus =
   | ResolvesToAlreadyValid
   | NoSubstituters
   deriving (Eq, Generic, Ord, Enum, Show)
-  deriving Arbitrary via GenericArbitrary BuildStatus
 
 -- | Result of the build
 data BuildResult = BuildResult
@@ -59,7 +52,6 @@ data BuildResult = BuildResult
     stopTime           :: !UTCTime
   }
   deriving (Eq, Generic, Ord, Show)
-  deriving Arbitrary via GenericArbitrary BuildResult
 
 buildSuccess :: BuildResult -> Bool
 buildSuccess BuildResult {..} =