From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sOUgHNJjYGeMrwAAqHPOHw:P1 (envelope-from ) for ; Mon, 16 Dec 2024 17:30:58 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id sOUgHNJjYGeMrwAAqHPOHw (envelope-from ) for ; Mon, 16 Dec 2024 18:30:58 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=jybPISkL; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=DDWkJlE5; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734370258; 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: content-transfer-encoding:content-transfer-encoding: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=px4FouiHmCPlh0JIuRG9HkIN10PLKWAx/9Yn4KzTksY=; b=q18RRURg7SajTbN0EttYLJECKRbtTfZ0VbbdB6ozB1hl2ZKq1R2W+E1Mds9nyyVsnvlzM/ s9F75rpKHHMXx7GHZOIUorl0suJTyfKdKzzxmdRB7JGyPtPDgip1a9Wi0rFiEBzcCTL3UO 2GsEpFYiG4IsOJr6AZJjlgOn1cz7BPW+5NInB8A2xZ/ivW7wWTC+5xR6Oi5Glrpp+pcFpo YIrb0ywilubCxu7A6icIGyai7WcAvOhkOYPwyBdNKpb7wSu21obeJwzHRJjnORAq1xZ+L6 6Ji4DvpYqQSQRLNfvVBTsSJMDf5JCIgnB0YRRE7i4CUJQoFpZ3WR6WFt5JC+ig== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734370258; a=rsa-sha256; cv=none; b=S+S1Huy/eY4HiQW0BOd3ZGwHeEDoocE5IDockyyVJe78nU4JtQ1tFs3QV7O6JfR5MWQHrK 2wMAxQMcAIr8hnOgdjoXwctPoG2kKgL4PT9WyrT9J97OW9OKNNqxjkwIQGJpqe7hkEJVIx mVmOHNV01arovnZvDIQv3u1dYvfCVNQcsZF1KYOLGyhD+V4gCFrcvnwNmayaa0E9YHtLMF 0nGmcou6qv8zM6Fh+BgH8O+G7bwWONEeuzO0lneWkVxVKrPS/z4yqSA70JH4EVIfDbas8b DtgTfoHMg1Q3DKDGQOErM0Jvy7X0yQW9piVFDC1XOdGHBCKaQvXRxtnOa06axQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=jybPISkL; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=DDWkJlE5; 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=none 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 447864484C for ; Mon, 16 Dec 2024 18:30:58 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNEvi-0001Wz-Rb; Mon, 16 Dec 2024 12:30:51 -0500 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 1tNEuC-0000NJ-OW for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:17 -0500 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 1tNEu7-0001wd-E8 for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=px4FouiHmCPlh0JIuRG9HkIN10PLKWAx/9Yn4KzTksY=; b=jybPISkL0xdNsQV7NWCuOgtDrP3j/A8SKtJUOh6vnQ2BDRqXaEVpR/dub0e6WaN3XQ5Xomalyp1KVMY2gtaO5sBCQOQQF3b7SEQqReVwa12pOTvHPmFvhJTRrN19bUPmO0RIhxFHrluxa8UPABM7fw7jGXv1eSs/IAEVGWDqcnED4kJafOiOQuoA3KU0m5sBAy+4Hi6ukf2x1hwQmWtwLMHjgJ+u6DECngaJbkWixpCfEJ2kA8wwMPnlb19F43WsjHBgXCh2qIAwOcwbSihHuZ7VVbGXsJDpCs1blUVIZzgVtq4o9fnpHQLOmgqcaisfL7HZPWolMqM23bwIws5vqQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNEu7-0006LZ-83 for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74609] [PATCH 11/21] gnu: Add mono-4.9.0. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Dec 2024 17:29:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74609 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74609@debbugs.gnu.org Cc: aaron.covrig.us@ieee.org, ludo@gnu.org, unmush , richard@freakingpenguin.com, unmush@proton.me, janneke@gnu.org Received: via spool by 74609-submit@debbugs.gnu.org id=B74609.173437012224137 (code B ref 74609); Mon, 16 Dec 2024 17:29:11 +0000 Received: (at 74609) by debbugs.gnu.org; 16 Dec 2024 17:28:42 +0000 Received: from localhost ([127.0.0.1]:55858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtd-0006Gz-EG for submit@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:42 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:53719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtU-0006Fy-Db for 74609@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:33 -0500 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4361f796586so49556135e9.3 for <74609@debbugs.gnu.org>; Mon, 16 Dec 2024 09:28:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734370052; x=1734974852; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=px4FouiHmCPlh0JIuRG9HkIN10PLKWAx/9Yn4KzTksY=; b=DDWkJlE5ZsVdjKeUTDJbJnnhusDp0Q9CP1M58ibf9qEL/8x8teI+L9Tg8dykCQzc9V U9cNv6BJKuFLME+qsT0J22KzV2oPbLdfB1F2E1Y0Y95aXq6lbszTRkseC71Mov0Jcy0s TYf+M0lRmrppwi37e/yX8UeFb2EL2dBWpoU49WtImI9+9OGjP8TfLAi5og8hdLaFLcg4 fAKNjQAWbAorQV0XOvbrQNF2LugUG14lL93+tZ5ETWiTiTyN35v8rHA7ev1g066qEvsf O0eh7daJu7jgm3+n2fN/JeJdQPwWHhV/IMmgseWO5SSZMNiSj/7wo6V1Q1g8iWTHz+7s aJLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734370052; x=1734974852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=px4FouiHmCPlh0JIuRG9HkIN10PLKWAx/9Yn4KzTksY=; b=jPTVBNzfsMzwOe4G7mIDO4o6/88ASeNWhn7/KkidGxWcLY0d2sDUd+CUMyjRae6aAx i3ps1n1V8emvZzsc+P+jdvKXWptjXrcFbIE+dyk+yHVUzRirP5a4cKSYo+ETiz9NoJZU /K7CP0e5qUkkGCVjEPe0NdSXcI9dQZFq4F2QgDoxRGqdwQxx6ZRoJG0ZKe+3UfyOFx9l cYUsEVF/e+/wUNgHzZEA1BuiCtzY6Dww0pAfMen9jroES4qdruCeQMkrRXb7UighHuei zT7gbNXvmEgBnmfxInHSTnddQqlU4l1TaevH+L7UoetfRhWDEU1Ho89iTc0HCXRJvnVC S6lw== X-Gm-Message-State: AOJu0Yw+7SuBdFIuFYoB1gvVZO88edgQK132/T8BRhfwedN5x+DnU48x NHTXzWWeS6JkX6hSnfD0Le3Heu58Qdo5KzTOTO5Xa7LAL9twWjdWIJR7s4oq X-Gm-Gg: ASbGnctSWqw0ZEq6zsCDORSK12GFC5cw1CzWrzDZaZghaQL8Bs98hmnCE9QhMHO6RBM zszl3DsN586adkcXSf2Id+X+jCr2yZNXEbxb8ysg+A4otO5D5gQt9i9P9nc2dAU6D/wMZWew+go jucn5GbpGxn0Xw6J7pBzsxPk1X0/wGPUf6UkIF67gyOUzwiadMX+20zVDUbFBZbNJAwFCnQw8ol mx7lyIOYpGoSg6XT8nUepG14a7OqXuVyPMVXWrf+kqSXXWVHrv7TpLNMZggUQ== X-Google-Smtp-Source: AGHT+IFOlYS5IJFfDTfQMJ2ex3xt8ohD9O16krRkuTqFlHkwHeRZ6RuAcaKS4wXNfQglA1oGIL0uhA== X-Received: by 2002:a05:600c:4511:b0:431:54f3:11ab with SMTP id 5b1f17b1804b1-4362aaa5d27mr119039275e9.33.1734370051423; Mon, 16 Dec 2024 09:27:31 -0800 (PST) Received: from localhost ([31.210.180.118]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4363602b1a1sm91920655e9.10.2024.12.16.09.27.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 09:27:30 -0800 (PST) From: Efraim Flashner Date: Mon, 16 Dec 2024 19:26:34 +0200 Message-ID: <25a65ced1e0ff59aeb0b6a9db06cfc4e527f19d6.1734369314.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -7.85 X-Spam-Score: -7.85 X-Migadu-Queue-Id: 447864484C X-Migadu-Scanner: mx11.migadu.com X-TUID: +S5sF2gPfw8v From: unmush * gnu/packages/dotnet.scm (mono-4.9.0): New variable. * gnu/packages/patches/mono-4.9.0-fix-runtimemetadataversion.patch: New patch. * gnu/local.mk (dist_patch_DATA): register it. Change-Id: Iea5926e79f7877aca718c1312c89bcc715b64d21 --- gnu/local.mk | 1 + gnu/packages/dotnet.scm | 129 ++++++++++++++++++ ...ono-4.9.0-fix-runtimemetadataversion.patch | 13 ++ 3 files changed, 143 insertions(+) create mode 100644 gnu/packages/patches/mono-4.9.0-fix-runtimemetadataversion.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8007ff19a7e..5facc66932b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1824,6 +1824,7 @@ dist_patch_DATA = \ %D%/packages/patches/mono-2.4.2.3-fixes.patch \ %D%/packages/patches/mono-2.6.4-fixes.patch \ %D%/packages/patches/mono-2.11.4-fixes.patch \ + %D%/packages/patches/mono-4.9.0-fix-runtimemetadataversion.patch \ %D%/packages/patches/mosaicatcher-unbundle-htslib.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ diff --git a/gnu/packages/dotnet.scm b/gnu/packages/dotnet.scm index 4d79740d7bd..e658edf8649 100644 --- a/gnu/packages/dotnet.scm +++ b/gnu/packages/dotnet.scm @@ -707,3 +707,132 @@ (define-public mono-3.12.1 ;; for some reason a default is only used if this is empty, not ;; if it is unset. (setenv "TZ" ""))))))))) + +(define mono-4.9.0-external-repo-specs + ;; format: ({reponame OR (reponame dir-name)} commit sha256) ... + '(("aspnetwebstack" "e77b12e6cc5ed260a98447f609e887337e44e299" + "0rks344qr4fmp3fs1264d2qkmm348m8d1kjd7z4l94iiirwn1fq1") + ;; (("reference-assemblies" "binary-reference-assemblies") + ;; "6c77197318fe85dfddf75a1b344b9bf8d0007b0b" + ;; "11hbs952srjlsiyin76y2llm5rfjkwjc67ya1i3p0pw193zw14jk") + ;; According to github description this is a "custom" fork of boringssl + ("boringssl" "c06ac6b33d3e7442ad878488b9d1100127eff998" + "187zpi1rvh9i6jfccwzqq337rxxi1rgny6mjq79r08dlrh0lydzc") + ("buildtools" "9b6ee8686be55a983d886938165b6206cda50772" + "0sjw3swavcmijynmaxh647qpkjsbgihdr8lhkyzf8dsprhlq4fxd") + ("cecil" "2b39856e80d8513f70bc3241ed05325b0de679ae" + "0vvax32r6bnhvrcvis83gdrdqcgyxb704hz28g9q0wnay4knqxdm") + (("cecil" "cecil-legacy") "33d50b874fd527118bc361d83de3d494e8bb55e1" + "1p4hl1796ib26ykyf5snl6cj0lx0v7mjh0xqhjw6qdh753nsjyhb") + ;; ("debian-snapshot" "9342f8f052f81deaba789f030db23a88b4369724" + ;; "") + ("ikdasm" "e4deabf61c11999f200dcea6f6d6b42474cc2131" + "1frbf70y7n7l72j393avdiwk6153cvfwwpighkf2m46clqmq4han") + (("ikvm-fork" "ikvm") "367864ef810859ae3ce652864233b35f2dd5fdbe" + "0ig99kbma4s0mzb13nzsk1vm200ygfr11q6mzgh6jj46s2fc35px") + ("Lucene.Net.Light" "85978b7eb94738f516824341213d5e94060f5284" + "0d118i52m3a0vfjhfci81a2kc4qvnj23gs02hrvdrfpd1q92fyii") + ("Newtonsoft.Json" "471c3e0803a9f40a0acc8aeceb31de6ff93a52c4" + "0dgngd5hqk6yhlg40kabn6qdnknm32zcx9q6bm2w31csnsk5978s") + ("nuget-buildtasks" "04bdab55d8de9edcf628694cfd2001561e8f8e60" + "1nklxayxkdskg5wlfl44cndzqkl18v561rz03hwx7wbn5w89q775") + ("nunit-lite" "4bc79a6da1f0ee538560b7e4d0caff46d3c86e4f" + "085fpabjw47rn8hb5zw6wizsg2jrgdbj9rnlar9lrls40wig272q") + ("rx" "b29a4b0fda609e0af33ff54ed13652b6ccf0e05e" + "1n1jwhmsbkcv2d806immcpzkb72rz04xy98myw355a8w5ah25yiv"))) + +(define-public mono-4.9.0 + (package + (inherit mono-3.12.1) + (version "4.9.0") + (name "mono") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.winehq.org/mono/mono.git") + ;; some commit chosen after configure.ac was updated to make + ;; the version >= 4.9.0 + (commit "5a3736606e6243d2c84d4df2cf35c284214b8cc4"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vqkkqkaqwbii4hdzg0vffyy31fz1kmmsa67jyqwxdsvgpjszih3")) + (modules '((guix build utils) + (ice-9 string-fun))) + (snippet #~(begin + #$(add-external-repos + mono-4.9.0-external-repo-specs) + #$prepare-mono-source)) + (patches (search-patches + ;; Saves us an extra intermediate step + "mono-4.9.0-fix-runtimemetadataversion.patch")))) + (native-inputs (modify-inputs (package-native-inputs mono-3.12.1) + (replace "mono" mono-3.12.1) + (append tzdata-for-tests))) + (arguments + (substitute-keyword-arguments (package-arguments mono-3.12.1) + ((#:configure-flags _ #f) + ;; "External Boehm is no longer supported" - I VILL NOT use the + ;; bundled software! + #~(list "--with-sgen=yes" + "--disable-boehm" + "--with-csc=mcs")) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'configure 'set-TZDIR + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (search-input-directory (or native-inputs inputs) + "share/zoneinfo"))) + (add-after 'unpack 'use-old-mono-libraries + ;; At this point in history mono had not, to my knowledge, + ;; deigned to grace us with the actual sources to the binaries + ;; shipped in external/binary-reference-assemblies, so just copy + ;; the libraries from an older mono for now I guess. + (lambda _ + (substitute* "./mcs/class/reference-assemblies/Makefile" + (("\\.\\./\\.\\./\\.\\./external/binary-reference-assemblies/v") + (string-append #$(this-package-native-input "mono") + "/lib/mono/"))))) + (add-after 'unpack 'disable-Microsoft.Build.Tasks-tests + (lambda _ + ;; These fail for unknown reasons + (substitute* "mcs/class/Microsoft.Build.Tasks/Makefile" + (("^include ../../build/library.make" all) + (string-append + all + "\nrun-test-recursive:\n\t@echo skipping tests\n"))))))))) + (license (list + ;; most of mcs/tools, mono/man, most of mcs/class, tests by + ;; default, mono/eglib, mono/metadata/sgen*, + ;; mono/arch/*/XXX-codegen.h + ;; mcs/mcs, mcs/gmcs (dual-licensed GPL) + ;; samples + license:x11 + ;; mcs/mcs, mcs/gmcs (dual-licensed X11) + ;; some of mcs/tools + license:gpl1+ ;; note: ./mcs/LICENSE.GPL specifies no version + ;; mono/mono (the mono VM, I think they meant mono/mini) + ;; mono/support (note: directory doesn't exist, probably meant + ;; ./support, but that contains a copy of zlib?) + license:lgpl2.0+ ;; note: ./mcs/LICENSE.LGPL specifies no version + ;; mcs/jay, mono/utils/memcheck.h + license:bsd-4 + ;; mono/utils/bsearch.c, mono/io-layer/wapi_glob.{h,c} + license:bsd-3 + ;; mono/utils/freebsd-{dwarf,elf_common,elf64,elf32}.h + license:bsd-2 + ;; mcs/class/System.Core/System/TimeZoneInfo.Android.cs + ;; mcs/class/RabbitMQ.Client (dual licensed mpl1.1) + license:asl2.0 + ;; ./support, contains a copy of zlib, incl. ./support/minizip + license:zlib + ;; mono/docs/HtmlAgilityPack, mcs/unit24 + license:ms-pl + ;; mcs/class/I18N/mklist.sh, mono/benchmark/{zipmark,logic}.cs + ;; mcs/class/{,Compat.}ICSharpCode.SharpZipLib + license:gpl2+ + ;; mcs/class/RabbitMQ.Client (dual licensed asl2.0) + license:mpl1.1 + ;; API Documentation + license:cc-by4.0)))) diff --git a/gnu/packages/patches/mono-4.9.0-fix-runtimemetadataversion.patch b/gnu/packages/patches/mono-4.9.0-fix-runtimemetadataversion.patch new file mode 100644 index 00000000000..ec5bad9ae12 --- /dev/null +++ b/gnu/packages/patches/mono-4.9.0-fix-runtimemetadataversion.patch @@ -0,0 +1,13 @@ +diff --git a/mcs/mcs/settings.cs b/mcs/mcs/settings.cs +index 1393bcd58f3..af5febe7cf6 100644 +--- a/mcs/mcs/settings.cs ++++ b/mcs/mcs/settings.cs +@@ -1197,7 +1197,7 @@ namespace Mono.CSharp { + } + return ParseResult.Success; + +- case "runtimemetadataversion": ++ case "/runtimemetadataversion": + if (value.Length == 0) { + Error_RequiresArgument (option); + return ParseResult.Error; -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted