Skip to content

Commit 2e799ea

Browse files
authored
hackage2nix: revert to base32 hashes from sri hashes, they are referred elsewhere (input-output-hk#80)
1 parent 0cc37d4 commit 2e799ea

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

nix-tools/hackage2nix/Main.hs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import Data.Aeson
1111
import Data.Aeson.Types ( Pair )
1212
import Data.Aeson.Encode.Pretty
1313
import qualified Data.ByteString.Base16 as Base16
14-
import qualified Data.ByteString.Base64 as Base64
1514
import qualified Data.ByteString.Char8 as BS
1615
import qualified Data.ByteString.Lazy as BL
1716
import Data.Foldable ( toList
@@ -101,9 +100,9 @@ version2json pname vnum (U.VersionData { U.cabalFileRevisions, U.metaFile }) =
101100
do
102101
revisionBindings <- sequenceA
103102
$ 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"
105104
return $ Seq.singleton $ fromPretty vnum .= object
106-
[ "sha256" .= ("sha256-" <> hash)
105+
[ "sha256" .= hash
107106
, "revisions" .= object
108107
( revisionBindings
109108
++ ["default" .= fst (last revisionBindings)]
@@ -119,16 +118,16 @@ revBindingJson
119118
revBindingJson pname vnum cabalFile revNum = do
120119
let qualifiedName = mconcat $ intersperse
121120
"-"
122-
[prettyPname, fromPretty vnum, revName, BS.unpack $ Base16.encode cabalHash]
121+
[prettyPname, fromPretty vnum, revName, BS.unpack cabalHash]
123122
revName :: (Semigroup a, IsString a) => a
124123
revName = "r" <> fromString (show revNum)
125124
revPath = "." </> "hackage" </> qualifiedName <.> "nix"
126125
prettyPname = fromPretty pname
127-
cabalHash = hashlazy cabalFile
126+
cabalHash = Base16.encode $ hashlazy cabalFile
128127
modify' $ mappend $ Seq.singleton
129128
(cabalFile, prettyPname ++ ".cabal", revPath)
130129
return $ revName .= object
131130
[ "outPath" .= (qualifiedName <> ".nix")
132131
, "revNum" .= revNum
133-
, "sha256" .= ("sha256-" <> decodeUtf8 (Base64.encode cabalHash))
132+
, "sha256" .= decodeUtf8 cabalHash
134133
]

0 commit comments

Comments
 (0)