diff options
author | Andy Tai <atai@atai.org> | 2024-05-11 10:01:55 -0700 |
---|---|---|
committer | Guix Patches Tester <> | 2024-05-11 19:17:26 +0200 |
commit | 8e1af7fc72b23c4f65689b38526bbc8014096c54 (patch) | |
tree | 38d1f970cb88a82895843066f807af0721e1df39 | |
parent | 9288654773a110156e0bb6fc703a9c24f5bfc527 (diff) | |
download | guix-patches-issue-70875.tar guix-patches-issue-70875.tar.gz |
gnu: squirrel: Update to 3.2.issue-70875
* gnu/packages/squirrel.scm (squirrel): Update to 3.2.
Change-Id: Iebb19806cdb98cb15e2e739657d4f90aa6eb596e
-rw-r--r-- | gnu/packages/squirrel.scm | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm index 1b9489882f..7f959cace0 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 @@ #: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-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,26 +49,16 @@ (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"))) + ;"doc/sqstdlib3.pdf" "doc/squirrel3.pdf" ;; pdf not build out of git; TODO + + ))) #t))))) (native-inputs `(("cmake" ,cmake-minimal) |