From patchwork Fri Jul 25 16:16:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 43263 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8FE4627BC4A; Fri, 25 Jul 2025 17:18:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9B09227BC49 for ; Fri, 25 Jul 2025 17:18:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufL7Z-0004OT-6H; Fri, 25 Jul 2025 12:18:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufL6U-0003a5-Ji for guix-patches@gnu.org; Fri, 25 Jul 2025 12:17:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufL6U-00016X-9s for guix-patches@gnu.org; Fri, 25 Jul 2025 12:17:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:In-Reply-To:References:MIME-Version:To:Subject; bh=RKLNalYhNx++ojnuRTMSTO2nerRFjuh2EW6d9rvEg6s=; b=j3z4ASnvLxGzvsUgamY96puhH+u8kiGx//lJoFu4KqWfDoBSN3IqQqlTr+ReNo0MPkkPLHaoFKKsNZz0ungoaTXua/2PfCP5IPujPcTFK+EJmoxXxIGivzO6r/dnsgQ30a6Ia+89KLFWBh5vx3iJ4cOmtmmoITaUXgpVX0oG582v7Uy7v/yKr9onpTSmNR5exf82OZuBRszO3pRrq9gdpsBlnKXexgMOho4jtCr5SuF0HhysBr1jYIORq/eRgb36okvZwQ6VbLRGAA5JyaikScDe/0kwCFP7rmpD7nWDA7qAG8JJcWvuur/BudAcycEIyHa0/u/sL1SjCoGghYJ0bg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufL6U-00039l-0K for guix-patches@gnu.org; Fri, 25 Jul 2025 12:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76899] Request for merging "c++-team" branch Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jul 2025 16:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Andreas Enge Cc: 76899@debbugs.gnu.org, Christopher Baines Received: via spool by 76899-submit@debbugs.gnu.org id=B76899.175346021512103 (code B ref 76899); Fri, 25 Jul 2025 16:17:01 +0000 Received: (at 76899) by debbugs.gnu.org; 25 Jul 2025 16:16:55 +0000 Received: from localhost ([127.0.0.1]:35579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufL6J-00038u-LV for submit@debbugs.gnu.org; Fri, 25 Jul 2025 12:16:55 -0400 Received: from mail-oa1-x35.google.com ([2001:4860:4864:20::35]:46428) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ufL6G-00038U-Hp for 76899@debbugs.gnu.org; Fri, 25 Jul 2025 12:16:49 -0400 Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-30063371404so793775fac.1 for <76899@debbugs.gnu.org>; Fri, 25 Jul 2025 09:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1753460202; x=1754065002; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=RKLNalYhNx++ojnuRTMSTO2nerRFjuh2EW6d9rvEg6s=; b=pDRLVX0anFithHjCJSTfO+p1R+wwvEtE7asCtrHkDnELx8krrjeEaO5jW2DkBUfByD CGw1OrlMvxqJ3j3waIn380n9SD/RXkgKy7uVmK1QbjXsI5aErTUo6gicsU7rYMuXRO2U DIdgyNJiAy1IeJK7p9fvdLyY1KQcHg3xaGMB0GFvna1SDVfOv/TNvdtDfOP+NXPPHWbl UncSTdW1jKE2zTJzfRip78RCc2m5TBBiwXM9KqAshS9McIVa7uVLq30LhU+3M5If17me u0eX1YnmbfYzqP0Rx0sjEiDzHisaceswFieRgcOB3HHaOawPUWgDwo0P3VO3Fof/aFhs USNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753460202; x=1754065002; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RKLNalYhNx++ojnuRTMSTO2nerRFjuh2EW6d9rvEg6s=; b=DruBF/yKn9YolW5Zz+NwCs3nH1wdCH6U0sMtbHfavMiQTBe9NjriBGqVwt8Xs7iOSg HjU/Tw6fzsdK/yDibLTd16HTRmcLFBLHvspojW85q40GccT0Dph8sDlBZ0jLOC4+bPvf uoH/A2zzIbsSsRBXGSIMDdo0AqZtLfb6gqL+rrH2tQKNTMC64yX0r/mMQ44vKshVJ2VE XSZLAUODnLQIAT7NkUUWjr5nLRFLS56ZjiRdniA0V0uBoVqVza3Tlz728yXzkFEnUkBo MPd09+XPnvJtIsUMSKwuSmNCaZ7CjUH1O2PAwj+EB3iObDKf10GHHgwU2JPVSZ/C+c7J kc2g== X-Forwarded-Encrypted: i=1; AJvYcCVHDCR1/FMh1/ua+8ZpIRheaFHmeDc1TMDrhtycqakMM/L9iiwkHemsjkmM/3IFxbJP1NIq8g==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yx/TzU7p7sEGhGelVG0OfgRDBqONRw2J3izs8dFRlxJ5InLXWeL e9TWJNcY+x4QokAJOK0umNgBL+rLNjX1rneMEzLstNOnWZl4zjVzJd/RdtYiIN0Y1WJq7IpegQB r/G9+7BsT9+hsiJ2iYiEOn1cwmFq2CGj0+8eBk9rcZQ== X-Gm-Gg: ASbGncvY/4qPxavasb67Qty8U6SDq0F6/w1IPXMk/6JyjMPug1fK31+Hu5ojlAHfiai W8I0AbJcLFDcbumIcQCOP1vX6t1zlHreo51k9Em6fIdJpZxehrz9zs9c1ok8p+vUtSwbVQWcGDr lxCdIcRCWSbzczXKROaUMx8aj/rmGJ5cfZ9LA9sUN1rGskCzvzXrLwkJhU0y1J+JhwFWeqpKIBU Rbiwic= X-Google-Smtp-Source: AGHT+IG1ds0b4HkAjw1hEaSU5Ss5gMn8H/hzXYYceY2TaN5ROx8cj2VMeBoxrmvel4YHY+eOs3ux6iLBaUBMi4rjc90= X-Received: by 2002:a05:6871:5584:b0:2f5:2b87:416a with SMTP id 586e51a60fabf-30701b47fccmr1542156fac.37.1753460202101; Fri, 25 Jul 2025 09:16:42 -0700 (PDT) MIME-Version: 1.0 References: <874ix5hvdk.fsf@cbaines.net> In-Reply-To: From: Greg Hogan Date: Fri, 25 Jul 2025 12:16:30 -0400 X-Gm-Features: Ac12FXya0sxGgEW__8uv7AwYSEHmJ00Yu2YH7xgijgPebj-xEPiD7ZhQgaWj3tU Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches On Fri, Jul 25, 2025 at 10:15 AM Andreas Enge wrote: > > Hello, > > this branch is now first in line. > Could you rebase it on master, possible a commit known (in an hour or two) > to data.qa.guix.gnu.org, or for the time being just commit > eb7fb3c59d8de06ef942dce55ceb9565917e7ddb > which is the merge of qt-team? > > And maybe add the commit of https://codeberg.org/guix/guix/pulls/1569 on top. > > Right now QA shows a lot of blocked packages: > https://qa.guix.gnu.org/branch/c++-team > > And CI failed with this message, inside > https://ci.guix.gnu.org/eval/2073835/log/raw > > (exception unbound-variable (value #f) (value "Unbound variable: ~S") (value (cmake-next)) (value #f)) > builder for `/gnu/store/sfff5zisrfw5r5s8dw5gsdwm413jdkr7-guix-package-cache.drv' failed to produce output path `/gnu/store/5b2bcrf30gh2q3rpzinq6ri1sxb1lnp1-guix-package-cache' > cannot build derivation `/gnu/store/dzz0dd83pz4gx76rbhzp7zdz9b0x1354-profile.drv': 1 dependencies couldn't be built > > I wonder if this indicates a problem with the branch, cmake-next is > definitely a package related to changes in this branch: > grep cmake-next gnu/packages/*.scm > gnu/packages/video.scm: #:cmake cmake-next ;needs cmake >= 3.28 > gnu/packages/xdisorg.scm: #:cmake cmake-next > So I think this is a place where cmake-next used to be used, but > it does not exist anymore. > > See this commit: > commit 83144c271c19af3a686a52c176fbb495f2c6d8dc > Author: Murilo > Date: Tue Jul 22 14:53:44 2025 -0300 > > gnu: hyprsunset: Update to 0.3.0. > > * gnu/packages/xdisorg.scm (hyprsunset): Update to 0.3.0. > [native-inputs]: Change gcc-14 to gcc-15. > [inputs]: Add hyprlang. > [arguments]{cmake}: Use cmake-next. > > Signed-off-by: John Kehayias > > And this one: > commit 686cc8728ebe6b0572bebb31fb671f5fa0880cf2 > Author: 宋文武 > Date: Mon Feb 10 13:05:44 2025 +0800 > > gnu: obs: Upduate to 31.0.1. > > * gnu/packages/patches/obs-modules-location.patch: Adjust for 31.0.1. > * gnu/packages/video.scm (obs): Update to 31.0.1. > [inputs]: Add rnnoise and uthash. > [arguments]: Use cmake-next. Add "-DENABLE_NVENC=OFF" to configure-flags. > Set OBS_EXECUTABLE_RPATH, OBS_LIBRARY_RPATH and OBS_MODULE_RPATH. > > Change-Id: Iaa8e7fceb04b3bf7e69cb0a040938ca90dfa46d0 > Signed-off-by: Andreas Enge > > I think this is a place where textual git rebases do work, but are not > semantically correct; we will need a fixup to the commit that removes > cmake-next to handle these two packages. > > Thanks, > > Andreas I have the branch ready to go (and did find the recent use of cmake-next earlier today) when the data service gives the next greenlight. QA found a build failure in llvm@3.5.2, so I am also locally testing the following patch for a subtle bug lurking since 2020 (llvm is currently aliased to llvm-13). diff --git i/gnu/packages/llvm.scm w/gnu/packages/llvm.scm index 087aa15f885..12a91c7579f 100644 --- i/gnu/packages/llvm.scm +++ w/gnu/packages/llvm.scm @@ -1352,7 +1352,7 @@ (define-public llvm-3.9.1 "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z")))) (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments llvm) + (substitute-keyword-arguments (package-arguments llvm-6) ((#:phases phases) #~(modify-phases #$phases (add-before 'build 'shared-lib-workaround