From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id UMHmNOV49GakRAAAe85BDQ:P1 (envelope-from ) for ; Wed, 25 Sep 2024 20:56:06 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id UMHmNOV49GakRAAAe85BDQ (envelope-from ) for ; Wed, 25 Sep 2024 22:56:05 +0200 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=ChhYbBDG; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=kLRWFWIy; 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), DKIM 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=1727297765; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=fUacfjSmPjRKgvIhXNXxNLnk2Wkjn8Jueoin1fDLWWY=; b=R+dqcKQ67Ag4EGMrl8oMXmiwJO6/9ClbL4TGkTnbhhj6xtanUv8ixsl7aA0BmH7q8W31Ol xE1aRabVb3+0cDZFGrYG8keDWMtKdPrDZVLywib6lYqwNVIHp816iOMwqei9z2WPO3k5CK KVNR0ROE2BU/jsNydAFr6cMfs8MRcF9SSaafQ4fVN5BLjO7ZU34S2Z/Kl2ar65www+TY0D Qb13OuBWjs/Q2wx6uBYVhcEzSELZVo+6Pmz6BmAgUN+J7nT48tL+VJzGybT5modgqaFLSr BRgzoXrYOFRz2vKaMAxvoAKIDGDrTTG/xmKdZ8d/hgPk1X/+5LJDQDcYYrfFWw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727297765; a=rsa-sha256; cv=none; b=cWwqhI+yj8YWeHNYUq0arbqsCBQrF2wQrFt9Tamolr3KQC9Rj+kt+btQbPr+N6bwZPluuh 1s2xJonBUNWN7Khw8cS2wUdarfAN+IdJ/bB9ZEMdvDU8iw6B75l+o+8E7J/HiwUwJ6WAf4 sinZ/SWfClJPGdxiXhnx4e9S3HUcoNYKx3xG/RPlnlpbRChsEmmh4XEYZYenLRpp9Kawc9 MVTzsdZKnoFdL/YsPoKq/FGC6s1JTtmibAXv1ns2F+tQMi4s7NGVF8DaSsjTT2S+WyA8By WMyu2GhBPscosTHqNEXAIiaOIMBkK36a9KwIrRaRLkPYK54xeUk9o1hL7OixXg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ChhYbBDG; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=kLRWFWIy; 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), DKIM not aligned (relaxed)" header.from=gmail.com (policy=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 5C5511AFB9 for ; Wed, 25 Sep 2024 22:56:04 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stZ2w-0002t0-Ns; Wed, 25 Sep 2024 16:55:38 -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 1stZ2u-0002sc-Pk for guix-patches@gnu.org; Wed, 25 Sep 2024 16:55:36 -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 1stZ2u-0007HU-Gd for guix-patches@gnu.org; Wed, 25 Sep 2024 16:55:36 -0400 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=fUacfjSmPjRKgvIhXNXxNLnk2Wkjn8Jueoin1fDLWWY=; b=ChhYbBDGgY7rNlOLzLqRNW3iBC3p40VqGsMiurj2uAU6eJ+MW1fvzMH8w0HvA5BaCWIiI2U6ZNRLz+wQHNO9wQgK05NvSjtPECwqNW+HaKwgDCoaddcK2ab0JUZsBPQVZ9e3hjECPCl0pW+B+Ei8xzWGOU8CI0BNyJHK7ned7qsVSERjcGuAuPNsf60LmIfJNnqpccYNHYzvdi0Zc7ss5GZYmt45M1mHBhVbhibFN207bQftSahJPHR8lFahiYNcXoYbH+v8B3KLTXr8Ab8Gl6P+kDlqt5x95SiYO6k0HXsgTVowjA5OxSV4SrwL2tonE+6qAKLaQL9Gr/0ykQ5eNQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stZ3K-0000vm-BZ for guix-patches@gnu.org; Wed, 25 Sep 2024 16:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73458] [PATCH 2/2] build-system: mix: Fix decoding of package names with git versions. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Sep 2024 20:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73458 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Giacomo Leidi , 73458@debbugs.gnu.org Received: via spool by 73458-submit@debbugs.gnu.org id=B73458.17272977152953 (code B ref 73458); Wed, 25 Sep 2024 20:56:02 +0000 Received: (at 73458) by debbugs.gnu.org; 25 Sep 2024 20:55:15 +0000 Received: from localhost ([127.0.0.1]:54504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stZ2Y-0000lW-J4 for submit@debbugs.gnu.org; Wed, 25 Sep 2024 16:55:15 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:46448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stYv3-0000IE-Lx for 73458@debbugs.gnu.org; Wed, 25 Sep 2024 16:47:30 -0400 Received: by mail-lf1-f65.google.com with SMTP id 2adb3069b0e04-537a399e06dso404770e87.1 for <73458@debbugs.gnu.org>; Wed, 25 Sep 2024 13:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727297157; x=1727901957; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=fUacfjSmPjRKgvIhXNXxNLnk2Wkjn8Jueoin1fDLWWY=; b=kLRWFWIydX2XQCnnqVMga8GicIDPl1ziAm1+0yUj010SBwkeiT+oFSTxAK4pHT/7EY 5AV9aMcxmAvxvmIV+IbeVjuQuBguFzty35WE026iKB29QK9hq19RdYArUIxQkguNePnX I2S8lD6FWNQhaTSE3c1JaHRnCa5Dt8dZvHdFV7/oRIWzVhNoMajoimaEoCMImxA5bKb0 1ZnFsUMKYOYkTGlPDiRfLD6XbXEmEyHNOG2fxGu7J2vUyvDti0M5Vc9wBAs0tdBIoVzF 0BciBoYAtY/Dk7XFG7oVfpRG3t8SkyoBOR5htwm+3SkTFF2q/W9LfPJxme8/NffvxXsu 621Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727297157; x=1727901957; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fUacfjSmPjRKgvIhXNXxNLnk2Wkjn8Jueoin1fDLWWY=; b=frx1B7gQ/ntn9X0uXEh6oU/YR3FCowqQ8uNsTcU4rQWVor0ArTYkA7YQn/r/9CX2qp cHIDzpkPNdFknIfmooE26JiSqQFEveFcQ2SBAjyxcGnA9DRC9qYQXfTrvs3cTd4loBDI oPly6EUFO7MfWVWDugmgfRwYhupBD8GY4VebqtqsR+tZbZCeipxDbz4DYnosPFHYpfpg Dy4m2YKE/9VXKTjG9DZGQSemtw4mQYNOKOazJ2z6+tXnqrOkzN/gkddKJv+ZXVKK3efz 8wqLT417SaY1kWvTeqHeTRlL4hJz+KH+xd83xhPbdHzn32v0aJMFjVGLxFIjsFkSFgAa S0KQ== X-Forwarded-Encrypted: i=1; AJvYcCXuZpbpM2EjrJpEZee9fxqdocYI2elVsz3B8DX9ZxOqDONm53LAKPJuzzqGM19CZf4ROg8iEA==@debbugs.gnu.org X-Gm-Message-State: AOJu0YwGTIrFKpBpYHmqdTRKHl+xeyvuAYO1LxuDPTbyETtYq3m4DTSk HM8OzwzIkj39l98PELjKfwRpoT5eT0hey0LRssKrnLGQRfrgFJfm4PNXLc7B X-Google-Smtp-Source: AGHT+IHN43Vujf17pSyjAlmqPxloMlEUQb7ec41mIeUjF/Ez5/cKQPua0eQo5xxooS4+/SEaJ2/AVg== X-Received: by 2002:a5d:554e:0:b0:37c:cee9:4682 with SMTP id ffacd0b85a97d-37ccee94741mr4487f8f.54.1727294064150; Wed, 25 Sep 2024 12:54:24 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c5cf496856sm2247401a12.24.2024.09.25.12.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 12:54:22 -0700 (PDT) Message-ID: <8264dde7b19aa96fb004f0aeb7908c43db6ad926.camel@gmail.com> From: Liliana Marie Prikler Date: Wed, 25 Sep 2024 21:54:21 +0200 In-Reply-To: <573318832af8089d4b974598cc284d1a2b5b3cd9.1727252673.git.goodoldpaul@autistici.org> References: <58afb3593e28f5f670b2be516a165b59e2665276.1727252673.git.goodoldpaul@autistici.org> <573318832af8089d4b974598cc284d1a2b5b3cd9.1727252673.git.goodoldpaul@autistici.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 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: mx12.migadu.com X-Migadu-Spam-Score: -10.47 X-Migadu-Queue-Id: 5C5511AFB9 X-Spam-Score: -10.47 X-TUID: 4nAicq/Ru4sO Am Mittwoch, dem 25.09.2024 um 10:24 +0200 schrieb Giacomo Leidi: > Fixes >=20 > * guix/build/mix-build-system.scm (%git-version-rx): New variable, > (package-name->elixir-name): use %git-version-rx to discriminate git > versions from regular ones. >=20 > Change-Id: Icc6dc56c3db62dfbc17c7c71354a7a7e3d2e5b2a > --- > =C2=A0guix/build/mix-build-system.scm | 9 +++++++-- > =C2=A01 file changed, 7 insertions(+), 2 deletions(-) >=20 > diff --git a/guix/build/mix-build-system.scm b/guix/build/mix-build- > system.scm > index 41f6061444..7250785914 100644 > --- a/guix/build/mix-build-system.scm > +++ b/guix/build/mix-build-system.scm > @@ -40,6 +40,9 @@ (define-module (guix build mix-build-system) > =C2=A0;; minor version number of the Elixir used in the build. > =C2=A0(define %elixir-version (make-parameter "X.Y")) > =C2=A0 > +(define %git-version-rx > +=C2=A0 (make-regexp "^(.*)-[0-9]+(\\.[0-9]+)?(\\.[0-9]+)?-[0-9]+\\..+$")= ) > + This regexp appears unsafe to me. It matches a numeric component in the package name as well. > =C2=A0(define (elixir-relative-libdir version) > =C2=A0=C2=A0 "Return the relative path inside a package namespace in the = store > where all > =C2=A0libraries for a specified Elixir VERSION are installed." > @@ -141,10 +144,12 @@ (define* (remove-mix-dirs . _) > =C2=A0 > =C2=A0(define (package-name->elixir-name name+ver) > =C2=A0=C2=A0 "Convert the Guix package NAME-VER to the corresponding Elix= ir > name-version > -format.=C2=A0 Example: elixir-a-pkg-1.2.3 -> a_pkg" > +format.=C2=A0 Example: elixir-a-pkg-1.2.3 -> a_pkg or elixir-a-pkg-0.0.0= - > 0.e51e36e > +-> a_pkg" > +=C2=A0 (define git-version? (regexp-exec %git-version-rx name+ver)) > =C2=A0=C2=A0 ((compose > =C2=A0=C2=A0=C2=A0=C2=A0 (cute string-join <> "_") > -=C2=A0=C2=A0=C2=A0 (cute drop-right <> 1) > +=C2=A0=C2=A0=C2=A0 (cute drop-right <> (if git-version? 2 1)) > =C2=A0=C2=A0=C2=A0=C2=A0 (cute string-split <> #\-)) I think we might have it easier if we pick the left side from a string- split with #\. Ideally, package names should not contain dots. > =C2=A0=C2=A0=C2=A0 (strip-prefix name+ver))) Cheers