Merge branch 'master' into bitTooLate

Author: sorki

.envrc

@@ -0,0 +1 @@
+eval "$(lorri direnv)"

.gitignore

@@ -1 +1,3 @@
 dist
+dist-newstyle
+.ghc.environment*

default.nix

@@ -10,5 +10,7 @@
 in {
   haskellPackages =
     pkgs.haskellPackages.override overrideHaskellPackages;
+  haskell844Packages =
+    pkgs.haskell.packages.ghc844.override overrideHaskellPackages;
   inherit pkgs;
 }

hnix-store-core/.envrc

@@ -0,0 +1 @@
+eval "$(lorri direnv)"

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

@@ -0,0 +1,88 @@
+name:                hnix-store-core
+version:             0.2.0.0
+synopsis:            Core effects for interacting with the Nix store.
+description:
+        This package contains types and functions needed to describe
+        interactions with the Nix store abstracted away from
+        specific effectful context.
+homepage:            https://github.com/haskell-nix/hnix-store
+license:             Apache-2.0
+license-file:        LICENSE
+author:              Shea Levy
+maintainer:          [email protected]
+copyright:           2018 Shea Levy
+category:            System
+build-type:          Simple
+extra-source-files:  ChangeLog.md, README.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     System.Nix.Base32
+                     , System.Nix.Build
+                     , System.Nix.Hash
+                     , System.Nix.Internal.Hash
+                     , System.Nix.Internal.Signature
+                     , System.Nix.Internal.StorePath
+                     , System.Nix.Nar
+                     , System.Nix.ReadonlyStore
+                     , System.Nix.Signature
+                     , System.Nix.StorePath
+                     , System.Nix.StorePathMetadata
+                     , System.Nix.Util
+                     , System.Nix.ValidPath
+  build-depends:       base >=4.10 && <5
+                     , base16-bytestring
+                     , bytestring
+                     , binary
+                     , bytestring
+                     , containers
+                     , cryptohash-md5
+                     , cryptohash-sha1
+                     , cryptohash-sha256
+                     , directory
+                     , filepath
+                     , hashable
+                     , mtl
+                     , regex-base
+                     , regex-tdfa-text
+                     , saltine
+                     , time
+                     , text
+                     , unix
+                     , unordered-containers
+                     , vector
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+
+Flag bounded_memory
+     description: Run tests of constant memory use (requires +RTS -T)
+     default: False
+
+test-suite format-tests
+   if flag(bounded_memory)
+     cpp-options: -DBOUNDED_MEMORY
+   ghc-options: -rtsopts -fprof-auto
+   type: exitcode-stdio-1.0
+   main-is: Driver.hs
+   other-modules:
+       NarFormat
+       Hash
+   hs-source-dirs:
+       tests
+   build-depends:
+       hnix-store-core
+     , base
+     , base64-bytestring
+     , binary
+     , bytestring
+     , containers
+     , directory
+     , process
+     , tasty
+     , tasty-discover
+     , tasty-hspec
+     , tasty-hunit
+     , tasty-quickcheck
+     , temporary
+     , text
+   default-language: Haskell2010

hnix-store-core/src/System/Nix/Base32.hs

@@ -0,0 +1,39 @@
+{-|
+Description: Implementation of Nix's base32 encoding.
+-}
+module System.Nix.Base32 where
+
+import qualified Data.ByteString        as BS
+import qualified Data.Text              as T
+import qualified Data.Vector            as V
+
+-- | Encode a 'BS.ByteString' in Nix's base32 encoding
+encode :: BS.ByteString -> T.Text
+encode c = T.pack $ map char32 [nChar - 1, nChar - 2 .. 0]
+  where
+    digits32 = V.fromList "0123456789abcdfghijklmnpqrsvwxyz"
+    -- Each base32 character gives us 5 bits of information, while
+    -- each byte gives is 8. Because 'div' rounds down, we need to add
+    -- one extra character to the result, and because of that extra 1
+    -- we need to subtract one from the number of bits in the
+    -- bytestring to cover for the case where the number of bits is
+    -- already a factor of 5. Thus, the + 1 outside of the 'div' and
+    -- the - 1 inside of it.
+    nChar = fromIntegral $ ((BS.length c * 8 - 1) `div` 5) + 1
+
+    byte = BS.index c . fromIntegral
+
+    -- May need to switch to a more efficient calculation at some
+    -- point.
+    bAsInteger :: Integer
+    bAsInteger = sum [fromIntegral (byte j) * (256 ^ j)
+                     | j <- [0 .. BS.length c - 1]
+                     ]
+
+    char32 :: Integer -> Char
+    char32 i = digits32 V.! digitInd
+      where
+        digitInd = fromIntegral $
+                   bAsInteger
+                   `div` (32^i)
+                   `mod` 32

hnix-store-core/src/System/Nix/Build.hs

@@ -13,7 +13,6 @@ module System.Nix.Build (
 import           Data.Time                 (UTCTime)
 import           Data.Text                 (Text)
 import           Data.HashSet              (HashSet)
-import           System.Nix.Path           (Path)
 
 -- keep the order of these Enums to match enums from reference implementations
 -- src/libstore/store-api.hh

hnix-store-core/src/System/Nix/Derivation.hs

@@ -1,29 +1,17 @@
 {-|
 Description : Cryptographic hashes for hnix-store.
-Maintainer  : Shea Levy <[email protected]>; Greg Hale <[email protected]>
 -}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE CPP #-}
 module System.Nix.Hash (
     HNix.Digest
 
-  , HNix.HashAlgorithm
-  , HNix.HashAlgorithm'(..)
-  , HNix.AlgoVal(..)
-  , HNix.HasDigest(..)
+  , HNix.HashAlgorithm(..)
+  , HNix.ValidAlgo(..)
+  , HNix.NamedAlgo(..)
+  , HNix.SomeNamedDigest(..)
   , HNix.hash
   , HNix.hashLazy
-
-  , HNix.printAsBase16
-  , HNix.printAsBase32
-  , HNix.printHashAlgo
+  , HNix.encodeBase32
+  , HNix.encodeBase16
   ) where
 
 import qualified System.Nix.Internal.Hash as HNix
-