unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Andy Tai <atai@atai.org>
To: 70875@debbugs.gnu.org
Cc: Andy Tai <atai@atai.org>
Subject: [bug#70875] [PATCH v4 1/2] gnu: squirrel: Update to 3.2.
Date: Mon, 24 Jun 2024 22:13:04 -0700	[thread overview]
Message-ID: <084d3cd366373d62d29b62a8d381365db066c35f.1719292239.git.atai@atai.org> (raw)
In-Reply-To: <cover.1719292239.git.atai@atai.org>

* 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 <atai@atai.org>
+;;; Copyright © 2019, 2024 Li-cheng (Andy) Tai <atai@atai.org>
 ;;
 ;;; 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





  reply	other threads:[~2024-06-25  5:15 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-11  9:31 [bug#70875] [PATCH] gnu: squirrel: Update to 3.2 Andy Tai
2024-05-11 10:16 ` [bug#70875] [PATCH v2] gnu: Add quirrel Andy Tai
2024-06-24  3:43   ` Maxim Cournoyer
2024-06-24 13:34     ` Andy Tai
2024-05-11 17:01 ` [bug#70875] [PATCH v3] gnu: squirrel: Update to 3.2 Andy Tai
2024-06-24  3:41 ` [bug#70875] [PATCH] " Maxim Cournoyer
2024-06-24 13:33   ` Andy Tai
2024-06-25  5:13 ` [bug#70875] [PATCH v4 0/2] squirrel: Update Andy Tai
2024-06-25  5:13   ` Andy Tai [this message]
2024-06-25  5:13   ` [bug#70875] [PATCH v4 2/2] gnu: squirrel: Code reformat Andy Tai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=084d3cd366373d62d29b62a8d381365db066c35f.1719292239.git.atai@atai.org \
    --to=atai@atai.org \
    --cc=70875@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).