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

weylus: unstable-2022-06-07 -> 0.11.4-unstable-2025-02-24; modernize derivation; move to by-name #391603

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

Conversation

KSJ2000
Copy link
Contributor

@KSJ2000 KSJ2000 commented Mar 20, 2025

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 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 22, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 22, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 22, 2025
@KSJ2000 KSJ2000 marked this pull request as draft March 22, 2025 08:25
@KSJ2000 KSJ2000 force-pushed the weylus branch 2 times, most recently from 15b653f to 655cca7 Compare March 22, 2025 08:36
@KSJ2000 KSJ2000 marked this pull request as ready for review March 22, 2025 08:50
@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 Mar 22, 2025
@nix-owners nix-owners bot requested a review from legendofmiracles March 22, 2025 08:58
Comment on lines 29 to 37
package = lib.mkOption {
type = package;
default = pkgs.callPackage ../../../pkgs/by-name/we/weylus/package.nix { };
defaultText = lib.literalExpression "pkgs.callPackage ../../../pkgs/by-name/we/weylus/package.nix {}";
description = ''
The weylus package to use.
'';
};
};
Copy link
Contributor

Choose a reason for hiding this comment

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

Why was this change made?

Copy link
Contributor Author

@KSJ2000 KSJ2000 Mar 26, 2025

Choose a reason for hiding this comment

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

It gave some errors otherwise because of the change to by-name/package.nix
Tho I'm not sure if that's the best way to do it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right. It was probably something transient that got resolved when I rebased.

Comment on lines 2 to 26
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
makeWrapper,
autoconf,
cmake,
dbus,
fetchFromGitHub,
ffmpeg,
x264,
libva,
git,
gst_all_1,
xorg,
lib,
libdrm,
pkg-config,
libtool,
libva,
libxkbcommon,
makeWrapper,
nix-update-script,
pango,
pipewire,
cmake,
git,
autoconf,
libtool,
pkg-config,
rustPlatform,
typescript,
ApplicationServices,
Carbon,
Cocoa,
VideoToolbox,
libxkbcommon,
Copy link
Contributor

Choose a reason for hiding this comment

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

I get all this is now alphabetically ordered, but lib, stdenv are usually at the top.

license = with lib.licenses; [ agpl3Only ];
mainProgram = "weylus";
maintainers = with lib.maintainers; [ lom ];
platforms = lib.platforms.linux;
Copy link
Contributor

Choose a reason for hiding this comment

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

Did upstream drop support for darwin?

If no, I think we ought to keep broken = and all the lib.optionals stuff.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If darwin doesn't work, is it better to have platforms=unix and broken=darwin instead of platforms linux? especially since there have been no more releases for like 4 years..

@github-actions github-actions bot added 10.rebuild-linux: 1 and removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants