From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id +Dt3BHxSemYt0wAAe85BDQ:P1 (envelope-from ) for ; Tue, 25 Jun 2024 05:15:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id +Dt3BHxSemYt0wAAe85BDQ (envelope-from ) for ; Tue, 25 Jun 2024 07:15:40 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=gls0rpYH; 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=1719292539; 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=mIdMN1lJgixcwwG6DPjV5NVkP7OXxQbS8aCSqb1AY4s=; b=gSkmwRQUMCjwzp9PhJTfyQ+SrIa4dpcO/5Uq3M8/vKMD9YXmOYWk2BZxvd7kdjtYL70C4g 2fzv88whCnht+1udVqTJCXDlime3/iJAbEFwWyFg0Pcs2h+jVWvTaFqJVUySd/gBeCDCnH Ws3hwYJ5q/6ID3D9iqNrm12aLfVF4sHP4ecfyNIIq3DeIcgPgchFFJQy+Em+oINIYr7vXZ MnDZwnx0Ehum7COnWf2GcBofw74Vo5vI+D0GvUqMjEGUbJMeB3RC5I5tlSudjTafVmt+SC DzkJCmy5uGNx3qua5JqoX6uNf0IS8l5z/rJACxtuPmTWiy7KiOnw2rKS8GCsdw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=gls0rpYH; 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-Seal: i=1; s=key1; d=yhetil.org; t=1719292539; a=rsa-sha256; cv=none; b=oVwmaCIC+ku+RF0ckrz4HBMhW32YCA/RtjPjUqkG1/7VdrMEn95bD6T4izZeYT8d8psr36 PqPH3hxhBYedV3F/YbpWGJgv5o411FRe9DT4PN/rs9iBsarIv1NjI+d04Jm+Fu3o2Rt35E 6mJfy2yoxXVX8qKi5LVtW7y0VK5/BqbW+lkcvQB9hsf0Cd7jCnVVNIQMw+FPMY1wbwS/+n oig+k/kdRZUo/FKhGjVcjjfcm3VwzyNdoMkQcWAmo+A7wDgE8lwojCingBrpRT+48OkvLZ rbazIr+dU66JVI6ojxwK5p7T8IgOyNDxmiXmGME4b98gLShk1EQIINTQzzmssw== 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 3BCB521CF0 for ; Tue, 25 Jun 2024 07:15:39 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sLyWG-00037q-QB; Tue, 25 Jun 2024 01:15:04 -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 1sLyWE-000375-14 for guix-patches@gnu.org; Tue, 25 Jun 2024 01:15:02 -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 1sLyWD-0002Sc-LZ for guix-patches@gnu.org; Tue, 25 Jun 2024 01:15:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sLyWF-0002Bn-2H for guix-patches@gnu.org; Tue, 25 Jun 2024 01:15:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70875] [PATCH v4 1/2] gnu: squirrel: Update to 3.2. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Jun 2024 05:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70875 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 70875@debbugs.gnu.org Cc: Andy Tai Received: via spool by 70875-submit@debbugs.gnu.org id=B70875.17192924628330 (code B ref 70875); Tue, 25 Jun 2024 05:15:03 +0000 Received: (at 70875) by debbugs.gnu.org; 25 Jun 2024 05:14:22 +0000 Received: from localhost ([127.0.0.1]:36075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLyVa-0002AC-6x for submit@debbugs.gnu.org; Tue, 25 Jun 2024 01:14:22 -0400 Received: from mail-pg1-f170.google.com ([209.85.215.170]:50499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLyVV-00029b-Aa for 70875@debbugs.gnu.org; Tue, 25 Jun 2024 01:14:20 -0400 Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-6e7b121be30so3784314a12.1 for <70875@debbugs.gnu.org>; Mon, 24 Jun 2024 22:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719292389; x=1719897189; 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=mIdMN1lJgixcwwG6DPjV5NVkP7OXxQbS8aCSqb1AY4s=; b=gls0rpYHBOmZGFMouUV4OCcgPZy2Rkrsapu/HUGE7nTKtrs6Rbkaxy3rdGd89FspAh Ctx2sukBPxLIkwKnU88UYsRccKO3I6eur921flf8DWKLzlI4O3xurDVBk1Jxp6ZiBWtw aih/sh6GMDOuLvrh5mNbNz6JfM01MaeFHX9+brkHAV8YmHfQy67BsLoRmBqAItHv9Ixu 9BXs+m6nHA3CpIBuE0NXp9k00I0aI+GyleKTeBW3/dG0vBiuzxBxRUO39EA1G2Em7DoW L5z5XVVx5mtjNIJ/02++BUvaDqxC75ZJdoYgSivB/D2FnUPRgCFy5jtp6ion3p9yTVZQ WKsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719292389; x=1719897189; 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=mIdMN1lJgixcwwG6DPjV5NVkP7OXxQbS8aCSqb1AY4s=; b=TULePeyX0ojT2SglCyy0gzK3c0RO9Nw+vj3x5gI7XcP4KRlknc/7R+47RPZiJPEYS7 exUm81Cr7H7PmdscO8inI8wlf3Fd3tWSxnbPtkIY4KcFyArzq0mSohmCUX2HIBXbpOSm xxNjJaSVmxdSxVDLUEw+iaXULpawpuTqeRt9enNazq2Mnm1jAaJtu1b7R65K2FXoEGZr 1V/3qfd0EBugUv2oL213n2lz1pbOxZhefOZn1ORntM6zninaHdN7FIxkis725XkVfMxn LVr5+diWfHuJV5Ic+HsDk/aVDZkJR3debgLefP3v62KBXqwOXr7H1Pj9Q3nglzDs5L2y 6Hgg== X-Gm-Message-State: AOJu0Yw//YKLeAzrZqze1BCxuXK84H7chyofsW+QJlZrQQ/lMWsqKT1I QEWK9+VMHPGH0d966L4nNUP7ahiT+pcwWFK700zTFxrBDkyoCcKDdwKENQ== X-Google-Smtp-Source: AGHT+IFSzYeCT8WoEW3FpDdKEyYoYa04zKb/hR4ANe12ZHqqNpopyewXKwzeyefNaU6JrgSPm3FJ+w== X-Received: by 2002:a05:6a21:19b:b0:1b4:e956:ae64 with SMTP id adf61e73a8af0-1bcf8002a94mr6784512637.54.1719292389122; Mon, 24 Jun 2024 22:13:09 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net. [98.37.226.154]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9ebbbddffsm71196595ad.285.2024.06.24.22.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 22:13:08 -0700 (PDT) From: Andy Tai Date: Mon, 24 Jun 2024 22:13:04 -0700 Message-Id: <084d3cd366373d62d29b62a8d381365db066c35f.1719292239.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -1.36 X-Migadu-Queue-Id: 3BCB521CF0 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -1.36 X-TUID: /PLTQr3sPJ9y * gnu/packages/squirrel.scm (squirrel): Update to 3.2. [source](origin): Switch to fetch from git with version tag. [arguments](phases): In install stage, adjust for source file location changes and do not install pdf doc files for they are not generated in build. Change-Id: Iebb19806cdb98cb15e2e739657d4f90aa6eb596e --- gnu/packages/squirrel.scm | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm index 1b9489882f..a318eb3815 100644 --- a/gnu/packages/squirrel.scm +++ b/gnu/packages/squirrel.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Li-cheng (Andy) Tai +;;; Copyright © 2019, 2024 Li-cheng (Andy) Tai ;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +22,7 @@ (define-module (gnu packages squirrel) #:use-module (gnu packages sphinx) #:use-module (guix build-system cmake) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build utils) #:use-module (guix packages) @@ -30,17 +31,16 @@ (define-module (gnu packages squirrel) (define-public squirrel (package (name "squirrel") - (version "3.1") + (version "3.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/squirrel/squirrel3/" - "squirrel " version " stable/squirrel_" - (string-join (string-split version #\.) "_") - "_stable.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/albertodemichelis/squirrel.git") + (commit (string-append "v" version)))) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jyh1523zrrnh9swanfrda0s14mvwc9431dh07g0nx74hbxsfia8")))) + "028v90k5bbcb8qwysgv6r0ycy6g920ns32i2sdq0i8hqib90ac5z")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DDISABLE_STATIC=ON") @@ -49,27 +49,16 @@ (define-public squirrel (modify-phases %standard-phases (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (let* ((source (assoc-ref %build-inputs "source")) + (out (assoc-ref outputs "out")) (doc-dir (string-append out "/share/doc/squirrel"))) (for-each (lambda (file) - (install-file (string-append "../squirrel3/" file) doc-dir)) + (install-file (string-append source "/" file) doc-dir)) '("COPYRIGHT" "HISTORY" "README" - "doc/sqstdlib3.pdf" "doc/squirrel3.pdf"))) - #t)) - (add-after 'install 'install-headers - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (include-dir (string-append out "/include/squirrel"))) - (mkdir-p include-dir) - (for-each - (lambda (header-file) - (copy-recursively header-file - (string-append include-dir - "/" - (basename header-file)))) - (find-files "../squirrel3/include"))) - #t))))) + ;"doc/sqstdlib3.pdf" "doc/squirrel3.pdf" ;; pdf not build out of git; TODO + + )))))))) (native-inputs `(("cmake" ,cmake-minimal) ("python-sphinx" ,python-sphinx))) -- 2.34.1