Skip to content

Commit

Permalink
Merge pull request #377 from qowoz/quoted-urls
Browse files Browse the repository at this point in the history
remove `quotedUrls`
  • Loading branch information
ryantm committed Dec 20, 2023
2 parents 4f99cdf + a29a4b4 commit 47ae71a
Showing 1 changed file with 1 addition and 24 deletions.
25 changes: 1 addition & 24 deletions src/Rewrite.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module Rewrite
( Args (..),
runAll,
golangModuleVersion,
quotedUrls,
rustCrateVersion,
version,
redirectedUrls,
Expand Down Expand Up @@ -61,8 +60,7 @@ plan =
("rustCrateVersion", rustCrateVersion),
("golangModuleVersion", golangModuleVersion),
("npmDepsVersion", npmDepsVersion),
("updateScript", updateScript),
("", quotedUrls) -- Don't change the logger
("updateScript", updateScript)
--("redirectedUrl", Rewrite.redirectedUrls)
]

Expand Down Expand Up @@ -93,27 +91,6 @@ version log args@Args {..} = do
lift $ log "updated version and sha256"
return $ Just "Version update"

--------------------------------------------------------------------------------
-- Rewrite meta.homepage (and eventually other URLs) to be quoted if not
-- already, as per https://github.com/NixOS/rfcs/pull/45
quotedUrls :: (Text -> IO ()) -> Args -> ExceptT Text IO (Maybe Text)
quotedUrls log Args {..} = do
lift $ log "[quotedUrls]"
homepage <- Nix.getHomepage attrPath
let goodHomepage = "homepage = " <> homepage <> ";"
let replacer = \target -> File.replaceIO target goodHomepage derivationFile
urlReplaced1 <- replacer ("homepage = " <> homepage <> ";")
urlReplaced2 <- replacer ("homepage = " <> homepage <> " ;")
urlReplaced3 <- replacer ("homepage =" <> homepage <> ";")
urlReplaced4 <- replacer ("homepage =" <> homepage <> "; ")
if urlReplaced1 || urlReplaced2 || urlReplaced3 || urlReplaced4
then do
lift $ log "[quotedUrls]: added quotes to meta.homepage"
return $ Just "Quoted meta.homepage for [RFC 45](https://github.com/NixOS/rfcs/pull/45)"
else do
lift $ log "[quotedUrls] nothing found to replace"
return Nothing

--------------------------------------------------------------------------------
-- Redirect homepage when moved.
redirectedUrls :: MonadIO m => (Text -> m ()) -> Args -> ExceptT Text m (Maybe Text)
Expand Down

0 comments on commit 47ae71a

Please sign in to comment.