cjb has quit [Read error: Connection reset by peer]
cjb has joined #nixos-dev
rajivr has joined #nixos-dev
appservicebot5 has quit [Quit: Bridge terminating on SIGTERM]
piegames[m] has quit [Quit: Bridge terminating on SIGTERM]
piegames[m] has joined #nixos-dev
appservicebot5 has joined #nixos-dev
bridge[evilred] has quit [Remote host closed the connection]
bridge[evilred] has joined #nixos-dev
<rmcgibbo[m]>
If I understand correctly, a bunch of builds on master/unstable were canceled on hydra to make space for the openssl patch to make it out the door. Are those builds that were canceled now in the queue to be rerun, or are they gone for good?
<samueldr>
most likely gone for good / until the next eval requeues them
<samueldr>
gone for good if those builds are not part of the next eval
<samueldr>
or else will be there the next time that thing you're asking about gets evaluated
<samueldr>
(they could be restarted if it matters)
<{^_^}>
#117591 (by s1341, 3 days ago, open): aarch64-android using minimal prebuilt components
<s1341_>
supersandro2000: how do I fix a conflict I can't see... :(
<supersandro2000>
s1341_: you didn't use the action but it worked. but be warned that not always works
<supersandro2000>
let me try something
<supersandro2000>
I rebased your branch on staging and going to force push it
orivej has joined #nixos-dev
<s1341_>
ok.
<supersandro2000>
no merge conflict and github is happy now
<supersandro2000>
please take a look if the rebase did something strange
<s1341_>
awesome. I'll check now.
<supersandro2000>
I suspect that github didn't use 3 way merge or the changes where to big
<s1341_>
looks good.
<s1341_>
thanks!
<supersandro2000>
nothing you couldn't have done
<s1341_>
didn't kmow how ;)
<s1341_>
i did try to rebase onto staging and force-push...
<s1341_>
but obviously that wasn't sufficient.
<supersandro2000>
did you do git fetch --all
<supersandro2000>
and git rebase upstream/staging?
rj has joined #nixos-dev
pmy has quit [Quit: WeeChat 3.1]
<ekleog>
sterni: well, I'm thinking we could 1. get rid of all auto-generated packages that aren't being used by nixpkgs itself (and replace them with a function that generates the packages live), and 2. only check in the lockfiles (or fetchurl them with their hash) for the packages that are being used by nixpkgs itself
<s1341_>
supersandro2000: i don't recall... but the rebase to staging broke something for me after all...
<s1341_>
now i have an infinite recursion due to cc.....
AlwaysLivid has quit [Remote host closed the connection]
sorki has joined #nixos-dev
FRidh has quit [Quit: Konversation terminated!]
srk has quit [Ping timeout: 240 seconds]
sorki is now known as srk
AlwaysLivid has joined #nixos-dev
zhaofeng_ircclou is now known as zhaofeng_alt
asbachb has joined #nixos-dev
__monty__ has quit [Quit: leaving]
<sterni>
can I somehow make the pkg-config setup hook add a non-standard directory to PKG_CONFIG_PATH from a derivation that is depended on
<sterni>
e. g. mirage-xen installs result/lib/ocaml/4.10.0/site-lib/pkgconfig/mirage-xen.pc which isn't picked up by the pkg-config setup hook of course
<sterni>
I'd be cool if I could inject something into the setup hook from the mirage-xen derivation?!
<sterni>
probably need have an own setup hook for that
asbachb has quit [Ping timeout: 240 seconds]
<clever>
sterni: you can read the main pkgconfig setup hook