-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
haskellPackages: use upstream version for reflex-dom(-core) #374457
Conversation
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.
Fix for gi-javascriptcore*: c2f080a
0a8cc81
to
26014db
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.
Can you give the second reflex related commit a commit message with the <attr path>: …
prefix as well?
I've already cherry picked f26afe0 onto haskell-updates.
]; | ||
inherit ( | ||
let | ||
useUpstream = pkg: version: lib.warnIf (super.${pkg}.version >= version) "${pkg} version override is no longer needed and should be removed" ( |
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.
Needs to use lib.versionAtLeast
instead, >=
on strings is just a lexical comparison.
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.
Oh right
''; | ||
})) | ||
]; | ||
reflex = lib.warnIf (super.reflex.version >= "0.9.3.2") "reflex version override is no longer needed and should be removed" |
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.
Also needs lib.versionAtLeast
.
… gi-gtk and gi-javascriptcore
Yes! |
Thanks! I've cherry-picked your commits manually and fixed your typo in 95d1770 |
Hmm? Which typo? |
Oh, the commit message. Could have sworn I had fixed that on the latest force push |
This fixes the
reflex-dom-core
build while we wait for the hackage release to propagate, but weird things happen with the deps ofreflex-dom
jsaddle-webkit2gtk-0.9.9.0 -> gi-javascriptcore (>=4.0.14 && <4.1), gi-webkit2 (>=4.0.14 && <4.1)
gi-webkit2-4.0.31 -> gi-javascriptcore (>=4.0 && <4.1),
gi-webkit2-4.0.32 -> gi-javascriptcore4
It seems
gi-webkit2
started using separate packages butjsaddle-webkit2gtk
hasn't yet adjusted to the change?IIUC until then we want to force
jsaddle-webkit2gtk
to usegi-javascriptcore4
?That simplifies things to
but then
gi-javascriptcore4
fails to build withand I can't seem to make it happy messing with
*PkgconfigDepends
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.