!UNVBThoJtlIiVwiDjU:nixos.org

Staging

348 Members
Staging merges | Find currently open staging-next PRs: https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+sort%3Aupdated-desc+head%3Astaging-next+head%3Astaging-next-21.05+is%3Aopen114 Servers

Load older messages


SenderMessageTime
19 Nov 2021
@jonringer:matrix.orgjonringersorry, misread23:07:42
@jonringer:matrix.orgjonringerI'll do it23:07:54
@jonringer:matrix.orgjonringer:)23:07:55
@vcunat:matrix.orgVladimír ČunátI did it already.23:08:01
@sandro:supersandro.deSandroand it seems to be already up 23:08:06
@jonringer:matrix.orgjonringer
In reply to @vcunat:matrix.org
I did it already.
[15:07:53] jon@nixos ~/projects/nixpkgs (staging)
$ git merge origin/staging-next
Already up to date.

yep

23:08:18
20 Nov 2021
@nykw:tchncs.denykw joined the room.11:09:34
21 Nov 2021
@jonringer:matrix.orgjonringer nrdxp: tomberek : we are under 1000 x86_64-linux rebuilds. We should probably finish up this staging-next cycle. Once it's merged we need to do the branch off 18:21:46
@trofi:matrix.orgtrofi Today's staging-next -> staging conflict merge: https://dpaste.com/DDUT9E898.txt. Something seemingly trivial around nixos/tests/custom-ca.nix 18:21:48
@jonringer:matrix.orgjonringer one issue is qt5.qtwebengine seems to be broken. But I don't know a good path forward. compiler seems to segfault 18:22:59
@jonringer:matrix.orgjonringerhttps://hydra.nixos.org/build/158729173/nixlog/118:23:15
@jonringer:matrix.orgjonringer

nevermind, hydra shows a different error:

../../3rdparty/chromium/components/paint_preview/common/subset_font.cc:74:3: error: 'hb_subset_input_set_retain_gids' was not declared in this scope; did you mean 'hb_subset_input_set_flags'?
18:24:00
@jonringer:matrix.orgjonringer not familiar with qmake, but looks like it's some of the vendored chromium headers aren't being correctly added to the -I paths 18:33:31
@jonringer:matrix.orgjonringerWas able to run qutebroswer fine with https://github.com/NixOS/nixpkgs/pull/14691919:54:13
@jonringer:matrix.orgjonringergoing to trigger an eval19:54:23
@tomberek:matrix.orgtomberektesting... that's a long build ^^^^^22:20:07
@hexa:lossy.networkhexafyi https://github.com/NixOS/nixpkgs/pull/146944 23:48:03
@hexa:lossy.networkhexa * fyi https://github.com/NixOS/nixpkgs/pull/146944 #soon23:48:10
22 Nov 2021
@vcunat:matrix.orgVladimír Čunát I merged staging-next. /cc nrdxp tomberek 18:31:58
@sternenseemann:systemli.orgsterni Vladimír Čunát: don't forget to close the PR, was a bit confused now 18:42:44
@vcunat:matrix.orgVladimír ČunátI don't know why it didn't auto-close. I re-checked that I merged the right commit and found nothing wrong.18:43:20
@vcunat:matrix.orgVladimír ČunátIt would be nicer to let it be shown as merged instead of closed.18:43:39
@sternenseemann:systemli.orgsterniI don't think there is a way to make it show merged unless it is merged via the web UI?18:44:18
@vcunat:matrix.orgVladimír ČunátNormally it's detected and marked. I almost never use the merge button.18:44:58
@vcunat:matrix.orgVladimír ČunátThis workflow of mine certainly worked this weekend.18:45:26
@vcunat:matrix.orgVladimír Čunát * This workflow of mine certainly still worked this weekend.18:45:35
@sternenseemann:systemli.orgsterniinteresting18:45:41
@sternenseemann:systemli.orgsterniwell maybe it's just slow then :)18:45:54
@sternenseemann:systemli.orgsternior maybe it doesn't like that the merge commit is not empty because it resolves a conflict?18:46:09
@vcunat:matrix.orgVladimír ČunátOn my side it was without conflict.18:46:34

There are no newer messages yet.


Back to Room ListRoom Version: 6