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

font-{alias,util}, gccmakedep, libp{ciacces,threadstub}s: refactor and migrate to pkgs/by-name from xorg namespace #369520

Open
wants to merge 6 commits into
base: staging
Choose a base branch
from

Conversation

quantenzitrone
Copy link
Contributor

@quantenzitrone quantenzitrone commented Dec 30, 2024

This is my next step on refactoring and migrating all xorg packages to pkgs/by-name.
Split of #322521
This is ready for review now.

Done:

  • fontalias
  • fontutil
  • gccmakedep
  • libpciaccess
  • libpthreadstubs

Will move to another PR:

  • libxcvt
  • makedepend
  • utilmacros
  • xbitmaps
  • xcbproto
  • xkeyboardconfig
  • xorgcffiles
  • xorgdocs
  • xorgsgmldoctools
  • xtrans

the list of xorg packages that don't depend on other xorg packages was generated by this script:

#!/usr/bin/env fish

set names (cat pkgs/servers/x11/xorg/default.nix | \
	grep callPackage | \
	string trim | \
	string split -m 1 -f 1 ' ')

for line in (cat pkgs/servers/x11/xorg/default.nix | grep callPackage | string trim)
	set name (string split -m 1 -f 1 ' ' $line)
	set xorgdepscount (string split -m 1 -f 2 ' ' $line | grep -Eo (string join '|' $names) | wc -l)
	if test $xorgdepscount -eq 0
		echo $name
	end
end | sort

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added the 6.topic: lib The Nixpkgs function library label Dec 30, 2024
@quantenzitrone quantenzitrone marked this pull request as draft December 30, 2024 23:50
@nix-owners nix-owners bot requested a review from alyssais December 30, 2024 23:51
@quantenzitrone quantenzitrone force-pushed the xorg-migrate-to-pkgs-by-name branch from cfd2737 to 16d54f4 Compare December 31, 2024 01:10
@quantenzitrone quantenzitrone changed the title font-alias, <todo>: refactored and migrated to pkgs/by-name from xorg namespace font-{alias,util}, <todo>: refactored and migrated to pkgs/by-name from xorg namespace Dec 31, 2024
@quantenzitrone quantenzitrone force-pushed the xorg-migrate-to-pkgs-by-name branch from 16d54f4 to fbd1b74 Compare December 31, 2024 02:49
@quantenzitrone quantenzitrone changed the title font-{alias,util}, <todo>: refactored and migrated to pkgs/by-name from xorg namespace font-{alias,util}, gccmakedep: refactored and migrated to pkgs/by-name from xorg namespace Dec 31, 2024
@quantenzitrone quantenzitrone changed the title font-{alias,util}, gccmakedep: refactored and migrated to pkgs/by-name from xorg namespace font-{alias,util}, gccmakedep: refactor and migrate to pkgs/by-name from xorg namespace Dec 31, 2024
@quantenzitrone quantenzitrone force-pushed the xorg-migrate-to-pkgs-by-name branch from fbd1b74 to 9dc0a55 Compare December 31, 2024 03:17
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 31, 2024
@quantenzitrone quantenzitrone changed the title font-{alias,util}, gccmakedep: refactor and migrate to pkgs/by-name from xorg namespace font-{alias,util}, gccmakedep, libpciaccess: refactor and migrate to pkgs/by-name from xorg namespace Dec 31, 2024
@alyssais
Copy link
Member

Would probably be easier to review and merge as separate PRs, rather than one big PR for 20 or whatever packages.

@quantenzitrone quantenzitrone force-pushed the xorg-migrate-to-pkgs-by-name branch from b737264 to 9ca6cf0 Compare December 31, 2024 15:39
@quantenzitrone quantenzitrone changed the title font-{alias,util}, gccmakedep, libpciaccess: refactor and migrate to pkgs/by-name from xorg namespace font-{alias,util}, gccmakedep, libp{ciacces,threadstub}s: refactor and migrate to pkgs/by-name from xorg namespace Dec 31, 2024
@quantenzitrone
Copy link
Contributor Author

yeah but xorg is over 200 packages and i don't want to do as many prs, so i want to do it in ok-ish chunks
but tbh 5 is probably ok, i will do the other 10 in 2 other prs

@quantenzitrone quantenzitrone force-pushed the xorg-migrate-to-pkgs-by-name branch from 7631916 to 69f4e03 Compare December 31, 2024 17:12
@quantenzitrone
Copy link
Contributor Author

5001+ rebuilds for the hydra, yummy

@quantenzitrone
Copy link
Contributor Author

i will have to configure my gpg signin, git signed these commits with the wrong key
a job for next year me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: lib The Nixpkgs function library 10.rebuild-darwin: 5001+ 10.rebuild-linux: 5001+
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants