Merge pull request #497 from nix-community/go-rust

drop cargoSha256, vendorSha256, match buildGo

Author: zowoq

src/Nix.hs

@@ -138,7 +138,7 @@ getDerivationFile attrPath = do
     & fmapRT (fst >>> T.strip >>> T.stripPrefix (T.pack npDir <> "/") >>> fromJust)
 
 -- Get an attribute that can be evaluated off a derivation, as in:
--- getAttr "cargoSha256" "ripgrep" -> 0lwz661rbm7kwkd6mallxym1pz8ynda5f03ynjfd16vrazy2dj21
+-- getAttr "cargoHash" "ripgrep" -> 0lwz661rbm7kwkd6mallxym1pz8ynda5f03ynjfd16vrazy2dj21
 getAttr :: MonadIO m => Text -> Text -> ExceptT Text m Text
 getAttr attr = srcOrMain (nixEvalApply ("p: p." <> attr))
 
@@ -204,7 +204,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 =", "cargoHash =", "vendorSha256 =", "vendorHash =", "hash =", "npmDepsHash ="]
+  sum $ map countUp ["sha256 =", "sha256=", "cargoHash =", "vendorHash =", "hash =", "npmDepsHash ="]
   where
     countUp x = T.count x derivationContents
 

src/Rewrite.hs

@@ -126,18 +126,17 @@ redirectedUrls log Args {..} = do
 --------------------------------------------------------------------------------
 -- Rewrite Rust on rustPlatform.buildRustPackage
 -- This is basically `version` above, but with a second pass to also update the
--- cargoSha256 vendor hash.
+-- cargoHash vendor hash.
 rustCrateVersion :: MonadIO m => (Text -> m ()) -> Args -> ExceptT Text m (Maybe Text)
 rustCrateVersion log args@Args {..} = do
   if
-      | and [(not (T.isInfixOf "cargoSha256" derivationContents)), (not (T.isInfixOf "cargoHash" derivationContents))] -> do
-          lift $ log "No cargoSha256 or cargoHash found"
+      | (not (T.isInfixOf "cargoHash" derivationContents)) -> do
+          lift $ log "No cargoHash found"
           return Nothing
       | hasUpdateScript -> do
           lift $ log "skipping because derivation has updateScript"
           return Nothing
       | otherwise -> do
-          _ <- lift $ File.replaceIO "cargoSha256 =" "cargoHash =" derivationFile
           -- 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 cargoHash!
@@ -160,14 +159,13 @@ rustCrateVersion log args@Args {..} = do
 golangModuleVersion :: MonadIO m => (Text -> m ()) -> Args -> ExceptT Text m (Maybe Text)
 golangModuleVersion log args@Args {..} = do
   if
-      | and [not (T.isInfixOf "buildGoModule" derivationContents && T.isInfixOf "vendorSha256" derivationContents), not (T.isInfixOf "buildGoModule" derivationContents && T.isInfixOf "vendorHash" derivationContents)] -> do
-          lift $ log "Not a buildGoModule package with vendorSha256 or vendorHash"
+      | not (T.isInfixOf "buildGo" derivationContents && T.isInfixOf "vendorHash" derivationContents) -> do
+          lift $ log "Not a buildGoModule package with vendorHash"
           return Nothing
       | hasUpdateScript -> do
           lift $ log "skipping because derivation has updateScript"
           return Nothing
       | otherwise -> do
-          _ <- lift $ File.replaceIO "vendorSha256 =" "vendorHash =" derivationFile
           -- 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 vendorHash!
@@ -197,7 +195,7 @@ golangModuleVersion log args@Args {..} = do
 --------------------------------------------------------------------------------
 -- Rewrite NPM packages with buildNpmPackage
 -- This is basically `version` above, but with a second pass to also update the
--- cargoSha256 vendor hash.
+-- npmDepsHash vendor hash.
 npmDepsVersion :: MonadIO m => (Text -> m ()) -> Args -> ExceptT Text m (Maybe Text)
 npmDepsVersion log args@Args {..} = do
   if