From unknown Wed Jun 18 23:00:12 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#66536 <66536@debbugs.gnu.org> To: bug#66536 <66536@debbugs.gnu.org> Subject: Status: [PATCH 0/1] gnu: unison: Update to 2.53.3. Reply-To: bug#66536 <66536@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:00:12 +0000 retitle 66536 [PATCH 0/1] gnu: unison: Update to 2.53.3. reassign 66536 guix-patches submitter 66536 pukkamustard severity 66536 normal tag 66536 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 08:02:02 2023 Received: (at submit) by debbugs.gnu.org; 14 Oct 2023 12:02:02 +0000 Received: from localhost ([127.0.0.1]:48037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrdLF-0002sx-J7 for submit@debbugs.gnu.org; Sat, 14 Oct 2023 08:02:01 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrdLC-0002sh-DU for submit@debbugs.gnu.org; Sat, 14 Oct 2023 08:02:00 -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 1qrdKj-000574-ID for guix-patches@gnu.org; Sat, 14 Oct 2023 08:01:29 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrdKg-00011E-S8 for guix-patches@gnu.org; Sat, 14 Oct 2023 08:01:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4B3DE240028 for ; Sat, 14 Oct 2023 14:01:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1697284883; bh=Ro/14cmpUYMh0rwBbrA+/oMws0/e05hq5TV8qlOfsBE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Hy/cATlrW1vN/kW+RuN0njCgD+A9b3OLcJhI0yIgS1UTE2zPIn+zUJkjlLb1aH1j6 6T812pj87IYI0DR55QqCDIDPVF8VIO/AfaVsqKuSHkLHn0jeCvfDysi2ttYxoi6sLF Hveech1bIjtX7dJZs6YoMouAQ4wobSsHgEiz45uBKzEAl4Ujz+rZW5Ftaf6UOdMQAz CCnPl3kj6x3mQFDyH7NVUX3G1lBLep62wEmn4GYG2t83yCt8dduAoQYQNioRNMdrZR JTKLhftAFQHEip6fe2xunnkioAUh+kdx39DHsA6LV8VEyISXGycaVHzKDk+f7MnAH+ /FafynPjjzu6Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S725t3x5Mz9rxG; Sat, 14 Oct 2023 14:01:22 +0200 (CEST) From: pukkamustard To: guix-patches@gnu.org Subject: [PATCH 0/1] gnu: unison: Update to 2.53.3. Date: Sat, 14 Oct 2023 12:01:12 +0000 Message-ID: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=pukkamustard@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: pukkamustard , Andreas Enge X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello Guix, This updates unison to 2.53.3. Unison can now be built with OCaml 4.14.1 (instead of 4.09). We should now be able to remove all OCaml 4.09 (and 4.07) packages except those needed for the prospective bootstrap. CCing Andreas who I belive is a unison user. Cheers, pukkamustard pukkamustard (1): gnu: unison: Update to 2.53.3. gnu/local.mk | 1 - gnu/packages/ocaml.scm | 50 ++---------- .../patches/unison-fix-ocaml-4.08.patch | 81 ------------------- 3 files changed, 8 insertions(+), 124 deletions(-) delete mode 100644 gnu/packages/patches/unison-fix-ocaml-4.08.patch base-commit: 1328c4cca531318e3ed90c6aecb522a5b22a4bcc -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 08:07:15 2023 Received: (at 66536) by debbugs.gnu.org; 14 Oct 2023 12:07:15 +0000 Received: from localhost ([127.0.0.1]:48058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrdQI-0003AF-IH for submit@debbugs.gnu.org; Sat, 14 Oct 2023 08:07:15 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrdQF-0003A2-GM for 66536@debbugs.gnu.org; Sat, 14 Oct 2023 08:07:12 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 32C57240028 for <66536@debbugs.gnu.org>; Sat, 14 Oct 2023 14:06:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1697285202; bh=Sxnpbb6vHCsGz/zPIzJzTFzCXTUQluYS4Dx8i//zW5Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=VBPxXnhK8/5Dr/4P2cBRPeEmwujS1rsf5aMnj6/cAHmx2nARxmCCCA8FzB9oJNhbg NxFdfzBoT9qk7HLx8440ZwFAcln3K5+iL6rEWhDq3/KHA4LuNMMXbhYosCE8TmFqCD uhKvOWTxXlOmutuxkJ55rNrGqvY7dowXAq+//gN1kE1uDdssZBJURo1b1OjKexCs+D SzQ3X0qbx9kx+Fp7+9qUErfSw02sedpOg9aF52G34EDrbkIyOXQn8BvUK91tCKzGjo rzy3I8kQzb+nr8u+FnEK37OON9FySE799y3Ky+ZBqJqsh7Kf49Y528Ulv+iVfGprRN P0350yVbM+RxQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S72D128qDz6txL; Sat, 14 Oct 2023 14:06:41 +0200 (CEST) From: pukkamustard To: 66536@debbugs.gnu.org Subject: [PATCH 1/1] gnu: unison: Update to 2.53.3. Date: Sat, 14 Oct 2023 12:06:32 +0000 Message-ID: <96c87152df219478aa55fdebef563d72c018089f.1697284367.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66536 Cc: pukkamustard , Andreas Enge X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (unison): Update to 2.53.0. [source]: Remove patch. [build-system]: Use dune-build-system. [outputs]: Remove "doc" output. [native-inputs]: Update package style. [propagated-inputs]: Add lablgtk3 and zlib. [arguments]: Enable tests. <#:phases>: Remove prepare-install and install-fsmonitor phases. * gnu/packages/patches/unison-fix-ocaml-4.08.patch: Remove file. * gnu/local.mk: Unregister. --- gnu/local.mk | 1 - gnu/packages/ocaml.scm | 50 ++---------- .../patches/unison-fix-ocaml-4.08.patch | 81 ------------------- 3 files changed, 8 insertions(+), 124 deletions(-) delete mode 100644 gnu/packages/patches/unison-fix-ocaml-4.08.patch diff --git a/gnu/local.mk b/gnu/local.mk index 13c2b94944..2b8cdbf181 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2062,7 +2062,6 @@ dist_patch_DATA = \ %D%/packages/patches/ungoogled-chromium-RUNPATH.patch \ %D%/packages/patches/ungoogled-chromium-system-ffmpeg.patch \ %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ - %D%/packages/patches/unison-fix-ocaml-4.08.patch \ %D%/packages/patches/unknown-horizons-python-3.8-distro.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8543505dbb..7993dbaa73 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1359,7 +1359,7 @@ (define-public ocaml4.07-lablgtk (define-public unison (package (name "unison") - (version "2.51.2") + (version "2.53.3") (source (origin (method git-fetch) (uri (git-reference @@ -1368,52 +1368,18 @@ (define-public unison (file-name (git-file-name name version)) (sha256 (base32 - "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq")) - (patches (search-patches "unison-fix-ocaml-4.08.patch")))) - (build-system gnu-build-system) - (outputs '("out" - "doc")) ; 1.9 MiB of documentation - (native-inputs - `(("ocaml" ,ocaml-4.09) - ;; For documentation - ("ghostscript" ,ghostscript) - ("texlive" ,(texlive-updmap.cfg)) - ("hevea" ,hevea) - ("lynx" ,lynx) - ("which" ,which))) - (arguments - `(#:parallel-build? #f - #:parallel-tests? #f - #:test-target "selftest" - #:tests? #f ; Tests require writing to $HOME. - ; If some $HOME is provided, they fail with the message - ; "Fatal error: Skipping some tests -- remove me!" - #:phases + "05ihxk1yynw08586i06w19xab9r24h9hr6v9bknqm98qrlshm92w")))) + (build-system dune-build-system) + (propagated-inputs (list lablgtk3 zlib)) + (native-inputs (list ghostscript (texlive-updmap.cfg '()) hevea lynx which)) + (arguments + `(#:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'install 'prepare-install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (setenv "HOME" out) ; forces correct INSTALLDIR in Makefile - #t))) - (add-after 'install 'install-fsmonitor - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - ;; 'unison-fsmonitor' is used in "unison -repeat watch" mode. - (install-file "src/unison-fsmonitor" bin) - #t))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") + (let ((doc (string-append (assoc-ref outputs "out") "/share/doc/unison"))) (mkdir-p doc) - ;; Remove an '\n' that prevents the doc to be generated - ;; correctly with newer hevea. - (substitute* "doc/local.tex" - (("----SNIP----.*") "----SNIP----")) ;; This file needs write-permissions, because it's ;; overwritten by 'docs' during documentation generation. (chmod "src/strings.ml" #o600) diff --git a/gnu/packages/patches/unison-fix-ocaml-4.08.patch b/gnu/packages/patches/unison-fix-ocaml-4.08.patch deleted file mode 100644 index 811f590721..0000000000 --- a/gnu/packages/patches/unison-fix-ocaml-4.08.patch +++ /dev/null @@ -1,81 +0,0 @@ -This patch is taken from the opam repository: -https://github.com/ocaml/opam-repository/blob/master/packages/unison/unison.2.51.2/files/ocaml48.patch - -It fixes compatibility with changes introduced in OCaml 4.08. - -diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml -index 7cefa2e..378fc8b 100644 ---- a/src/Makefile.OCaml -+++ b/src/Makefile.OCaml -@@ -272,7 +272,7 @@ endif - - # Gtk GUI - ifeq ($(UISTYLE), gtk) -- CAMLFLAGS+=-I +lablgtk -+ CAMLFLAGS+=-I $(LABLGTKLIB) - OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo - OCAMLLIBS+=lablgtk.cma - endif -@@ -282,7 +282,7 @@ OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) - - ifeq ($(UISTYLE), gtk2) - ifndef OCAMLFIND -- CAMLFLAGS+=-I +lablgtk2 -+ CAMLFLAGS+=-I $(LABLGTK2LIB) - else - CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk2 ) - endif -diff --git a/src/files.ml b/src/files.ml -index 5ff1881..1d1fbcc 100644 ---- a/src/files.ml -+++ b/src/files.ml -@@ -734,7 +734,7 @@ let get_files_in_directory dir = - with End_of_file -> - dirh.System.closedir () - end; -- Sort.list (<) !files -+ List.sort String.compare !files - - let ls dir pattern = - Util.convertUnixErrorsToTransient -diff --git a/src/recon.ml b/src/recon.ml -index 2c619bb..2412c18 100644 ---- a/src/recon.ml -+++ b/src/recon.ml -@@ -661,8 +661,8 @@ let rec reconcile - - (* Sorts the paths so that they will be displayed in order *) - let sortPaths pathUpdatesList = -- Sort.list -- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) -+ List.sort -+ Path.compare - pathUpdatesList - - let rec enterPath p1 p2 t = -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index 453027d..c2288b8 100755 ---- a/src/system/system_generic.ml -+++ b/src/system/system_generic.ml -@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen - let chmod = Unix.chmod - let chown = Unix.chown - let utimes = Unix.utimes --let link = Unix.link -+let link s d = Unix.link s d - let openfile = Unix.openfile - let opendir f = - let h = Unix.opendir f in -diff --git a/src/uigtk2.ml b/src/uigtk2.ml -index fbc5d8f..4e82cc2 100644 ---- a/src/uigtk2.ml -+++ b/src/uigtk2.ml -@@ -94,7 +94,7 @@ let icon = - let icon = - let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in - Gpointer.blit -- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); -+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); - p - - let leftPtrWatch = -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 17 05:32:48 2023 Received: (at 66536) by debbugs.gnu.org; 17 Oct 2023 09:32:48 +0000 Received: from localhost ([127.0.0.1]:58596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsgRU-0001bG-0O for submit@debbugs.gnu.org; Tue, 17 Oct 2023 05:32:48 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:54073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsgRR-0001az-Si; Tue, 17 Oct 2023 05:32:46 -0400 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id 5218527BBE2; Tue, 17 Oct 2023 10:32:18 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 2e3367b2; Tue, 17 Oct 2023 09:32:18 +0000 (UTC) From: Christopher Baines To: control@debbugs.gnu.org,66536@debbugs.gnu.org Subject: QA review for 66536 Date: Tue, 17 Oct 2023 09:32:18 +0000 Message-ID: <87v8b5d271.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66536 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) user guix usertag 66536 + reviewed-looks-good thanks I don't know anything about unison, but this looks good to me. From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 15:54:57 2023 Received: (at 66536-done) by debbugs.gnu.org; 19 Oct 2023 19:54:57 +0000 Received: from localhost ([127.0.0.1]:37838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtZ6f-0002sY-7c for submit@debbugs.gnu.org; Thu, 19 Oct 2023 15:54:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtZ6a-0002sG-Ow for 66536-done@debbugs.gnu.org; Thu, 19 Oct 2023 15:54:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtZ63-0007Xj-Ca; Thu, 19 Oct 2023 15:54:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=b5oG7MTeuoEKL2qIjf8VyuhI/JwZWog9y3CMykVrkn0=; b=gkTI97bDN6tIEaFvrK79 /SLv1HiRItgoDCP99/Vm7QbEl8C0MFNLiNSbYEz3HK3iWFodJlR88VHkWWJAtHB5Wq+fRcTttqEf8 tevbr79ifOghjH32i/fPVoVjUZDZxSAI3qDqG+8gBflXRA6DRbD9zGjYIlb2c5Ruft7DAw1+wEkUZ SRHio34HfXalZjf0dtgrtq2DKrqpX+xDgFvUGNO5UDrzbRqWOs85hjqcQezSgnKGTGuGG0vEP4H3m 0bj5911y6N9n7Ec2CmOIDmEa7cxEfveLcKQif8ldeubF721t5D/htZ9lztPxdm3jOHQWQWPxjmCB+ Q7XoXKgg5J5fLA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: [bug#66536] QA review for 66536 In-Reply-To: <87v8b5d271.fsf@cbaines.net> (Christopher Baines's message of "Tue, 17 Oct 2023 09:32:18 +0000") References: <87v8b5d271.fsf@cbaines.net> Date: Thu, 19 Oct 2023 21:54:16 +0200 Message-ID: <87y1fyz8uv.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66536-done Cc: pukkamustard , 66536-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Christopher Baines skribis: > user guix > usertag 66536 + reviewed-looks-good > thanks > > I don't know anything about unison, but this looks good to me. I saw the dark green tick on qa.guix so I applied it. :-) Thanks, Ludo=E2=80=99. From unknown Wed Jun 18 23:00:12 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 17 Nov 2023 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator