diff options
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/admin.scm | 8 | ||||
-rw-r--r-- | gnu/packages/emacs-xyz.scm | 4 | ||||
-rw-r--r-- | gnu/packages/engineering.scm | 4 | ||||
-rw-r--r-- | gnu/packages/flashing-tools.scm | 19 | ||||
-rw-r--r-- | gnu/packages/games.scm | 192 | ||||
-rw-r--r-- | gnu/packages/graphics.scm | 86 | ||||
-rw-r--r-- | gnu/packages/license.scm | 9 | ||||
-rw-r--r-- | gnu/packages/linux.scm | 26 | ||||
-rw-r--r-- | gnu/packages/lisp.scm | 54 | ||||
-rw-r--r-- | gnu/packages/maths.scm | 10 | ||||
-rw-r--r-- | gnu/packages/perl.scm | 4 |
11 files changed, 333 insertions, 83 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8c550a79af..3dc5f35af0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3341,7 +3341,7 @@ Logitech Unifying Receiver.") (package (name "lynis") ;; Also update the ‘lynis-sdk’ input to the commit matching this release. - (version "2.7.4") + (version "2.7.5") (source (origin (method git-fetch) @@ -3350,7 +3350,7 @@ Logitech Unifying Receiver.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1jjk5hcxmp4f4ppsljiq95l2ln6b03azydap3b35lsvxkjybv88k")) + (base32 "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0")) (modules '((guix build utils))) (snippet '(begin @@ -3367,10 +3367,10 @@ Logitech Unifying Receiver.") (method git-fetch) (uri (git-reference (url "https://github.com/CISOfy/lynis-sdk") - (commit "90f301e21c204792cf372f1cf05890a562f2e31b"))) + (commit "bf1c1d95121da9ca79a9eac5a15ed8d81e34094d"))) (file-name (git-file-name "lynis-sdk" version)) (sha256 - (base32 "1d0smr1fxrvbc3hl8lzy33im9ahzr0hgs3kk09r8g8xccjkcm52l")))))) + (base32 "1ndz5v0039dqa87cva2dk55a8hkw0fibsw8hh2ddmny9qkr4l3dp")))))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1b9ae73966..1b8ae47fc2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8197,7 +8197,7 @@ memoizing functions.") (define-public emacs-linum-relative (package (name "emacs-linum-relative") - (version "0.5") + (version "0.6") (source (origin (method git-fetch) @@ -8206,7 +8206,7 @@ memoizing functions.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s")))) + (base32 "0b3n1gk2w1p72x0zfdz9l70winq2fnjpjrgq0awxx730xk7ypp5n")))) (build-system emacs-build-system) (home-page "https://github.com/coldnew/linum-relative") (synopsis "Relative line numbering for Emacs") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 103cb19e83..169d912c35 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1816,7 +1816,7 @@ simulations are also supported.") (define-public qucs-s (package (name "qucs-s") - (version "0.0.20") + (version "0.0.21") (source (origin (method url-fetch) (uri (string-append "https://github.com/ra3xdh/qucs_s/archive/" @@ -1824,7 +1824,7 @@ simulations are also supported.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "01dizf4rjciqc8x7bmv3kbhdlz90bm6n9m9fz7dbzqcwvszcs1hx")))) + "12m1jwhb9qwvb141qzyskbxnw3wn1x22d02z4b4862p7xvccl5h7")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 42ce560ca7..7d5c1cf723 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -413,28 +413,25 @@ Management Engine (ME). You need to @code{sudo rmmod mei_me} and (define-public me-cleaner (package (name "me-cleaner") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/corna/me_cleaner/" "archive/v" version ".tar.gz")) (sha256 (base32 - "1pgwdqy0jly80nhxmlmyibs343497yjzs6dwfbkcw0l1gjm8i5hw")) + "0hdnay1ai0r6l69z63jkiz6yfwdsqc2mrfyj77hgadv7xxxqm6na")) (file-name (string-append name "-" version ".tar.gz")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'create-setup.py - (lambda _ - (call-with-output-file "setup.py" - (lambda (port) - (format port "\ -from setuptools import setup -setup(name='me_cleaner', version='~a', scripts=['me_cleaner.py']) -" ,version))) - #t))))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man/man1"))) + (install-file "man/me_cleaner.1" man) + #t)))))) (home-page "https://github.com/corna/me_cleaner") (synopsis "Intel ME cleaner") (description "This package provides tools for disabling Intel diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c9527ddd44..d68f6aa451 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2030,6 +2030,126 @@ some of the restrictions in the venerable Z-machine format. This is the reference interpreter, using the Glk API.") (license license:expat))) +(define-public fifechan + (package + (name "fifechan") + (version "0.1.5") + (source (origin + (method url-fetch) + (uri (string-append "https://codeload.github.com/fifengine/" + "fifechan/tar.gz/" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wxs9vz5x9y8chghd8vp7vfk089lfb0qnzggi17zrqkrngs5zgi9")))) + (build-system cmake-build-system) + (inputs + `(("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("mesa" ,mesa))) + (arguments + '(#:tests? #f)) ; No included tests + (home-page "https://fifengine.github.io/fifechan/") + (synopsis "Cross platform GUI library specifically for games") + (description + "Fifechan is a lightweight cross platform GUI library written in C++ +specifically designed for games. It has a built in set of extendable GUI +Widgets, and allows users to create more.") + (license license:lgpl2.1+))) + +(define-public fifengine + (package + (name "fifengine") + (version "0.4.2") + (source (origin + (method url-fetch) + (uri (string-append "https://codeload.github.com/fifengine/" + "fifengine/tar.gz/" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1y4grw25cq5iqlg05rnbyxw1njl11ypidnlsm3qy4sm3xxdvb0p8")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; TODO The test running fails to run some tests. + #:modules ((srfi srfi-1) + (guix build cmake-build-system) + (guix build utils)) + #:configure-flags + (list + (string-append "-DOPENALSOFT_INCLUDE_DIR=" + (assoc-ref %build-inputs "openal") + "/include/AL") + (string-append "-DPYTHON_SITE_PACKAGES=" + (assoc-ref %outputs "out") + "/lib/python3.7/site-packages")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-run_tests.py + (lambda _ + ;; Patch the test runner to exit with a status of 1 if any test + ;; fails, to allow detecting failures. + (substitute* "run_tests.py" + (("ERROR\\. One or more tests failed!'\\)") + "ERROR. One or more tests failed!') +\t\texit(1)")) + #t)) + ;; Run tests after installation so that we can make use of the built + ;; python modules. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (define python-version + (let* ((version (last (string-split + (assoc-ref inputs "python") + #\-))) + (components (string-split version #\.)) + (major+minor (take components 2))) + (string-join major+minor "."))) + + (when tests? + ;; Set PYTHONPATH so that python finds the installed modules. + (setenv "PYTHONPATH" + (string-append (getenv "PYTHONPATH") ":" + (assoc-ref outputs "out") + "/lib/python" + python-version + "/site-packages")) + ;; The tests require an X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (setenv "XDG_RUNTIME_DIR" "/tmp") + ;; Run tests + (chdir ,(string-append "../" name "-" version)) + (invoke "python3" "run_tests.py" "-a")) + #t))))) + (inputs + `(("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("sdl2-ttf" ,sdl2-ttf) + ("tinyxml" ,tinyxml) + ("openal" ,openal) + ("libogg" ,libogg) + ("glew" ,glew) + ("libvorbis" ,libvorbis) + ("boost" ,boost) + ("fifechan" ,fifechan) + ("swig" ,swig) + ("python" ,python))) + (native-inputs + `(("python" ,python) + ("swig" ,swig) + ("xvfb" ,xorg-server))) + (propagated-inputs + `(("python-future" ,python-future))) + (home-page "https://www.fifengine.net/") + (synopsis "FIFE is a multi-platform isometric game engine written in C++") + (description + "@acronym{FIFE, Flexible Isometric Free Engine} is a multi-platform +isometric game engine. Python bindings are included allowing users to create +games using Python as well as C++.") + (license license:lgpl2.1+))) + (define-public fizmo (package (name "fizmo") @@ -2189,6 +2309,78 @@ against each other or just trying to beat the computer; single-player mode is also available.") (license license:gpl3+))) +(define-public unknown-horizons + (package + (name "unknown-horizons") + (version "2019.1") + (source (origin + (method url-fetch) + (uri (string-append "https://codeload.github.com/unknown-horizons/" + "unknown-horizons/tar.gz/" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n747p7h0qp48szgp262swg0xh8kxy1bw8ag1qczs4i26hyzs5x4")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'set-HOME + (lambda _ + (setenv "HOME" "/tmp"))) + (add-after 'build 'build-extra + (lambda _ + (invoke "python3" "./setup.py" "build_i18n") + (invoke "python3" "horizons/engine/generate_atlases.py" "2048") + #t)) + (add-after 'install 'patch + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/bin/unknown-horizons") + (("os\\.chdir\\(get\\_content\\_dir\\_parent_path\\(\\)\\)") + (string-append "os.chdir(\"" + (assoc-ref outputs "out") + "/share/unknown-horizons\")")))) + #t)) + ;; TODO: Run GUI tests as well + (replace 'check + (lambda _ + (substitute* "horizons/constants.py" + (("IS_DEV_VERSION = False") + "IS_DEV_VERSION = True")) + (invoke "pytest" "tests") + (substitute* "horizons/constants.py" + (("IS_DEV_VERSION = True") + "IS_DEV_VERSION = False")) + #t))))) + (inputs + `(("fifengine" ,fifengine) + ("python:tk" ,python "tk") + ("python-pillow" ,python-pillow) + ("python-pyyaml" ,python-pyyaml))) + (native-inputs + `(("intltool" ,intltool) + + ;; Required for tests + ("python-greenlet" ,python-greenlet) + ("python-polib" ,python-polib) + ("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) + (home-page "http://unknown-horizons.org/") + (synopsis "Isometric realtime strategy, economy and city building simulation") + (description + "Unknown Horizons is a 2D realtime strategy simulation with an emphasis +on economy and city building. Expand your small settlement to a strong and +wealthy colony, collect taxes and supply your inhabitants with valuable +goods. Increase your power with a well balanced economy and with strategic +trade and diplomacy.") + (license (list + license:gpl2+ ; Covers code + license:expat ; tests/dummy.py, ext/polib.py + license:cc-by-sa3.0 ; Covers some media content + license:cc-by3.0 ; Covers some media content + license:bsd-3)))) ; horizons/ext/speaklater.py + (define-public gnujump (package (name "gnujump") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 638ec1fee7..c57d90f5ac 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Alex Kost <alezost@gmail.com> ;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net> @@ -79,6 +79,7 @@ #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils)) @@ -1107,47 +1108,52 @@ or by subtracting one shape from the other.") (license license:gpl2)))) (define-public coin3D - (package - (name "coin3D") - (version "4.0.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://bitbucket.org/Coin3D/coin/downloads/coin-" - version "-src.zip")) - (sha256 - (base32 - "1mqwlqzvc9ydfxi0bfskwlil16mbnkphfz36p0zl2mvw6h05aqh0")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file - '("cfg/csubst.exe" - "cfg/wrapmsvc.exe")) - #t)))) - (build-system cmake-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz))) - (inputs - `(("boost" ,boost) - ("freeglut" ,freeglut) - ("glew" ,glew))) - (arguments - `(#:configure-flags - (list - "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" - (string-append "-DBOOST_ROOT=" - (assoc-ref %build-inputs "boost"))))) - (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home") - (synopsis - "High-level 3D visualization library with Open Inventor 2.1 API") - (description - "Coin is a 3D graphics library with an Application Programming Interface + ;; The ‘4.0.0’ zip archive isn't stable, nor in fact a release. See: + ;; https://bitbucket.org/Coin3D/coin/issues/179/coin-400-srczip-has-been-modified + (let ((revision 1) + (changeset "ab8d0e47a4de3230a8137feb39c142d6ba45f97d")) + (package + (name "coin3D") + (version + (simple-format #f "3.1.3-~A-~A" revision (string-take changeset 7))) + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://bitbucket.org/Coin3D/coin") + (changeset changeset))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ff44jz6lg4rylljvy69n1hcjh9y6achbv9jpn1cv2sf8cxn3r2j")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file + '("cfg/csubst.exe" + "cfg/wrapmsvc.exe")) + #t)))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz))) + (inputs + `(("boost" ,boost) + ("freeglut" ,freeglut) + ("glew" ,glew))) + (arguments + `(#:configure-flags + (list + "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" + (string-append "-DBOOST_ROOT=" + (assoc-ref %build-inputs "boost"))))) + (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home") + (synopsis + "High-level 3D visualization library with Open Inventor 2.1 API") + (description + "Coin is a 3D graphics library with an Application Programming Interface based on the Open Inventor 2.1 API. For those who are not familiar with Open Inventor, it is a scene-graph based retain-mode rendering and model interaction library, written in C++, which has become the de facto standard graphics library for 3D visualization and visual simulation software in the scientific and engineering community.") - (license license:bsd-3))) + (license license:bsd-3)))) diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index 73b0dff3f5..b7519f91ae 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -38,7 +38,7 @@ (define-public perl-regexp-pattern-license (package (name "perl-regexp-pattern-license") - (version "3.1.92") + (version "3.1.94") (source (origin (method url-fetch) @@ -46,8 +46,7 @@ "mirror://cpan/authors/id/J/JO/JONASS/Regexp-Pattern-License-" "v" version ".tar.gz")) (sha256 - (base32 - "0gxv8wpvlllmvhkpixv5x23ywn1s6zs7ypcs38s7nfh4phamyixh")))) + (base32 "0kznpv628jrndn4nw646f6pl7yqvmacwljlygvsjfdkyh0i4sr2k")))) (build-system perl-build-system) (native-inputs `(("perl-regexp-pattern" ,perl-regexp-pattern) @@ -114,7 +113,7 @@ statements and serializes in normalized format.") (define-public licensecheck (package (name "licensecheck") - (version "3.0.36") + (version "3.0.37") (source (origin (method url-fetch) (uri (string-append @@ -122,7 +121,7 @@ statements and serializes in normalized format.") "v" version ".tar.gz")) (sha256 (base32 - "0y14ppq6f9hc0rc0syhfgms1r7fd51vpgfx5va6b2v84y8anb6g1")))) + "12l83zf85zagpagizmzy3bwkc659sbzqf18cycx8g4h6d3mc5kqw")))) (build-system perl-build-system) (native-inputs `(("perl-regexp-pattern" ,perl-regexp-pattern) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 63ce0c62ae..6f7ec1bb15 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -189,25 +189,25 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define deblob-scripts-5.2 (linux-libre-deblob-scripts - "5.2.17" + "5.2.19" (base32 "076fwxlm6jq6z4vg1xq3kr474zz7qk71r90sf9dnfia3rw2pb4fa") - (base32 "0d3pp1bqchqc7vnxr1a56km5r0hzjiiipzz2xc3wgjwfi51k9kxc"))) + (base32 "1vghzpvlsvz5q8baxjza8jdryjmcx61g2pmnm6dd1k7glr6jy1a9"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.75" + "4.19.77" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za"))) (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.146" + "4.14.147" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n"))) (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.194" + "4.9.195" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w"))) @@ -365,34 +365,34 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.3))) -(define-public linux-libre-5.2-version "5.2.18") +(define-public linux-libre-5.2-version "5.2.19") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) - (hash (base32 "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd"))) + (hash (base32 "12mi857lyd5vj8qhj2f505hqnwzsnd829hxd78n9kk88iv1f966y"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.2))) -(define-public linux-libre-4.19-version "4.19.76") +(define-public linux-libre-4.19-version "4.19.77") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds"))) + (hash (base32 "1agksl35amjzc6g6d9zjwz6p5qir2cligb5c1d9s2bag9766jav1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.146") +(define-public linux-libre-4.14-version "4.14.147") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3"))) + (hash (base32 "04jvp05spszcxmkdsl21dylbcf76ns9bwxf1zlk4x7cxiil97mwg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.194") +(define-public linux-libre-4.9-version "4.9.195") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m"))) + (hash (base32 "0s4xj8f1dpnz3fbrqmgwq02smhcrq1ni8hgn2bbfqvm15lm5dgjl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 84597e4e73..2bdebed04e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -7664,3 +7664,57 @@ implementation specific equivalent.") (define-public ecl-trivial-macroexpand-all (sbcl-package->ecl-package sbcl-trivial-macroexpand-all)) + +(define-public sbcl-serapeum + (let ((commit "65837f8a0d65b36369ec8d000fff5c29a395b5fe") + (revision "0")) + (package + (name "sbcl-serapeum") + (version (git-version "0.0.0" revision commit)) + (home-page "https://github.com/ruricolist/serapeum") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0clwf81r2lvk1rbfvk91s9zmbkas9imf57ilqclw12mxaxlfsnbw")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("trivia" ,sbcl-trivia) + ("trivia.quasiquote" ,sbcl-trivia.quasiquote) + ("split-sequence" ,sbcl-split-sequence) + ("string-case" ,sbcl-string-case) + ("parse-number" ,sbcl-parse-number) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("named-readtables" ,sbcl-named-readtables) + ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras) + ("parse-declarations-1.0" ,sbcl-parse-declarations) + ("global-vars" ,sbcl-global-vars) + ("trivial-file-size" ,sbcl-trivial-file-size) + ("trivial-macroexpand-all" ,sbcl-trivial-macroexpand-all))) + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("local-time" ,sbcl-local-time))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "serapeum.asd" + ;; Guix does not have Quicklisp, and probably never will. + (("\\(:file \"quicklisp\"\\)") "")) + #t))))) + (synopsis "Common Lisp utility library beyond Alexandria") + (description + "Serapeum is a conservative library of Common Lisp utilities. It is a +supplement, not a competitor, to Alexandria.") + (license license:expat)))) + +(define-public cl-serapeum + (sbcl-package->cl-source-package sbcl-serapeum)) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 357382f038..fe9d59b69a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1775,18 +1775,20 @@ ASCII text files using Gmsh's own scripting language.") (define-public maxflow (package (name "maxflow") - (version "3.04") + ;; Versioning is ambiguous: the git tag matching this commit is ‘3.0.5’, + ;; which matches CMakeLists.txt, but README.md and CHANGES say ‘3.04’. + (version "3.0.5") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gerddie/maxflow.git") - (commit "42401fa54823d16b9da47716f04e5d9ef1605875"))) - (file-name (string-append name "-" version "-checkout")) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "0rll38whw55h0vcjrrwdnh9ascvxby0ph7n1l0d12z17cg215kkb")))) (build-system cmake-build-system) - (home-page "http://pub.ist.ac.at/~vnk/software.html") + (home-page "https://pub.ist.ac.at/~vnk/software.html") (synopsis "Library implementing Maxflow algorithm") (description "An implementation of the maxflow algorithm described in @cite{An Experimental Comparison of Min-Cut/Max-Flow Algorithms for diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b3710fe488..7d1235ed65 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -298,14 +298,14 @@ list manipulation routines.") (define-public perl-async-interrupt (package (name "perl-async-interrupt") - (version "1.24") + (version "1.25") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/ML/MLEHMANN/" "Async-Interrupt-" version ".tar.gz")) (sha256 (base32 - "1lx4am3cqb9vvng9fhlwgfd7mk3afbrg8rps6xgpas6ij67dw8m0")))) + "0jh94wj1b6a0cnni8prsb59g5lak5rfj2fw5ng96291zmz2yqp1w")))) (build-system perl-build-system) (native-inputs `(("perl-canary-stability" ,perl-canary-stability))) |