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

Already on GitHub? Sign in to your account

Jump to bottom

kde/gear: 24.02.0 -> 24.02.1 #297740

Merged
merged 4 commits into from Mar 21, 2024
Merged

kde/gear: 24.02.0 -> 24.02.1 #297740

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
919046f
kde/gear: 24.02.0 -> 24.02.1
K900 Mar 21, 2024
efdbcac
kdePackages.mkKdeDerivation: fix meta operator priority
K900 Mar 21, 2024
0403caa
kdePackages.elisa: just depend on libvlc
K900 Mar 21, 2024
9ed0a0a
kdePackages.kalarm: add new libcanberra dependency
K900 Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/kde/lib/mk-kde-derivation.nix
View file
Open in desktop
Expand Up @@ -124,4 +124,4 @@ in
position = "${pos.file}:${toString pos.line}";
} // (args.meta or { });
in
stdenv.mkDerivation (defaultArgs // cleanArgs) // { inherit meta; }
stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta; })
Copy link
Member

Choose a reason for hiding this comment

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

I don't think that is correct. To apply meta.pos correctly, it needs to be merged after mkDerivation got evaluated. When I do nix edit kdePackages.ark on this branch, this file gets opened, instead of pkgs/kde/gear/ark/default.nix like on nixos-unstable currently.

Copy link
Member

Choose a reason for hiding this comment

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

please see #297780

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But doing it the other way around breaks meta.broken.