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

Fix pname misuse, part 1 #326683

Merged
merged 4 commits into from
Jul 13, 2024
Merged

Fix pname misuse, part 1 #326683

merged 4 commits into from
Jul 13, 2024

Conversation

eclairevoyant
Copy link
Contributor

@eclairevoyant eclairevoyant commented Jul 13, 2024

Description of changes

finalAttrs.pname in a url is objectively wrong, so replace its use with a string literal.

  • treewide: fix uses of repo = finalAttrs.pname
  • treewide: fix uses of finalAttrs.pname in source urls
  • treewide: fix uses of finalAttrs.pname in meta.homepage

Also, remove the finalAttrs arg entirely if the changes above resulted in it being unused:

sed -i 's/(finalAttrs: {/{/;s/^})$/}/' $(rg -c finalAttrs $(git diff @{^^^,} --name-only) | rg ':1$' | sed 's/:1$//')

I didn't touch the whole tree since the regex would need tweaking for edge cases.

Related: #310373, #277994

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.11 Release Notes (or backporting 23.11 and 24.05 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.

@eclairevoyant eclairevoyant requested a review from jtojnar as a code owner July 13, 2024 00:25
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Jul 13, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jul 13, 2024
@Mic92 Mic92 merged commit e570759 into NixOS:master Jul 13, 2024
29 checks passed
@eclairevoyant eclairevoyant deleted the pname-misuse-pt-1 branch July 13, 2024 12:25
imincik added a commit to imincik/geospatial-nix that referenced this pull request Jul 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: best practices 6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants