From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UPsyBBCyDWVzKgAAG6o9tA:P1 (envelope-from ) for ; Fri, 22 Sep 2023 17:26:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id UPsyBBCyDWVzKgAAG6o9tA (envelope-from ) for ; Fri, 22 Sep 2023 17:26:08 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C1F4436750 for ; Fri, 22 Sep 2023 17:26:07 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="bd7h/87q"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695396367; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=3T7KeWTLJb2RjeeruGnKcmDElojPGnzNcgQdEwP1wsE=; b=X/qfOPJyiaCtlE1kgaBUd5kCCY8CGgP/B/Gn2Cwq2HKC4b/C2fmxQeZDgXswAF8s3a9Hcy 3bzbDYIJ8Dp+msbCPBTb0EYaFK6rZgpn3ag3SWMoTKJlrgdpJy6LJkQjXTyoAAs+lty4qe uIUj6B/WCbPdxDToAHIRE5hRFMRigHUvxUWYSDvhF32oiQVuOTqsYo3pU/RGmV/J8H7YUD domgg4Bp6jj2exrtghRMRlmWGTZLqfNV3mTKAnCoLP3Qq9h4TCiRtVaq0lCotQZO1tKWTb IPGO1mh3zhbHkpp4+sJnVzb40yheW5vNMR8uTqOEb8yRxonIlbLAbHMjMVAF+w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695396367; a=rsa-sha256; cv=none; b=qoHq9xQrvmoV8w14mFkQtCI45Jy/j0Qa1QANYymMCqP/fvi5X+vkaIdGGeeWk/rEbAyaqC vD3kMIECW0iOWzNAJ3KXJGlTus78VC+ivnAfSMgUGoc8Tw6sZWXgSPdbkl70O88EJ4kmQF 04dIuW3PA/eeTDXwPkvhONHXgUwUHnQRkI+DdyfLsami6nfVgFLmueHDA0rofBlaQ5pCd/ mzJugHzn9kFlcoVw+zivBrHnfXoj7mkJG2xt/KBB2pB0ahYtLkDKBlE1jMP6O5JaG5z3iH d97pxmJPR8FSR35Dix62MPumaV11eOIShY/LW5Z5md390kqYJvc1cr6GHbV0RA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="bd7h/87q"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qji2T-00038G-4K; Fri, 22 Sep 2023 11:25:53 -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 1qji2R-00037k-Qb for guix-patches@gnu.org; Fri, 22 Sep 2023 11:25:51 -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 1qji2R-0007mN-IA for guix-patches@gnu.org; Fri, 22 Sep 2023 11:25:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qji2b-0004CM-Sz for guix-patches@gnu.org; Fri, 22 Sep 2023 11:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Sep 2023 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: pukkamustard Cc: 64249@debbugs.gnu.org, Julien Lepiller Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169539633016092 (code B ref 64249); Fri, 22 Sep 2023 15:26:01 +0000 Received: (at 64249) by debbugs.gnu.org; 22 Sep 2023 15:25:30 +0000 Received: from localhost ([127.0.0.1]:37117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qji25-0004BU-Pk for submit@debbugs.gnu.org; Fri, 22 Sep 2023 11:25:30 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:40128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qji22-0004BD-Fq for 64249@debbugs.gnu.org; Fri, 22 Sep 2023 11:25:27 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40471c054f9so7121055e9.0 for <64249@debbugs.gnu.org>; Fri, 22 Sep 2023 08:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695396309; x=1696001109; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3T7KeWTLJb2RjeeruGnKcmDElojPGnzNcgQdEwP1wsE=; b=bd7h/87qWpHHWUfOaz8SnrouFZW7tpHD86KE+yXgyvyyPQPqUag1Dl+rR6fu/h6HHz j3MUk7HecrN3apqcJBjTrLEoHQFJOG3B0/cq473AvQEpqh5W2yjw/QGnLMHZsNKHBd4h YCPzDrN7XK1jS/pSOdP1G2AH9yHQCRZxxidg5Oxo5YJKzhiHzPR7ZM/HSwvo/VfLgx9H SU3b+E0KFUhsEqKqf/vHCef5+o7etkbwAqE10vSnXPDFyFCDHweSG+xrxClnza0OXXOB nKMxB7PDOD/VIP9wLCqbXPuw26guhhm/GyGe0oEfrL0EhAcj5qPfyAJ05q4LcU2dWCrT Filw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695396309; x=1696001109; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3T7KeWTLJb2RjeeruGnKcmDElojPGnzNcgQdEwP1wsE=; b=c8EaVcNx9U0f9kHG4mRCnsgbbm/CnPMIn3espcFOZRYFbLG/sXMk4MWNDh1Y9UoxgW UVLU4/aCH9J9SCWEtNdxPuU+vQ6Rz5/7sDUGdiTQKV2kvxw16LYXXjvJcpxd8sQJEUkO b0ZLYYj7RuTrV/PU7J73Jrk8iBSi7XLtt0I78leEPdNnnEKuZhSoRBvUPfm3y+Bpy/ta u8tjc3PS6aYd//SHltDmhUhvDTsq6RLUpINbGko4kfBQ2e9QqklQQo6q/I8z+UNh/UtS zEyG3GvO+opOa+V3lSkPHveDWeza8qFMSBctRsV3ZW92kGpwSPD8AuQT0sBjJ2QJ7G9c y3SQ== X-Gm-Message-State: AOJu0YygStK2B7mKREiIZDd4HumIg+Gxc+PeIgPkDPZ+SlQjCIYZryBI tIz+ncG+7InnJuovA1QZbA4= X-Google-Smtp-Source: AGHT+IF8+qY6htwODzTgmGQZs8vTlcsJktTcYJNZ9gKIjljMVBQir3iGbae5JviKingI4YHvTSjR2g== X-Received: by 2002:a05:600c:358d:b0:401:b53e:6c3e with SMTP id p13-20020a05600c358d00b00401b53e6c3emr8221754wmq.1.1695396309397; Fri, 22 Sep 2023 08:25:09 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id hu23-20020a05600ca29700b003fef5e76f2csm239653wmb.0.2023.09.22.08.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:25:08 -0700 (PDT) From: Simon Tournier References: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> Date: Fri, 22 Sep 2023 16:21:38 +0200 In-Reply-To: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> (pukkamustard@posteo.net's message of "Tue, 12 Sep 2023 06:57:02 +0000") Message-ID: <87msxe8f0t.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -5.14 X-Spam-Score: -5.14 X-Migadu-Queue-Id: C1F4436750 X-TUID: T26B6PV1tAmN Hi, On Tue, 12 Sep 2023 at 06:57, pukkamustard wrote: > * gnu/packages/ocaml.scm (opam): Update to 2.1.5. > [native-inputs]: Add more test data. > [arguments]: Disable failing test. > (ocaml-graph): Update to 2.0.0. > (ocaml-dose3): Update to 7.0.0. > * gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch: Remove. > * gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch: Remove. > * gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch: Remove. > * gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch: Remove. > * gnu/local.mk (dist_path_DATA): Unregister removed patches. > --- > gnu/local.mk | 4 - > gnu/packages/ocaml.scm | 132 +++++++++-------- > .../ocaml-dose3-Fix-for-ocaml-4.06.patch | 52 ------- > .../ocaml-dose3-Install-mli-cmx-etc.patch | 133 ------------------ > .../ocaml-dose3-add-unix-dependency.patch | 25 ---- > .../ocaml-dose3-dont-make-printconf.patch | 9 -- > 6 files changed, 74 insertions(+), 281 deletions(-) > delete mode 100644 gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch > delete mode 100644 gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch > delete mode 100644 gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch > delete mode 100644 gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch I get: --8<---------------cut here---------------start------------->8--- Applying: gnu: opam: Update to 2.1.5. error: corrupt patch at line 292 error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 gnu: opam: Update to 2.1.5. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". --8<---------------cut here---------------end--------------->8--- And as suggested by base-commit: 5db78e7c1b06d1b4892bdb3e153b95b21577271e from the cover letter, I am on the top of it. What do I miss? Cheers, simon