Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update a bunch (148+) of homepages (permanent redirect problems as found by repology) #33263

Merged
merged 148 commits into from Jan 5, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Jan 1, 2018

Motivation for this change

This is my effort for #30636, well, a first blast at trying to fix the easy issues.

The repository was passed through a script, specific version used available here:

It has changed mostly meta homepage URLs, BUT, some download URLs have been changed. This is a side-effect of the dumb (but effective) way the change is handled. All download URLs that were a sub-path of the homepages have been automatically converted. For all URLs changed, this happened to be http→https.

Things done

Nothing was tested, no build of any of the affected software was done as this is all metadata changes.

The commits have been viewed (with my eyeballs) one by one. I have checked a couple of them manually to see whether all was right or not, especially when download URLs were changed too. If something fails, it's likely that it is the download URL, and that download URL already was previously failing.

YES, if anything fails, (except for URLs having disappeared), I'll take responsibility and clean it through the script.


Last, I would like to know if there's already some guidelines for commits made with automated tools. This is the way my commits look (the quote quotes the problem as stated in repology):

zeal: Updates homepage URL.

This commit automatically fixes the following problem:

> Homepage link "http://zealdocs.org/" is a permanent redirect to
> "https://zealdocs.org/" and should be updated

(Commit automatically made using repology-autofixer)

If there is anything you would like added or changed to the messages, just ask, running this script is really cheap, it's basically one API request, and some (short) waiting time.

@samueldr samueldr changed the title Repology/autofixer Update a bunch (226+) of homepages (permanent redirect problems as found by repology) Jan 1, 2018
@vcunat
Copy link
Member

vcunat commented Jan 1, 2018

@grahamc: the borg's auto-tagging has some bad edge cases, apparently, but I don't expect it matters :-)

@vcunat
Copy link
Member

vcunat commented Jan 1, 2018

Last, I would like to know if there's already some guidelines for commits made with automated tools.

I don't think we really have them. The style of these commits looks good to me. I'm not sure whether to take this way of many commits or a single big treewide commit.

EDIT: in case a source download breaks (due to this), we won't see it on Hydra, at least not soon enough, but the risk+damage seems rather low.

@samueldr
Copy link
Member Author

samueldr commented Jan 1, 2018

It is a hard choice, with regards to the contributing guidelines, whether to make a huge commit, or one commit per URL. It can be argued both ways!

  • One commit per change, using the appropriate commit naming rules. This "pollutes" the global history, but makes each change an easy to understand, logical change, with regards to the history of that file.
  • One big commit, has a more generic commit message, but does not "pollute" the global history. This does make the change way bigger, making a file's local history weirder to understand when glancing at it. One big commit makes it inconvenient to explain each change with the exact problems fixed.

For this particular problem fixer, the permanent redirects, it is expected that the next time the script is used, a really low number of changes will need to be done, making many commits much more palatable.

peti
peti previously requested changes Jan 1, 2018
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't edit hackage-packages.nix.

