-
-
Notifications
You must be signed in to change notification settings - Fork 14.3k
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
webkitgtk: refactor top-level to deprecate default ABI version #345611
Conversation
062ed62
to
5a6bcc9
Compare
5a6bcc9
to
1da61e6
Compare
6a1d60f
to
5be77d0
Compare
|
Result of 4 packages built:
|
Cleaned up the tree @jtojnar, will wait a bit for feedback but this seems mergeable as is. |
error: function 'anonymous lambda' called without required argument 'webkitgtk_4_0-web-process-extension'
at /ofborg/checkout/2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-1/pkgs/development/haskell-modules/hackage-packages.nix:124272:6:
124271| "gi-webkitwebprocessextension" = callPackage
124272| ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
| ^
124273| , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup |
a41c3a6
to
8ae3ae4
Compare
Addressed all your comments @jtojnar, thanks for the review. :3 |
3f3fabb
to
2c69010
Compare
Working on rebase |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, LGTM now.
sed -i 's/ webkitgtk\b/ webkitgtk_4_0/g' pkgs/**.nix sed -i 's/(webkitgtk\b/(webkitgtk_4_0/g' pkgs/**.nix sed -i 's/\.webkitgtk\b/.webkitgtk_4_0/g' pkgs/**.nix webkitgtk is currently pointing to that specific ABI version but the alias is going to start warning
2c69010
to
b9a93b6
Compare
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Quick skim through, LGTM.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM conceptually, want to see 0 rebuilds confirmed.
Detects the webkitgtk_4_0 as a new package so hasn't reported 0. :c Labelled as 1 rebuild on previous evals |
@ofborg eval |
Eval finished as 1 rebuild due to webkitgtk_4_0 being treated as a new package |
This commit partially reverts ccec93c. This will break a lot of packages in haskellPackages (due to a missing webkitgtk), but at least hackage-packages.nix is reproducible with the generation shell script again. Unfortunately, it seems the generated nature of hackage-packages.nix was ignored when preparing the webkitgtk change: #345611 (comment)
When we don't know the exact version from the cabal file, we still emit the generic name that has recently been removed from nixpkgs safe for an alias (NixOS/nixpkgs#345611) which we can't use in hackage-packages.nix. This is still the best solution for downstream expressions generated by cabal2nix, in nixpkgs we'll have to manually specify the correct version (instead of hackage2nix picking the default which may not always be correct). Co-authored-by: sternenseemann <[email protected]>
When we don't know the exact version from the cabal file, we still emit the generic name that has recently been removed from nixpkgs safe for an alias (NixOS/nixpkgs#345611) which we can't use in hackage-packages.nix. This is still the best solution for downstream expressions generated by cabal2nix, in nixpkgs we'll have to manually specify the correct version (instead of hackage2nix picking the default which may not always be correct). Co-authored-by: sternenseemann <[email protected]>
Description of changes
This is to avoid breaking things by changing the default version and making dependents more explicit about such dependency
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.