worldofpeace changed the topic of #nixos-dev to: NixOS Development (#nixos for questions) | NixOS 20.09 Nightingale ✨ https://discourse.nixos.org/t/nixos-20-09-release/9668 | https://hydra.nixos.org/jobset/nixos/trunk-combined https://channels.nix.gsc.io/graph.html | https://r13y.com | 20.09 RMs: worldofpeace, jonringer | https://logs.nix.samueldr.com/nixos-dev
<Gaelan> I most recently tried "git merge f2478462740cd4e9c7f245e2711d6b851d153a8f", a commit that (AFAICT) appears on both master and staging
<jtojnar> rebasing onto the tip of staging would probably be best
<Gaelan> eww, rebase… but I'll see if it works
__monty__ has quit [Quit: leaving]
<Gaelan> thanks, that worked! jtojnar++
<{^_^}> jtojnar's karma got increased to 68
<jtojnar> generally, it is better to rebase (for cleaner history) or merge on as recent commit as you can in your target branch
<jtojnar> you only need to use the common commit between branches when you want to change target branch on GitHub and want to avoid pinging ton of people
<supersandro2000> IIRC ``git checkout -b X master staging``
<supersandro2000> also having merge commits in PR is a blocker for me
supersandro2000 has quit [Disconnected by services]
supersandro2000 has joined #nixos-dev
<hexa-> jtojnar++ for explaining the flags array issue
<{^_^}> jtojnar's karma got increased to 69
cole-h has joined #nixos-dev
mkaito has quit [Quit: WeeChat 3.0]
rajivr has joined #nixos-dev
orivej has quit [Ping timeout: 246 seconds]
orivej has joined #nixos-dev
jonringer has joined #nixos-dev
LnL has quit [Ping timeout: 264 seconds]
LnL has joined #nixos-dev
orivej has quit [Ping timeout: 256 seconds]
LnL- has joined #nixos-dev
LnL has quit [Ping timeout: 260 seconds]
jonringer has quit [Remote host closed the connection]
srhb has quit [Read error: Connection reset by peer]
srhb has joined #nixos-dev
jkkm has quit [Read error: Connection reset by peer]
typetetris has quit [Read error: Connection reset by peer]
jkkm has joined #nixos-dev
typetetris has joined #nixos-dev
supersandro2000 has quit [Quit: Ping timeout (120 seconds)]
supersandro2000 has joined #nixos-dev
tom39291 has quit [Remote host closed the connection]
tom39291 has joined #nixos-dev
saschagrunert has joined #nixos-dev
supersandro2000 has quit [Quit: The Lounge - https://thelounge.chat]
supersandro2000 has joined #nixos-dev
orivej has joined #nixos-dev
FRidh has joined #nixos-dev
Gaelan_ has joined #nixos-dev
Gaelan has quit [Read error: Connection reset by peer]
__monty__ has joined #nixos-dev
FRidh has quit [Ping timeout: 272 seconds]
FRidh has joined #nixos-dev
supersandro2000 has joined #nixos-dev
supersandro2000 has quit [Changing host]
tilpner has joined #nixos-dev
cole-h has quit [Ping timeout: 272 seconds]
edwtjo has quit [Ping timeout: 246 seconds]
edwtjo has joined #nixos-dev
edwtjo has joined #nixos-dev
edwtjo has quit [Changing host]
<yorick> would it be possible to batch those buildFlagsArray fixes?
<yorick> and possibly disallow it in mkDerivation?
<yorick> they're still happening on master
orivej has quit [Ping timeout: 240 seconds]
<qyliss> I'd ask siraben if they're interested in that
BaughnLogBot has quit [Quit: ZNC 1.6.2+deb1 - http://znc.in]
BaughnLogBot has joined #nixos-dev
<Mic92> It looks to as if ofborg uses stale code for evaluation here: https://github.com/NixOS/nixpkgs/pull/113156
<{^_^}> #113156 (by Mic92, 16 hours ago, open): libical: 3.0.8 -> 3.0.9 (fix build on staging)
<Mic92> *to me
<gchristensen> which lines don't match up?
<gchristensen> ah
<Mic92> gchristensen: https://gist.github.com/GrahamcOfBorg/8ce8c3e85ff971d575c7ff7e004dc7d2#file-output-path-comparison-L44 after my fix there is no DRM_AMD_DC_DCN3_0 on line 256 anymore...
<gchristensen> Mic92: ofborg cannot evaluate the *target* branch, so it can't calculate differences. if you know it fixes it, you'll just have to merge it
<gchristensen> it would be nice if ofborg did not so strongly object when the target branch is broken
<Mic92> gchristensen: ah. so it first checks staging and fails because evaluation fails?
<Mic92> Now it makese sense
<gchristensen> yeah, to get baseline numbers and dervitations to compare against
<Mic92> Well I do the same in nixpkgs-review
<Mic92> I will just go ahead and merge my fix than
<gchristensen> luckily ofborg is not of legal drinking age
<Mic92> gchristensen: I guess its feasible to detect broken master and see if a PR fixes the issue, but this is so rare these days that it is probably not worth it.
<gchristensen> right
<Mic92> I would rather invest time in a merge bot.
<Mic92> like bors
<gchristensen> that does sound like a good idea :)
<gchristensen> changing ofborg to continue when the target branch fails to evaluate would maybe not be such a nightmare, it would be changing fields to be Optional and then chasing the compiler through all its complaints I suppose
AlwaysLivid has joined #nixos-dev
orivej has joined #nixos-dev
<siraben> someone up to merge #112302?
<{^_^}> https://github.com/NixOS/nixpkgs/pull/112302 (by siraben, 1 week ago, open): treewide: unzip buildInputs to nativeBuildInputs
FRidh has quit [Ping timeout: 256 seconds]
FRidh has joined #nixos-dev
mkaito has joined #nixos-dev
mkaito has joined #nixos-dev
mkaito has quit [Changing host]
srhb has quit [Ping timeout: 264 seconds]
ghuntley has quit [Ping timeout: 268 seconds]
srhb has joined #nixos-dev
saschagrunert has quit [Remote host closed the connection]
ghuntley has joined #nixos-dev
rajivr has quit [Quit: Connection closed for inactivity]
BaughnLogBot has quit [Quit: ZNC 1.6.2+deb1 - http://znc.in]
BaughnLogBot has joined #nixos-dev
AlwaysLivid has quit [Remote host closed the connection]
AlwaysLivid has joined #nixos-dev
AlwaysLivid has quit [Remote host closed the connection]
AlwaysLivid has joined #nixos-dev
<hexa-> rmcgibbo[m]: can you investigate the timeouts here? i can't repo. https://github.com/NixOS/nixpkgs/pull/113219#issuecomment-779392297
<rmcgibbo[m]> looks like this is the third time today i've seen `timed out after 300 seconds of silence`
<rmcgibbo[m]> I think I should just completely disable `--silent-timeout`...
<rmcgibbo[m]> hexa-: I deployed a new version that removed `--silent-timeout`, but I still do have a 1hr-per-drv and 2-hrs-for-the-whole build limit in place.
mkaito has quit [Quit: WeeChat 3.0]
FRidh has quit [Quit: Konversation terminated!]
<rmcgibbo[m]> hexa-: In fact -- I'm just going to have the bot refrain from commenting at all if any of the packages hit a timeout during my build.
pmy has quit [Ping timeout: 272 seconds]
pmy has joined #nixos-dev
pie_ has quit [Ping timeout: 256 seconds]
cole-h has joined #nixos-dev
__monty__ has quit [Quit: leaving]
tilpner_ has joined #nixos-dev
tilpner has quit [Ping timeout: 240 seconds]
tilpner_ is now known as tilpner
janneke has quit [Quit: janneke quits Mes'sing]
janneke has joined #nixos-dev