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.

Sign up for GitHub

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

Jump to bottom

goverlay: 0.7.1 -> 1.2 #368202

Merged
merged 4 commits into from
Dec 27, 2024
Merged

goverlay: 0.7.1 -> 1.2 #368202

merged 4 commits into from
Dec 27, 2024

Conversation

Chais
Copy link
Contributor

@Chais Chais commented Dec 25, 2024

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.

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Dec 25, 2024
SigmaSquadron
SigmaSquadron reviewed Dec 25, 2024
View reviewed changes
Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

Welcome to Nixpkgs! Please review the Contribution Guidelines for more information about how to format your commits. Notably, their titles should follow the packagename: oldversion -> newversion template. Ideally, the removal of find-xdg-data-files and the alphabetical sorting should also be separate commits, following the packagename: change description template.

pkgs/tools/graphics/goverlay/default.nix Outdated
Comment on lines 1 to 26
{
lib,
writeScriptBin,
bash,
stdenv,
coreutils,
fetchFromGitHub,
fpc,
lazarus-qt,
wrapQtAppsHook,
breeze-qt5,
libGL,
libGLU,
libqt5pas,
libX11,
coreutils,
git,
gnugrep,
iproute2,
lazarus-qt6,
lib,
libGL,
libGLU,
libnotify,
libqt6pas,
libX11,
nix-update-script,
polkit,
procps,
stdenv,
systemd,
util-linux,
vulkan-tools,
which,
nix-update-script,
wrapQtAppsHook,
}:
Copy link
Contributor

Choose a reason for hiding this comment

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

For consistency with other packages, please put lib as the first attribute in the function call, followed by stdenv and fetchFromGitHub.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The sorting I can split out, I'm not sure how useful the removal of find-xdg-data-files is on its own. It was required with 0.7.1 but isn't with 1.2. Unless you're referring of the deletion of find-xdg-data-files.patch, than I can easily separate.

@SigmaSquadron SigmaSquadron added the 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed label Dec 25, 2024
@Chais Chais changed the title Bump GOverlay to 1.2 goverlay: 0.7.1 -> 1.2 Dec 25, 2024
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog labels Dec 25, 2024
@SigmaSquadron
Copy link
Contributor

SigmaSquadron commented Dec 25, 2024 via email

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 26, 2024
@kira-bruneau
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 368202

x86_64-linux

⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
✅ 2 packages built:
  • goverlay
  • goverlay.man

@kira-bruneau
Copy link
Contributor

kira-bruneau commented Dec 26, 2024 •
edited
Loading

Thanks for the update @Chais!!

Just for reference, I was originally getting a build error:

EThread: Failed to create new thread
  $0000000000444A56
  $0000000000444E71
  $0000000000937974
  $0000000000935AD8
  $000000000052F9BA
  $00000000005AAB8B
  $00000000004056F6
  $00000000004051E3
  $000000000040343F
  $0000000000408CE3
  $000000000040B9C9

This was one of the reasons why I removed myself as maintainer on goverlay, but finally tracked the issue down to a bug in lazarus: https://bugs.gentoo.org/937421.

I just had this option set in my NixOS config:

nix.daemonCPUSchedPolicy = "idle"

Temporarily removing this allows me to build the package again.

kira-bruneau
kira-bruneau reviewed Dec 26, 2024
View reviewed changes
Copy link
Contributor

@kira-bruneau kira-bruneau left a comment

Choose a reason for hiding this comment

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

Oh wait, I missed that CI is failing on formatting right now. Other than that though, this looks good to me!

@kira-bruneau kira-bruneau self-requested a review December 26, 2024 19:50
@Chais
Copy link
Contributor Author

Chais commented Dec 26, 2024

Oh wait, I missed that CI is failing on formatting right now. Other than that though, this looks good to me!

@kira-bruneau I saw the formatting check failing but was unsure if it's something that should be remedied, given that nixfmt mostly pulls arrays into fewer lines and most files have one element per line.

@kira-bruneau
Copy link
Contributor

@kira-bruneau I saw the formatting check failing but was unsure if it's something that should be remedied, given that nixfmt mostly pulls arrays into fewer lines and most files have one element per line.

Oh yep it should be remedied here. It's not complete yet, but there's been a big push to have everything formatted with nixfmt. There are still some files that haven't been formatted yet, but that's mainly to avoid merge conflicts.

See #322537

@Chais
Copy link
Contributor Author

Chais commented Dec 26, 2024

nixfmt check still fails after running it. Would be helpful to know what the check takes offense at.

@kira-bruneau
Copy link
Contributor

Oh I just ran it locally and pushed the diff. It looks like the issue was just an extra empty line.

@Chais
Copy link
Contributor Author

Chais commented Dec 26, 2024

Oh I just ran it locally and pushed the diff. It looks like the issue was just an extra empty line.

Oh, that's interesting. Yours arranged the arrays in one element per line again. What was it originally complaining about then?

@kira-bruneau
Copy link
Contributor

Oh it was just the extra blank line above stdenv.mkDerivation that was left after removing find-xdg-data-files.

@kira-bruneau kira-bruneau merged commit 8f24b0a into NixOS:master Dec 27, 2024
41 of 42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SigmaSquadron SigmaSquadron SigmaSquadron left review comments

@kira-bruneau kira-bruneau kira-bruneau approved these changes

Assignees
No one assigned
Labels
2.status: blocked by pr/issue Another PR or issue is preventing this from being completed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Package request: Goverlay 0.7.1 -> 1.2
4 participants
@Chais @SigmaSquadron @kira-bruneau @NixOSInfra