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

treewide: fix broken AlpineLinux repo links #87892

Merged
merged 1 commit into from May 15, 2020

Conversation

Aver1y
Copy link
Contributor

@Aver1y Aver1y commented May 15, 2020

Motivation for this change

Apparently they changed their url scheme causing some of these links to break. E.g:

Broken: https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53
Fixed:  https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53

For some reason the versions with the cgit part still work for some of the links, however this just changes all of them.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Aver1y Aver1y changed the title apparmor: Fix broken patch links apparmor (pkgsMusl): Fix broken patch links May 15, 2020
@Aver1y Aver1y force-pushed the apparmor-fix-broken-patch-links branch from 61e29f5 to e851445 Compare May 15, 2020 14:33
@Mic92
Copy link
Member

Mic92 commented May 15, 2020

Seems like a general problem:

$ ag 'https://git.alpinelinux.org/cgit/aports' -l
pkgs/tools/networking/vde2/default.nix
pkgs/tools/misc/figlet/default.nix
pkgs/servers/monitoring/net-snmp/default.nix
pkgs/applications/misc/xterm/default.nix
pkgs/os-specific/linux/powertop/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/lvm2/default.nix
pkgs/os-specific/linux/apparmor/default.nix
pkgs/os-specific/linux/musl/default.nix
pkgs/development/libraries/gamin/default.nix
pkgs/development/libraries/libexecinfo/default.nix
pkgs/shells/tcsh/default.nix

@Aver1y
Copy link
Contributor Author

Aver1y commented May 15, 2020

For some reason only some (a minority actually) of those links are broken. However the version without the cgit part always seems to work. Should we just change them all or only the broken ones. Maybe the ones which aren't broken yet will become so in the future.

E.g.: https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1

@Mic92
Copy link
Member

Mic92 commented May 15, 2020

Just fix them all.

Actually not all of these were broken, however the version without the
cgit part works for all links.
@Aver1y Aver1y force-pushed the apparmor-fix-broken-patch-links branch from e851445 to 71924bc Compare May 15, 2020 15:46
@Aver1y Aver1y changed the title apparmor (pkgsMusl): Fix broken patch links Fix broken AlpineLinux repo links May 15, 2020
@Mic92 Mic92 changed the title Fix broken AlpineLinux repo links treewide: fix broken AlpineLinux repo links May 15, 2020
@Mic92 Mic92 merged commit 7517299 into NixOS:master May 15, 2020
Mic92 pushed a commit that referenced this pull request May 15, 2020
@Mic92
Copy link
Member

Mic92 commented May 15, 2020

Backport:

[detached HEAD a8650ff] treewide: fix broken AlpineLinux repo links (#87892)
Author: Lila lila91142@gmail.com
Date: Fri May 15 17:58:27 2020 +0200
12 files changed, 19 insertions(+), 19 deletions(-)

@Aver1y Aver1y deleted the apparmor-fix-broken-patch-links branch May 15, 2020 16:04
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

3 participants