nix-community/nixpkgs-update
1
1
Fork 0
mirror of https://github.com/nix-community/nixpkgs-update.git synced 2024-11-30 12:22:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix golang for vendor hash changes

Browse Source 
Resolves #203
This commit is contained in:
Benjamin Hipple 2020-06-06 13:27:26 -04:00
parent 6a00700a93
commit 1b95a7c5d9
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nix.hs
View File

@ -136,10 +136,10 @@ getDrvAttr drvAttr =
-- Get an attribute that can be evaluated off a derivation, as in:
-- getAttr "cargoSha256" "ripgrep" -> 0lwz661rbm7kwkd6mallxym1pz8ynda5f03ynjfd16vrazy2dj21
getAttr :: MonadIO m => Text -> Text -> ExceptT Text m Text
getAttr attr =
getAttr :: MonadIO m => Raw -> Text -> Text -> ExceptT Text m Text
getAttr raw attr =
srcOrMain
(\attrPath -> nixEvalET (EvalOptions Raw (Env [])) (attrPath <> "." <> attr))
(\attrPath -> nixEvalET (EvalOptions raw (Env [])) (attrPath <> "." <> attr))
getHash :: MonadIO m => Text -> ExceptT Text m Text
getHash =
@ -299,7 +299,7 @@ numberOfFetchers derivationContents =
-- Sum the number of things that look like fixed-output derivation hashes
numberOfHashes :: Text -> Int
numberOfHashes derivationContents =
sum $ map countUp ["sha256 =", "sha256=", "cargoSha256 =", "modSha256 ="]
sum $ map countUp ["sha256 =", "sha256=", "cargoSha256 =", "vendorSha256 ="]
where
countUp x = T.count x derivationContents

32
src/Rewrite.hs
View File

@ -171,7 +171,7 @@ rustCrateVersion log args@(Args _ attrPth drvFile drvContents) = do
-- This starts the same way `version` does, minus the assert
srcVersionFix args
-- But then from there we need to do this a second time for the cargoSha256!
oldCargoSha256 <- Nix.getAttr "cargoSha256" attrPth
oldCargoSha256 <- Nix.getAttr Nix.Raw "cargoSha256" attrPth
_ <- lift $ File.replaceIO oldCargoSha256 Nix.sha256Zero drvFile
newCargoSha256 <- Nix.getHashFromBuild attrPth
when (oldCargoSha256 == newCargoSha256) $ throwE "cargoSha256 hashes equal; no update necessary"
@ -185,27 +185,33 @@ rustCrateVersion log args@(Args _ attrPth drvFile drvContents) = do
--------------------------------------------------------------------------------
-- Rewrite Golang packages with buildGoModule
-- This is basically `version` above, but with a second pass to also update the
-- modSha256 go vendor hash.
-- vendorSha256 go vendor hash.
golangModuleVersion :: MonadIO m => (Text -> m ()) -> Args -> ExceptT Text m (Maybe Text)
golangModuleVersion log args@(Args _ attrPth drvFile drvContents) = do
if not (T.isInfixOf "buildGoModule" drvContents && T.isInfixOf "modSha256" drvContents)
if not (T.isInfixOf "buildGoModule" drvContents && T.isInfixOf "vendorSha256" drvContents)
then do
lift $ log "Not a buildGoModule package with modSha256"
lift $ log "Not a buildGoModule package with vendorSha256"
return Nothing
else do
-- This starts the same way `version` does, minus the assert
srcVersionFix args
-- But then from there we need to do this a second time for the modSha256!
oldModSha256 <- Nix.getAttr "modSha256" attrPth
lift . log $ "Found old modSha256 = " <> oldModSha256
_ <- lift $ File.replaceIO oldModSha256 Nix.sha256Zero drvFile
newModSha256 <- Nix.getHashFromBuild attrPth
when (oldModSha256 == newModSha256) $ throwE "modSha256 hashes equal; no update necessary"
lift . log $ "Replacing modSha256 with " <> newModSha256
_ <- lift $ File.replaceIO Nix.sha256Zero newModSha256 drvFile
-- But then from there we need to do this a second time for the vendorSha256!
-- Note that explicit `null` cannot be coerced to a string by nix eval --raw
oldVendorSha256 <- (Nix.getAttr Nix.Raw "vendorSha256" attrPth <|> Nix.getAttr Nix.NoRaw "vendorSha256" attrPth)
lift . log $ "Found old vendorSha256 = " <> oldVendorSha256
-- Sometimes we just use the srcs vendored in the repo
if (oldVendorSha256 == "null")
then do
lift . log $ "vendorSha256 is explicitly set to null; leaving it to use repo vendored src"
else do
_ <- lift $ File.replaceIO oldVendorSha256 Nix.sha256Zero drvFile
newVendorSha256 <- Nix.getHashFromBuild attrPth
_ <- lift $ File.replaceIO Nix.sha256Zero newVendorSha256 drvFile
-- Note that on some small bumps, this may not actually change if go.sum did not
lift . log $ "Replaced vendorSha256 with " <> newVendorSha256
-- Ensure the package actually builds and passes its tests
Nix.build attrPth
lift $ log "Finished updating modSha256"
lift $ log "Finished updating vendorSha256"
return $ Just "Golang update"
--------------------------------------------------------------------------------