@@ -32184,7 +32184,7 @@ self: {
executableHaskellDepends = [
base criterion optparse-applicative process silently text turtle
];
homepage = "http://github.com/Gabriel439/bench";
homepage = "https://github.com/Gabriel439/bench";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't edit auto-generated files. See the first line of this module.

@samueldr samueldr changed the title Update a bunch (226+) of homepages (permanent redirect problems as found by repology) Update a bunch (225+) of homepages (permanent redirect problems as found by repology) Jan 1, 2018
@samueldr
Copy link
Member Author

samueldr commented Jan 1, 2018

The hackage-packages file has been blacklisted. I pushed the result of a new run of the tool (explaining the two screen-fulls of commits).

Just to verify, dotnet-packages and python-packages are fine to change, right? (There is no comment on those files.)

Are there other auto-generated files that such a tool would need to steer away from?

@FRidh
Copy link
Member

FRidh commented Jan 1, 2018

python-packages is fine. As there are a lot of Python changes in staging currently, it may be best to base against staging or create this commit after staging is merged into master.

@samueldr
Copy link
Member Author

samueldr commented Jan 1, 2018

Since it is stupidly cheap to re-run this, I prefer, for expediency's sake, to re-run on master without python-packages, then either re-run on staging with only python-packages or wait until staging is merged to re-run.

Not that there's any reason to do this fast.

This commit automatically fixes the following problem:

> Homepage link "http://github.com/airspy/airspyone_host" is a permanent redirect
> to "https://github.com/airspy/airspyone_host" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://aws.amazon.com/elasticbeanstalk/" is a permanent redirect
> to "https://aws.amazon.com/elasticbeanstalk/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://dotnet.github.io/core/" is a permanent redirect to
> "https://dotnet.github.io/core/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://bisqwit.iki.fi/source/cromfs.html" is a permanent redirect
> to "https://bisqwit.iki.fi/source/cromfs.html" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://ctop.sh/" is a permanent redirect to "https://ctop.sh/"
> and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://josephp91.github.io/curlcpp/" is a permanent redirect to
> "https://josephp91.github.io/curlcpp/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://grothoff.org/christian/doodle/" is a permanent redirect to
> "https://grothoff.org/christian/doodle/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://suckless.org/" is a permanent redirect to
> "https://suckless.org/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://software.sil.org/gentium/" is a permanent redirect to
> "https://software.sil.org/gentium/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://opendyslexic.org/" is a permanent redirect to
> "https://opendyslexic.org/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://als.regnet.cz/fpm2/" is a permanent redirect to
> "https://als.regnet.cz/fpm2/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://www.virtualbox.org/" is a permanent redirect to
> "https://www.virtualbox.org/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://www.vmime.org/" is a permanent redirect to
> "https://www.vmime.org/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://github.com/VMML/vmmlib/" is a permanent redirect to
> "https://github.com/VMML/vmmlib/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://hoytech.com/vmtouch/" is a permanent redirect to
> "https://hoytech.com/vmtouch/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://www.unix-ag.uni-kl.de/~massar/vpnc/" is a permanent
> redirect to "https://www.unix-ag.uni-kl.de/~massar/vpnc/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://wayland.freedesktop.org/" is a permanent redirect to
> "https://wayland.freedesktop.org/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://www.zaphoyd.com/websocketpp/" is a permanent redirect to
> "https://www.zaphoyd.com/websocketpp/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://wkhtmltopdf.org/" is a permanent redirect to
> "https://wkhtmltopdf.org/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://tools.suckless.org/wmname" is a permanent redirect to
> "https://tools.suckless.org/wmname" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://utelle.github.io/wxsqlite3/" is a permanent redirect to
> "https://utelle.github.io/wxsqlite3/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://xapian.org/" is a permanent redirect to
> "https://xapian.org/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://pingus.seul.org/~grumbel/xboxdrv/" is a permanent redirect
> to "https://pingus.seul.org/~grumbel/xboxdrv/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://cgit.freedesktop.org/xcb/util-cursor" is a permanent
> redirect to "https://cgit.freedesktop.org/xcb/util-cursor" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://portland.freedesktop.org/wiki/" is a permanent redirect to
> "https://portland.freedesktop.org/wiki/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://www.x.org/" is a permanent redirect to
> "https://www.x.org/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://cgit.freedesktop.org/xorg/driver/xf86-video-nested" is a
> permanent redirect to
> "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested" and should be
> updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://www.jwz.org/xscreensaver/" is a permanent redirect to
> "https://www.jwz.org/xscreensaver/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://tukaani.org/xz/" is a permanent redirect to
> "https://tukaani.org/xz/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://www.zabbix.com/" is a permanent redirect to
> "https://www.zabbix.com/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://pwmt.org/projects/zathura/" is a permanent redirect to
> "https://pwmt.org/projects/zathura/" and should be updated

(Commit automatically made using repology-autofixer)
This commit automatically fixes the following problem:

> Homepage link "http://zealdocs.org/" is a permanent redirect to
> "https://zealdocs.org/" and should be updated

(Commit automatically made using repology-autofixer)
@samueldr samueldr reopened this Jan 1, 2018
@samueldr samueldr changed the title Update a bunch (225+) of homepages (permanent redirect problems as found by repology) Update a bunch (148+) of homepages (permanent redirect problems as found by repology) Jan 1, 2018
@grahamc
Copy link
Member

grahamc commented Jan 1, 2018

@vcunat w.r.t. the edge case here, right now it runs nix-instantiate . -A stdenv. Should I change this to nix-instantiate . -A stdenv.out?

@vcunat
Copy link
Member

vcunat commented Jan 1, 2018

@grahamc: that would still be derivation. To print the out-path, I know e.g. nix eval -f . stdenv.outPath (with nix-1.12).

@orivej
Copy link
Contributor

orivej commented Jan 5, 2018

I'd strongly prefer one treewide commit, or rather one commit that changes all meta and another that changes all src.

@fpletz fpletz dismissed peti’s stale review January 5, 2018 18:24

hackage-packages.nix is not modified anymore

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also prefer one commit but 👍

@vcunat vcunat merged commit 7b97c8c into NixOS:master Jan 5, 2018
@samueldr samueldr deleted the repology/autofixer branch January 5, 2018 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants