-
-
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
Reapply "openobserve: 0.7.2 -> 0.8.1" #289751
Conversation
I was testing a mostly similar one here #289526 |
@happysalada Oh yeah that one would be more ideal! It shouldn't require explicit testing, as long as the derivation hashes match |
alight, I'll wait for ofborg to be happy and for my local build to finish before merging. |
openobserve = darwin.apple_sdk_11_0.callPackage ../servers/monitoring/openobserve { | ||
apple_sdk = darwin.apple_sdk_11_0; | ||
}; |
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.
Does this work?
openobserve = darwin.apple_sdk_11_0.callPackage ../servers/monitoring/openobserve { | |
apple_sdk = darwin.apple_sdk_11_0; | |
}; | |
openobserve = callPackage ../servers/monitoring/openobserve { | |
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; | |
}; |
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.
Not entirely. It looks like there's also a separate rustPlatform
attribute provided by the darwin.apple_sdk_11_0.callPackage
.
This reverts commit ac637ef. The original PR (NixOS#289522) broke the `pkgs/by-name` check on master, so it was reverted in NixOS#289655. This reapplies the original commits and makes sure that the `pkgs/by-name` check works by moving it out of `pkgs/by-name`.
f9fb872
to
f90974b
Compare
@happysalada @wegank I'll just merge this one for now, since the original PR was already tested and merged. Any refactorings can be done with a separate PR. |
Description of changes
This reapplies #289522, which originally broke the
pkgs/by-name
check on master,so it was reverted in #289655.
This reapplies the original commits and makes sure that the
pkgs/by-name
check works by moving it out ofpkgs/by-name
.pkgs/by-name
is limited topkgs.callPackage
. See here for the detailed list of checks. It usingpkgs.callPackage
is a hard requirement, though it can easily be confusing with the "soft" ratchet checks, which wouldn't break master.I fully admit that the errors for
pkgs/by-name
should be better to avoid such situations. I'll improve the error reporting for thepkgs/by-name
check next week to improve this, see NixOS/nixpkgs-vet#6 for updates. It's really not great that this has delayed a security fix.Ping @risicle @happysalada @adisbladis @mweinelt
Things done
Add a 👍 reaction to pull requests you find important.