@@ -11,7 +11,6 @@ import Data.Aeson
11
11
import Data.Aeson.Types ( Pair )
12
12
import Data.Aeson.Encode.Pretty
13
13
import qualified Data.ByteString.Base16 as Base16
14
- import qualified Data.ByteString.Base64 as Base64
15
14
import qualified Data.ByteString.Char8 as BS
16
15
import qualified Data.ByteString.Lazy as BL
17
16
import Data.Foldable ( toList
@@ -101,9 +100,9 @@ version2json pname vnum (U.VersionData { U.cabalFileRevisions, U.metaFile }) =
101
100
do
102
101
revisionBindings <- sequenceA
103
102
$ zipWith (revBindingJson pname vnum) cabalFileRevisions [0 .. ]
104
- let hash = decodeUtf8 $ Base64. encode $ fst $ Base16. decode $ fromString $ P. parseMetaData pname vnum metaFile Map. ! " sha256"
103
+ let hash = decodeUtf8 $ fromString $ P. parseMetaData pname vnum metaFile Map. ! " sha256"
105
104
return $ Seq. singleton $ fromPretty vnum .= object
106
- [ " sha256" .= ( " sha256- " <> hash)
105
+ [ " sha256" .= hash
107
106
, " revisions" .= object
108
107
( revisionBindings
109
108
++ [" default" .= fst (last revisionBindings)]
@@ -119,16 +118,16 @@ revBindingJson
119
118
revBindingJson pname vnum cabalFile revNum = do
120
119
let qualifiedName = mconcat $ intersperse
121
120
" -"
122
- [prettyPname, fromPretty vnum, revName, BS. unpack $ Base16. encode cabalHash]
121
+ [prettyPname, fromPretty vnum, revName, BS. unpack cabalHash]
123
122
revName :: (Semigroup a , IsString a ) => a
124
123
revName = " r" <> fromString (show revNum)
125
124
revPath = " ." </> " hackage" </> qualifiedName <.> " nix"
126
125
prettyPname = fromPretty pname
127
- cabalHash = hashlazy cabalFile
126
+ cabalHash = Base16. encode $ hashlazy cabalFile
128
127
modify' $ mappend $ Seq. singleton
129
128
(cabalFile, prettyPname ++ " .cabal" , revPath)
130
129
return $ revName .= object
131
130
[ " outPath" .= (qualifiedName <> " .nix" )
132
131
, " revNum" .= revNum
133
- , " sha256" .= ( " sha256- " <> decodeUtf8 ( Base64. encode cabalHash))
132
+ , " sha256" .= decodeUtf8 cabalHash
134
133
]
0 commit comments