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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: fix various metadata urls #299293

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

lolbinarycat
Copy link
Contributor

Description of changes

i found a bunch of broken metadata urls, this fixes some of them.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

Copy link
Contributor

@LordGrimmauld LordGrimmauld left a comment

Choose a reason for hiding this comment

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

Please make sure your commits and messages match up with the contributing guidelines, especially in terms of squashing commits and naming them. "Merge branch 'master' into meta-url-fix" shouldn't be contributed like that. You probably want to rebase and force push to your fork to fix it.

Other than that, two inconsistencies i found are explained in the review comments.

@@ -40,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
description = "AWS post-exploitation tool";
mainProgram = "ec2stepshell";
homepage = "https://github.com/saw-your-packet/EC2StepShell";
changelog = "https://github.com/saw-your-packet/EC2StepShell/blob/${version}/CHANGELOG.txt";
changelog = "https://github.com/saw-your-packet/EC2StepShell/blob/${rev}/CHANGELOG.txt";
Copy link
Contributor

Choose a reason for hiding this comment

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

if you put src.rev here instead of referring to the constant, you don't need to define the constant containing the git commit hash.

@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
];
platforms = platforms.linux;
license = licenses.zlib;
downloadPage = "http://matricks.github.com/bam/";
downloadPage = "http://matricks.github.io/bam/";
Copy link
Contributor

Choose a reason for hiding this comment

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

https?

@lolbinarycat
Copy link
Contributor Author

You probably want to rebase and force push to your fork to fix it.

my local nixpkgs copy is maintained using shallow pulls, and the rebase command has several modes it can operate in.

if you can point me towards the correct incantations that will make sure i don't have to open a new PR, that would be greatly appreciated.

also, the thing about merges should probably be in the contributing guide.

@LordGrimmauld
Copy link
Contributor

LordGrimmauld commented Apr 13, 2024

To fix your previous commit, git commit --amend is nice, it changes your last commit instead of making a new one.

If you already made a new one (like this merge commit here), you might want to use git rebase HEAD~2 to rebase the last two commits before HEAD. You might also want to add -i cli flag for interactive mode. You likely want to pick the oldest commit, and squash the newer commits. If you want to change the message of a commit you can also use reword. The editor opened by git rebase as well as man git-rebase should give more detailed info.

Be aware all of these require force pushes and therefore are only advised to be used on forks you own and use for PRs. Never force push to production repos.

@lolbinarycat
Copy link
Contributor Author

trying to rebase gives me hundreds of merge conflicts.

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